getting project up to date

Liv Haapala
Commit 6f4de988 authored Mar 09, 2023 by Liv Haapala
Showing with 110 additions and 101 deletions
MoyaAdmin/MoyaAdminUI/MoyaAdminLib/RestClient.cs
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.Designer.cs
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.cs
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.resx
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/Properties/AssemblyInfo.cs
MoyaAdmin/MoyaAdminUI/autopublish.xml
MoyaAdmin/MoyaAdminUI/out_moya.nsi
--- a/MoyaAdmin/MoyaAdminUI/MoyaAdminLib/RestClient.cs
+++ b/MoyaAdmin/MoyaAdminUI/MoyaAdminLib/RestClient.cs
@@ -207,6 +207,8 @@ namespace MoyaAdminLib
        public static ApiCredential GetApiCredential(string username, string pw, string apiKey, string url)
        {
+            string requestUrl = url + "/rest/apiapp/v1/createInstance/" + apiKey;
+            Console.WriteLine("Url: " + requestUrl);
            var request = (HttpWebRequest)WebRequest.Create(url+"/rest/apiapp/v1/createInstance/"+apiKey);
            /*
            NetworkCredential credentials = new NetworkCredential();
@@ -220,6 +222,8 @@ namespace MoyaAdminLib
            request.PreAuthenticate = true;
            */
            string encoded = System.Convert.ToBase64String(System.Text.Encoding.GetEncoding("iso-8859-1").GetBytes(username + ":" + pw));
            request.Headers.Add("Authorization", "Basic " + encoded);

--- a/MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.Designer.cs
+++ b/MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.Designer.cs
@@ -34,6 +34,7 @@
            this.printPlaceStickersForSelectedPlacesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.doAReplaceForComputerPlaceNameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.moveSelectedPlacesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.getCSVForSelectedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.MapPictureBox = new System.Windows.Forms.PictureBox();
            this.placeEditor = new System.Windows.Forms.PropertyGrid();
            this.PlacesListView = new System.Windows.Forms.ListView();
@@ -74,7 +75,6 @@
            this.ImageRefreshTimer = new System.Windows.Forms.Timer(this.components);
            this.panel2 = new System.Windows.Forms.Panel();
            this.placesCountTimer = new System.Windows.Forms.Timer(this.components);
-            this.getCSVForSelectedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
            this.placesContextMenuStrip.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.MapPictureBox)).BeginInit();
@@ -116,6 +116,13 @@
            this.moveSelectedPlacesToolStripMenuItem.Text = "Move selected places";
            this.moveSelectedPlacesToolStripMenuItem.Click += new System.EventHandler(this.moveSelectedPlacesToolStripMenuItem_Click);
            // 
+            // getCSVForSelectedToolStripMenuItem
+            // 
+            this.getCSVForSelectedToolStripMenuItem.Name = "getCSVForSelectedToolStripMenuItem";
+            this.getCSVForSelectedToolStripMenuItem.Size = new System.Drawing.Size(276, 22);
+            this.getCSVForSelectedToolStripMenuItem.Text = "Get CSV for selected";
+            this.getCSVForSelectedToolStripMenuItem.Click += new System.EventHandler(this.getCSVForSelectedToolStripMenuItem_Click);
+            // 
            // MapPictureBox
            // 
            this.MapPictureBox.Cursor = System.Windows.Forms.Cursors.Default;
@@ -381,6 +388,7 @@
            this.toolStripButton3.Name = "toolStripButton3";
            this.toolStripButton3.Size = new System.Drawing.Size(23, 22);
            this.toolStripButton3.Text = "Get Printed Cards CSV";
+            this.toolStripButton3.Visible = false;
            this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click_2);
            // 
            // TopPanel
@@ -514,13 +522,6 @@
            this.placesCountTimer.Interval = 600000000;
            this.placesCountTimer.Tick += new System.EventHandler(this.placesCountTimer_Tick);
            // 
-            // getCSVForSelectedToolStripMenuItem
-            // 
-            this.getCSVForSelectedToolStripMenuItem.Name = "getCSVForSelectedToolStripMenuItem";
-            this.getCSVForSelectedToolStripMenuItem.Size = new System.Drawing.Size(276, 22);
-            this.getCSVForSelectedToolStripMenuItem.Text = "Get CSV for selected";
-            this.getCSVForSelectedToolStripMenuItem.Click += new System.EventHandler(this.getCSVForSelectedToolStripMenuItem_Click);
-            // 
            // MainForm
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

