diff --git a/XPS/Bin/SteamWare.dll b/XPS/Bin/SteamWare.dll index 9d1c168..81b6fb3 100644 Binary files a/XPS/Bin/SteamWare.dll and b/XPS/Bin/SteamWare.dll differ diff --git a/XPS/equaAppSettings.config b/XPS/equaAppSettings.config index f4fa714..5e02bc8 100644 --- a/XPS/equaAppSettings.config +++ b/XPS/equaAppSettings.config @@ -18,7 +18,7 @@ - + @@ -42,5 +42,5 @@ - + \ No newline at end of file diff --git a/XPS/images/barcode_orange_l.png b/XPS/images/barcode_orange_l.png new file mode 100644 index 0000000..9f0b1da Binary files /dev/null and b/XPS/images/barcode_orange_l.png differ diff --git a/XPS/images/barcode_orange_m.png b/XPS/images/barcode_orange_m.png new file mode 100644 index 0000000..19ec258 Binary files /dev/null and b/XPS/images/barcode_orange_m.png differ diff --git a/XPS/images/barcode_orange_s.png b/XPS/images/barcode_orange_s.png new file mode 100644 index 0000000..49c8492 Binary files /dev/null and b/XPS/images/barcode_orange_s.png differ diff --git a/XPS/images/barcode_white_l.png b/XPS/images/barcode_white_l.png new file mode 100644 index 0000000..74193b7 Binary files /dev/null and b/XPS/images/barcode_white_l.png differ diff --git a/XPS/images/barcode_white_m.png b/XPS/images/barcode_white_m.png new file mode 100644 index 0000000..5caf557 Binary files /dev/null and b/XPS/images/barcode_white_m.png differ diff --git a/XPS/images/barcode_white_s.png b/XPS/images/barcode_white_s.png new file mode 100644 index 0000000..61eaa76 Binary files /dev/null and b/XPS/images/barcode_white_s.png differ diff --git a/XPS/mod_ULP.ascx b/XPS/mod_ULP.ascx index 8ca2535..fe779ef 100644 --- a/XPS/mod_ULP.ascx +++ b/XPS/mod_ULP.ascx @@ -39,9 +39,7 @@ - <%----%> - diff --git a/XPS/mod_barcode.ascx b/XPS/mod_barcode.ascx index 385349c..38717b6 100644 --- a/XPS/mod_barcode.ascx +++ b/XPS/mod_barcode.ascx @@ -1,17 +1,17 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeFile="mod_barcode.ascx.cs" Inherits="mod_barcode" %> -
+
-
+
-
+
diff --git a/XPS/mod_elencoComm.ascx b/XPS/mod_elencoComm.ascx index d8de37b..77fe377 100644 --- a/XPS/mod_elencoComm.ascx +++ b/XPS/mod_elencoComm.ascx @@ -116,9 +116,7 @@ ReadOnly="true" DataFormatString="{0:dd/MM/yy}" /> - - <%----%> + diff --git a/XPS/tmp/LabelEqua_1.emf b/XPS/tmp/LabelEqua_1.emf index 2a97e79..a8f2ae6 100644 Binary files a/XPS/tmp/LabelEqua_1.emf and b/XPS/tmp/LabelEqua_1.emf differ diff --git a/XPS/tmp/ReportSchedaIdentificazione_1.emf b/XPS/tmp/ReportSchedaIdentificazione_1.emf index d0ccb43..6039cb2 100644 Binary files a/XPS/tmp/ReportSchedaIdentificazione_1.emf and b/XPS/tmp/ReportSchedaIdentificazione_1.emf differ diff --git a/project/XPS_app.sln b/project/XPS_app.sln index de2f8e7..6eb98b7 100644 --- a/project/XPS_app.sln +++ b/project/XPS_app.sln @@ -65,6 +65,7 @@ Global {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Installer|Any CPU.ActiveCfg = Installer|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Installer|Any CPU.Build.0 = Installer|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Installer|Mixed Platforms.ActiveCfg = Release|Any CPU + {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Installer|Mixed Platforms.Build.0 = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|.NET.ActiveCfg = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|.NET.Build.0 = Release|Any CPU {2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -85,6 +86,7 @@ Global {B1C93D09-7B57-4B57-93EF-0539F31A7102}.Installer|.NET.Build.0 = Debug|.NET {B1C93D09-7B57-4B57-93EF-0539F31A7102}.Installer|Any CPU.ActiveCfg = Debug|.NET {B1C93D09-7B57-4B57-93EF-0539F31A7102}.Installer|Mixed Platforms.ActiveCfg = Debug|.NET + {B1C93D09-7B57-4B57-93EF-0539F31A7102}.Installer|Mixed Platforms.Build.0 = Debug|.NET {B1C93D09-7B57-4B57-93EF-0539F31A7102}.Release|.NET.ActiveCfg = Debug|.NET {B1C93D09-7B57-4B57-93EF-0539F31A7102}.Release|.NET.Build.0 = Debug|.NET {B1C93D09-7B57-4B57-93EF-0539F31A7102}.Release|Any CPU.ActiveCfg = Debug|.NET @@ -119,6 +121,7 @@ Global {2F3C923A-AE51-4B80-87E0-85C7DF7038A9}.Installer|Any CPU.ActiveCfg = Release|Any CPU {2F3C923A-AE51-4B80-87E0-85C7DF7038A9}.Installer|Any CPU.Build.0 = Release|Any CPU {2F3C923A-AE51-4B80-87E0-85C7DF7038A9}.Installer|Mixed Platforms.ActiveCfg = Release|Any CPU + {2F3C923A-AE51-4B80-87E0-85C7DF7038A9}.Installer|Mixed Platforms.Build.0 = Release|Any CPU {2F3C923A-AE51-4B80-87E0-85C7DF7038A9}.Release|.NET.ActiveCfg = Release|Any CPU {2F3C923A-AE51-4B80-87E0-85C7DF7038A9}.Release|Any CPU.ActiveCfg = Release|Any CPU {2F3C923A-AE51-4B80-87E0-85C7DF7038A9}.Release|Any CPU.Build.0 = Release|Any CPU diff --git a/project/XPS_deploy/Release/bin/SteamWare.dll b/project/XPS_deploy/Release/bin/SteamWare.dll index 2ebea9a..81b6fb3 100644 Binary files a/project/XPS_deploy/Release/bin/SteamWare.dll and b/project/XPS_deploy/Release/bin/SteamWare.dll differ diff --git a/project/XPS_deploy/Release/bin/XPS.dll b/project/XPS_deploy/Release/bin/XPS.dll index f053df1..d16ab65 100644 Binary files a/project/XPS_deploy/Release/bin/XPS.dll and b/project/XPS_deploy/Release/bin/XPS.dll differ diff --git a/project/XPS_deploy/ResolveAssemblyReference.cache b/project/XPS_deploy/ResolveAssemblyReference.cache index 7550590..6783238 100644 Binary files a/project/XPS_deploy/ResolveAssemblyReference.cache and b/project/XPS_deploy/ResolveAssemblyReference.cache differ diff --git a/project/XPS_deploy/Source/Bin/SteamWare.dll b/project/XPS_deploy/Source/Bin/SteamWare.dll index 2ebea9a..81b6fb3 100644 Binary files a/project/XPS_deploy/Source/Bin/SteamWare.dll and b/project/XPS_deploy/Source/Bin/SteamWare.dll differ diff --git a/project/XPS_installer/Release/XPS_installer.msi b/project/XPS_installer/Release/XPS_installer.msi index 4794c07..e108e08 100644 Binary files a/project/XPS_installer/Release/XPS_installer.msi and b/project/XPS_installer/Release/XPS_installer.msi differ diff --git a/project/XPS_installer/XPS_installer.vdproj b/project/XPS_installer/XPS_installer.vdproj index f76da1c..5f72037 100644 --- a/project/XPS_installer/XPS_installer.vdproj +++ b/project/XPS_installer/XPS_installer.vdproj @@ -435,14 +435,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:XPS" - "ProductCode" = "8:{FC978CFD-25F2-4ABA-A2EC-D6506765A5DF}" - "PackageCode" = "8:{43DCB281-59D7-492D-B1A7-ECACCCCA5E16}" + "ProductCode" = "8:{DE00E2C9-4602-4934-A212-5BF6E4928069}" + "PackageCode" = "8:{6349F76A-40DD-43E4-AA89-F7866F110B39}" "UpgradeCode" = "8:{71B65361-FEA5-44CA-9B9A-45597433DB20}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.2.0" + "ProductVersion" = "8:1.2.1" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:035-460560" "ARPHELPLINK" = "8:info@steamware.net"