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

Corretta progind

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@2789 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1996-05-10 12:14:42 +00:00
parent ed35f9b3ad
commit 72c832bd15
2 changed files with 3637 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3361
include/isam.cpp
View File

File diff suppressed because it is too large Load Diff

42
include/progind.cpp
View File

@ -24,7 +24,7 @@ TIndwin::TIndwin(long max, const char* txt, bool cancel, bool bar, int div)
{ {
if (_max <= 0) _max = 1; if (_max <= 0) _max = 1;
TToken_string testo(txt, '\r'); TToken_string testo(txt, '\n');
word maxlen = div; word maxlen = div;
const word lines = measure_text(testo, maxlen); const word lines = measure_text(testo, maxlen);
@ -35,24 +35,19 @@ TIndwin::TIndwin(long max, const char* txt, bool cancel, bool bar, int div)
if (bar) if (bar)
{ {
_bar = ver * CHARY; _bar = ver * CHARY;
ver += 3; ver += 2;
} }
ver += cancel ? 3 : 0; ver += cancel ? 2 : 0;
set_win(create_interface(TASK_WIN, -1, -1, hor, ver, TITLE_TEXT, this, FALSE)); set_win(create_interface(TASK_WIN, -1, -1, hor, ver, TITLE_TEXT, this, FALSE));
/* _text = new TMultiline_control(win(), DLG_NULL, 1, 1, hor-2, lines, 512, "CD", "");
RCT r; r.left = CHARX; r.top = CHARY; r.right = CHARX*(hor-2); r.bottom = r.top + lines*CHARY+4;
_text = xvt_ctl_create(WC_TEXT, &r, (char*)txt, win(), CTL_FLAG_CENTER_JUST, 0l, DLG_NULL); testo.replace('\n', '\r');
*/ _text->set_caption(testo);
_text = new TField_control(win(), DLG_NULL, 1, 1, hor-2, lines, "CD", (char*)txt);
if (cancel) if (cancel)
{ {
/*
_cancel = xvt_create_control(WC_PUSHBUTTON, -11, -1, 9, 2,
"Annulla", win(), 0, 0l, DLG_CANCEL);
*/
_cancel = new TPushbutton_control(win(), DLG_CANCEL, -11, -1, 10, 2, "", "Annulla", BMP_CANCEL); _cancel = new TPushbutton_control(win(), DLG_CANCEL, -11, -1, 10, 2, "", "Annulla", BMP_CANCEL);
} }
open_modal(); open_modal();
@ -112,14 +107,13 @@ void TIndwin::update_bar()
RCT r; xvt_vobj_get_client_rect(win(), &r); RCT r; xvt_vobj_get_client_rect(win(), &r);
r.left = CHARX; r.right -= CHARX; r.left = CHARX; r.right -= CHARX;
r.top = (int)_bar; r.top = (int)_bar;
r.bottom = r.top + 3*CHARY; r.bottom = r.top + 2*CHARY;
#if XVT_OS == XVT_OS_WIN
r.top += 6;
r.bottom -= 6;
#endif
const int width = r.right - r.left;
const int width = r.right - r.left;
RCT b = r; RCT b = r;
set_pen(COLOR_BLACK);
/*
set_brush(COLOR_BLUE); set_brush(COLOR_BLUE);
b.right = b.left + int(width*prc); b.right = b.left + int(width*prc);
xvt_dwin_draw_rect(win(), &b); xvt_dwin_draw_rect(win(), &b);
@ -133,6 +127,18 @@ void TIndwin::update_bar()
char n[8]; sprintf(n, "%d%%", int(100*prc)); char n[8]; sprintf(n, "%d%%", int(100*prc));
xvt_dwin_draw_text(win(), r.left+width/2-CHARX, (r.bottom+r.top+CHARY)/2-3, n, -1); xvt_dwin_draw_text(win(), r.left+width/2-CHARX, (r.bottom+r.top+CHARY)/2-3, n, -1);
set_mode(M_COPY); set_mode(M_COPY);
*/
WINDOW w = win();
b.right = b.left + int(width*prc);
xi_draw_3d_rect(w, &b, FALSE, 2, 0, 0, 0);
set_brush(COLOR_WHITE);
b.left = b.right; b.right = r.right;
xvt_dwin_draw_rect(w, &b);
char n[8]; sprintf(n, "%d%%", int(100*prc));
xvt_dwin_draw_text(w, r.left+width/2-CHARX, (r.bottom+r.top+CHARY)/2-3, n, -1);
check_stop(); check_stop();
} }