diff --git a/src/ba/ba7100.cpp b/src/ba/ba7100.cpp index 80b29e6ee..d2655347f 100755 --- a/src/ba/ba7100.cpp +++ b/src/ba/ba7100.cpp @@ -1743,7 +1743,7 @@ class TMailer : public TSkeleton_application TString _profile; protected: - virtual bool task_win_iconized() const { return !_start_full_screen && xvt_win_is_taskbar_visible(); } + virtual bool task_win_iconized() const { return !_start_full_screen && !xvt_win_is_taskbar_visible(); } virtual bool create(); virtual void main_loop(); }; @@ -1753,9 +1753,10 @@ bool TMailer::create() TString arg1 = main_app().argv(2); TString arg2 = main_app().argv(3); TString arg3 = main_app().argv(4); - bool multiple_instances = arg1.starts_with("-f") || arg2.starts_with("-f") || arg3.starts_with("-f"); - _start_full_screen = arg1.starts_with("-v") || arg2.starts_with("-v") || arg3.starts_with("-v"); + bool multiple_instances = arg1.starts_with("-m") || arg2.starts_with("-m") || arg3.starts_with("-m"); + + _start_full_screen = arg1.starts_with("-f") || arg2.starts_with("-f") || arg3.starts_with("-f"); if (!multiple_instances && xvt_vobj_get_attr(NULL_WIN, ATTR_APPL_ALREADY_RUNNING)) { TString msg; msg.format(FR("%s già in esecuzione!"), appname); @@ -1777,9 +1778,12 @@ bool TMailer::create() void TMailer::main_loop() { WINDOW tray = xvt_trayicon_create(TASK_WIN, 9013, appname); // CampoServer.ico - + open_files(LF_USER, 0); - if (!_start_full_screen && xvt_win_is_taskbar_visible()) + + TMailer_mask mm; + +if (!_start_full_screen && xvt_win_is_taskbar_visible()) { if (tray != NULL_WIN) { @@ -1788,12 +1792,9 @@ void TMailer::main_loop() xvt_vobj_get_outer_rect(SCREEN_WIN, &rct_screen); xvt_vobj_get_outer_rect(TASK_WIN, &rct_postman); if (xvt_rect_get_width(&rct_postman) >= xvt_rect_get_width(&rct_screen) - 64) - xvt_vobj_set_visible(TASK_WIN, FALSE); + xvt_vobj_set_visible(TASK_WIN, false); } } - - TMailer_mask mm; - if (_profile.full()) mm.load_profile(_profile, "ADMIN"); mm.run(); diff --git a/src/ba/ba7100a.uml b/src/ba/ba7100a.uml index e82b7e843..58681496a 100755 --- a/src/ba/ba7100a.uml +++ b/src/ba/ba7100a.uml @@ -61,7 +61,17 @@ END ENDPAGE -PAGE "Ricezione" 0 0 0 2 +TOOLBAR "Bottombar" 0 -3 0 1 + +STRING DLG_PROFILE 50 +BEGIN + PROMPT 1 -2 "Profilo " + PSELECT +END + +ENDPAGE + +PAGE "Ricezione" -1 -1 0 -3 BOOLEAN F_MAPI BEGIN @@ -189,18 +199,23 @@ END ENDPAGE -TOOLBAR "Toolbar" 0 -3 -1 -1 - -STRING DLG_PROFILE 50 -BEGIN - PROMPT 1 0 "Profilo " - PSELECT -END - -ENDPAGE ENDMASK +TOOLBAR "Topbar" 0 0 0 2 + +BUTTON DLG_USER 10 2 +BEGIN + PROMPT -12 -1 "Conferma" + PICTURE TOOL_SAVEREC +END + +BUTTON DLG_CANCEL 10 2 +BEGIN + PROMPT -22 -1 "" +END +ENDPAGE + PAGE "Message" -1 -1 78 19 BOOLEAN F_CHECKED @@ -250,38 +265,10 @@ END ENDPAGE -TOOLBAR "Topbar" 0 0 0 2 - -BUTTON DLG_USER 10 2 -BEGIN - PROMPT -12 -1 "Conferma" - PICTURE TOOL_SAVEREC -END - -BUTTON DLG_CANCEL 10 2 -BEGIN - PROMPT -22 -1 "" -END - ENDPAGE ENDMASK -PAGE "Indirizzi" -1 -1 62 6 - -STRING F_DEST 50 -BEGIN - PROMPT 1 1 "Indirizzo " - CHECKTYPE REQUIRED -END - -STRING F_GROUP 50 -BEGIN - PROMPT 1 2 "Gruppo " -END - -ENDPAGE - TOOLBAR "Topbar" 0 0 0 2 BUTTON DLG_OK 10 2 @@ -303,8 +290,44 @@ END ENDPAGE +PAGE "Indirizzi" -1 -1 62 6 + +STRING F_DEST 50 +BEGIN + PROMPT 1 1 "Indirizzo " + CHECKTYPE REQUIRED +END + +STRING F_GROUP 50 +BEGIN + PROMPT 1 2 "Gruppo " +END + +ENDPAGE + + ENDMASK +TOOLBAR "Topbar" 0 0 0 2 + +BUTTON DLG_OK 10 2 +BEGIN + PROMPT -13 -1 "" +END + +BUTTON DLG_DELREC 10 2 +BEGIN + PROMPT -23 -1 "" + PICTURE BMP_DELREC +END + +BUTTON DLG_CANCEL 10 2 +BEGIN + PROMPT -33 -1 "" +END + +ENDPAGE + PAGE "Parametri" -1 -1 62 12 STRING F_DEST 50 @@ -333,6 +356,9 @@ END ENDPAGE + +ENDMASK + TOOLBAR "Topbar" 0 0 0 2 BUTTON DLG_OK 10 2 @@ -353,8 +379,6 @@ END ENDPAGE -ENDMASK - PAGE "Script" -1 -1 70 5 BOOLEAN F_CHECKED @@ -374,24 +398,4 @@ END ENDPAGE -TOOLBAR "Topbar" 0 0 0 2 - -BUTTON DLG_OK 10 2 -BEGIN - PROMPT -13 -1 "" -END - -BUTTON DLG_DELREC 10 2 -BEGIN - PROMPT -23 -1 "" - PICTURE BMP_DELREC -END - -BUTTON DLG_CANCEL 10 2 -BEGIN - PROMPT -33 -1 "" -END - -ENDPAGE - ENDMASK