From fcffd0c3f4aa5c863a9506e0cf538cdc4c5507cf Mon Sep 17 00:00:00 2001 From: luca Date: Tue, 10 Mar 2009 16:23:28 +0000 Subject: [PATCH] Patch level :10.0 256 Files correlati : Ricompilazione Demo : [ ] Commento : utilizzata la nuova standardizzazione pictures nelle maschere di ba0 e ba1 git-svn-id: svn://10.65.10.50/trunk@18482 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ba/ba0100a.uml | 20 +++++++++++++++----- ba/ba0102.cpp | 2 +- ba/ba0200a.uml | 8 ++++---- ba/ba0300a.uml | 16 ++++++++++++---- ba/ba0400a.uml | 16 +++++++++++----- ba/ba1100a.uml | 10 +++++----- ba/ba1100b.uml | 4 ++++ ba/ba1100c.uml | 3 +++ ba/ba1100d.uml | 14 +++++++++++--- ba/ba1100f.uml | 4 ++++ ba/ba1100g.uml | 4 ++++ ba/ba1500a.uml | 37 +++---------------------------------- ba/ba1600b.uml | 33 +++++++++++++++++++++++++++------ ba/ba1800a.uml | 3 +-- ba/ba2300.uml | 2 +- ba/ba4200b.uml | 2 +- ba/ba4200c.uml | 2 +- ba/ba4300a.uml | 2 +- ba/ba5000.uml | 2 +- ba/ba8200a.uml | 15 ++++++--------- 20 files changed, 116 insertions(+), 83 deletions(-) diff --git a/ba/ba0100a.uml b/ba/ba0100a.uml index ff2cd87a0..73c8240d1 100755 --- a/ba/ba0100a.uml +++ b/ba/ba0100a.uml @@ -1,6 +1,6 @@ #include "ba0100a.h" -PAGE "Selezione utente" -1 -1 30 6 +PAGE "Selezione utente" -1 -1 30 4 STRING F_USER 64 16 BEGIN @@ -20,14 +20,24 @@ BEGIN FLAGS "*" END -BUTTON DLG_OK 10 2 +ENDPAGE + +TOOLBAR "bottombar" 0 0 0 2 + +BUTTON DLG_OK 2 2 BEGIN - PROMPT -12 -1 "" + PROMPT -13 -1 "" END -BUTTON DLG_CANCEL 10 2 +BUTTON DLG_INFO 2 2 BEGIN - PROMPT -22 -1 "" + PROMPT -23 -1 "" + PICTURE TOOL_INFO +END + +BUTTON DLG_CANCEL 2 2 +BEGIN + PROMPT -33 -1 "" END ENDPAGE diff --git a/ba/ba0102.cpp b/ba/ba0102.cpp index afbdef2f7..3191300e0 100755 --- a/ba/ba0102.cpp +++ b/ba/ba0102.cpp @@ -1222,7 +1222,7 @@ bool TExplorer_mask::on_key(KEY k) TExplorer_mask::TExplorer_mask(TMenu& menu) : _tree(menu) { add_button_tool(DLG_SHRINK, TR("Menu Iniziale"), TOOL_FIRSTREC); - add_button_tool(DLG_FINDREC, TR("Ricerca"), TOOL_LENTE); + add_button_tool(DLG_FINDREC, TR("Ricerca"), TOOL_FINDREC); add_button_tool(DLG_NULL, "", 0); add_button_tool(DLG_CONFIG, TR("Opzioni"), TOOL_CONFIG); add_button_tool(DLG_USER, TR("Utente"), TOOL_PERMISSIONS); diff --git a/ba/ba0200a.uml b/ba/ba0200a.uml index 62c74db11..93914a471 100755 --- a/ba/ba0200a.uml +++ b/ba/ba0200a.uml @@ -166,7 +166,7 @@ TOOLBAR "topbar" 0 0 0 2 BUTTON DLG_SAVEREC 10 2 BEGIN PROMPT -16 -1 "Salva" - PICTURE BMP_SAVEREC + PICTURE TOOL_SAVEREC END BUTTON DLG_OK 10 2 @@ -177,19 +177,19 @@ END BUTTON DLG_NEWREC 10 2 BEGIN PROMPT -36 -1 "Nuovo tema" - PICTURE BMP_NEWREC + PICTURE TOOL_NEWREC END BUTTON DLG_DELREC 10 2 BEGIN PROMPT -46 -1 "Elimina tema" - PICTURE BMP_DELREC + PICTURE TOOL_DELREC END BUTTON DLG_USER 10 2 BEGIN PROMPT -56 -1 "Font" - PICTURE BMP_FONT + PICTURE TOOL_FONT END BUTTON DLG_CANCEL 10 2 diff --git a/ba/ba0300a.uml b/ba/ba0300a.uml index e84a353fe..6eb3c84f3 100755 --- a/ba/ba0300a.uml +++ b/ba/ba0300a.uml @@ -7,12 +7,16 @@ BEGIN ITEM "Programma@40" END -BUTTON DLG_OK 10 2 +ENDPAGE + +TOOLBAR "topbar" 0 0 0 2 + +BUTTON DLG_OK 2 2 BEGIN PROMPT -12 -1 "" END -BUTTON DLG_CANCEL 10 2 +BUTTON DLG_CANCEL 2 2 BEGIN PROMPT -22 -1 "" END @@ -21,6 +25,7 @@ ENDPAGE ENDMASK +//--------maschera di riga dello sheet----------// PAGE "Editor" -1 -1 52 5 STRING 101 3 @@ -34,6 +39,10 @@ BEGIN FLAGS "B" END +ENDPAGE + +TOOLBAR "topbar" 0 0 0 2 + BUTTON DLG_OK 10 2 BEGIN PROMPT -13 -1 "" @@ -42,8 +51,7 @@ END BUTTON DLG_DELREC 10 2 BEGIN PROMPT -23 -1 "" - PICTURE BMP_DELREC - PICTURE BMP_DELRECDN + PICTURE TOOL_DELREC END diff --git a/ba/ba0400a.uml b/ba/ba0400a.uml index 44f0dbaf8..9d28628af 100755 --- a/ba/ba0400a.uml +++ b/ba/ba0400a.uml @@ -21,6 +21,10 @@ BEGIN PICTURE 1663 END +ENDPAGE + +TOOLBAR "bottombar" 0 0 0 2 + BUTTON DLG_OK 10 2 BEGIN PROMPT -13 -1 "" @@ -29,8 +33,7 @@ END BUTTON DLG_DELREC 10 2 BEGIN PROMPT -23 -1 "" - PICTURE BMP_DELREC - PICTURE BMP_DELRECDN + PICTURE TOOL_DELREC END BUTTON DLG_CANCEL 10 2 @@ -42,7 +45,7 @@ ENDPAGE ENDMASK -PAGE "Riga" -1 -1 60 5 +PAGE "Riga" -1 -1 60 3 STRING F_PREF_DESC 50 45 BEGIN @@ -55,6 +58,10 @@ BEGIN FLAGS "D" END +ENDPAGE + +TOOLBAR "bottombar" 0 0 0 2 + BUTTON DLG_OK 10 2 BEGIN PROMPT -13 -1 "" @@ -63,8 +70,7 @@ END BUTTON DLG_DELREC 10 2 BEGIN PROMPT -23 -1 "" - PICTURE BMP_DELREC - PICTURE BMP_DELRECDN + PICTURE TOOL_DELREC END BUTTON DLG_CANCEL 10 2 diff --git a/ba/ba1100a.uml b/ba/ba1100a.uml index f61eaec72..3efdd6a45 100755 --- a/ba/ba1100a.uml +++ b/ba/ba1100a.uml @@ -96,7 +96,7 @@ BEGIN PROMPT 2 0 "Compatta" MESSAGE EXIT,K_F5 FLAGS "D" - PICTURE 156 + PICTURE TOOL_PACK GROUP 1 END @@ -104,7 +104,7 @@ BUTTON DLG_DUMP 9 2 BEGIN PROMPT 3 0 "Scarica" MESSAGE EXIT,K_F7 - PICTURE 151 + PICTURE TOOL_EXPORT GROUP 1 END @@ -113,7 +113,7 @@ BEGIN PROMPT 4 0 "Carica" MESSAGE EXIT,K_F8 FLAGS "D" - PICTURE 150 + PICTURE TOOL_IMPORT GROUP 1 END @@ -122,14 +122,14 @@ BEGIN PROMPT 5 0 "Record" MESSAGE EXIT,K_F6 FLAGS "D" - PICTURE 111 + PICTURE TOOL_CONFIG GROUP 1 END BUTTON DLG_EDIT 9 2 BEGIN PROMPT 6 0 "~Edit" - PICTURE BMP_EDIT + PICTURE TOOL_EDIT MESSAGE EXIT,K_F4 END diff --git a/ba/ba1100b.uml b/ba/ba1100b.uml index 9f7a3d967..e35f75e82 100755 --- a/ba/ba1100b.uml +++ b/ba/ba1100b.uml @@ -62,6 +62,10 @@ BEGIN FLAGS "P" END +ENDPAGE + +TOOLBAR "topbar" 0 0 0 2 + BUTTON DLG_OK 10 2 BEGIN PROMPT -12 -1 "" diff --git a/ba/ba1100c.uml b/ba/ba1100c.uml index 1397ca277..af103430c 100755 --- a/ba/ba1100c.uml +++ b/ba/ba1100c.uml @@ -43,6 +43,9 @@ BEGIN FLAGS "P" END +ENDPAGE + +TOOLBAR "topbar" 0 0 0 2 BUTTON DLG_OK 10 2 BEGIN diff --git a/ba/ba1100d.uml b/ba/ba1100d.uml index de639d326..ad30af99f 100755 --- a/ba/ba1100d.uml +++ b/ba/ba1100d.uml @@ -6,7 +6,7 @@ BUTTON DLG_SAVEREC 10 2 BEGIN PROMPT -15 -1 "Conferma" MESSAGE EXIT,K_SAVE - PICTURE BMP_OK + PICTURE TOOL_OK GROUP 1 END @@ -24,7 +24,7 @@ BUTTON DLG_IMPORT 10 2 BEGIN PROMPT -45 -1 "~Importa" MESSAGE EXIT,K_F7 - PICTURE 150 + PICTURE TOOL_IMPORT GROUP 1 END @@ -32,7 +32,7 @@ BUTTON DLG_EXPORT 10 2 BEGIN PROMPT -35 -1 "~Esporta" MESSAGE EXIT,K_F6 - PICTURE 151 + PICTURE TOOL_EXPORT GROUP 1 END @@ -135,6 +135,10 @@ BEGIN HELP "Descrizione del campo" END +ENDPAGE + +TOOLBAR "topbar" 0 0 0 2 + BUTTON DLG_OK 10 2 BEGIN PROMPT -13 -1 "" @@ -169,6 +173,10 @@ BEGIN PROMPT 1 4 "Chiavi duplicate" END +ENDPAGE + +TOOLBAR "topbar" 0 0 0 2 + BUTTON DLG_OK 10 2 BEGIN PROMPT -13 -1 "" diff --git a/ba/ba1100f.uml b/ba/ba1100f.uml index 43e283261..758bb4ac2 100755 --- a/ba/ba1100f.uml +++ b/ba/ba1100f.uml @@ -11,6 +11,10 @@ BEGIN CHECKTYPE REQUIRED END +ENDPAGE + +TOOLBAR "topbar" 0 0 0 2 + BUTTON DLG_OK 9 2 BEGIN PROMPT -12 -1 "" diff --git a/ba/ba1100g.uml b/ba/ba1100g.uml index 22c8d9330..ba2d66fc3 100755 --- a/ba/ba1100g.uml +++ b/ba/ba1100g.uml @@ -8,6 +8,10 @@ BEGIN WARNING "Specificare il file da editare" END +ENDPAGE + +TOOLBAR "topbar" 0 0 0 2 + BUTTON DLG_OK 10 2 BEGIN PROMPT -12 -1 "" diff --git a/ba/ba1500a.uml b/ba/ba1500a.uml index ad18691e3..b2fb85ef1 100755 --- a/ba/ba1500a.uml +++ b/ba/ba1500a.uml @@ -10,52 +10,21 @@ END BUTTON DLG_SETPRINT 10 2 BEGIN PROMPT -26 -11 "~Imposta" - PICTURE BMP_SETPRINT + PICTURE TOOL_SETPRINT END BUTTON F_PRINT 10 2 BEGIN PROMPT -36 -11 "~Stampa" - PICTURE BMP_PRINT + PICTURE TOOL_PRINT END -BUTTON DLG_INFO 2 2 -BEGIN - PROMPT -46 -11 "Info" - MESSAGE EXIT,K_F2 - PICTURE BMP_INFO -END - -BUTTON DLG_HELP 2 2 -BEGIN - PROMPT -56 -11 "Help" - MESSAGE EXIT,K_F1 - PICTURE BMP_HELP -END - -BUTTON DLG_QUIT 10 2 -BEGIN - PROMPT -66 -11 "" -END +#include ENDPAGE PAGE "Attivazione Moduli" -1 -1 79 21 -/* -STRING F_K1 16 -BEGIN - PROMPT 1 1 "Attivazione 1 " - FLAGS "U" -END - -STRING F_K2 16 -BEGIN - PROMPT 35 1 "" - FLAGS "U" -END -*/ - STRING F_SN 5 BEGIN PROMPT 54 1 "N.Serie " diff --git a/ba/ba1600b.uml b/ba/ba1600b.uml index a73295ee0..db02ee226 100755 --- a/ba/ba1600b.uml +++ b/ba/ba1600b.uml @@ -10,7 +10,7 @@ END BUTTON F_DESELECT 24 2 BEGIN PROMPT -23 -11 "Annulla aggiornamento" - PICTURE TOOL_CONVERT + PICTURE TOOL_DELREC END BUTTON DLG_CANCEL 10 2 @@ -101,6 +101,10 @@ BEGIN PROMPT 34 2 "Sottomodulo " END +ENDPAGE + +TOOLBAR "topbar" 0 0 0 2 + BUTTON DLG_OK 10 2 BEGIN PROMPT -14 -1 "" @@ -109,13 +113,13 @@ END BUTTON DLG_DELREC 10 2 BEGIN PROMPT -24 -1 "~Elimina" - PICTURE BMP_DELREC + PICTURE TOOL_DELREC END BUTTON DLG_EDIT 10 2 BEGIN PROMPT -34 -1 "Edit" - PICTURE BMP_EDIT + PICTURE TOOL_EDIT END BUTTON DLG_CANCEL 10 2 @@ -135,10 +139,14 @@ BEGIN PROMPT 1 1 "File " END +ENDPAGE + +TOOLBAR "topbar" 0 0 0 2 + BUTTON 100 10 2 BEGIN PROMPT -12 -1 "~Collega" - PICTURE BMP_LINK + PICTURE TOOL_LINK END BUTTON DLG_CANCEL 10 2 @@ -174,6 +182,10 @@ BEGIN CHECKTYPE REQUIRED END +ENDPAGE + +TOOLBAR "topbar" 0 0 0 2 + BUTTON DLG_OK 10 2 BEGIN PROMPT -13 -1 "" @@ -182,6 +194,7 @@ END BUTTON DLG_DELREC 10 2 BEGIN PROMPT -23 -1 "" + PICTURE TOOL_DELREC END BUTTON DLG_CANCEL 10 2 @@ -207,6 +220,10 @@ BEGIN PROMPT 1 2 "Includi nell'aggiornamento" END +ENDPAGE + +TOOLBAR "topbar" 0 0 0 2 + BUTTON DLG_OK 10 2 BEGIN PROMPT -13 -1 "" @@ -215,7 +232,7 @@ END BUTTON DLG_DELREC 10 2 BEGIN PROMPT -23 -1 "~Elimina" - PICTURE BMP_DELREC + PICTURE TOOL_DELREC END BUTTON DLG_CANCEL 10 2 @@ -235,10 +252,14 @@ BEGIN PROMPT 1 1 "File " END +ENDPAGE + +TOOLBAR "topbar" 0 0 0 2 + BUTTON 100 10 2 BEGIN PROMPT -12 -1 "~Elimina" - PICTURE BMP_DELREC + PICTURE TOOL_DELREC END BUTTON DLG_CANCEL 10 2 diff --git a/ba/ba1800a.uml b/ba/ba1800a.uml index 22ca8dcec..7794eff51 100755 --- a/ba/ba1800a.uml +++ b/ba/ba1800a.uml @@ -5,8 +5,7 @@ TOOLBAR "" 0 20 0 3 BUTTON F_SAVE 10 2 BEGIN PROMPT -13 -11 "~Registra" - PICTURE BMP_SAVEREC - PICTURE BMP_SAVERECDN + PICTURE TOOL_SAVEREC END BUTTON F_IMPORT 10 2 diff --git a/ba/ba2300.uml b/ba/ba2300.uml index c2b83c7ca..643bf7c81 100755 --- a/ba/ba2300.uml +++ b/ba/ba2300.uml @@ -6,7 +6,7 @@ BUTTON DLG_SELECT 10 2 BEGIN PROMPT -13 -11 "~Selezione" MESSAGE EXIT,K_ENTER - PICTURE BMP_SELECT + PICTURE TOOL_MULTISEL END BUTTON DLG_RESET 20 2 diff --git a/ba/ba4200b.uml b/ba/ba4200b.uml index b87a0ce77..7243f3fce 100755 --- a/ba/ba4200b.uml +++ b/ba/ba4200b.uml @@ -12,7 +12,7 @@ END BUTTON DLG_EMAIL 2 2 BEGIN PROMPT -1 0 "~Posta" - PICTURE BMP_EMAIL + PICTURE TOOL_EMAIL END ENDPAGE diff --git a/ba/ba4200c.uml b/ba/ba4200c.uml index 9a289b830..942297b49 100755 --- a/ba/ba4200c.uml +++ b/ba/ba4200c.uml @@ -12,7 +12,7 @@ END BUTTON DLG_EMAIL 2 2 BEGIN PROMPT -1 0 "~Posta" - PICTURE BMP_EMAIL + PICTURE TOOL_EMAIL END ENDPAGE diff --git a/ba/ba4300a.uml b/ba/ba4300a.uml index d2681f74e..2f290b02f 100755 --- a/ba/ba4300a.uml +++ b/ba/ba4300a.uml @@ -13,7 +13,7 @@ END BUTTON DLG_EMAIL 10 2 BEGIN PROMPT -66 -11 "~Posta" - PICTURE BMP_EMAIL + PICTURE TOOL_EMAIL END #include diff --git a/ba/ba5000.uml b/ba/ba5000.uml index 74ea63ce2..1073908cf 100755 --- a/ba/ba5000.uml +++ b/ba/ba5000.uml @@ -5,7 +5,7 @@ TOOLBAR "Toolbar" 0 0 0 2 BUTTON DLG_FINDREC 9 2 BEGIN PROMPT 38 5 "Ri~cerca" - PICTURE 166 + PICTURE TOOL_FINDREC MESSAGE EXIT,K_F9 END diff --git a/ba/ba8200a.uml b/ba/ba8200a.uml index 5ec1c5d70..bc91861d0 100755 --- a/ba/ba8200a.uml +++ b/ba/ba8200a.uml @@ -5,40 +5,37 @@ TOOLBAR "" 0 0 0 2 BUTTON DLG_SAVEREC 10 2 BEGIN PROMPT -15 -11 "~Salva" - PICTURE BMP_SAVEREC - PICTURE BMP_SAVERECDN + PICTURE TOOL_SAVEREC END BUTTON DLG_NEWREC 10 2 BEGIN PROMPT -25 -11 "~Nuovo" - PICTURE BMP_NEWREC - PICTURE BMP_NEWRECDN + PICTURE TOOL_NEWREC END BUTTON DLG_DELREC 10 2 BEGIN PROMPT -35 -11 "Elimina" - PICTURE BMP_DELREC - PICTURE BMP_DELRECDN + PICTURE TOOL_DELREC END BUTTON DLG_FINDREC 10 2 BEGIN PROMPT -45 -11 "Ri~cerca" - PICTURE 166 + PICTURE TOOL_FINDREC END BUTTON DLG_INFO 10 2 BEGIN PROMPT -45 -11 "Info" - PICTURE BMP_INFO + PICTURE TOOL_INFO END BUTTON DLG_HELP 10 2 BEGIN PROMPT -45 -11 "Help" - PICTURE BMP_HELP + PICTURE TOOL_HELP END BUTTON DLG_QUIT 10 2