root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CCorretta gestione numero copie

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@242 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1994-09-14 16:47:19 +00:00
parent 7696ebc104
commit c1e97ca1f9
12 changed files with 823 additions and 828 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/applicat.cpp
View File

@ -33,20 +33,6 @@ HIDDEN long backdrop_eh( WINDOW win, EVENT* ep)
clear_window( win, COLOR_BLUE );
#else
clear_window( win, COLOR_GRAY );
/*
const RCT& rct = ep->v.update.rct;
bool even = FALSE;
for (int y = 0; y < rct.bottom; y += 96)
{
const int sx = even ? 96 : 0;
for (int x = sx; x < rct.right; x += 192)
if (
(y+64) > rct.top && y < rct.bottom &&
(x+64) > rct.left && x < rct.right
) win_draw_icon(win, x, y, ICON_RSRC);
even = !even;
}
*/
#endif
return 0L;
@ -120,7 +106,7 @@ void TApplication::wait_for(const char* command)
while (waiting_for) do_events();
///////////////////////////////////////////////////////////
// It seems necessary to restore these things
// We need to restore these things
///////////////////////////////////////////////////////////
customize_controls(TRUE);
xvt_statbar_refresh();

1
include/applicat.h
View File

@ -54,6 +54,7 @@ public:
virtual bool menu(MENU_TAG) { return TRUE; } // Controlla il menu
virtual bool destroy(); // Rimuove l'applicazione
virtual void print();
virtual word class_id() const { return CLASS_APPLICATION; }
void stop_run(); // Forza chiusura applicazione
void check_menu_item(MENU_TAG item); // Check menu

3
include/classes.h
View File

@ -15,6 +15,9 @@
#define CLASS_FILENAME 12
#define CLASS_TOKEN_STRING 13
#define CLASS_APPLICATION 40
#define CLASS_PRINT_APPLICATION 41
#define CLASS_PRINTROW 50
#define CLASS_PRINTER 51

6
include/execp.cpp
View File

@ -63,7 +63,13 @@ int TExternal_app::run(bool async)
#elif XVT_OS == XVT_OS_WIN
set_cursor(TASK_WIN, CURSOR_WAIT);
_exitcode = WinExec((char*)_path, SW_SHOW);
if (_exitcode >= 32)
{
if (!async) MainApp()->wait_for(_path);
_exitcode = 0;
}
else error_box("Impossibile eseguire %s", (const char*)_path);
set_cursor(TASK_WIN, CURSOR_ARROW);
#else

8
include/mask.cpp
View File

@ -218,9 +218,7 @@ TMask::TMask(const char* title, int pages, int cols, int rows, int xpos,
void TMask::read_mask(const char* name, int mode, int num)
{
#ifdef DBG
clock1 = clock();
#endif
_source_file = name;
_source_file.ext(MASK_EXT);
@ -258,9 +256,7 @@ void TMask::read_mask(const char* name, int mode, int num)
add_buttons();
#ifdef DBG
clock1 = clock()-clock1;
#endif
}
@ -434,9 +430,7 @@ bool TMask::page_enabled(int page) const
void TMask::start_run()
{
#ifdef DBG
clock2 = clock();
#endif
load_checks();
@ -465,9 +459,7 @@ void TMask::start_run()
}
}
#ifdef DBG
clock2 = clock() - clock2;
#endif
}
bool TMask::check_fields()

2
include/mov.h
View File

@ -25,6 +25,6 @@
#define MOV_OCFPI "OCFPI"
#define MOV_CORRLIRE "CORRLIRE"
#define MOV_CORRVALUTA "CORRVALUTA"
#define MOV_DATACOMP "DATACOMP"
#endif

4
include/msksheet.cpp
View File

@ -616,11 +616,11 @@ break;
if (ok) dispatch_e_char(parent(), k);
}
break;
case K_ENTER:
case K_ESC:
case K_CTRL+K_ENTER:
{
const bool ok = (bool)xi_move_focus(_itf);
if (ok) dispatch_e_char(parent(), k == K_ENTER ? K_TAB : K_BTAB);
dispatch_e_char(parent(), k == K_ESC ? K_ESC : K_TAB);
}
break;

6
include/printapp.h
View File

@ -14,10 +14,6 @@
#include <relation.h>
#endif
#ifndef __STRINGS_H
#include <strings.h>
#endif
// compatibility
#define TPrintapp TPrint_application
@ -395,6 +391,8 @@ public:
// di solito basta e avanza quella di default
virtual bool menu(MENU_TAG m);
virtual word class_id() const { return CLASS_PRINT_APPLICATION; }
// print menu is enabled when set_print returns TRUE
void enable_print_menu();
void disable_print_menu();

47
include/printer.cpp
View File