--- a/MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.cs
+++ b/MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.cs
@@ -57,6 +57,8 @@ namespace MoyaAdminUI
            refreshPlacesCountTexBoxes();
            placesCountTimer.Start();
+            this.Text = "MoyaAdminUI " + Application.ProductVersion;
            //PlacesListView.
            //PlacesListView.ListViewItemSorter = new AlphaNumericStringComparer();

--- a/MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.resx
+++ b/MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.resx
@@ -214,53 +214,53 @@
  <data name="usersToolStripPrintButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        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
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALsSURBVDhPjZJ5SBNQHMdnhNoiJoWFlEhUVCZ5VGY6JaVJ
+        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
-        pavckdlmlOS1OZcubM5NXR6lmzmnmcsdecx5sLzy1qaidEGilBVREBUVRSiWldq+rbl/DAI/8IP33vf3
+        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
-        /cL7vUf4H25ubjsDAgJ0vnt8h1xdXXMsRw6LyjJhHSYzCgTnEX00EERHB0sRxTZpeTRK4zm/R7VY6CkE
+        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
-        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
+        gn2w1t6h0irZhlbEurjQkomFpmQ0C0/9IhKJXlZpOa77KE6MBGmCG4V2yLxdFcBLifJkciIzY1ih8w2J
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        Jpwqa7Tc25+fCueQ2HlHR8cNVjuBwGaz7fNu6oTxauPTcIXhJ73YgGBFNegldeA1DuJywwA42lacyNeC
-        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
+        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
-        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
+        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
-        W5H2AAAAAElFTkSuQmCC
+        wmhgAAAAAElFTkSuQmCC
 </value>
  </data>
  <data name="cardLocationInputToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        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
-        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
+        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
-        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
+        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
-        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
+        fe9z7yHx//rY0vQ94TDRJq5Z0TykRdHcvWVVYWPtP+IUUUDkNNauOSmoY8kS1M0KLigb6nlgiPD2PS+1
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        +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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        lehBME8OJJiU/wXM/RUI2rBcl78B9XPkoBY/HjcAAAAASUVORK5CYII=
+        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
 </value>
  </data>
  <data name="incomingFormToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -281,20 +281,20 @@
  <data name="cardInfoToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        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
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALwSURBVDhPdVNrSFNhGD5io/6YiEX+KKdzm3M6HZaZmpfw
+        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
-        fnaf8zJvaSppmmVlBIGLsG1nbnMuL9nUrP4k/Qoi6EetCwkJiVFGYSBa+VOQwD+Dvb3vcUoSvfDA4bzP
+        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
-        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
+        83zveb73MLsqz7wnmrVlxbCW0VilbVHIcr8J9EzvqEecIHt3xWu4sBjW2ivR2FcUVeZAZsMwZJ4egfQ6
-        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
+        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
-        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
+        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
-        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
+        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
-        IadplP8Ew8UpkOk5EGsdgBlAgtrOQ2JwrotUHMtg45qwcThAoxd3+PhRxVoOmvpmYOHbGjz1L4BMcxOE
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        xalITlZengAAAABJRU5ErkJggg==
+        galG4RY9gAAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="cloackRoomToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -330,20 +330,20 @@
  <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        xAiBqQVpuo+IrxjH9vpoHIsXW31tS6ADyyCdiKtNBe/REWQORCDbcBnCBgtSdc+QrJxACGnC5sbjOBSd
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
 </value>
  </data>
  <data name="orgMealToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -415,21 +415,21 @@
  <data name="generateBacksidesToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        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
