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

Migliorata visibilità studio corrente in menu principale

Browse Source 
git-svn-id: svn://10.65.10.50/branches/R_10_00@22878 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2013-07-26 15:32:33 +00:00
parent 92268fcfd9
commit d2d92a2761
5 changed files with 75 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ba/ba0100.cpp
View File

@ -2349,7 +2349,7 @@ TMenu_application::TMenu_application(const char* name)
int ba0100(int argc, char** argv) int ba0100(int argc, char** argv)
{ {
if (xvt_vobj_get_attr(NULL_WIN, ATTR_APPL_ALREADY_RUNNING)) if (xvt_vobj_get_attr(NULL_WIN, ATTR_APPL_ALREADY_RUNNING))
return error_box(TR("Il menu principale è già in esecuzione!")); return warning_box(TR("Il menu principale è già in esecuzione!"));
TApplication::check_parameters(argc, argv); TApplication::check_parameters(argc, argv);

28
ba/ba0102.cpp
View File

@ -320,11 +320,18 @@ void TMenu_tree::change_root(const char* rid)
goto_root(); goto_root();
} }
TMenu_tree::TMenu_tree(TMenu& menu) : _menu(&menu), _curr_id(128, '/') void TMenu_tree::set_menu(TMenu& menu)
{ {
_menu = &menu;
_curr_id.cut(0);
change_root("MENU_000"); change_root("MENU_000");
} }
TMenu_tree::TMenu_tree(TMenu& menu) : _menu(NULL), _curr_id(128, '/')
{
set_menu(menu);
}
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
// Utility // Utility
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
@ -952,12 +959,13 @@ void TMenulist_field::curr_item(TToken_string& id) const
// TSpidey_mask // TSpidey_mask
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
#define DLG_TREE 301
#define DLG_LIST 302
#define DLG_LOOK 303
void draw_spider(WINDOW w, int mode, const PNT& mouse) void draw_spider(WINDOW w, int mode, const PNT& mouse)
{ {
static int _spider = -1; static bool _spider = ADVANCED_GRAPHICS && is_power_reseller(true); // Attiva eventuale ragno;
if (_spider < 0)
_spider = ADVANCED_GRAPHICS && is_power_reseller(true); // Attiva eventuale ragno
if (_spider && xvt_vobj_is_focusable(w)) if (_spider && xvt_vobj_is_focusable(w))
{ {
RCT client; xvt_vobj_get_client_rect(w, &client); RCT client; xvt_vobj_get_client_rect(w, &client);
@ -1043,9 +1051,9 @@ WINDOW TSpidey_mask::dlg2win(short id) const
const int pos = id2pos(id); const int pos = id2pos(id);
if (pos >= 0) if (pos >= 0)
{ {
TMask_field& f = fld(pos); const TMask_field& f = fld(pos);
CHECKD(f.is_kind_of(CLASS_WINDOWED_FIELD), "Not a windowed field ", id); if (f.is_kind_of(CLASS_WINDOWED_FIELD))
w = ((TWindowed_field&)f).win().win(); w = ((const TWindowed_field&)f).win().win();
} }
return w; return w;
} }
@ -1140,10 +1148,6 @@ TSpidey_mask::TSpidey_mask() : TAutomask ("Menu", 1, 0, 0, 0, 0)
// TExplorer_mask // TExplorer_mask
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
#define DLG_TREE 301
#define DLG_LIST 302
#define DLG_LOOK 303
void TExplorer_mask::update() void TExplorer_mask::update()
{ {
TMask::update(); TMask::update();

2
ba/ba0102.h
View File

@ -58,6 +58,8 @@ public:
long find_node(const TString& id); long find_node(const TString& id);
void change_root(const char* id); void change_root(const char* id);
void set_menu(TMenu& menu);
TMenu_tree(TMenu& menu); TMenu_tree(TMenu& menu);
virtual ~TMenu_tree() { } virtual ~TMenu_tree() { }
}; };

13
ba/ba0103.cpp
View File

@ -6,6 +6,7 @@
#include <defmask.h> #include <defmask.h>
#include <dongle.h> #include <dongle.h>
#include <execp.h> #include <execp.h>
#include <prefix.h>
#include <utility.h> #include <utility.h>
enum { DLG_TREE = 101, DLG_LOOK = 102, DLG_MAIN = 103 }; enum { DLG_TREE = 101, DLG_LOOK = 102, DLG_MAIN = 103 };
@ -716,6 +717,14 @@ long TOutlook_mask::handler(WINDOW w, EVENT* ep)
return TSpidey_mask::handler(w, ep); return TSpidey_mask::handler(w, ep);
} }
void TOutlook_mask::on_firm_change()
{
WINDOW pane = dlg2win(DLG_TREE);
if (pane != NULL_WIN)
xvt_pane_set_title(pane, prefix().firm().ragione_sociale());
TSpidey_mask::on_firm_change();
}
bool TOutlook_mask::on_field_event(TOperable_field& o, TField_event e, long jolly) bool TOutlook_mask::on_field_event(TOperable_field& o, TField_event e, long jolly)
{ {
switch (o.dlg()) switch (o.dlg())
@ -871,7 +880,7 @@ bool TOutlook_mask::on_field_event(TOperable_field& o, TField_event e, long joll
TOutlook_mask::TOutlook_mask(TMenu& menu) : _tree(menu), _locked(false) TOutlook_mask::TOutlook_mask(TMenu& menu) : _tree(menu), _locked(false)
{ {
xvtil_statbar_destroy(); // Ammazza status bar inutile xvtil_statbar_destroy(); // Ammazza status bar "inutile"
RCT rct; xvt_vobj_get_client_rect(TASK_WIN, &rct); RCT rct; xvt_vobj_get_client_rect(TASK_WIN, &rct);
WINDOW panel = page_win(0); WINDOW panel = page_win(0);
@ -899,6 +908,8 @@ TOutlook_mask::TOutlook_mask(TMenu& menu) : _tree(menu), _locked(false)
save_perspective(0); // Salva default save_perspective(0); // Salva default
load_perspective(1); // Carica custom load_perspective(1); // Carica custom
set_handlers(); set_handlers();
on_firm_change(); // Mostra ragione sociale nella barra del menu
} }
TOutlook_mask::~TOutlook_mask() TOutlook_mask::~TOutlook_mask()

1
ba/ba0103.h
View File

@ -24,6 +24,7 @@ class TOutlook_mask : public TSpidey_mask
protected: protected:
virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly); virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly);
virtual bool can_be_closed() const; virtual bool can_be_closed() const;
virtual void on_firm_change();
TBook_field& book_field() const; TBook_field& book_field() const;