From 5dc679896c5918aad7d53d754707abb5ae65c380 Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 10 Mar 2009 16:22:44 +0000
Subject: [PATCH] Patch level         :10.0 256 Files correlati     :
 Ricompilazione Demo : [ ] Commento            : iniziata standardizzazione
 delle pictures nelle maschere di campo (sia toolbar che bottoni normali). Da
 ora in avanti vige la ferrea regola: 1) nelle toolbar si usano sempre e solo
 "picture tool_" 2) nei bottoni sparsi si usano le "picture bmp_" 3) e'
 vietato l'uso di picture numeriche!!! 4) quando e' possibile creare le
 toolbar utilizzando quelle predefinite con #include
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Chi non seguirà tali semplici e ferree norme sara' alleggerito delle sue parti sferiche inferiori!


git-svn-id: svn://10.65.10.50/trunk@18481 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 include/bagn001a.uml |  7 ++---
 include/bagn002.uml  |  6 +++-
 include/bagn005.uml  |  4 +++
 include/bagn006.uml  | 15 +++++----
 include/bagn008.uml  | 16 +++++-----
 include/browbar.h    | 14 ++++-----
 include/cancelbar.h  | 16 +++++-----
 include/elabar.h     |  2 +-
 include/filebar.h    |  6 ++--
 include/helpbar.h    | 12 ++++----
 include/navbar.h     | 20 ++++++------
 include/printbar.h   |  6 ++--
 include/stdbar.h     |  2 +-
 include/toolbar.h    | 72 +++++++++++++++++++++-----------------------
 include/toolfld.cpp  |  2 +-
 include/urldefid.h   | 56 ++++++++++++++++------------------
 16 files changed, 127 insertions(+), 129 deletions(-)

diff --git a/include/bagn001a.uml b/include/bagn001a.uml
index a2c9d5615..8237488ad 100755
--- a/include/bagn001a.uml
+++ b/include/bagn001a.uml
@@ -77,20 +77,19 @@ END
 
 ENDPAGE
 
-TOOLBAR "tobpar" 0 0 0 2
+TOOLBAR "bottombar" 0 0 0 2
 
 BUTTON DLG_SETPRINT 10 2
 BEGIN
   PROMPT -14 -1 "~Imposta"
-  PICTURE 165
+  PICTURE TOOL_SETPRINT
 END
      
 BUTTON DLG_SAVEREC 10 2
 BEGIN 
   PROMPT -24 -1 "~Registra"
   MESSAGE EXIT,K_INS
-  PICTURE 103 
-  PICTURE 153
+  PICTURE TOOL_SAVEREC
 END         
      
 BUTTON DLG_OK 10 2
diff --git a/include/bagn002.uml b/include/bagn002.uml
index 3e2787aa2..820266ea5 100755
--- a/include/bagn002.uml
+++ b/include/bagn002.uml
@@ -1,6 +1,6 @@
 #include "bagn002.h"
 
-PAGE "Selezione Ditta" -1 -1 66 7
+PAGE "Selezione Ditta" -1 -1 66 4
 
 STRING F_PATHPREF 50
 BEGIN
@@ -53,6 +53,10 @@ BEGIN
   GROUP 1
 END
 
+ENDPAGE
+
+TOOLBAR "bottombar" 0 0 0 2
+
 BUTTON DLG_OK 10 2
 BEGIN
   PROMPT -12 -1 ""
diff --git a/include/bagn005.uml b/include/bagn005.uml
index c9be342d5..ef1114972 100755
--- a/include/bagn005.uml
+++ b/include/bagn005.uml
@@ -25,6 +25,10 @@ BEGIN
   PROMPT 36 3 "Espress. regolare"
 END
 
+ENDPAGE
+
+TOOLBAR "topbar" 0 0 0 2
+
 BUTTON DLG_OK 10 2
 BEGIN
   PROMPT -12 -1 ""
diff --git a/include/bagn006.uml b/include/bagn006.uml
index 4b389a008..7c8e7fd9f 100755
--- a/include/bagn006.uml
+++ b/include/bagn006.uml
@@ -11,19 +11,19 @@ END
 BUTTON F_NEWREC 10 2
 BEGIN
   PROMPT -25 -1 "~Nuovo"