@ -39,8 +39,7 @@ PrintWhat;
#include <windows.h>
void TPrinter ::
_get_windows_printer_names (TToken_string & t)
void TPrinter::_get_windows_printer_names (TToken_string & t)
{
char *buf = new char[4096]; // ammazzao'
@ -57,8 +56,7 @@ _get_windows_printer_names (TToken_string & t)
delete buf;
}
BOOLEAN TPrinter ::
start_winprint (long data)
BOOLEAN TPrinter::start_winprint (long data)
{
PrDesc *pd = (PrDesc *) data;
TTextfile & txt = *(pd->_txt);
@ -70,8 +68,7 @@ start_winprint (long data)
#endif
// utils del caz
HIDDEN void
read_int (const char *s, int &n, int &cnt)
HIDDEN void read_int (const char *s, int &n, int &cnt)
{
static char nbuf[10];
int j = 0;
@ -84,8 +81,7 @@ read_int (const char *s, int &n, int &cnt)
}
#if XVT_OS == XVT_OS_WIN
void TPrinter ::
set_win_formlen ()
void TPrinter::set_win_formlen ()
{
long pw, ph, phr, pvr;
xvt_escape (XVT_ESC_GET_PRINTER_INFO, _print_rcd, &ph, &pw, &pvr, &phr);
@ -98,13 +94,12 @@ set_win_formlen ()
}
else
warning_box ("Il driver di stampante non e' valido. Non stampare prima di averlo"
" reinstallato");
warning_box ("Il driver di stampante non e' valido.\n"
"Non stampare prima di averlo reinstallato");
}
#endif
void TPrinter ::
_parse_background ()
void TPrinter::_parse_background ()
{
char op;
int x1, x2, y1, y2;
@ -285,8 +280,7 @@ _parse_background ()
}
}
void TPrinter ::
setbackground (const char *b)
void TPrinter::setbackground (const char *b)
{
_background.destroy ();
_bg_desc = b;
@ -646,7 +640,8 @@ bool set_windows_print_device (TMask_field & f, KEY key)
#endif
TPrinter :: TPrinter ():_date (TODAY), _multiple_link (FALSE), _frozen (FALSE), _isgraphics (TRUE),
TPrinter::TPrinter()
: _date (TODAY), _multiple_link (FALSE), _frozen (FALSE), _isgraphics (TRUE),
_lines_per_inch (6), _ch_size (12)
{
@ -1176,7 +1171,12 @@ void TPrinter::set()
mask.set (MSK_1_PRINTERS, format ("%d", _curprn));
mask.set (MSK_1_CODES, format ("%d", _curcode));
mask.set (MSK_1_FILENAME, _printerfile);
mask.set (MSK_1_NPAGES, format("%d",((TPrint_application*)MainApp())->get_n_copies()));
int nc = 1;
if (MainApp()->class_id() == CLASS_PRINT_APPLICATION)
nc = ((TPrint_application*)MainApp())->get_n_copies();
mask.set(MSK_1_NPAGES, nc);
mask.reset (MSK_1_SAVE);
if (mask.run () == K_ESC)
@ -1196,7 +1196,9 @@ void TPrinter::set()
_curprn = atoi(mask.get(MSK_1_PRINTERS));
if (MainApp()->class_id() == CLASS_PRINT_APPLICATION)
((TPrint_application*)MainApp())->set_n_copies(atoi(mask.get(MSK_1_NPAGES)));
PrinterDef& def = (PrinterDef &) get_description (_curprn);
switch (atoi(mask.get (MSK_1_TYPE)))
{
@ -1241,9 +1243,13 @@ void TPrinter::set()
mask.set(MSK_1_PRINTERS, pn1.get(_curprn));
mask.hide(MSK_1_CODES);
mask.set(MSK_1_ISGRAPHICS, _isgraphics ? "X" : "");
mask.set (MSK_1_SIZE, format ("%d", _ch_size));
mask.set (MSK_1_LINES, format ("%d", _lines_per_inch));
mask.set (MSK_1_NPAGES, format("%d",((TPrint_application*)MainApp())->get_n_copies()));
mask.set(MSK_1_SIZE, _ch_size);
mask.set(MSK_1_LINES, _lines_per_inch);
int nc = 1;
if (MainApp()->class_id() == CLASS_PRINT_APPLICATION)
nc = ((TPrint_application*)MainApp())->get_n_copies();
mask.set(MSK_1_NPAGES, nc);
if (_printertype == fileprinter)
mask.set (MSK_1_TYPE, "1");
@ -1305,7 +1311,10 @@ void TPrinter::set()
mask.set_workfile (s);
mask.save ();
}
if (MainApp()->class_id() == CLASS_PRINT_APPLICATION)
((TPrint_application*)MainApp())->set_n_copies(atoi (mask.get (MSK_1_NPAGES)));
switch (atoi (mask.get (MSK_1_TYPE)))
{
case 0: // stampante

8
include/xvtility.cpp
View File

@ -211,7 +211,7 @@ RCT& resize_rect(short x, short y, short dx, short dy, WIN_TYPE wt, WINDOW paren
if (get_window_type(parent) == W_PLAIN) // Mask with Toolbar
{
if (y >= 0) y++;
if (x >= 0 && wt != WO_TE)
if (x > 0 || (wt != WO_TE && x == 0))
{
const int width = (int)get_value(NULL_WIN, ATTR_SCREEN_WIDTH);
if (width > 640) x += (width-640) / (2*COLX);
@ -526,14 +526,14 @@ WINDOW xvt_create_window(WIN_TYPE wt,
CHECKD(win, "Can't create a window: XVT error ", get_xvterrno());
#if XVT_OS == XVT_OS_WIN
static bool set = TRUE;
if (set)
static bool to_set = TRUE;
if (to_set)
{
HWND hwnd = (HWND)get_value(win, ATTR_NATIVE_WINDOW);
word style = GetClassWord(hwnd, GCW_STYLE);
style |= CS_BYTEALIGNCLIENT | CS_SAVEBITS;
SetClassWord(hwnd, GCW_STYLE, style);
set = FALSE;
to_set = FALSE;
}
#endif