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

dongle: ripristinata gestione chiave master eutron_login

Browse Source 
printwin: corretta esportazione in PDF vecchie printapp

git-svn-id: svn://10.65.10.50/branches/R_10_00@22797 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2013-02-07 14:19:10 +00:00
parent bdd0b0e608
commit 5f290bedd1
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/clifo.h
View File

@ -40,6 +40,7 @@
#define CLI_DATANASC "DATANASC" #define CLI_DATANASC "DATANASC"
#define CLI_STATONASC "STATONASC" #define CLI_STATONASC "STATONASC"
#define CLI_COMNASC "COMNASC" #define CLI_COMNASC "COMNASC"
#define CLI_SESSO "SESSO"
#define CLI_SCONTO "SCONTO" #define CLI_SCONTO "SCONTO"
#define CLI_RAGGRB "RAGGRB" #define CLI_RAGGRB "RAGGRB"
#define CLI_RAGGFT "RAGGFT" #define CLI_RAGGFT "RAGGFT"

8
include/dongle.cpp
View File

@ -299,13 +299,13 @@ bool TDongle::hardlock_login(bool test_all_keys)
return ok; return ok;
} }
bool TDongle::eutron_login(bool /*test_all_keys*/) // AGA dongle pitifully died bool TDongle::eutron_login(bool test_all_keys)
{ {
bool ok = false; bool ok = false;
const char* labels[2] = { "AGA.CAMPO", "25EBAI" }; const char* labels[3] = { "AGA.INFORMATICA", "AGA.CAMPO", "25EBAI" };
TDongleType types[2] = { _user_dongle, _developer_dongle }; TDongleType types[3] = { _aga_dongle, _user_dongle, _developer_dongle };
for (int k = 0; k < 2; k++) for (int k = test_all_keys ? 0 : 1; k < 3; k++)
{ {
const unsigned char* pwd = (const unsigned char*)::encode(labels[k]); const unsigned char* pwd = (const unsigned char*)::encode(labels[k]);
ok = xvt_dongle_sl_login((const unsigned char*)labels[k], pwd) != 0; ok = xvt_dongle_sl_login((const unsigned char*)labels[k], pwd) != 0;

16
include/printwin.cpp
View File

@ -244,7 +244,8 @@ bool TPrintwin::print_band(
// @comm Di solito viene disegnata l'intera pagina, ma la cosa dipende dal driver di stampa // @comm Di solito viene disegnata l'intera pagina, ma la cosa dipende dal driver di stampa
{ {
const long first_row = (long)page * _formlen; const long first_row = (long)page * _formlen;
const int rows = (r.bottom - r.top) / _chary; const int rows = (r.bottom - r.top) / _chary;
const int top = r.top / _chary; const int top = r.top / _chary;
const long lines = _txt.lines(); const long lines = _txt.lines();
int k; int k;
@ -279,7 +280,7 @@ bool TPrintwin::do_print(word page_from, word page_to, word copies)
for (word c = 0; c < copies && !_aborted; c++) for (word c = 0; c < copies && !_aborted; c++)
{ {
bool finished = FALSE; bool finished = false;
for (word page = page_from-1; !finished && !_aborted; page++) for (word page = page_from-1; !finished && !_aborted; page++)
{ {
if (page_to >= page_from && page >= page_to) if (page_to >= page_from && page >= page_to)
@ -357,9 +358,14 @@ TPrintwin::TPrintwin(TTextfile& txt, const char* title)
_chary = p.get_dots_per_line(); _chary = p.get_dots_per_line();
_hofs = p.get_horz_offset() + segno*LEN_SPACES(prwin,abs_column); _hofs = p.get_horz_offset() + segno*LEN_SPACES(prwin,abs_column);
_vofs = p.get_vert_offset() + p.get_line_offset()*_chary; _vofs = p.get_vert_offset() + p.get_line_offset()*_chary;
_formlen = p.formlen(); if (ispdf) // Guy: 06-02-2013
p.formlen(_pagelen); _formlen = _pagelen;
else
{
_formlen = p.formlen();
p.formlen(_pagelen);
}
_formwidth = p.formwidth(); _formwidth = p.formwidth();
_inited = TRUE; _inited = TRUE;