-  PICTURE BMP_NEWREC
+  PICTURE TOOL_NEWREC
 END
 
 BUTTON F_LINK 10 2
 BEGIN
   PROMPT -35 -1 "~Edit"
-  PICTURE BMP_EDIT
+  PICTURE TOOL_EDIT
 END
 
 BUTTON F_PRINT 10 2
 BEGIN
   PROMPT -45 -1 "Stampa"
-  PICTURE BMP_PRINT
+  PICTURE TOOL_PRINT
 END
 
 BUTTON DLG_CANCEL 10 2
@@ -79,26 +79,25 @@ END
 BUTTON F_NEWREC 10 2
 BEGIN
   PROMPT -26 -1 "~Nuovo"
-  PICTURE BMP_NEWREC
+  PICTURE TOOL_NEWREC
 END
 
 BUTTON F_LINK 10 2
 BEGIN
   PROMPT -36 -1 "~Edit"
-  PICTURE BMP_EDIT
+  PICTURE TOOL_EDIT
 END
 
 BUTTON DLG_DELREC 10 2
 BEGIN
   PROMPT -46 -1 ""
-  PICTURE BMP_DELREC
-  PICTURE BMP_DELRECDN
+  PICTURE TOOL_DELREC
 END
 
 BUTTON F_PRINT 10 2
 BEGIN
   PROMPT -56 -1 "Stampa"
-  PICTURE BMP_PRINT
+  PICTURE TOOL_PRINT
 END
 
 BUTTON DLG_CANCEL 10 2
diff --git a/include/bagn008.uml b/include/bagn008.uml
index 7bc5a33b1..1cf52f757 100755
--- a/include/bagn008.uml
+++ b/include/bagn008.uml
@@ -12,7 +12,7 @@ TOOLBAR "Toolbar" 0 0 0 2
 BUTTON DLG_PRINT 10 2
 BEGIN
   PROMPT -14 -1 "~Stampa"
-  PICTURE BMP_PRINT
+  PICTURE TOOL_PRINT
   MESSAGE EXIT,K_ENTER
 END
 
@@ -20,43 +20,43 @@ BUTTON DLG_SAVEREC 10 2
 BEGIN
   PROMPT -24 -1 "Esporta"
   MESSAGE EXIT,K_SAVE
-  PICTURE 151
+  PICTURE TOOL_EXPORT
 END
 
 BUTTON DLG_FIRSTREC 3
 BEGIN
   PROMPT -34 -1 "Prima"
-  PICTURE 121
+  PICTURE TOOL_FIRSTREC
 END
 
 BUTTON DLG_PREVREC 3
 BEGIN
   PROMPT -34 -2 "Precedente"
-  PICTURE 122
+  PICTURE TOOL_PREVREC
 END
 
 BUTTON DLG_FINDREC 10 2
 BEGIN
   PROMPT -34 -1 "Pagina"
-  PICTURE 166
+  PICTURE TOOL_FINDREC
 END
 
 BUTTON DLG_NEXTREC 3
 BEGIN
   PROMPT -34 -2 "Prossima"
-  PICTURE 124
+  PICTURE TOOL_NEXTREC
 END
 
 BUTTON DLG_LASTREC 3
 BEGIN
   PROMPT -34 -1   "Ultima"
-  PICTURE 125
+  PICTURE TOOL_LASTREC
 END
 
 BUTTON DLG_QUIT 10 2
 BEGIN
   PROMPT -44 -1 "~Fine"
-  PICTURE BMP_QUIT
+  PICTURE TOOL_QUIT
 END
 
 ENDPAGE
diff --git a/include/browbar.h b/include/browbar.h
index 0f86130c8..8a23faa12 100755
--- a/include/browbar.h
+++ b/include/browbar.h
@@ -1,19 +1,19 @@
-BUTTON DLG_FINDREC 10 2
+BUTTON DLG_FINDREC 2 2
 BEGIN
-PROMPT -13 -1 "Ri~cerca"
+PROMPT 1 1 "Ri~cerca"
 MESSAGE EXIT,K_F9
-PICTURE BMP_LENTE
+PICTURE TOOL_FINDREC
 END
 
