Skip to content

Joona Romppanen / Moya Info Tools

Go to a project
Commit 258f0580 by Liv Haapala
Options

pieniä muutoksia softiin

1 parent 84ed809c
Inline Side-by-side
Showing with 232 additions and 192 deletions
CardDisplay/CardDisplay/CardDisplay/Forms/Form1.cs
...@@ -235,7 +235,7 @@ namespace CardDisplay ...@@ -235,7 +235,7 @@ namespace CardDisplay
try try
{ {
ret = client.MakeRequest("meta/v1/printedcard/" + card.cardId + "/card-filing"); ret = client.MakeRequest("meta/v1/printedcard/" + card.eventuserId + "/card-filing");
} }
catch (ApplicationException ex) catch (ApplicationException ex)
{ {
...@@ -255,7 +255,7 @@ namespace CardDisplay ...@@ -255,7 +255,7 @@ namespace CardDisplay
slot2ReaderEventId = re.readerEventId; slot2ReaderEventId = re.readerEventId;
slot2Cards.Add(card); slot2Cards.Add(card);
pictureBox2.ImageLocation = RestClient.GetRequestURL(Properties.Settings.Default.ApiURL, "card/GetImage/" + card.cardId); pictureBox2.ImageLocation = RestClient.GetRequestURL(Properties.Settings.Default.ApiURL, "card/GetImage/" + card.eventuserId);
pictureBox2.Tag = re.eventuser; pictureBox2.Tag = re.eventuser;
slot2SelectedCard = card; slot2SelectedCard = card;
break; break;
......
MoyaAdmin/MoyaAdminUI/MoyaAdminLib/Card.cs
...@@ -16,6 +16,7 @@ namespace MoyaAdminLib ...@@ -16,6 +16,7 @@ namespace MoyaAdminLib
//{"id":3990,"state":"PENDING_VALIDATION","cardTemplate":"pelaaja","username":"Miketzu","wholeName":"Mirco Renko"} //{"id":3990,"state":"PENDING_VALIDATION","cardTemplate":"pelaaja","username":"Miketzu","wholeName":"Mirco Renko"}
public int id; public int id;
public int eventuserId; public int eventuserId;
public int cardId;
public DateTime printTime; public DateTime printTime;
public string state; public string state;
public string template; public string template;
......
MoyaAdmin/MoyaAdminUI/MoyaAdminLib/obj/Debug/MoyaAdminLib.csproj.FileListAbsolute.txt
...@@ -8,7 +8,6 @@ D:\Devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\obj\Debug\MoyaA ...@@ -8,7 +8,6 @@ D:\Devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\obj\Debug\MoyaA
I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\bin\Debug\MoyaAdminLib.dll.config I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\bin\Debug\MoyaAdminLib.dll.config
I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\bin\Debug\MoyaAdminLib.dll I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\bin\Debug\MoyaAdminLib.dll
I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\bin\Debug\MoyaAdminLib.pdb I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\bin\Debug\MoyaAdminLib.pdb
I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\obj\Debug\MoyaAdminLib.csprojResolveAssemblyReference.cache
I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\obj\Debug\MoyaAdminLib.Controls.EventUserEditor.resources I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\obj\Debug\MoyaAdminLib.Controls.EventUserEditor.resources
I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\obj\Debug\MoyaAdminLib.csproj.GenerateResource.Cache I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\obj\Debug\MoyaAdminLib.csproj.GenerateResource.Cache
I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\obj\Debug\MoyaAdminLib.dll I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\obj\Debug\MoyaAdminLib.dll
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.Designer.cs
...@@ -51,6 +51,10 @@ ...@@ -51,6 +51,10 @@
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.orgMealToolStripButton = new System.Windows.Forms.ToolStripButton(); this.orgMealToolStripButton = new System.Windows.Forms.ToolStripButton();
this.TopPanel = new System.Windows.Forms.Panel(); this.TopPanel = new System.Windows.Forms.Panel();
this.freePlacesCountTextBox = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.reservedPlacesCountTextBox = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.MapsComboBox = new System.Windows.Forms.ComboBox(); this.MapsComboBox = new System.Windows.Forms.ComboBox();
this.searchTextBox = new System.Windows.Forms.TextBox(); this.searchTextBox = new System.Windows.Forms.TextBox();
...@@ -58,11 +62,9 @@ ...@@ -58,11 +62,9 @@
this.searchTimer = new System.Windows.Forms.Timer(this.components); this.searchTimer = new System.Windows.Forms.Timer(this.components);
this.ImageRefreshTimer = new System.Windows.Forms.Timer(this.components); this.ImageRefreshTimer = new System.Windows.Forms.Timer(this.components);
this.panel2 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel();
this.label1 = new System.Windows.Forms.Label();
this.reservedPlacesCountTextBox = new System.Windows.Forms.TextBox();
this.freePlacesCountTextBox = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.placesCountTimer = new System.Windows.Forms.Timer(this.components); this.placesCountTimer = new System.Windows.Forms.Timer(this.components);
this.allPlacesCountTextBox = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.MapPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.MapPictureBox)).BeginInit();
this.toolStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout();
this.TopPanel.SuspendLayout(); this.TopPanel.SuspendLayout();
...@@ -270,6 +272,8 @@ ...@@ -270,6 +272,8 @@
// //
// TopPanel // TopPanel
// //
this.TopPanel.Controls.Add(this.allPlacesCountTextBox);
this.TopPanel.Controls.Add(this.label4);
this.TopPanel.Controls.Add(this.freePlacesCountTextBox); this.TopPanel.Controls.Add(this.freePlacesCountTextBox);
this.TopPanel.Controls.Add(this.label2); this.TopPanel.Controls.Add(this.label2);
this.TopPanel.Controls.Add(this.reservedPlacesCountTextBox); this.TopPanel.Controls.Add(this.reservedPlacesCountTextBox);
...@@ -282,6 +286,40 @@ ...@@ -282,6 +286,40 @@
this.TopPanel.Size = new System.Drawing.Size(752, 45); this.TopPanel.Size = new System.Drawing.Size(752, 45);
this.TopPanel.TabIndex = 15; this.TopPanel.TabIndex = 15;
// //
// freePlacesCountTextBox
//
this.freePlacesCountTextBox.Location = new System.Drawing.Point(418, 18);
this.freePlacesCountTextBox.Name = "freePlacesCountTextBox";
this.freePlacesCountTextBox.ReadOnly = true;
this.freePlacesCountTextBox.Size = new System.Drawing.Size(100, 20);
this.freePlacesCountTextBox.TabIndex = 10;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(362, 21);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(46, 13);
this.label2.TabIndex = 9;
this.label2.Text = "Avoinna";
//
// reservedPlacesCountTextBox
//
this.reservedPlacesCountTextBox.Location = new System.Drawing.Point(251, 18);
this.reservedPlacesCountTextBox.Name = "reservedPlacesCountTextBox";
this.reservedPlacesCountTextBox.ReadOnly = true;
this.reservedPlacesCountTextBox.Size = new System.Drawing.Size(100, 20);
this.reservedPlacesCountTextBox.TabIndex = 8;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(204, 21);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(41, 13);
this.label1.TabIndex = 7;
this.label1.Text = "Varattu";
//
// label3 // label3
// //
this.label3.AutoSize = true; this.label3.AutoSize = true;
...@@ -341,44 +379,27 @@ ...@@ -341,44 +379,27 @@
this.panel2.Size = new System.Drawing.Size(752, 471); this.panel2.Size = new System.Drawing.Size(752, 471);
this.panel2.TabIndex = 17; this.panel2.TabIndex = 17;
// //
// label1 // placesCountTimer
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(204, 21);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(41, 13);
this.label1.TabIndex = 7;
this.label1.Text = "Varattu";
//
// reservedPlacesCountTextBox
//
this.reservedPlacesCountTextBox.Location = new System.Drawing.Point(251, 18);
this.reservedPlacesCountTextBox.Name = "reservedPlacesCountTextBox";
this.reservedPlacesCountTextBox.ReadOnly = true;
this.reservedPlacesCountTextBox.Size = new System.Drawing.Size(100, 20);
this.reservedPlacesCountTextBox.TabIndex = 8;
//
// freePlacesCountTextBox
// //
this.freePlacesCountTextBox.Location = new System.Drawing.Point(418, 18); this.placesCountTimer.Interval = 60000;
this.freePlacesCountTextBox.Name = "freePlacesCountTextBox"; this.placesCountTimer.Tick += new System.EventHandler(this.placesCountTimer_Tick);
this.freePlacesCountTextBox.ReadOnly = true;
this.freePlacesCountTextBox.Size = new System.Drawing.Size(100, 20);
this.freePlacesCountTextBox.TabIndex = 10;
// //
// label2 // allPlacesCountTextBox
// //
this.label2.AutoSize = true; this.allPlacesCountTextBox.Location = new System.Drawing.Point(580, 18);
this.label2.Location = new System.Drawing.Point(362, 21); this.allPlacesCountTextBox.Name = "allPlacesCountTextBox";
this.label2.Name = "label2"; this.allPlacesCountTextBox.ReadOnly = true;
this.label2.Size = new System.Drawing.Size(50, 13); this.allPlacesCountTextBox.Size = new System.Drawing.Size(100, 20);
this.label2.TabIndex = 9; this.allPlacesCountTextBox.TabIndex = 12;
this.label2.Text = "Vapaana";
// //
// placesCountTimer // label4
// //
this.placesCountTimer.Interval = 60000; this.label4.AutoSize = true;
this.placesCountTimer.Tick += new System.EventHandler(this.placesCountTimer_Tick); this.label4.Location = new System.Drawing.Point(524, 21);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(36, 13);
this.label4.TabIndex = 11;
this.label4.Text = "Kaikki";
// //
// MainForm // MainForm
// //
...@@ -442,6 +463,8 @@ ...@@ -442,6 +463,8 @@
private System.Windows.Forms.TextBox reservedPlacesCountTextBox; private System.Windows.Forms.TextBox reservedPlacesCountTextBox;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private System.Windows.Forms.Timer placesCountTimer; private System.Windows.Forms.Timer placesCountTimer;
private System.Windows.Forms.TextBox allPlacesCountTextBox;
private System.Windows.Forms.Label label4;
} }
} }
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.cs
...@@ -92,7 +92,8 @@ namespace MoyaAdminUI ...@@ -92,7 +92,8 @@ namespace MoyaAdminUI
} }
catch (Exception e) catch (Exception e)
{ {
MessageBox.Show("Could not connect to Moya server"); //MessageBox.Show("Could not connect to Moya server");
Console.WriteLine("Could not connect to Moya server");
} }
MapPictureBox.Refresh(); MapPictureBox.Refresh();
} }
...@@ -1195,15 +1196,24 @@ namespace MoyaAdminUI ...@@ -1195,15 +1196,24 @@ namespace MoyaAdminUI
{ {
int free = 0; int free = 0;
int reserved = 0; int reserved = 0;
int all = 0;
foreach (ListViewItem lvi in PlacesListView.Items) foreach (ListViewItem lvi in PlacesListView.Items)
{ {
if (lvi.Tag != null && lvi.Tag is ComputerPlace) if (lvi.Tag != null && lvi.Tag is ComputerPlace)
{ {
ComputerPlace place = (ComputerPlace)lvi.Tag; ComputerPlace place = (ComputerPlace)lvi.Tag;
if (place.Taken) if (place.Taken)
{
reserved += 1; reserved += 1;
all += 1;
}
else if (place.Buyable) else if (place.Buyable)
{
free += 1; free += 1;
all += 1;
}
else if (!place.Disabled)
all += 1;
} }
} }
if (freePlacesCountTextBox.Text != free.ToString()) if (freePlacesCountTextBox.Text != free.ToString())
...@@ -1223,6 +1233,8 @@ namespace MoyaAdminUI ...@@ -1223,6 +1233,8 @@ namespace MoyaAdminUI
{ {
reservedPlacesCountTextBox.Text = reserved.ToString(); reservedPlacesCountTextBox.Text = reserved.ToString();
} }
if (allPlacesCountTextBox.Text != all.ToString())
allPlacesCountTextBox.Text = all.ToString();
} }
private void MainForm_SizeChanged(object sender, EventArgs e) private void MainForm_SizeChanged(object sender, EventArgs e)
...@@ -1246,6 +1258,10 @@ namespace MoyaAdminUI ...@@ -1246,6 +1258,10 @@ namespace MoyaAdminUI
private void placesCountTimer_Tick(object sender, EventArgs e) private void placesCountTimer_Tick(object sender, EventArgs e)
{ {
PlacesListView.Items.Clear();
loadComputerPlaces();
MapPictureBox.Refresh();
refreshPlacesCountTexBoxes(); refreshPlacesCountTexBoxes();
} }
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.resx
...@@ -143,47 +143,47 @@ ...@@ -143,47 +143,47 @@
<data name="toolStripRefreshButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="toolStripRefreshButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
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
RK5CYII= rkJggg==
</value> </value>
</data> </data>
<data name="UnlockToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="UnlockToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
...@@ -214,53 +214,53 @@ ...@@ -214,53 +214,53 @@
<data name="usersToolStripPrintButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="usersToolStripPrintButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
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
FP25hQAAAABJRU5ErkJggg== acAAAAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="cardLocationInputToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="cardLocationInputToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
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
</value> </value>
</data> </data>
<data name="incomingFormToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="incomingFormToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
...@@ -281,69 +281,69 @@ ...@@ -281,69 +281,69 @@
<data name="cardInfoToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="cardInfoToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
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
DOP3B8y6qbDRm+2fAAAAAElFTkSuQmCC AX8Aq0epojIVu3gAAAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="cloackRoomToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="cloackRoomToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
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
Iu8ZIcSTfwE7illiQXIIigAAAABJRU5ErkJggg== LkXes0KIUX8BLJtZYb+Zf84AAAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
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
</value> </value>
</data> </data>
<data name="orgMealToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="orgMealToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
......
PrintServer/moyaPrintServer/moyaPrintServer/Card.cs
...@@ -9,7 +9,7 @@ namespace moyaPrintServer ...@@ -9,7 +9,7 @@ namespace moyaPrintServer
{ {
public int id; public int id;
public string cardTemplate; public string template;
public string username; public string username;
public string wholeName; public string wholeName;
public string state; public string state;
......
PrintServer/moyaPrintServer/moyaPrintServer/Form1.cs
...@@ -135,6 +135,7 @@ namespace moyaPrintServer ...@@ -135,6 +135,7 @@ namespace moyaPrintServer
pd.PrintPage += new PrintPageEventHandler(PrintPage); pd.PrintPage += new PrintPageEventHandler(PrintPage);
if(PrintersComboBox.SelectedItem != null)
pd.PrinterSettings.PrinterName = PrintersComboBox.SelectedItem.ToString(); pd.PrinterSettings.PrinterName = PrintersComboBox.SelectedItem.ToString();
pd.DefaultPageSettings = pd.PrinterSettings.DefaultPageSettings; pd.DefaultPageSettings = pd.PrinterSettings.DefaultPageSettings;
...@@ -231,7 +232,7 @@ namespace moyaPrintServer ...@@ -231,7 +232,7 @@ namespace moyaPrintServer
foreach (Card card in queuelist.cards) foreach (Card card in queuelist.cards)
{ {
// jos ei ole filtteriä niin tulosta kaikki validoidut kortit. Jos on filtteri niin tulosta vain ne joihin se osuu // jos ei ole filtteriä niin tulosta kaikki validoidut kortit. Jos on filtteri niin tulosta vain ne joihin se osuu
if (card.state == "VALIDATED" && (CardFilterTextBox.Text.Length == 0 || CardFilterTextBox.Text == card.cardTemplate)) if (card.state == "VALIDATED" && (CardFilterTextBox.Text.Length == 0 || CardFilterTextBox.Text == card.template))
{ {
ListViewItem lvi = listView.Items.Add(card.id.ToString()); ListViewItem lvi = listView.Items.Add(card.id.ToString());
...@@ -257,7 +258,7 @@ namespace moyaPrintServer ...@@ -257,7 +258,7 @@ namespace moyaPrintServer
foreach (PrintQueue pq in queueCollection) foreach (PrintQueue pq in queueCollection)
{ {
if (pq.FullName == PrintersComboBox.SelectedItem.ToString()) if (PrintersComboBox.SelectedItem != null && pq.FullName == PrintersComboBox.SelectedItem.ToString())
printQueue = pq; printQueue = pq;
} }
......
PrintServer/moyaPrintServer/moyaPrintServer/Properties/AssemblyInfo.cs
...@@ -32,5 +32,5 @@ using System.Runtime.InteropServices; ...@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.25.0")] [assembly: AssemblyVersion("1.0.29.0")]
[assembly: AssemblyFileVersion("1.0.25.0")] [assembly: AssemblyFileVersion("1.0.29.0")]
PrintServer/moyaPrintServer/out_moya.nsi
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
Name "MoyaPrintServer moya v1_00_25" Name "MoyaPrintServer moya v1_00_29"
; DO NOT CHANGE OutFile "installer_temp.exe" !!! AutoPublish requires this. ; DO NOT CHANGE OutFile "installer_temp.exe" !!! AutoPublish requires this.
...@@ -198,7 +198,7 @@ FunctionEnd ...@@ -198,7 +198,7 @@ FunctionEnd
Section "!MoyaPrintServer moya stable v1_00_25" SecMain Section "!MoyaPrintServer moya stable v1_00_29" SecMain
SetShellVarContext current SetShellVarContext current
...@@ -212,9 +212,9 @@ Section "!MoyaPrintServer moya stable v1_00_25" SecMain ...@@ -212,9 +212,9 @@ Section "!MoyaPrintServer moya stable v1_00_25" SecMain
SetOverwrite On SetOverwrite On
File /oname=autoupdate.xml "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Release\autoupdate.moya.xml" File /oname=autoupdate.xml "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\autoupdate.moya.xml"
File /oname=moyaPrintServer.exe "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Release\moyaPrintServer.exe" File /oname=moyaPrintServer.exe "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\moyaPrintServer.exe"
File autoupdate.crt File autoupdate.crt
...@@ -224,10 +224,10 @@ Section "!MoyaPrintServer moya stable v1_00_25" SecMain ...@@ -224,10 +224,10 @@ Section "!MoyaPrintServer moya stable v1_00_25" SecMain
; that is referenced to the main project. ; that is referenced to the main project.
File "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Release\AutoUpdateLib.dll" File "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.dll"
File "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Release\moyaPrintServer.pdb" File "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\moyaPrintServer.pdb"
File "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Release\AutoUpdateLib.pdb" File "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.pdb"
...@@ -315,10 +315,10 @@ Section "Uninstall" ...@@ -315,10 +315,10 @@ Section "Uninstall"
; that is referenced to the main project. ; that is referenced to the main project.
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Release\AutoUpdateLib.dll" Delete "$INSTDIR\I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.dll"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Release\moyaPrintServer.pdb" Delete "$INSTDIR\I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\moyaPrintServer.pdb"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Release\AutoUpdateLib.pdb" Delete "$INSTDIR\I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.pdb"
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!