-        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
+        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
-        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
+        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
-        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
+        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
-        UNPf1/qBjuyXxd/pt5Gt7erqugZZE7PcPlpqqMUDL+LGZXq5liHk8/nzSu6YaFWhjIiwRG3hC8sxxAdt
+        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
-        +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
+        v6Pm45A1MZ9nu8O1YkbxVcvv0EuxSugorngDbeVthSgsQ6fnjJq88ZpaRIPWyjwCPL1G19Flix9AA0x4
-        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
+        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
-        NRt7pDqAtvmCdCviD+MKMUtXRZoDZHSu36MLP4iIkXOSOFIbQPf2LTTWvPQo9kMod9NkMaQ2gB4yc2hC
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        gmsxVmNfU6XvQnpUu0tAoPt7yU/JA0a/i/p9moTmgZf3XaKXaxlBNpttlOitF/tznJTeD296WLvq0Dls
-        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
+        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
 </value>
  </data>
  <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

--- a/MoyaAdmin/MoyaAdminUI/MoyaAdminUI/Properties/AssemblyInfo.cs
+++ b/MoyaAdmin/MoyaAdminUI/MoyaAdminUI/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.37")]
+[assembly: AssemblyVersion("1.0.38")]
-[assembly: AssemblyFileVersion("1.0.37")]
+[assembly: AssemblyFileVersion("1.0.38")]
--- a/MoyaAdmin/MoyaAdminUI/autopublish.xml
+++ b/MoyaAdmin/MoyaAdminUI/autopublish.xml
 <?xml version="1.0" encoding="utf-8"?>
 <AutoPublishSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
  <UploadUser>f-solu-06</UploadUser>
-  <PrivateKeyPath />
+  <PrivateKeyPath>C:\devel\proj\AutoUpdate.svn\src\AutoPublish\Properties\key.txt</PrivateKeyPath>
  <UploadPath>/home/f-solu-06/software.f-solutions.fi</UploadPath>
-  <UploadHost>www4.f-solutions.fi</UploadHost>
+  <UploadHost>sftp.f-solutions.fi</UploadHost>
  <ProjectName>MoyaAdminUI</ProjectName>
  <Customers>
    <Customer>

--- a/MoyaAdmin/MoyaAdminUI/out_moya.nsi
+++ b/MoyaAdmin/MoyaAdminUI/out_moya.nsi
@@ -22,7 +22,7 @@
-  Name "MoyaAdminUI moya v1_00_28"
+  Name "MoyaAdminUI moya v1_00_38"
  ; DO NOT CHANGE OutFile "installer_temp.exe" !!! AutoPublish requires this.
@@ -198,7 +198,7 @@ FunctionEnd
-Section "!MoyaAdminUI moya stable v1_00_28" SecMain
+Section "!MoyaAdminUI moya stable v1_00_38" SecMain
  SetShellVarContext current
@@ -225,16 +225,17 @@ Section "!MoyaAdminUI moya stable v1_00_28" SecMain
  ; that is referenced to the main project.
  File "C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\MoyaAdminLib.dll"
+  File "C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\Csv.dll"
  File "C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\ImageResizer.dll"
+  File "C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\Emgu.CV.dll"
+  File "C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\Emgu.Util.dll"
  File "C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\zxing.dll"
  File "C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\Interop.bpac.dll"
-  File "C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\AutoUpdateLib.dll"
  File "C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\MoyaAdminUI.pdb"
  File "C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\MoyaAdminLib.pdb"
  File "C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\ImageResizer.pdb"
  File "C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\zxing.pdb"
-  File "C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\AutoUpdateLib.pdb"
@@ -323,16 +324,17 @@ Section "Uninstall"
  ; that is referenced to the main project.
  Delete "$INSTDIR\C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\MoyaAdminLib.dll"
+  Delete "$INSTDIR\C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\Csv.dll"
  Delete "$INSTDIR\C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\ImageResizer.dll"
+  Delete "$INSTDIR\C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\Emgu.CV.dll"
+  Delete "$INSTDIR\C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\Emgu.Util.dll"
  Delete "$INSTDIR\C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\zxing.dll"
  Delete "$INSTDIR\C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\Interop.bpac.dll"
-  Delete "$INSTDIR\C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\AutoUpdateLib.dll"
  Delete "$INSTDIR\C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\MoyaAdminUI.pdb"
  Delete "$INSTDIR\C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\MoyaAdminLib.pdb"
  Delete "$INSTDIR\C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\ImageResizer.pdb"
  Delete "$INSTDIR\C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\zxing.pdb"
-  Delete "$INSTDIR\C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\AutoUpdateLib.pdb"