diff --git a/GMW/GMW_Term/GMW_Term.csproj b/GMW/GMW_Term/GMW_Term.csproj index c12dce7d..bc6a7ea9 100644 --- a/GMW/GMW_Term/GMW_Term.csproj +++ b/GMW/GMW_Term/GMW_Term.csproj @@ -243,28 +243,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -282,7 +260,6 @@ - @@ -299,9 +276,24 @@ - - - + + + + + + + + + + + + + + + + + + diff --git a/GMW/GMW_Term/Style.css b/GMW/GMW_Term/Style.css index b2984bec..e0144df9 100644 --- a/GMW/GMW_Term/Style.css +++ b/GMW/GMW_Term/Style.css @@ -15,7 +15,7 @@ padding: 0px; border: 1px black solid; background-position: center bottom; - background-image: url('images/logo_sw.png'); + background-image: url('images/logo_sw.jpg'); background-repeat: no-repeat; } @@ -29,7 +29,7 @@ } #taskBanner { - height: 20px; + height:10px; } #smallTable { @@ -53,6 +53,7 @@ height: 100px; text-align: center; vertical-align: middle; + margin-left: 5px; } .quadro1 @@ -87,6 +88,16 @@ color: White; text-align: center; } + +.ctrHeaderPagerMini +{ + background-color: #b8b8b8; + color: White; + text-align: center; + font-size: x-small; + height: 10px; +} + .ctrHeaderPagerWide { background-color: #b8b8b8; @@ -130,118 +141,138 @@ color: #333333; background-color: #D1DDF1; } + +.ctrFooterMini +{ + font-size: x-small; + height: 15px; +} .btnDeposita { display: block; - width: 100px; + width: 70px; height:40px; border: solid 2px red; background-color: #FFAAAA; + font-size:x-small; } .btnSposta { display: block; - width: 100px; + width: 70px; height:40px; border: solid 2px green; background-color: #AAFFAA; + font-size:x-small; } .btnRettifica { display: block; - width: 100px; + width: 70px; height:40px; border: solid 2px blue; background-color: #AAAAFF; + font-size:x-small; } .btnPreleva { display: block; - width: 100px; + width: 70px; height:40px; border: solid 2px red; background-color: #FFAAFF; + font-size:x-small; } .btnConferma { display: block; - width: 100px; + width: 70px; height:40px; border: solid 2px yellow; background-color: #FFFFAA; + font-size:x-small; } .btnCellaPiena { display: block; - width: 100px; + width: 70px; height:40px; border: solid 2px blue; background-color: #AAFFFF; + font-size:x-small; } .btnBarcode { display: block; - width: 100px; + width: 70px; height:40px; text-align: center; border: solid 2px blue; background-color: #AAFFFF; + font-size:x-small; } .btnChiudi { display: block; - width: 100px; + width: 70px; height: 40px; border: solid 2px yellow; background-color: #FFFFAA; + font-size:x-small; } .btnChiudiInput { display: block; - width: 100px; + width: 70px; height:40px; border: solid 2px red; background-color: #FFAAFF; + font-size:x-small; } .btnDeliberaFusi { display: block; - width: 100px; + width: 70px; height:40px; border: solid 2px green; background-color: #AAFFAA; + font-size:x-small; } .btnDeliberaWipPre { display: block; - width: 100px; + width: 70px; height:40px; border: solid 2px green; background-color: #AAFFAA; + font-size:x-small; } .btnDeliberaWipPost { display: block; - width: 100px; + width: 70px; height:40px; border: solid 2px green; background-color: #AAFFAA; + font-size:x-small; } .btnUpdate { display: block; - width: 100px; + width: 70px; height:40px; border: solid 2px green; background-color: #AAFFAA; + font-size:x-small; } .btnCancel { display: block; - width: 100px; + width: 70px; height:40px; border: solid 2px blue; background-color: #AAAAFF; + font-size:x-small; } /* classe generale per div dei bottoni */ @@ -251,6 +282,74 @@ float: left; } + +/* bottoni homepage */ + +.btnBarcodeBig +{ + width: 90px; + height:90px; + border: solid 2px blue; + background-color: #AAFFFF; + text-align: center; + white-space:pre; +} + +.btnSearchBig +{ + width: 90px; + height: 90px; + border: solid 2px yellow; + background-color: #FFFFAA; + white-space:pre; +} + +.btnListBig +{ + width: 90px; + height:90px; + border: solid 2px red; + background-color: #FFAAFF; + white-space:pre; +} + +.btnTaskBig +{ + width: 90px; + height:90px; + border: solid 2px green; + background-color: #AAFFAA; + white-space:pre; +} + +.btnHome +{ + width: 80px; + height:20px; + border: solid 2px green; + background-color: #AAFFAA; + white-space:pre; + font-size: x-small; +} + +.btnLogout +{ + width: 80px; + height:20px; + border: solid 2px red; + background-color: #FFAAFF; + white-space:pre; + font-size: x-small; +} + +/* classe per calendario popup ajax */ + +.miniCalendar .ajax__calendar_container +{ + background-color: White; + font-size: xx-small; +} + /* classe comune per bottoni selezione terminalino .bottoniSel diff --git a/GMW/GMW_Term/Web.config b/GMW/GMW_Term/Web.config index 07a80b4a..a8cb9395 100644 --- a/GMW/GMW_Term/Web.config +++ b/GMW/GMW_Term/Web.config @@ -57,7 +57,7 @@ - + diff --git a/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx b/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx index e1551269..5d8911c1 100644 --- a/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx @@ -6,9 +6,9 @@
- +
-
+
@@ -16,9 +16,9 @@
- +
-
+
@@ -26,9 +26,9 @@
- +
-
+
@@ -36,9 +36,9 @@
- -
diff --git a/GMW/GMW_Term/WebUserControls/mod_barcode.ascx b/GMW/GMW_Term/WebUserControls/mod_barcode.ascx index 01aaad76..c7df8c25 100644 --- a/GMW/GMW_Term/WebUserControls/mod_barcode.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_barcode.ascx @@ -14,8 +14,8 @@
- - + +
diff --git a/GMW/GMW_Term/WebUserControls/mod_currentTask.ascx b/GMW/GMW_Term/WebUserControls/mod_currentTask.ascx index 9b7a9afc..7adc7bf6 100644 --- a/GMW/GMW_Term/WebUserControls/mod_currentTask.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_currentTask.ascx @@ -1,4 +1,4 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_currentTask.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_currentTask" %>
- +
diff --git a/GMW/GMW_Term/WebUserControls/mod_home.ascx b/GMW/GMW_Term/WebUserControls/mod_home.ascx index ba8e2ebd..fd54ab37 100644 --- a/GMW/GMW_Term/WebUserControls/mod_home.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_home.ascx @@ -1,17 +1,17 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_home.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_home" %>
-  
-  
- +
- +
diff --git a/GMW/GMW_Term/WebUserControls/mod_home.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_home.ascx.cs index f484505c..c99e773a 100644 --- a/GMW/GMW_Term/WebUserControls/mod_home.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_home.ascx.cs @@ -24,13 +24,13 @@ namespace GMW_Term.WebUserControls { // scrive label e text bottoni - btn1.Text = "[1]-Barcode"; + btn1.Text = "Barcode\n[Alt+1]"; btn1.AccessKey = "1"; - btn2.Text = "[3]-" + traduci("Research"); + btn2.Text = traduci("Research") + "\n[Alt+3]" ; btn2.AccessKey = "3"; - btn3.Text = "[7]-" + traduci("TakeList"); + btn3.Text = traduci("TakeList") + "\n[Alt+7]"; btn3.AccessKey = "7"; - btn4.Text = "[9]-" + traduci("ActiveTask"); + btn4.Text = traduci("ActiveTask") + "\n[Alt+9]"; btn4.AccessKey = "9"; } diff --git a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx index 45fb0b35..d64848ef 100644 --- a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx @@ -6,16 +6,14 @@
-
+
- - + +
- + @@ -40,12 +38,12 @@ CommandName="Update" ToolTip='<%# tooltipTipo(Eval("CodTipoLista")) %>' /> - +
- +
@@ -71,7 +69,7 @@
- + -    + <%--  --%>
- - + +
-
+
+ Width="70%" AutoGenerateColumns="False" OnDataBound="grView_DataBound" DataKeyNames="CodLista,UDC" + DataSourceID="odsDetail" OnRowUpdating="grViewDetail_RowUpdating" Font-Size="X-Small"> diff --git a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs index f28e6557..15a7f8cf 100644 --- a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs @@ -166,11 +166,11 @@ namespace GMW_Term.WebUserControls { } } int totRecord = grView.Rows.Count + grView.PageSize * (grView.PageCount - 1); - lblNumRec.Text = string.Format("{0} records of ~ {1}", grView.Rows.Count, totRecord); + //lblNumRec.Text = string.Format("{0} records of ~ {1}", grView.Rows.Count, totRecord); } else { - lblNumRec.Text = ""; + //lblNumRec.Text = ""; } } /// @@ -579,11 +579,11 @@ namespace GMW_Term.WebUserControls string answ = ""; if (MagClass.magazzino.userHasActiveLP && stato == 1) { - answ = string.Format("~/images/circleDis_s_{0}.png", codStato); + answ = string.Format("~/images/squareDis_s_{0}.jpg", codStato); } else { - answ = string.Format("~/images/circle_s_{0}.png", codStato); + answ = string.Format("~/images/square_s_{0}.jpg", codStato); } return answ; } @@ -748,7 +748,7 @@ namespace GMW_Term.WebUserControls /// public string pathImgTipo(object codice) { - return string.Format("~/images/lista_{0}_s.png", codice); + return string.Format("~/images/lista_{0}_s.jpg", codice); } /// /// restituisce tooltip da mostrare x TIPO lista @@ -820,6 +820,15 @@ namespace GMW_Term.WebUserControls } + public string trimma(string testo, int maxChar) + { + string answ= testo; + if(testo.Length > maxChar) + { + answ = testo.Substring(0, 10); + } + return answ; + } } } \ No newline at end of file diff --git a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs index 0d38591b..e748c861 100644 --- a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs +++ b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs @@ -76,15 +76,6 @@ namespace GMW_Term.WebUserControls { /// protected global::System.Web.UI.WebControls.GridView grView; - /// - /// lblNumRec control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblNumRec; - /// /// lblWarning control. /// diff --git a/GMW/GMW_Term/WebUserControls/mod_menuTop.ascx b/GMW/GMW_Term/WebUserControls/mod_menuTop.ascx index 9c1b4848..847f41ac 100644 --- a/GMW/GMW_Term/WebUserControls/mod_menuTop.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_menuTop.ascx @@ -1,4 +1,4 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_menuTop.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_menuTop" %>
- +
\ No newline at end of file diff --git a/GMW/GMW_Term/WebUserControls/mod_periodoAnalisi.ascx b/GMW/GMW_Term/WebUserControls/mod_periodoAnalisi.ascx index adf4c610..5e9cc2dc 100644 --- a/GMW/GMW_Term/WebUserControls/mod_periodoAnalisi.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_periodoAnalisi.ascx @@ -1,9 +1,9 @@ <%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_periodoAnalisi" CodeBehind="mod_periodoAnalisi.ascx.cs" %> -<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+ DataSourceID="odsPeriodi" DataTextField="label" DataValueField="value" Font-Size="Smaller" + Width="90px"> @@ -15,18 +15,12 @@
- -
- -
diff --git a/GMW/GMW_Term/WebUserControls/mod_periodoAnalisi.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_periodoAnalisi.ascx.designer.cs index 83993315..6e21898e 100644 --- a/GMW/GMW_Term/WebUserControls/mod_periodoAnalisi.ascx.designer.cs +++ b/GMW/GMW_Term/WebUserControls/mod_periodoAnalisi.ascx.designer.cs @@ -39,15 +39,6 @@ public partial class mod_periodoAnalisi { /// protected global::System.Web.UI.WebControls.TextBox txtInizio; - /// - /// CalendarExtender1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::AjaxControlToolkit.CalendarExtender CalendarExtender1; - /// /// RequiredFieldValidator1 control. /// @@ -66,15 +57,6 @@ public partial class mod_periodoAnalisi { /// protected global::System.Web.UI.WebControls.TextBox txtFine; - /// - /// CalendarExtender2 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::AjaxControlToolkit.CalendarExtender CalendarExtender2; - /// /// RequiredFieldValidator2 control. /// diff --git a/GMW/GMW_Term/WebUserControls/mod_search.ascx b/GMW/GMW_Term/WebUserControls/mod_search.ascx index 5e83f4f8..1d0801f2 100644 --- a/GMW/GMW_Term/WebUserControls/mod_search.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_search.ascx @@ -1,15 +1,15 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_search.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_search" %> <%@ Register Src="mod_searchResults.ascx" TagName="mod_searchResults" TagPrefix="uc1" %> -
+
-
-
- - +
+
+
-
- +
+ +
diff --git a/GMW/GMW_Term/WebUserControls/mod_search.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_search.ascx.designer.cs index 146ff09b..d8ab7b54 100644 --- a/GMW/GMW_Term/WebUserControls/mod_search.ascx.designer.cs +++ b/GMW/GMW_Term/WebUserControls/mod_search.ascx.designer.cs @@ -22,6 +22,15 @@ namespace GMW_Term.WebUserControls { /// protected global::System.Web.UI.WebControls.Label lblInput; + /// + /// txtRicerca control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtRicerca; + /// /// btnLoginPage control. /// @@ -40,15 +49,6 @@ namespace GMW_Term.WebUserControls { /// protected global::System.Web.UI.WebControls.Button btnButtonsHome; - /// - /// txtRicerca control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox txtRicerca; - /// /// mod_searchResults1 control. /// diff --git a/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx b/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx index ae9cfe1f..4f5fec13 100644 --- a/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx @@ -4,13 +4,13 @@
+ Width="90%" DataKeyNames="tipo,valore" DataSourceID="ods" OnRowUpdating="grView_RowUpdating" Font-Size="X-Small"> - + @@ -35,8 +35,8 @@ -    - + <%--    + --%> diff --git a/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx.cs index 9ae2e317..4dbcf8af 100644 --- a/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx.cs @@ -123,11 +123,11 @@ namespace GMW_Term.WebUserControls { } } int totRecord = grView.Rows.Count + grView.PageSize * (grView.PageCount - 1); - lblNumRec.Text = string.Format("{0} records of ~ {1}", grView.Rows.Count, totRecord); + //lblNumRec.Text = string.Format("{0} records of ~ {1}", grView.Rows.Count, totRecord); } else { - lblNumRec.Text = ""; + //lblNumRec.Text = ""; } } /// @@ -241,7 +241,7 @@ namespace GMW_Term.WebUserControls /// protected void aggiornaControlliDataGL() { - grView.PageSize = 4; + grView.PageSize = 3; } /// @@ -260,7 +260,7 @@ namespace GMW_Term.WebUserControls SteamWare.memLayer.ML.emptySessionVal(string.Format("{0}_sel", _idxGridView)); grView.SelectedIndex = -1; grView.DataBind(); - lblWarning.Visible = false; + //lblWarning.Visible = false; } /// @@ -370,13 +370,13 @@ namespace GMW_Term.WebUserControls switch (tipo) { case "UDC": - answ = string.Format("~/images/UDC.png", codice); + answ = string.Format("~/images/Udc.jpg", codice); break; case "Particolare": - answ = string.Format("~/images/Part.png", codice); + answ = string.Format("~/images/Part.jpg", codice); break; case "Cella": - answ = string.Format("~/images/Cella.png", codice); + answ = string.Format("~/images/Cella.jpg", codice); break; default: break; diff --git a/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx.designer.cs index bfcc362a..cc247d87 100644 --- a/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx.designer.cs +++ b/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx.designer.cs @@ -22,24 +22,6 @@ namespace GMW_Term.WebUserControls { /// protected global::System.Web.UI.WebControls.GridView grView; - /// - /// lblNumRec control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblNumRec; - - /// - /// lblWarning control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblWarning; - /// /// ods control. /// diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index 1b4f069b..87069ca1 100644 Binary files a/GMW/GMW_Term/bin/GMW_Term.dll and b/GMW/GMW_Term/bin/GMW_Term.dll differ diff --git a/GMW/GMW_Term/bin/GMW_data.dll b/GMW/GMW_Term/bin/GMW_data.dll index cd2f1092..3df04868 100644 Binary files a/GMW/GMW_Term/bin/GMW_data.dll and b/GMW/GMW_Term/bin/GMW_data.dll differ diff --git a/GMW/GMW_Term/bin/SteamWare.dll b/GMW/GMW_Term/bin/SteamWare.dll index 6294df7c..9c53cd5a 100644 Binary files a/GMW/GMW_Term/bin/SteamWare.dll and b/GMW/GMW_Term/bin/SteamWare.dll differ diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.csproj.FileListAbsolute.txt b/GMW/GMW_Term/obj/Debug/GMW_Term.csproj.FileListAbsolute.txt index e67ad016..d08b65de 100644 --- a/GMW/GMW_Term/obj/Debug/GMW_Term.csproj.FileListAbsolute.txt +++ b/GMW/GMW_Term/obj/Debug/GMW_Term.csproj.FileListAbsolute.txt @@ -27,32 +27,32 @@ c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\ResolveAssemblyReference.cache c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\GMW_Term.dll c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\GMW_Term.pdb -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_Term.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_Term.pdb -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\AjaxControlToolkit.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_data.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\SteamWare.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ICSharpCode.SharpZipLib.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\AjaxControlToolkit.pdb -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_data.pdb -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\SteamWare.pdb -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\SteamWare.xml -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ar\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\cs\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\de\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\es\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\fr\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\he\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\hi\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\it\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ja\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ko\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\nl\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\pt\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ru\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\tr-TR\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\zh-CHS\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\zh-CHT\AjaxControlToolkit.resources.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\ResolveAssemblyReference.cache -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\GMW_Term.dll -C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\GMW_Term.pdb +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_Term.dll +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_Term.pdb +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\AjaxControlToolkit.dll +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_data.dll +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\SteamWare.dll +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ICSharpCode.SharpZipLib.dll +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\AjaxControlToolkit.pdb +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_data.pdb +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\SteamWare.pdb +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\SteamWare.xml +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ar\AjaxControlToolkit.resources.dll +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\cs\AjaxControlToolkit.resources.dll +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\de\AjaxControlToolkit.resources.dll +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\es\AjaxControlToolkit.resources.dll +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\fr\AjaxControlToolkit.resources.dll +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\he\AjaxControlToolkit.resources.dll +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\hi\AjaxControlToolkit.resources.dll +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\it\AjaxControlToolkit.resources.dll +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ja\AjaxControlToolkit.resources.dll +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ko\AjaxControlToolkit.resources.dll +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\nl\AjaxControlToolkit.resources.dll +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\pt\AjaxControlToolkit.resources.dll +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ru\AjaxControlToolkit.resources.dll +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\tr-TR\AjaxControlToolkit.resources.dll +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\zh-CHS\AjaxControlToolkit.resources.dll +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\zh-CHT\AjaxControlToolkit.resources.dll +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\ResolveAssemblyReference.cache +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\GMW_Term.dll +c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\GMW_Term.pdb diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index 1b4f069b..d1538979 100644 Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ diff --git a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache index 8b4ed051..92b551af 100644 Binary files a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj index b0f98a3b..3ebce614 100644 --- a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj +++ b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj @@ -344,14 +344,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW_Term" - "ProductCode" = "8:{0E2CFBF4-7822-4419-AB79-3D0A1148B859}" - "PackageCode" = "8:{94D57F74-FC98-49EF-BB93-1888C0CEFB4E}" + "ProductCode" = "8:{D6CB5F9E-4454-47AF-8422-A3B2797EF37E}" + "PackageCode" = "8:{BFD25881-4CD7-487F-8BB9-B9176FDF245E}" "UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.260" + "ProductVersion" = "8:1.0.265" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" @@ -824,7 +824,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9C1BA08A590A44EC9515C0F91AD50A1D" { - "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe" + "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A89965CB827F476CB8D496FFFC9653DF" @@ -852,7 +852,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B0271B832DBE45F0B50639E61DAE3CF4" { - "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe" + "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A89965CB827F476CB8D496FFFC9653DF" diff --git a/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi b/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi index 4c734a8d..a31edcae 100644 Binary files a/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi and b/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi differ