Aggiuta la possibilta' di aggiungere voci disabilitate
git-svn-id: svn://10.65.10.50/trunk@3474 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
parent
dc51f36028
commit
e4d1daa421
19
ba/ba0.cpp
19
ba/ba0.cpp
@ -590,13 +590,13 @@ void TMenu_application::load_menu()
|
||||
}
|
||||
|
||||
_menu.add(ts);
|
||||
const TString80 action(ts->get(2));
|
||||
TString80 action(ts->get(2));
|
||||
const int last = _menu.items() - 1;
|
||||
|
||||
if (atoi(action) > 0)
|
||||
{
|
||||
TToken_string list(ts->get(), ',');
|
||||
const TString& mod = list.get();
|
||||
const TString16 mod = list.get(0);
|
||||
int module = atoi(mod);
|
||||
|
||||
if (module == 0)
|
||||
@ -614,17 +614,21 @@ void TMenu_application::load_menu()
|
||||
}
|
||||
}
|
||||
else
|
||||
_enabled.set(last, TRUE);
|
||||
{
|
||||
action.trim(); action.upper();
|
||||
const bool on = action != "DISABLED";
|
||||
_enabled.set(last, on);
|
||||
}
|
||||
// _enabled.set(last, module_enabled(action));
|
||||
}
|
||||
_first[++_max] = _menu.items();
|
||||
}
|
||||
|
||||
int TMenu_application::find_menu(const char* s) const
|
||||
{
|
||||
{
|
||||
TString str(s); str.upper();
|
||||
int found = -1;
|
||||
|
||||
TString v(80);
|
||||
for (int i = 0; i < _menu.items(); i++)
|
||||
{
|
||||
if (_enabled[i])
|
||||
@ -633,8 +637,7 @@ int TMenu_application::find_menu(const char* s) const
|
||||
const int m = l.get_int(0);
|
||||
if (m != _level)
|
||||
{
|
||||
TString v(l.get()); v.upper();
|
||||
|
||||
v = l.get(); v.upper();
|
||||
if (v.find(str) >= 0)
|
||||
{
|
||||
found = i;
|
||||
@ -691,7 +694,7 @@ void TMenu_application::reload_images()
|
||||
TImage* i = (TImage*)_images.objptr(id);
|
||||
if (i)
|
||||
{
|
||||
TString n(16); n.format("ba%02d.bmp", id);
|
||||
TString16 n; n.format("ba%02d.bmp", id);
|
||||
i->load(n);
|
||||
i->convert_transparent_color(MASK_BACK_COLOR);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user