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

Correzioni per installazione Setup -> SetCmpUp

Browse Source 
git-svn-id: svn://10.65.10.50/branches/R_10_00@22682 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2012-07-02 13:03:23 +00:00
parent 05aa5970c9
commit eb8fef43a1
3 changed files with 908 additions and 881 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ba/ba0101.cpp
View File

@ -327,12 +327,8 @@ bool TMenuitem::perform_program() const
return error_box("Password di servizio errata!\nAccesso negato."); return error_box("Password di servizio errata!\nAccesso negato.");
} }
if (_firm && main_app().get_firm() == 0) if (_firm && main_app().get_firm() <= 0)
{ ok = menu().set_firm(0);
// Forza ditta 1 in demo altrimenti chiedila all'utente
const int cd = dongle().demo() ? 1 : 0;
ok = menu().set_firm(cd);
}
if (ok) if (ok)
{ {
@ -608,8 +604,10 @@ bool TMenu::set_firm(long firm) const
{ {
TPointer_array codes; TPointer_array codes;
const int nditte = prefix().firms(codes); const int nditte = prefix().firms(codes);
if (nditte == 1) if (codes.empty())
firm = codes.get_long(0); return error_box(TR("Non esistono ditte selezionabili"));
if (nditte == 1 || dongle().demo())
firm = codes.get_long(0);
} }
return main_app().set_firm(firm); return main_app().set_firm(firm);
} }
@ -623,7 +621,7 @@ bool TMenu::jumpto(TSubmenu* next)
{ {
if (next->query_firm()) if (next->query_firm())
{ {
if (!set_firm(dongle().demo() ? 1 : 0)) if (!set_firm(0))
next = NULL; next = NULL;
} }
if (next) if (next)

2
ba/ba0102.cpp
View File

@ -1303,7 +1303,7 @@ const TString& get_logo()
if (currlogo.blank()) if (currlogo.blank())
{ {
//se non trova il logo del producer usa il logo standard //se non trova il logo del producer usa il logo standard
currlogo = "menulogo.jpg"; currlogo = "sirio_logo.jpg";
} }
} }

1771
ba/ba0103.cpp
View File

File diff suppressed because it is too large Load Diff