-BUTTON DLG_CANCEL 10 2
+BUTTON DLG_CANCEL 2 2
 BEGIN
-PROMPT -23 -1 ""
+PROMPT 2 1 ""
 MESSAGE EXIT,K_ESC
 END
 
-BUTTON DLG_QUIT 10 2
+BUTTON DLG_QUIT 2 2
 BEGIN
-PROMPT -33 -1 ""
+PROMPT 3 1 ""
 MESSAGE EXIT,K_QUIT
 END
 
diff --git a/include/cancelbar.h b/include/cancelbar.h
index 7882c8dbf..888502172 100755
--- a/include/cancelbar.h
+++ b/include/cancelbar.h
@@ -6,28 +6,28 @@ END
 
 BUTTON DLG_INFO 2 2
 BEGIN
-  PROMPT 9 1 "Info"
+  PROMPT 1 1 "Info"
   MESSAGE EXIT,K_F2
-  PICTURE BMP_INFO
+  PICTURE TOOL_INFO
 END
 
 BUTTON DLG_HELP 2 2
 BEGIN
-  PROMPT 10 1 "Help"
+  PROMPT 2 1 "Help"
   MESSAGE EXIT,K_F1
-  PICTURE BMP_HELP
+  PICTURE TOOL_HELP
 END
 
 BUTTON DLG_CANCEL 2 2
 BEGIN
-  PROMPT 11 1 "Annulla"
+  PROMPT 3 1 "Annulla"
   MESSAGE EXIT,K_ESC
-  PICTURE 102
+  PICTURE TOOL_CANCEL
 END
 
 BUTTON DLG_QUIT 2 2
 BEGIN
-  PROMPT 12 1 "Fine"
+  PROMPT 4 1 "Fine"
   MESSAGE EXIT,K_QUIT
-  PICTURE BMP_QUIT
+  PICTURE TOOL_QUIT
 END
diff --git a/include/elabar.h b/include/elabar.h
index 9666e1e13..9d71b179c 100755
--- a/include/elabar.h
+++ b/include/elabar.h
@@ -1,7 +1,7 @@
 BUTTON DLG_OK 2 2
 BEGIN
   PROMPT 1 1 "Elabora"
-  PICTURE BMP_ELABORA
+  PICTURE TOOL_ELABORA
 END
 
 #include <helpbar.h>
diff --git a/include/filebar.h b/include/filebar.h
index 30c2c6f37..4a118bceb 100755
--- a/include/filebar.h
+++ b/include/filebar.h
@@ -2,21 +2,21 @@ BUTTON DLG_NEWREC 2 2
 BEGIN
   PROMPT 1 1 "~Nuovo"
   MESSAGE EXIT,K_INS
-  PICTURE BMP_NEWREC
+  PICTURE TOOL_NEWREC
 END
 
 BUTTON DLG_SAVEREC 2 2
 BEGIN
   PROMPT 2 1 "~Registra"
   MESSAGE EXIT,K_SAVE
-  PICTURE BMP_SAVEREC
+  PICTURE TOOL_SAVEREC
 END
 
 BUTTON DLG_DELREC 2 2
 BEGIN
   PROMPT 3 1 "~Elimina"
   MESSAGE EXIT,K_DEL
-  PICTURE BMP_DELREC
+  PICTURE TOOL_DELREC
 END
 
 BUTTON DLG_NULL 2 2
diff --git a/include/helpbar.h b/include/helpbar.h
index e7fc88ae9..5777d4bda 100755
--- a/include/helpbar.h
+++ b/include/helpbar.h
@@ -6,16 +6,16 @@ END
 
 BUTTON DLG_INFO 2 2
 BEGIN
-  PROMPT 9 1 "Info"
+  PROMPT 1 1 "Info"
   MESSAGE EXIT,K_F2
-  PICTURE BMP_INFO
+  PICTURE TOOL_INFO
 END
 
 BUTTON DLG_HELP 2 2
 BEGIN
-  PROMPT 10 1 "Help"
+  PROMPT 2 1 "Help"
   MESSAGE EXIT,K_F1
-  PICTURE BMP_HELP
+  PICTURE TOOL_HELP
 END
 
 BUTTON DLG_NULL 2 2
