From 4b18414caeb1f8d7c2942790e60d4ff66abbccd4 Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 8 Sep 2008 09:09:43 +0000
Subject: [PATCH] Patch level         : Files correlati     : Ricompilazione
 Demo : [ ] Commento            :

git-svn-id: svn://10.65.10.50/trunk@17181 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 lv/lv0300.cpp         |  2 +-
 lv/lv0300a.h          | 26 ++++++++++++++++++++
 lv/lv0300a.uml        |  2 +-
 lv/lvmenu.men         | 25 ++++++++++++-------
 projects/Setup.vcproj |  2 +-
 projects/lv0.vcproj   | 56 +++++++++++++++++++++++++++++++++++++++++++
 projects/lv2.vcproj   | 24 +++++++++++++++++++
 7 files changed, 125 insertions(+), 12 deletions(-)
 create mode 100755 lv/lv0300a.h

diff --git a/lv/lv0300.cpp b/lv/lv0300.cpp
index 6e55b63e6..0e7643fc1 100755
--- a/lv/lv0300.cpp
+++ b/lv/lv0300.cpp
@@ -1,6 +1,6 @@
 #include <confapp.h>
 
-#include "lvconf.h"
+#include "lv0300a.h"
 
 class TConf_Lavanderie : public TConfig_application
 {
diff --git a/lv/lv0300a.h b/lv/lv0300a.h
new file mode 100755
index 000000000..72ec54981
--- /dev/null
+++ b/lv/lv0300a.h
@@ -0,0 +1,26 @@
+//campi maschera lv0300a
+#define DDT  1
+#define RIT  2
+#define PRE  3
+#define ANT  4
+
+#define F_CODNUM_DDT      101
+#define F_DESNUM_DDT      102
+#define F_TIPODOC_DDT     103
+#define F_DESTIPODOC_DDT  104
+
+#define F_CODNUM_RIT      105
+#define F_DESNUM_RIT      106
+#define F_TIPODOC_RIT     107
+#define F_DESTIPODOC_RIT  108
+
+#define F_CODNUM_PRE      109
+#define F_DESNUM_PRE      110
+#define F_TIPODOC_PRE     111
+#define F_DESTIPODOC_PRE  112
+
+#define F_CODNUM_ANT      113
+#define F_DESNUM_ANT      114
+#define F_TIPODOC_ANT     115
+#define F_DESTIPODOC_ANT  116
+
diff --git a/lv/lv0300a.uml b/lv/lv0300a.uml
index bab50abe2..ac9f0ef17 100755
--- a/lv/lv0300a.uml
+++ b/lv/lv0300a.uml
@@ -1,4 +1,4 @@
-#include "lvconf.h"
+#include "lv0300a.h"
 
 TOOLBAR "" 0 0 0 2
 
diff --git a/lv/lvmenu.men b/lv/lvmenu.men
index e2526323e..79736f41c 100755
--- a/lv/lvmenu.men
+++ b/lv/lvmenu.men
@@ -4,6 +4,8 @@ Picture = <ba00>
 Module  = 41
 Flags   = ""
 Item_01 = "Archivi e Tabelle di Base", [LVMENU_001]
+Item_02 = "Gestione Planning", [LVMENU_040]
+Item_03 = "Configurazione", [LVMENU_090]
 
 [LVMENU_001]
 Caption = "Archivi e Tabelle di Base"
@@ -14,7 +16,6 @@ Item_01 = "Tabelle", [LVMENU_002]
 Item_02 = "Stampa Tabelle", [LVMENU_010]
 Item_03 = "Archivi di Base", [LVMENU_020]
 Item_04 = "Stampa Archivi di Base", [LVMENU_030]
-Item_05 = "Gestione Planning", [LVMENU_040]
 
 [LVMENU_002]
 Caption = "Tabelle"
@@ -26,20 +27,18 @@ Item_02 = "Mezzi di Trasporto", "lv0 -0 MEZ", "F"
 Item_03 = "Itinerari", "lv0 -0 ITI", "F"
 Item_04 = "Tipi di Sospensione", "lv0 -0 TSP", "F"
 Item_05 = "Frequenza Consegne", "lv0 -0 FRQ", "F"
-Item_06 = "Modalità di Passaggio", "lv0 -0 MPS", "F"
-Item_07 = "Lavaggio", "lv0 -0 LAV", "F"
-Item_08 = "Linea di Destinazione", "lv0 -0 LND", "F"
-Item_09 = "Lavatrice", "lv0 -0 LVT", "F"
-Item_10 = "Mangano", "lv0 -0 MAN", "F"
+Item_06 = "Lavaggio", "lv0 -0 LAV", "F"
+Item_07 = "Linea di Destinazione", "lv0 -0 LND", "F"
+Item_08 = "Lavatrice", "lv0 -0 LVT", "F"
+Item_09 = "Mangano", "lv0 -0 MAN", "F"
 
 [LVMENU_020]
 Caption = "Archivi di Base"
 Picture = <ba00>
 Module  = 41
 Flags   = ""
-Item_01 = "Parametri gestione Lavanderie", "lv0 -2", "F"
-Item_02 = "Contratti", "lv0 -3", "F"
-Item_03 = "Passaggi Planning per Contratto e Periodi di Sospensione", "lv0 -4", "F"
+Item_01 = "Contratti", "lv0 -3", "F"
+Item_02 = "Passaggi Planning per Contratto e Periodi di Sospensione", "lv0 -4", "F"
 
 [LVMENU_040]
 Caption = "Gestione Planning"
@@ -48,3 +47,11 @@ Module  = 41
 Flags   = ""
 Item_01 = "Generazione Automatica Planning", "lv2 -0", "F"
 Item_02 = "Gestione Manuale Planning", "lv2 -1", "F"
+
+[LVMENU_090]
+Caption = "Configurazione"
+Picture = <ba00>
+Module  = 41
+Flags   = ""
+Item_01 = "Parametri gestione lavanderie", "lv0 -2", "F"
+
diff --git a/projects/Setup.vcproj b/projects/Setup.vcproj
index fd5223bb8..b4d8b9b30 100755
--- a/projects/Setup.vcproj
+++ b/projects/Setup.vcproj
@@ -65,7 +65,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wsock32.lib comctl32.lib rpcrt4.lib netapi32.lib mpr.lib"
-				OutputFile="..\exed\program\setup\$(ProjectName).exe"
+				OutputFile="..\exed\setup\$(ProjectName).exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
diff --git a/projects/lv0.vcproj b/projects/lv0.vcproj
index bb88047bb..6012b51e9 100755
--- a/projects/lv0.vcproj
+++ b/projects/lv0.vcproj
@@ -221,6 +221,10 @@
 				RelativePath="..\lv\lv0100.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\lv\lv0300.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\lv\lv0400.cpp"
 				>
@@ -234,6 +238,30 @@
 			Name="Masks"
 			Filter="uml"
 			>
+			<File
+				RelativePath="..\lv\lv0300a.uml"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Compiling mask $(InputPath)..."
+						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
+						Outputs="$(TargetDir)$(InputName).msk"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Compiling mask $(InputPath)..."
+						CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk"
+						Outputs="$(TargetDir)$(InputName).msk"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\lv\lv0400a.uml"
 				>
@@ -507,6 +535,10 @@
 				RelativePath="..\lv\lv0.h"
 				>
 			</File>
+			<File
+				RelativePath="..\lv\lv0300a.h"
+				>
+			</File>
 			<File
 				RelativePath="..\lv\lv0400.h"
 				>
@@ -841,6 +873,18 @@
 			Filter="rep"
 			>
 		</Filter>
+		<File
+			RelativePath="..\lib\AgaLib.lib"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				ExcludedFromBuild="true"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+				/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath="..\lib\AgaLibD.lib"
 			>
@@ -876,6 +920,18 @@
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\lib\vedoc.lib"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				ExcludedFromBuild="true"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+				/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath="..\lib\vedocd.lib"
 			>
diff --git a/projects/lv2.vcproj b/projects/lv2.vcproj
index d27ad2ea3..d1ca4b6c9 100755
--- a/projects/lv2.vcproj
+++ b/projects/lv2.vcproj
@@ -326,6 +326,18 @@
 			Filter="rep"
 			>
 		</Filter>
+		<File
+			RelativePath="..\lib\AgaLib.lib"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				ExcludedFromBuild="true"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+				/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath="..\lib\AgaLibD.lib"
 			>
@@ -361,6 +373,18 @@
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\lib\vedoc.lib"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				ExcludedFromBuild="true"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+				/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath="..\lib\vedocd.lib"
 			>