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

Patch level : 10.0 348

Browse Source 
Files correlati     : ba0.exe ba1.exe
Ricompilazione Demo : [ ]
Commento            :
Aggiunte icone di area all'albero del menu

Errore 1372
Corretto aggiornamento cartella setup su client.


git-svn-id: svn://10.65.10.50/trunk@19047 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2009-06-17 10:17:04 +00:00
parent bf201c79d5
commit a2e1fd516b
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ba/ba0102.cpp
View File

@ -253,15 +253,13 @@ TImage* TMenu_tree::image(bool selected) const
{
const TMenuitem& mi = curr_item();
if (mi.disabled())
return get_res_icon(10203);
if (mi.is_program())
{
int ico = mi.icon();
if (ico <= 0)
ico = ICON_RSRC;
return get_res_icon(ico);
}
return TTree::image(selected);
return get_res_icon(10203); // Icona di stop
int ico = mi.icon(); // Eventuale icona di programma o cartella
if (ico <= 0 && mi.is_program()) // Forza icona per i programmi
ico = ICON_RSRC;
return ico > 0 ? get_res_icon(ico) : TTree::image(selected);
}
long TMenu_tree::find_node(const TString& id)
@ -284,8 +282,7 @@ void TMenu_tree::change_root(const char* rid)
goto_root();
}
TMenu_tree::TMenu_tree(TMenu& menu)
: _menu(&menu), _curr_id(128, '/')
TMenu_tree::TMenu_tree(TMenu& menu) : _menu(&menu), _curr_id(128, '/')
{
change_root("MENU_000");
}

8
ba/ba1101.cpp
View File

@ -30,7 +30,7 @@ void TDir_sheet::add()
TDir_sheet::TDir_sheet(const char* title, bool superprassi, const char* colonne)
: TSheet(0, 0, 0, 0, title, colonne, superprassi ? 0xC : 0x8)
{
add_button(DLG_PRINT, TR("Tracciati"), K_F3, BMP_PRINT);
add_button(DLG_PRINT, TR("Tracciati"), K_F3, TOOL_PRINT);
add_button(DLG_NULL, "", 0); // Separatore
if (superprassi)
@ -38,12 +38,12 @@ TDir_sheet::TDir_sheet(const char* title, bool superprassi, const char* colonne)
add_button(DLG_OTHERFILE, TR("File Esterni"), K_F5, 113);
add_button(DLG_CONVERT, TR("Conversione"), K_F7, 156);
if (is_power_station())
add_button(DLG_ADDFILE, TR("Nuovo file"), K_F8, BMP_NEWREC);
add_button(DLG_ADDFILE, TR("Nuovo file"), K_F8, TOOL_NEWREC);
add_button(DLG_NULL, "", 0); // Separatore
}
add_button(DLG_INFO, TR("Info"), K_F2, BMP_INFO);
add_button(DLG_HELP, TR("Help"), K_F1, BMP_HELP);
add_button(DLG_INFO, TR("Info"), K_F2, TOOL_INFO);
add_button(DLG_HELP, TR("Help"), K_F1, TOOL_HELP);
xvt_toolbar_set_last_tool(toolbar(), DLG_QUIT);
rebuild();

8
ba/ba1700.cpp
View File

@ -1314,7 +1314,13 @@ bool TInstaller_mask::get_patches_path(TFilename& path) const
return true;
}
else
{
path = get(F_PATH);
// Toglie l'eventual slash finale
const char last = path.right(1)[0];
if (last == '/' || last == '\\')
path.rtrim(1);
}
return false;
}
@ -1327,7 +1333,7 @@ void TInstaller_mask::parse_internet_path(TString & http_server, TFilename &http
((TMask*)this)->set(F_WEB, http_server);
}
if (http_server.compare("http://", 7, true) == 0)
if (http_server.starts_with("http://"))
http_server.ltrim(7);
const int slash = http_server.find('/');