@@ -26,7 +26,7 @@ END
 
 BUTTON DLG_QUIT 2 2
 BEGIN
-  PROMPT 12 1 "Fine"
+  PROMPT 3 1 "Fine"
   MESSAGE EXIT,K_QUIT
-  PICTURE BMP_QUIT
+  PICTURE TOOL_QUIT
 END
diff --git a/include/navbar.h b/include/navbar.h
index da89d0d41..3bbf8af78 100755
--- a/include/navbar.h
+++ b/include/navbar.h
@@ -1,34 +1,34 @@
 BUTTON DLG_FIRSTREC 2 2
 BEGIN
-  PROMPT 4 1 "Primo"
+  PROMPT 1 1 "Primo"
   MESSAGE EXIT,K_HOME
-	PICTURE 121
+	PICTURE TOOL_FIRSTREC
 END
 
 BUTTON DLG_PREVREC 2 2
 BEGIN
-  PROMPT 5 1 "Indietro"
+  PROMPT 2 1 "Indietro"
   MESSAGE EXIT,K_PREV
-	PICTURE 122
+	PICTURE TOOL_PREVREC
 END
 
 BUTTON DLG_FINDREC 2 2
 BEGIN
-  PROMPT 6 1 "Ri~cerca"
+  PROMPT 3 1 "Ri~cerca"
   MESSAGE EXIT,K_F9
-  PICTURE 166
+  PICTURE TOOL_FINDREC
 END
 
 BUTTON DLG_NEXTREC 2 2
 BEGIN
-  PROMPT 7 1 "Avanti"
+  PROMPT 4 1 "Avanti"
   MESSAGE EXIT,K_NEXT
-	PICTURE 124
+	PICTURE TOOL_NEXTREC
 END
 
 BUTTON DLG_LASTREC 2 2
 BEGIN
-  PROMPT 8 1 "Ultimo"
+  PROMPT 5 1 "Ultimo"
   MESSAGE EXIT,K_END
-	PICTURE 125
+	PICTURE TOOL_LASTREC
 END
diff --git a/include/printbar.h b/include/printbar.h
index d427f64ed..7fb7501b4 100755
--- a/include/printbar.h
+++ b/include/printbar.h
@@ -1,13 +1,13 @@
 BUTTON DLG_PRINT 2 2
 BEGIN
   PROMPT 1 1 "Stampa"
-  PICTURE BMP_PRINT
+  PICTURE TOOL_PRINT
 END
 
 BUTTON DLG_SETPRINT 2 2
 BEGIN
-  PROMPT 1 1 "Imposta"
-  PICTURE BMP_SETPRINT
+  PROMPT 2 1 "Imposta"
+  PICTURE TOOL_SETPRINT
 END
 
 #include <helpbar.h>
\ No newline at end of file
diff --git a/include/stdbar.h b/include/stdbar.h
index 18e006eec..06dbf0caf 100755
--- a/include/stdbar.h
+++ b/include/stdbar.h
@@ -1,7 +1,7 @@
 BUTTON DLG_OK 2 2
 BEGIN
   PROMPT 1 1 "Conferma"
-  PICTURE BMP_OK
+  PICTURE TOOL_OK
 END
 
 #include <helpbar.h>
\ No newline at end of file
diff --git a/include/toolbar.h b/include/toolbar.h
index b3cd30483..abb8ebd29 100755
--- a/include/toolbar.h
+++ b/include/toolbar.h
@@ -1,74 +1,70 @@
-BUTTON DLG_SAVEREC 10 2
+BUTTON DLG_SAVEREC 2 2
 BEGIN
-  PROMPT -16 -1 "~Registra"
+  PROMPT 1 1 "~Registra"
   MESSAGE EXIT,K_SAVE
-  PICTURE BMP_SAVEREC
-  PICTURE BMP_SAVERECDN
+  PICTURE TOOL_SAVEREC
 END
 
-BUTTON DLG_NEWREC 10 2
+BUTTON DLG_NEWREC 2 2
 BEGIN
-  PROMPT -26 -1 "~Nuovo"
+  PROMPT 2 1 "~Nuovo"
   MESSAGE EXIT,K_INS
