Egalware/XPS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- aggiunte icone barcode colorate

Browse Source 
- verifica ricompilazione con ultime steamware x errore string (qui è ok...)
- ricompilato con esecuzione del setup delle cartelle...

git-svn-id: https://keyhammer.ath.cx/svn/XPS/trunk@103 43c8e981-f90d-406c-a89a-24a2c4268d51
This commit is contained in:
samuele
2008-12-03 14:12:47 +00:00
parent ed085d2945
commit 78076815fb
32 changed files with 102 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project/XPS_app.sln
+25
View File
@@ -26,9 +26,14 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "XPS", "..\..\WebSites\XPS\"
EndProjectSection
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "XPS_installer", "XPS_installer\XPS_installer.vdproj", "{DE085B2F-CF8E-4997-924C-C929350317EE}"
ProjectSection(ProjectDependencies) = postProject
{FB6006EA-4630-4ECB-82E4-FAC0866789D9} = {FB6006EA-4630-4ECB-82E4-FAC0866789D9}
EndProjectSection
EndProject
Project("{2CFEAB61-6A3B-4EB8-B523-560B4BEEF521}") = "XPS_deploy", "XPS_deploy\XPS_deploy.wdproj", "{2F3C923A-AE51-4B80-87E0-85C7DF7038A9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SetDirectoryPermission", "..\SetDirectoryPermission\SetDirectoryPermission.csproj", "{FB6006EA-4630-4ECB-82E4-FAC0866789D9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -121,6 +126,26 @@ Global
{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
{2F3C923A-AE51-4B80-87E0-85C7DF7038A9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{FB6006EA-4630-4ECB-82E4-FAC0866789D9}.Debug|.NET.ActiveCfg = Debug|Any CPU
{FB6006EA-4630-4ECB-82E4-FAC0866789D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FB6006EA-4630-4ECB-82E4-FAC0866789D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FB6006EA-4630-4ECB-82E4-FAC0866789D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{FB6006EA-4630-4ECB-82E4-FAC0866789D9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{FB6006EA-4630-4ECB-82E4-FAC0866789D9}.Deploy|.NET.ActiveCfg = Debug|Any CPU
{FB6006EA-4630-4ECB-82E4-FAC0866789D9}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{FB6006EA-4630-4ECB-82E4-FAC0866789D9}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{FB6006EA-4630-4ECB-82E4-FAC0866789D9}.Deploy|Mixed Platforms.ActiveCfg = Debug|Any CPU
{FB6006EA-4630-4ECB-82E4-FAC0866789D9}.Deploy|Mixed Platforms.Build.0 = Debug|Any CPU
{FB6006EA-4630-4ECB-82E4-FAC0866789D9}.Installer|.NET.ActiveCfg = Release|Any CPU
{FB6006EA-4630-4ECB-82E4-FAC0866789D9}.Installer|Any CPU.ActiveCfg = Release|Any CPU
{FB6006EA-4630-4ECB-82E4-FAC0866789D9}.Installer|Any CPU.Build.0 = Release|Any CPU
{FB6006EA-4630-4ECB-82E4-FAC0866789D9}.Installer|Mixed Platforms.ActiveCfg = Release|Any CPU
{FB6006EA-4630-4ECB-82E4-FAC0866789D9}.Installer|Mixed Platforms.Build.0 = Release|Any CPU
{FB6006EA-4630-4ECB-82E4-FAC0866789D9}.Release|.NET.ActiveCfg = Release|Any CPU
{FB6006EA-4630-4ECB-82E4-FAC0866789D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FB6006EA-4630-4ECB-82E4-FAC0866789D9}.Release|Any CPU.Build.0 = Release|Any CPU
{FB6006EA-4630-4ECB-82E4-FAC0866789D9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{FB6006EA-4630-4ECB-82E4-FAC0866789D9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
project/XPS_deploy/Release/bin/SteamWare.dll
BIN
View File
Binary file not shown.
project/XPS_deploy/Release/bin/XPS.dll
BIN
View File
Binary file not shown.
project/XPS_deploy/Release/equaAppSettings.config
+2 -2
View File
@@ -18,7 +18,7 @@
<add key="titleApp" value="XPS_titleApp"/>
<add key="welcomeApp" value="XPS_welcomeApp"/>
<add key="appName" value="XPS"/>
<add key="mainRev" value="0.9"/>
<add key="mainRev" value="1.0"/>
<add key="copyRight" value="SteamWare © 2008"/>
<add key="defaultApp" value="XPS_Appl"/>
<add key="defaultTitle" value="XPS_ShortWelcome"/>
@@ -42,5 +42,5 @@
<add key="reportName_lbl" value="LabelEqua"/>
<add key="reportOpzPdf" value="&amp;rs:Format=PDF"/>
<add key="printerSchedaIdent" value="Brother HL-2170W series"/>
<add key="printerBarcode" value="Brother Q-500"/>
<add key="printerBarcode" value="\\EEEPCASUS\Brother QL-500"/>
</appSettings>
project/XPS_deploy/Release/images/barcode_orange_l.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 339 B

project/XPS_deploy/Release/images/barcode_orange_m.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 268 B

project/XPS_deploy/Release/images/barcode_orange_s.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 207 B

project/XPS_deploy/Release/images/barcode_white_l.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 327 B

project/XPS_deploy/Release/images/barcode_white_m.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 264 B

project/XPS_deploy/Release/images/barcode_white_s.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 205 B

project/XPS_deploy/Release/mod_ULP.ascx
+1 -3
View File
@@ -39,9 +39,7 @@
<HeaderTemplate>
</HeaderTemplate>
<ItemTemplate>
<%--<asp:HyperLink runat="server" ID="lnkPDF" ImageUrl="~/images/table.png" NavigateUrl='<%# XPS.obj.urlReport(Eval("Cod"),"module","") %>'
Target="_blank" ToolTip='<%# traduci("anteprimaBarcode") %>' />--%>
<asp:ImageButton runat="server" ID="btnPrintScheda" ImageUrl="~/images/table.png" CommandArgument='<%# Eval("Cod")%>' ToolTip='<%# traduci("stampaSchedaIdentificazione") %>'
<asp:ImageButton runat="server" ID="btnPrintScheda" ImageUrl='<%# imgPath(SteamWare.tipoImg.barcodeArancio , SteamWare.dimImg.small) %>' CommandArgument='<%# Eval("Cod")%>' ToolTip='<%# traduci("stampaSchedaIdentificazione") %>'
onclick="btnPrintScheda_Click" />
</ItemTemplate>
</asp:TemplateField>
project/XPS_deploy/Release/mod_barcode.ascx
+3 -3
View File
@@ -1,17 +1,17 @@
<%@ control language="C#" autoeventwireup="true" inherits="mod_barcode, XPS" %>
<div style="text-align: center;">
<div style="text-align: center; font-size:20pt;;">
<div>
<asp:TextBox runat="server" ID="txtComando" TextMode="Password" Width="200px"
ontextchanged="txtComando_TextChanged" />
</div>
<asp:Panel runat="server" ID="pnlBarcodeBox" CssClass="">
<div style="background-color: #FFE800; padding: 8px; margin: 1px; height:15px;">
<div style="background-color: #FFE800; padding: 8px; margin: 1px;">
<asp:Label runat="server" ID="lblInput" Text="" />
</div>
<div style="background-color:#FFC500; padding:8px; margin:1px;">
<asp:Label runat="server" ID="lblValore" Text="" />
</div>
<div style="background-color: #FF7700; padding: 8px; margin: 1px; height:15px;">
<div style="background-color: #FF7700; padding: 8px; margin: 1px; ">
<asp:Label runat="server" ID="lblRichiesta" Text="" Font-Bold="true" />
</div>
<asp:Label ID="lblBrowser" runat="server"></asp:Label>
project/XPS_deploy/Release/mod_elencoComm.ascx
+1 -3
View File
@@ -115,9 +115,7 @@
ReadOnly="true" DataFormatString="{0:dd/MM/yy}" />
<asp:TemplateField ShowHeader="False">
<ItemTemplate>
<asp:HyperLink runat="server" ID="lnkPDF" ImageUrl="~/images/table.png" NavigateUrl='<%# XPS.obj.urlReport(Eval("Cod"),"label","") %>'
Target="_blank" ToolTip='<%# traduci("anteprimaBarcode") %>' />
<%--<asp:ImageButton runat="server" ID="btnPrintScheda" ImageUrl="~/images/table.png" CommandArgument='<%# Eval("Cod")%>' ToolTip='<%# traduci("stampaBarcode") %>' OnClick="btnPrintScheda_Click" />--%>
<asp:ImageButton runat="server" ID="btnPrintScheda" ImageUrl='<%# imgPath(SteamWare.tipoImg.barcode , SteamWare.dimImg.small) %>' CommandArgument='<%# Eval("Cod")%>' ToolTip='<%# traduci("stampaBarcode") %>' OnClick="btnPrintScheda_Click" />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="Ciclo" HeaderText="Ciclo" SortExpression="Ciclo" ReadOnly="true" />
project/XPS_deploy/Release/tmp/LabelEqua_1.emf
BIN
View File
Binary file not shown.
project/XPS_deploy/Release/tmp/ReportSchedaIdentificazione_1.emf
BIN
View File
Binary file not shown.
project/XPS_deploy/Release/web.config
+2 -2
View File
@@ -90,7 +90,7 @@
<add key="titleApp" value="XPS_titleApp" />
<add key="welcomeApp" value="XPS_welcomeApp" />
<add key="appName" value="XPS" />
<add key="mainRev" value="0.9" />
<add key="mainRev" value="1.0" />
<add key="copyRight" value="SteamWare © 2008" />
<add key="defaultApp" value="XPS_Appl" />
<add key="defaultTitle" value="XPS_ShortWelcome" />
@@ -112,7 +112,7 @@
<add key="reportName_lbl" value="LabelEqua" />
<add key="reportOpzPdf" value="&amp;rs:Format=PDF" />
<add key="printerSchedaIdent" value="Brother HL-2170W series" />
<add key="printerBarcode" value="Brother Q-500" />
<add key="printerBarcode" value="\\EEEPCASUS\Brother QL-500" />
</appSettings>
<connectionStrings>
<add name="SteamWare_XPSConnectionString" connectionString="Data Source=localhost;Initial Catalog=SteamWare_XPS;Persist Security Info=True;User id=equa;Password=steamware"
project/XPS_deploy/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
project/XPS_deploy/Source/Bin/SteamWare.dll
BIN
View File
Binary file not shown.
project/XPS_deploy/Source/equaAppSettings.config
+2 -2
View File
@@ -18,7 +18,7 @@
<add key="titleApp" value="XPS_titleApp"/>
<add key="welcomeApp" value="XPS_welcomeApp"/>
<add key="appName" value="XPS"/>
<add key="mainRev" value="0.9"/>
<add key="mainRev" value="1.0"/>
<add key="copyRight" value="SteamWare © 2008"/>
<add key="defaultApp" value="XPS_Appl"/>
<add key="defaultTitle" value="XPS_ShortWelcome"/>
@@ -42,5 +42,5 @@
<add key="reportName_lbl" value="LabelEqua"/>
<add key="reportOpzPdf" value="&amp;rs:Format=PDF"/>
<add key="printerSchedaIdent" value="Brother HL-2170W series"/>
<add key="printerBarcode" value="Brother Q-500"/>
<add key="printerBarcode" value="\\EEEPCASUS\Brother QL-500"/>
</appSettings>
project/XPS_deploy/Source/images/barcode_orange_l.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 339 B

project/XPS_deploy/Source/images/barcode_orange_m.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 268 B

project/XPS_deploy/Source/images/barcode_orange_s.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 207 B

project/XPS_deploy/Source/images/barcode_white_l.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 327 B

project/XPS_deploy/Source/images/barcode_white_m.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 264 B

project/XPS_deploy/Source/images/barcode_white_s.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 205 B

project/XPS_deploy/Source/mod_ULP.ascx
+1 -3
View File
@@ -39,9 +39,7 @@
<HeaderTemplate>
</HeaderTemplate>
<ItemTemplate>
<%--<asp:HyperLink runat="server" ID="lnkPDF" ImageUrl="~/images/table.png" NavigateUrl='<%# XPS.obj.urlReport(Eval("Cod"),"module","") %>'
Target="_blank" ToolTip='<%# traduci("anteprimaBarcode") %>' />--%>
<asp:ImageButton runat="server" ID="btnPrintScheda" ImageUrl="~/images/table.png" CommandArgument='<%# Eval("Cod")%>' ToolTip='<%# traduci("stampaSchedaIdentificazione") %>'
<asp:ImageButton runat="server" ID="btnPrintScheda" ImageUrl='<%# imgPath(SteamWare.tipoImg.barcodeArancio , SteamWare.dimImg.small) %>' CommandArgument='<%# Eval("Cod")%>' ToolTip='<%# traduci("stampaSchedaIdentificazione") %>'
onclick="btnPrintScheda_Click" />
</ItemTemplate>
</asp:TemplateField>
project/XPS_deploy/Source/mod_barcode.ascx
+3 -3
View File
@@ -1,17 +1,17 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeFile="mod_barcode.ascx.cs" Inherits="mod_barcode" %>
<div style="text-align: center;">
<div style="text-align: center; font-size:20pt;;">
<div>
<asp:TextBox runat="server" ID="txtComando" TextMode="Password" Width="200px"
ontextchanged="txtComando_TextChanged" />
</div>
<asp:Panel runat="server" ID="pnlBarcodeBox" CssClass="">
<div style="background-color: #FFE800; padding: 8px; margin: 1px; height:15px;">
<div style="background-color: #FFE800; padding: 8px; margin: 1px;">
<asp:Label runat="server" ID="lblInput" Text="" />
</div>
<div style="background-color:#FFC500; padding:8px; margin:1px;">
<asp:Label runat="server" ID="lblValore" Text="" />
</div>
<div style="background-color: #FF7700; padding: 8px; margin: 1px; height:15px;">
<div style="background-color: #FF7700; padding: 8px; margin: 1px; ">
<asp:Label runat="server" ID="lblRichiesta" Text="" Font-Bold="true" />
</div>
<asp:Label ID="lblBrowser" runat="server"></asp:Label>
project/XPS_deploy/Source/mod_elencoComm.ascx
+1 -3
View File
@@ -116,9 +116,7 @@
ReadOnly="true" DataFormatString="{0:dd/MM/yy}" />
<asp:TemplateField ShowHeader="False">
<ItemTemplate>
<asp:HyperLink runat="server" ID="lnkPDF" ImageUrl="~/images/table.png" NavigateUrl='<%# XPS.obj.urlReport(Eval("Cod"),"label","") %>'
Target="_blank" ToolTip='<%# traduci("anteprimaBarcode") %>' />
<%--<asp:ImageButton runat="server" ID="btnPrintScheda" ImageUrl="~/images/table.png" CommandArgument='<%# Eval("Cod")%>' ToolTip='<%# traduci("stampaBarcode") %>' OnClick="btnPrintScheda_Click" />--%>
<asp:ImageButton runat="server" ID="btnPrintScheda" ImageUrl='<%# imgPath(SteamWare.tipoImg.barcode , SteamWare.dimImg.small) %>' CommandArgument='<%# Eval("Cod")%>' ToolTip='<%# traduci("stampaBarcode") %>' OnClick="btnPrintScheda_Click" />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="Ciclo" HeaderText="Ciclo" SortExpression="Ciclo" ReadOnly="true" />
project/XPS_deploy/Source/tmp/LabelEqua_1.emf
BIN
View File
Binary file not shown.
project/XPS_deploy/Source/tmp/ReportSchedaIdentificazione_1.emf
BIN
View File
Binary file not shown.
project/XPS_installer/Release/XPS_installer.msi
BIN
View File
Binary file not shown.
project/XPS_installer/XPS_installer.vdproj
+61 -7
View File
@@ -21,6 +21,12 @@
}
"Entry"
{
"MsmKey" = "8:_64FB4C9F1B8345AD8C1770FC63178CD7"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_ACDA9284B8BE45769DB08C80CEEBD3BB"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -34,6 +40,12 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_64FB4C9F1B8345AD8C1770FC63178CD7"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_00F95120EF5746039D322C25A9BEC7B5"
"MsmSig" = "8:_UNDEFINED"
}
@@ -193,6 +205,20 @@
{
"CustomAction"
{
"{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_76C389DDF9E447FBAEAF4B167B43E437"
{
"Name" = "8:Primary output from SetDirectoryPermission (Active)"
"Condition" = "8:"
"Object" = "8:_64FB4C9F1B8345AD8C1770FC63178CD7"
"FileType" = "3:2"
"InstallAction" = "3:1"
"Arguments" = "8:c:\\rrrr pippo"
"EntryPoint" = "8:"
"Sequence" = "3:1"
"Identifier" = "8:_59112240_A101_48BF_B82E_94F14F0790B1"
"InstallerClass" = "11:TRUE"
"CustomActionData" = "8:"
}
}
"DefaultFeature"
{
@@ -328,17 +354,17 @@
}
"{4C6F2762-250E-4E7D-82DC-65B304135C98}:_77B3F16AD8664DFBB612FA88C9462200"
{
"AllowScriptSourceAccess" = "11:TRUE"
"AllowScriptSourceAccess" = "11:FALSE"
"AllowReadAccess" = "11:TRUE"
"AllowWriteAccess" = "11:TRUE"
"AllowDirectoryBrowse" = "11:FALSE"
"LogVisits" = "11:TRUE"
"Index" = "11:TRUE"
"LogVisits" = "11:FALSE"
"Index" = "11:FALSE"
"ExecutePermissions" = "3:2"
"Name" = "8:tmp"
"AlwaysCreate" = "11:TRUE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Transitive" = "11:TRUE"
"Property" = "8:_3DF3F795C5DD4757AC12B5232ACC38CC"
"Folders"
{
@@ -395,14 +421,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:XPS"
"ProductCode" = "8:{953688E2-B6CA-4984-9E0E-357492FF3388}"
"PackageCode" = "8:{7E5D5566-D64B-4C03-97EE-ADB5E289361D}"
"ProductCode" = "8:{E1AEEA25-BB61-4733-980D-ED9A7EAD557B}"
"PackageCode" = "8:{33FF332D-A9F7-49AD-8DB4-144C0B6CA72B}"
"UpgradeCode" = "8:{71B65361-FEA5-44CA-9B9A-45597433DB20}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.1.0"
"ProductVersion" = "8:1.1.1"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:035-460560"
"ARPHELPLINK" = "8:info@steamware.net"
@@ -845,6 +871,34 @@
}
"ProjectOutput"
{
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_64FB4C9F1B8345AD8C1770FC63178CD7"
{
"SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_BC5E70D6EEEE487C984AA2BFCBBC67A8"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
"ProjectOutputGroupRegister" = "3:1"
"OutputConfiguration" = "8:"
"OutputGroupCanonicalName" = "8:Built"
"OutputProjectGuid" = "8:{FB6006EA-4630-4ECB-82E4-FAC0866789D9}"
"ShowKeyOutput" = "11:TRUE"
"ExcludeFilters"
{
}
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D0BD83802BE74225822AB6895088B34C"
{
"SourcePath" = "8:"