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

Patch level : 10.0

Browse Source 
Files correlati     : ba0.exe
Ricompilazione Demo : [ ]
Commento            :
Corrette alcune colorazioni


git-svn-id: svn://10.65.10.50/trunk@17621 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2008-11-13 12:30:31 +00:00
parent 76404a0845
commit a956e989ea
2 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ba/ba0100.cpp
View File

@ -366,7 +366,7 @@ void TColor_mask::TPreview_panel::update()
xvt_font_destroy(fontid);
}
else
xvt_dwin_set_font(win(), xvt_default_font());
xvt_dwin_set_font(win(), xvtil_default_font());
set_opaque_text(false);
set_pen(p = get_color_entry("Normal"));
@ -533,7 +533,7 @@ bool TColor_mask::apply_theme()
}
xvt_mem_free((DATA_PTR)cc);
XVT_FNTID defont = xvt_default_font(false, false); // Legge il font standard
XVT_FNTID defont = xvtil_default_font(false, false); // Legge il font standard
XVT_FNTID fontid = xvt_res_get_font(0); // Legge il font di sistema
xvt_font_set_size(fontid, xvt_font_get_size(defont)); // Forza l'altezza standard
xvt_font_serialize(fontid, _font_desc.get_buffer(), _font_desc.size());
@ -546,7 +546,7 @@ bool TColor_mask::apply_theme()
{
TConfig color(CONFIG_GUI, "Colors");
_color = color.list_variables();
xvt_font_serialize(xvt_default_font(), _font_desc.get_buffer(), _font_desc.size());
xvt_font_serialize(xvtil_default_font(), _font_desc.get_buffer(), _font_desc.size());
}
break;
}
@ -650,7 +650,7 @@ bool TColor_mask::on_field_event(TOperable_field& f, TField_event e, long jolly)
if (_font_desc.full())
xvt_font_deserialize(fontid, _font_desc);
else
xvt_font_copy(fontid, xvt_default_font(), XVT_FA_ALL);
xvt_font_copy(fontid, xvtil_default_font(), XVT_FA_ALL);
if (xvt_dm_post_font_sel(win(), fontid, NULL, 0))
{
xvt_font_serialize(fontid, _font_desc.get_buffer(), _font_desc.size());
@ -697,7 +697,7 @@ TColor_mask::TColor_mask()
set(218, EASY_RIDER ? "X" : "");
set(219, TOOL_TEXT ? "X" : "");
xvt_font_serialize(xvt_default_font(), _font_desc.get_buffer(), _font_desc.size());
xvt_font_serialize(xvtil_default_font(), _font_desc.get_buffer(), _font_desc.size());
}
void TColor_mask::save_colors(TConfig& colors)

49
ba/ba0103.cpp
View File

@ -196,7 +196,7 @@ short TBook_window::add_page(const TString& caption)
wd.wtype = WC_NOTEBK;
wd.ctlcolors = xcc;
wd.v.ctl.ctrl_id = DLG_MAIN;
wd.v.ctl.font_id = xvt_default_font();
wd.v.ctl.font_id = xvtil_default_font();
wd.v.ctl.flags = CTL_FLAG_TAB_BOTTOM; // should be wxCHECK_VERSION(2,8,9)
wd.v.ctl.flags |= CTL_FLAG_CENTER_JUST; // old compatibility flags
@ -437,15 +437,7 @@ void TOutlook_mask::handler(WINDOW w, EVENT* ep)
switch (ep->v.cmd.tag)
{
case 8001:
{
TTree_field& tf = tfield(DLG_TREE);
_tree.change_root("MENU_000"); // Torna alla radice standard
_tree.goto_root();
_tree.shrink_all();
tf.win().force_update(); // Provoca la rigenerazione dell'albero collassato
tf.on_key(K_SPACE);
set(DLG_LOOK, -1); // Deseleziona
}
set(DLG_LOOK, "", true); // Seleziona menu completo
break;
case 8002:
load_perspective(0); // Ricarica default
@ -529,7 +521,7 @@ bool TOutlook_mask::on_field_event(TOperable_field& o, TField_event e, long joll
if (ico <= 0 || ico == ICON_RSRC)
{
const int area = get_int(DLG_LOOK);
if (area >= 0 && area < 16)
if (area > 0 && area < 16)
ico = _icon[area];
else
ico = ICON_RSRC;
@ -544,19 +536,30 @@ bool TOutlook_mask::on_field_event(TOperable_field& o, TField_event e, long joll
case DLG_LOOK:
if (e == fe_modify)
{
TTree_field& tf = tfield(DLG_TREE);
const int sel = atoi(o.get());
TToken_string id("MENU_000", '/');
_tree.change_root(id); // Torna alla radice standard
for (int i = 0; i < sel; i++)
if (sel > 0)
{
do
_tree.goto_rbrother(); // Sceglie l'opportuno ramo principale
while (!_tree.enabled());
for (int i = 1; i < sel; i++)
{
do
_tree.goto_rbrother(); // Sceglie l'opportuno ramo principale
while (!_tree.enabled());
}
_tree.goto_firstson();
_tree.curr_id(id);
_tree.change_root(id.get(1)); // Imposta una nuova radice
synchronize_tree_field(tf);
}
else
{
_tree.goto_root();
_tree.shrink_all();
tf.win().force_update();
tf.on_key(K_SPACE);
}
_tree.goto_firstson();
_tree.curr_id(id);
_tree.change_root(id.get(1)); // Imposta una nuova radice
synchronize_tree_field(tfield(DLG_TREE));
}
break;
default: break;
@ -604,6 +607,10 @@ TOutlook_mask::TOutlook_mask(TMenu& menu) : _tree(menu), _locked(false)
TString caption;
int i = 0;
int ico = 10219;
of->add_item(ico, TR("Menu principale"), 0);
_icon[i++] = ico;
for (bool ok = _tree.goto_root(); ok; ok = _tree.goto_rbrother())
{
const TMenuitem& mi = _tree.curr_item();
@ -616,10 +623,8 @@ TOutlook_mask::TOutlook_mask(TMenu& menu) : _tree(menu), _locked(false)
}
}
const int minimain = 800;
xvt_pane_add(panel, dlg2win(DLG_TREE), "Menu", 1, 0); // Left upper pane
xvt_pane_add(panel, dlg2win(DLG_LOOK), "Bar", 1, 0); // Left lower pane
xvt_pane_add(panel, dlg2win(DLG_LOOK), "Aree", 1, 0); // Left lower pane
xvt_pane_add(panel, dlg2win(DLG_MAIN), "Main", 0, 0); // Main pane
save_perspective(0); // Salva default
load_perspective(1); // Carica custom