-  PICTURE BMP_NEWREC
-  PICTURE BMP_NEWRECDN
+  PICTURE TOOL_NEWREC
 END
 
-BUTTON DLG_DELREC 10 2
+BUTTON DLG_DELREC 2 2
 BEGIN
-  PROMPT -36 -1 "~Elimina"
+  PROMPT 3 1 "~Elimina"
   MESSAGE EXIT,K_DEL
-  PICTURE BMP_DELREC
-  PICTURE BMP_DELRECDN
+  PICTURE TOOL_DELREC
 END
 
-BUTTON DLG_PREVREC 3
+BUTTON DLG_FIRSTREC 2 2
 BEGIN
-  PROMPT -46 -2 ""
-  MESSAGE EXIT,K_PREV
-	PICTURE 122
-END
-
-BUTTON DLG_FIRSTREC 3
-BEGIN
-  PROMPT -46 -1 ""
+  PROMPT 4 1 ""
   MESSAGE EXIT,K_HOME
-	PICTURE 121
+	PICTURE TOOL_FIRSTREC
 END
 
-BUTTON DLG_FINDREC 10 2
+BUTTON DLG_PREVREC 2 2
 BEGIN
-  PROMPT -46 -1 "~c"
+  PROMPT 5 1 ""
+  MESSAGE EXIT,K_PREV
+	PICTURE TOOL_PREVREC
+END
+
+BUTTON DLG_FINDREC 2 2
+BEGIN
+  PROMPT 6 1 "~c"
   MESSAGE EXIT,K_F9
-  PICTURE 166
+  PICTURE TOOL_FINDREC
 END
 
-BUTTON DLG_NEXTREC 3
+BUTTON DLG_NEXTREC 2 2
 BEGIN
-  PROMPT -46 -2 ""
+  PROMPT 7 1 ""
   MESSAGE EXIT,K_NEXT
-	PICTURE 124
+	PICTURE TOOL_NEXTREC
 END
 
-BUTTON DLG_LASTREC 3
+BUTTON DLG_LASTREC 2 2
 BEGIN
-  PROMPT -46 -1   ""
+  PROMPT 8 1 ""
   MESSAGE EXIT,K_END
-	PICTURE 125
+	PICTURE TOOL_LASTREC
 END
 
-BUTTON DLG_CANCEL 10 2
+BUTTON DLG_CANCEL 2 2
 BEGIN
-  PROMPT -56 -1 "~Annulla"
+  PROMPT 9 1 "~Annulla"
   MESSAGE EXIT,K_ESC
-  PICTURE 102
+  PICTURE TOOL_CANCEL
 END
 
-BUTTON DLG_QUIT 10 2
+BUTTON DLG_QUIT 2 2
 BEGIN
-  PROMPT -66 -1 "~Fine"
+  PROMPT 10 1 "~Fine"
   MESSAGE EXIT,K_QUIT
-  PICTURE BMP_QUIT
-  PICTURE BMP_QUITDN
+  PICTURE TOOL_QUIT
 END
 
diff --git a/include/toolfld.cpp b/include/toolfld.cpp
index df143e685..2f71057bb 100755
--- a/include/toolfld.cpp
+++ b/include/toolfld.cpp
@@ -128,7 +128,7 @@ void TButton_tool::create(WINDOW toolbar)
     break;
   case DLG_SELECT:
     if (_ctl_data._bmp_up <= 0)
-      _ctl_data._bmp_up = TOOL_SELECT;
+      _ctl_data._bmp_up = TOOL_MULTISEL;
     set_exit_key(K_ENTER);
     break;
   case DLG_HELP: 
diff --git a/include/urldefid.h b/include/urldefid.h
index 6b66044cd..4a295c16f 100755
--- a/include/urldefid.h
+++ b/include/urldefid.h
@@ -52,13 +52,8 @@
 #define BMP_SAVEREC   103
 #define BMP_DELREC    104
 #define BMP_NEWREC    105
-#define BMP_CONFIG    107
-#define BMP_FAX       108 
+#define BMP_CONFIG    107 
 #define BMP_SEARCH    109
