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

Patch level : 10.0

Browse Source 
Files correlati     : sc2 sc2500.msk
Ricompilazione Demo : [ ]
Commento            :
Aggiustate toolbar moderne


git-svn-id: svn://10.65.10.50/trunk@16950 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2008-07-25 15:14:33 +00:00
parent 7ad78a68a2
commit d660a8a854
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sc/sc2100.cpp
View File

@ -743,7 +743,7 @@ static int tot_compare(const void* o1, const void* o2)
const THash_object* h1 = *((const THash_object**)o1); const THash_object* h1 = *((const THash_object**)o1);
const THash_object* h2 = *((const THash_object**)o2); const THash_object* h2 = *((const THash_object**)o2);
return stricmp(h1->key(), h2->key()); return h1->key().compare(h2->key(), -1, true); // was stricmp
} }
word TEC_form::ordina_totali_per_valuta(THash_object* tot[MAXTOT]) word TEC_form::ordina_totali_per_valuta(THash_object* tot[MAXTOT])

2
sc/sc2401.cpp
View File

@ -624,7 +624,7 @@ static int tot_compare(const void* o1, const void* o2)
const THash_object* h1 = *((const THash_object**)o1); const THash_object* h1 = *((const THash_object**)o1);
const THash_object* h2 = *((const THash_object**)o2); const THash_object* h2 = *((const THash_object**)o2);
return stricmp(h1->key(), h2->key()); return h1->key().compare(h2->key(), -1, true); // was stricmp
} }
word TESSL_form::ordina_totali_per_valuta(THash_object* tot[MAXTOT]) word TESSL_form::ordina_totali_per_valuta(THash_object* tot[MAXTOT])

8
sc/sc2500.cpp
View File

@ -208,6 +208,7 @@ void TConfronta_mask::show_progress(long pos, long tot)
void TConfronta_mask::fill_browse() void TConfronta_mask::fill_browse()
{ {
_running = true;
TWait_cursor hourglass; TWait_cursor hourglass;
TBrowsefile_field& b = (TBrowsefile_field&)field(F_PREVIEW); TBrowsefile_field& b = (TBrowsefile_field&)field(F_PREVIEW);
TViswin& w = b.vis_win(); TViswin& w = b.vis_win();
@ -236,7 +237,6 @@ void TConfronta_mask::fill_browse()
TSaldo sld; TSaldo sld;
const int annoes = esercizio_corrente(); const int annoes = esercizio_corrente();
const char tipoc = get(F_TIPOC)[0]; const char tipoc = get(F_TIPOC)[0];
_running = TRUE;
xvtil_statbar_set(TR("Inizializzazione...")); xvtil_statbar_set(TR("Inizializzazione..."));
_last_perc = -1; _last_perc = -1;
@ -334,8 +334,8 @@ void TConfronta_mask::fill_browse()
} }
} }
} }
_running = FALSE;
w.goto_top(); w.goto_top();
_running = false;
} }
bool TConfronta_mask::on_field_event(TOperable_field& f, TField_event e, long jolly) bool TConfronta_mask::on_field_event(TOperable_field& f, TField_event e, long jolly)
@ -343,7 +343,7 @@ bool TConfronta_mask::on_field_event(TOperable_field& f, TField_event e, long jo
switch (f.dlg()) switch (f.dlg())
{ {
case DLG_ELABORA: case DLG_ELABORA:
if (e == fe_button) if (e == fe_button && !_running)
{ {
// disabilito campi di selezione e bottone elabora // disabilito campi di selezione e bottone elabora
disable(-4); disable(-4);
@ -360,7 +360,7 @@ bool TConfronta_mask::on_field_event(TOperable_field& f, TField_event e, long jo
break; break;
case F_CANCEL: case F_CANCEL:
if (e == fe_button) if (e == fe_button)
_running = FALSE; _running = false;
break; break;
case DLG_PRINT: case DLG_PRINT:
if (e == fe_button) if (e == fe_button)

20
sc/sc2500.uml
View File

@ -1,6 +1,6 @@
#include "sc2500.h" #include "sc2500.h"
TOOLBAR "" 0 0 0 2 TOOLBAR "toolbar" 0 0 0 2
BUTTON DLG_ELABORA 10 2 BUTTON DLG_ELABORA 10 2
BEGIN BEGIN
@ -9,13 +9,6 @@ BEGIN
GROUP 4 GROUP 4
END END
BUTTON DLG_PRINT 10 2
BEGIN
PROMPT -24 -11 ""
FLAGS "D"
GROUP 6
END
BUTTON F_CANCEL 10 2 BUTTON F_CANCEL 10 2
BEGIN BEGIN
PROMPT -34 -11 "~Annulla" PROMPT -34 -11 "~Annulla"
@ -23,14 +16,21 @@ BEGIN
FLAGS "H" FLAGS "H"
END END
BUTTON DLG_PRINT 10 2
BEGIN
PROMPT -24 -11 ""
FLAGS "D"
GROUP 6
END
BUTTON DLG_QUIT 10 2 BUTTON DLG_QUIT 10 2
BEGIN BEGIN
PROMPT -33 -11 "" PROMPT -44 -11 ""
END END
ENDPAGE ENDPAGE
PAGE "Controllo saldi" -1 -1 78 20 PAGE "Controllo saldi" 0 0 0 0
GROUPBOX DLG_NULL 78 4 GROUPBOX DLG_NULL 78 4
BEGIN BEGIN