From 2f6ed34fe32be48170b52e2dc17b98de7cdfe80c Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 30 Aug 1994 08:07:13 +0000 Subject: [PATCH] Rinominata la maschera di gestione stampa su dischetti da tfilepr a bagn004 git-svn-id: svn://10.65.10.50/trunk@94 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- include/bagn004.uml | 60 ++++++++++++++++++++++++++++++++++++++++++++ include/mask.cpp | 6 ----- include/msksheet.cpp | 2 +- 3 files changed, 61 insertions(+), 7 deletions(-) create mode 100755 include/bagn004.uml diff --git a/include/bagn004.uml b/include/bagn004.uml new file mode 100755 index 000000000..0527d7003 --- /dev/null +++ b/include/bagn004.uml @@ -0,0 +1,60 @@ + +// +// tfilepr.uml +// + +#include + +PAGE "Stampa su disco" -1 -1 55 13 + +RADIOBUTTON F_FORMATO_DISCO 18 +BEGIN + PROMPT 2 2 "Formato dischetto" + HELP "Scegli il tipo di dischetto che intendi utilizzare" + ITEM "1|360" + ITEM "2|1,2" + ITEM "3|720" + ITEM "4|1,44" + ITEM "5|2,88" +END + +LIST F_DRIVE 2 +BEGIN + PROMPT 27 2 "Drive destinazione " + HELP "Scegliere il drive di destinazione della stampa" + ITEM "1|A:" + ITEM "2|B:" +END + +STRING F_FILE_DESTINAZIONE 13 +BEGIN + PROMPT 27 4 "Nome file " + HELP "Assegna il nome del file che verra' generato" +END + +STRING F_LABEL 12 +BEGIN + PROMPT 27 5 "Etichetta " + HELP "Etichetta che verra' assegnata ai dischetti" +END + +BOOLEAN F_FORMATTA +BEGIN + PROMPT 27 7 " Formatta dischetti" + HELP "Formatta ogni dischetto prima di scriverlo" +END + +BUTTON DLG_OK 9 3 +BEGIN + PROMPT 14 10 "" +END + +BUTTON DLG_CANCEL 9 3 +BEGIN + PROMPT 30 10 "" +END + +ENDPAGE + +ENDMASK + diff --git a/include/mask.cpp b/include/mask.cpp index 4d4b167a4..fd60865da 100755 --- a/include/mask.cpp +++ b/include/mask.cpp @@ -760,12 +760,6 @@ WINDOW TMask::read_page(TScanner& scanner, bool toolbar) } } - if (mode() == MODE_SEARCH) - { - title.insert("RICERCA: ", 0); - r.bottom = 12; - } - WINDOW w; if (toolbar || toolwin()) diff --git a/include/msksheet.cpp b/include/msksheet.cpp index d93b93df7..3a9814264 100755 --- a/include/msksheet.cpp +++ b/include/msksheet.cpp @@ -401,7 +401,7 @@ break; const int col = cid - FIRST_FIELD; TMask_field* f = field(cid); src = row(rec).get(col); // Set value for cell - if (src && *src && f->class_id() == CLASS_REAL_FIELD) + if (src && *src && (f->class_id()==CLASS_REAL_FIELD || f->class_id()==CLASS_DATE_FIELD)) { src = f->picture_data(src, FALSE); // Get formatted string }