-#define BMP_CHECK_ON  110
-#define BMP_CHECK_OFF 111
-#define BMP_RADIO_ON  112
-#define BMP_RADIO_OFF 113
 #define BMP_QUIT      114
 #define BMP_SELECT    115
 #define BMP_EDIT      116
@@ -76,15 +71,11 @@
 #define BMP_MODULE2   128
 #define BMP_MODULE3   129
 #define BMP_MODULE4   130
-#define BMP_BOOK1     131
-#define BMP_BOOK2     132
-#define BMP_BOOK3     133
 #define BMP_MODULE    134
 #define BMP_OLE       135
-#define BMP_1         136
-#define BMP_2         137
-#define BMP_3         138
 #define BMP_EMAIL     139
+#define BMP_HARDLOCK  140
+#define BMP_EUTRON    141
 #define BMP_IMPORT    150
 #define BMP_EXPORT    151
 #define BMP_SAVERECDN 153
@@ -94,7 +85,6 @@
 #define BMP_HELP      163
 #define BMP_QUITDN    164
 #define BMP_SETPRINT  165
-#define BMP_LENTE     166
 #define BMP_DIR       167
 #define BMP_DIRDN     168
 #define BMP_FILE      169
@@ -108,60 +98,66 @@
 #define BMP_FONT      179
 #define BMP_COPY      180
 
-#define BMP_CLOSETURN    206
-#define BMP_CLOSESCONTR  207
-#define BMP_SUSPSCONTR   208
-#define BMP_SUSPSCONTRS  209
-#define BMP_SCONTR2FATT  210
-#define BMP_PERMISSIONS  211
-#define BMP_PRINTELENCO  212
-#define BMP_PRINTSCHEDE  213
-#define BMP_PRINTETICH   214
-#define BMP_PRINTRUBRICA 215
-
+//immagini bottoni barre strumenti principali
+//-------------------------------------------
 #define TOOL_OK         101
 #define TOOL_CANCEL     102
 #define TOOL_SAVEREC    103
 #define TOOL_DELREC     104
 #define TOOL_NEWREC     105
 #define TOOL_CONFIG     107
+
+#define TOOL_DOWNLOAD   113
 #define TOOL_QUIT       114
-#define TOOL_SELECT     115
+#define TOOL_MULTISEL   115
 #define TOOL_EDIT       116
 #define TOOL_LINK       117
 #define TOOL_PRINT      118
 #define TOOL_RECALC     119
 #define TOOL_ELABORA    120
+
 #define TOOL_FIRSTREC   121
 #define TOOL_PREVREC    122
 #define TOOL_STOPREC    123
 #define TOOL_NEXTREC    124
 #define TOOL_LASTREC    125
 #define TOOL_FINDREC    126
+
+#define TOOL_OLE        135
 #define TOOL_EMAIL      139
-#define TOOL_SIGNMAIL   140
-#define TOOL_SIGNPDF    141
-#define TOOL_SIGNARCH   142
+#define TOOL_SIGNMAIL   142
+#define TOOL_SIGNPDF    143
+#define TOOL_SIGNARCH   144
+
 #define TOOL_IMPORT     150
 #define TOOL_EXPORT     151
 #define TOOL_CONVERT    156
+#define TOOL_PACK       157
+
 #define TOOL_INFO       162
 #define TOOL_HELP       163
 #define TOOL_SETPRINT   165
-#define TOOL_LENTE      166
+
 #define TOOL_PDF        174
 #define TOOL_ARCHIVE    175
 #define TOOL_PREVIEW    176
 #define TOOL_FONT       179
+
 #define TOOL_COPY       180
+#define TOOL_ALT        201
+#define TOOL_QUESTION   202
+#define TOOL_WARNING    203
 #define TOOL_PREF       204
 #define TOOL_ADDPREF    205
-#define TOOL_CLOSETURN  206
+
+#define TOOL_CLOSETURN    206
 #define TOOL_CLOSESCONTR  207
 #define TOOL_SUSPSCONTR   208
 #define TOOL_SUSPSCONTRS  209
 #define TOOL_SCONTR2FATT  210
+
 #define TOOL_PERMISSIONS  211
+
 #define TOOL_PRINTELENCO  212
 #define TOOL_PRINTSCHEDE  213
 #define TOOL_PRINTETICH   214