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

Patch level : 10.0

Browse Source 
Files correlati     : un ciclone il libreria
Ricompilazione Demo : [ ]
Commento            :


git-svn-id: svn://10.65.10.50/trunk@16742 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2008-06-13 08:39:28 +00:00
parent 9dde3973a1
commit 1cf7fdd905
6 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/colors.h
View File

@ -37,6 +37,7 @@ extern bool AUTOSELECT;
extern bool AUTOZOOM; extern bool AUTOZOOM;
extern bool AUTOEND; extern bool AUTOEND;
extern int TOOL_SIZE; extern int TOOL_SIZE;
extern bool TOOL_TEXT;
extern bool EASY_RIDER; extern bool EASY_RIDER;
const COLOR COLOR_DKCYAN = MAKE_COLOR(0,128,128); const COLOR COLOR_DKCYAN = MAKE_COLOR(0,128,128);

3
include/controls.cpp
View File

@ -41,6 +41,7 @@ bool AUTOZOOM = false;
bool AUTOEND = false; bool AUTOEND = false;
bool NATIVE_CONTROLS = false; bool NATIVE_CONTROLS = false;
int TOOL_SIZE = 24; int TOOL_SIZE = 24;
bool TOOL_TEXT = true;
bool EASY_RIDER = true; bool EASY_RIDER = true;
HIDDEN bool _button_blocked = false; HIDDEN bool _button_blocked = false;
@ -329,6 +330,8 @@ void customize_colors()
} }
} }
TOOL_SIZE = colors.get_int("ToolSize", NULL, -1, TOOL_SIZE); TOOL_SIZE = colors.get_int("ToolSize", NULL, -1, TOOL_SIZE);
TOOL_TEXT = colors.get_bool("ToolText", NULL, -1, TOOL_TEXT);
const int SPEECH_MODE = colors.get_int("SpeechMode", NULL, -1, 0); const int SPEECH_MODE = colors.get_int("SpeechMode", NULL, -1, 0);
xvt_vobj_set_attr(NULL_WIN, ATTR_SPEECH_MODE, SPEECH_MODE); xvt_vobj_set_attr(NULL_WIN, ATTR_SPEECH_MODE, SPEECH_MODE);

10
include/mask.cpp
View File

@ -276,8 +276,9 @@ TMask::TMask(const char* maskname, int num, int max)
TMask::~TMask() TMask::~TMask()
{ {
_field.destroy(); _field.destroy();
xvt_vobj_destroy(_toolwin);
xvt_vobj_destroy(_notebook); //xvt_vobj_destroy(_toolwin);
//xvt_vobj_destroy(_notebook);
} }
word TMask::class_id() const word TMask::class_id() const
@ -1238,7 +1239,10 @@ WINDOW TMask::create_bar(int height)
if (height < 0) if (height < 0)
w = create_interface(win(), 0, height, 0, 0, "", this); // Bottom bar w = create_interface(win(), 0, height, 0, 0, "", this); // Bottom bar
else else
w = xvt_toolbar_create(-1, 0, 0, -1, TOOL_SIZE, 0, win()); // Top bar {
const long flags = TOOL_TEXT ? CTL_FLAG_PASSWORD : 0;
w = xvt_toolbar_create(-1, 0, 0, -1, TOOL_SIZE, flags, win()); // Top bar
}
insert_bar(w); // Inserisce toolbar e crea notebook, se necessario insert_bar(w); // Inserisce toolbar e crea notebook, se necessario
return w; return w;
} }

11
include/msksheet.cpp
View File

@ -93,14 +93,11 @@ void TRow_property::set(int col, COLOR back, COLOR fore)
void TRow_property::get(int col, COLOR & back, COLOR & fore) const void TRow_property::get(int col, COLOR & back, COLOR & fore) const
{ {
if (col > 0) if (col > 0) // Lascia stare la colonna del numero riga
{ {
if (_cell_prop == NULL) back = _back;
{ fore = _fore;
back = _back; if (_cell_prop != NULL)
fore = _fore;
}
else
{ {
const TCell_property* cp = (const TCell_property*)_cell_prop->objptr(col); const TCell_property* cp = (const TCell_property*)_cell_prop->objptr(col);
if (cp != NULL) if (cp != NULL)

2
include/relapbar.h
View File

@ -56,7 +56,7 @@ END
BUTTON DLG_INFO 2 2 BUTTON DLG_INFO 2 2
BEGIN BEGIN
PROMPT 9 1 "Informazioni" PROMPT 9 1 "Info"
MESSAGE EXIT,K_F2 MESSAGE EXIT,K_F2
PICTURE BMP_INFO PICTURE BMP_INFO
END END

4
include/toolfld.cpp
View File

@ -147,6 +147,8 @@ void TButton_tool::create(WINDOW toolbar)
break; break;
} }
_ctl_data._prompt.strip("~&"); // Togli eventuali acceleratori antiestetici
if (dlg() <= 0 || _ctl_data._bmp_up <= 0) if (dlg() <= 0 || _ctl_data._bmp_up <= 0)
xvt_toolbar_add_control(toolbar, -1, TOOL_SEPARATOR, "", 0, _ctl_data._width, -1); xvt_toolbar_add_control(toolbar, -1, TOOL_SEPARATOR, "", 0, _ctl_data._width, -1);
else else
@ -181,7 +183,7 @@ bool TButton_tool::on_key(KEY key)
if (xvt_vobj_get_attr(NULL_WIN, ATTR_SPEECH_MODE) & (1<<7)) if (xvt_vobj_get_attr(NULL_WIN, ATTR_SPEECH_MODE) & (1<<7))
{ {
TString str = prompt(); TString str = prompt();
str.strip("~"); str.strip("&~");
xvt_dm_post_speech(str, 7, TRUE); xvt_dm_post_speech(str, 7, TRUE);
} }