Skip to content

Codecrew / Moya Info Tools

Go to a project
Commit 6f4de988 by Liv Haapala
Options

getting project up to date

1 parent 4d46f84b
Expand all
Inline Side-by-side
Showing with 27 additions and 18 deletions
MoyaAdmin/MoyaAdminUI/MoyaAdminLib/RestClient.cs
...@@ -207,6 +207,8 @@ namespace MoyaAdminLib ...@@ -207,6 +207,8 @@ namespace MoyaAdminLib
public static ApiCredential GetApiCredential(string username, string pw, string apiKey, string url) 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); var request = (HttpWebRequest)WebRequest.Create(url+"/rest/apiapp/v1/createInstance/"+apiKey);
/* /*
NetworkCredential credentials = new NetworkCredential(); NetworkCredential credentials = new NetworkCredential();
...@@ -220,6 +222,8 @@ namespace MoyaAdminLib ...@@ -220,6 +222,8 @@ namespace MoyaAdminLib
request.PreAuthenticate = true; request.PreAuthenticate = true;
*/ */
string encoded = System.Convert.ToBase64String(System.Text.Encoding.GetEncoding("iso-8859-1").GetBytes(username + ":" + pw)); string encoded = System.Convert.ToBase64String(System.Text.Encoding.GetEncoding("iso-8859-1").GetBytes(username + ":" + pw));
request.Headers.Add("Authorization", "Basic " + encoded); request.Headers.Add("Authorization", "Basic " + encoded);
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.Designer.cs
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
this.printPlaceStickersForSelectedPlacesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.printPlaceStickersForSelectedPlacesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.doAReplaceForComputerPlaceNameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.doAReplaceForComputerPlaceNameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.moveSelectedPlacesToolStripMenuItem = 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.MapPictureBox = new System.Windows.Forms.PictureBox();
this.placeEditor = new System.Windows.Forms.PropertyGrid(); this.placeEditor = new System.Windows.Forms.PropertyGrid();
this.PlacesListView = new System.Windows.Forms.ListView(); this.PlacesListView = new System.Windows.Forms.ListView();
...@@ -74,7 +75,6 @@ ...@@ -74,7 +75,6 @@
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.placesCountTimer = new System.Windows.Forms.Timer(this.components); this.placesCountTimer = new System.Windows.Forms.Timer(this.components);
this.getCSVForSelectedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
this.placesContextMenuStrip.SuspendLayout(); this.placesContextMenuStrip.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.MapPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.MapPictureBox)).BeginInit();
...@@ -116,6 +116,13 @@ ...@@ -116,6 +116,13 @@
this.moveSelectedPlacesToolStripMenuItem.Text = "Move selected places"; this.moveSelectedPlacesToolStripMenuItem.Text = "Move selected places";
this.moveSelectedPlacesToolStripMenuItem.Click += new System.EventHandler(this.moveSelectedPlacesToolStripMenuItem_Click); 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 // MapPictureBox
// //
this.MapPictureBox.Cursor = System.Windows.Forms.Cursors.Default; this.MapPictureBox.Cursor = System.Windows.Forms.Cursors.Default;
...@@ -381,6 +388,7 @@ ...@@ -381,6 +388,7 @@
this.toolStripButton3.Name = "toolStripButton3"; this.toolStripButton3.Name = "toolStripButton3";
this.toolStripButton3.Size = new System.Drawing.Size(23, 22); this.toolStripButton3.Size = new System.Drawing.Size(23, 22);
this.toolStripButton3.Text = "Get Printed Cards CSV"; this.toolStripButton3.Text = "Get Printed Cards CSV";
this.toolStripButton3.Visible = false;
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click_2); this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click_2);
// //
// TopPanel // TopPanel
...@@ -514,13 +522,6 @@ ...@@ -514,13 +522,6 @@
this.placesCountTimer.Interval = 600000000; this.placesCountTimer.Interval = 600000000;
this.placesCountTimer.Tick += new System.EventHandler(this.placesCountTimer_Tick); 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 // MainForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.cs
...@@ -57,6 +57,8 @@ namespace MoyaAdminUI ...@@ -57,6 +57,8 @@ namespace MoyaAdminUI
refreshPlacesCountTexBoxes(); refreshPlacesCountTexBoxes();
placesCountTimer.Start(); placesCountTimer.Start();
this.Text = "MoyaAdminUI " + Application.ProductVersion;
//PlacesListView. //PlacesListView.
//PlacesListView.ListViewItemSorter = new AlphaNumericStringComparer(); //PlacesListView.ListViewItemSorter = new AlphaNumericStringComparer();
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/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.37")] [assembly: AssemblyVersion("1.0.38")]
[assembly: AssemblyFileVersion("1.0.37")] [assembly: AssemblyFileVersion("1.0.38")]
MoyaAdmin/MoyaAdminUI/autopublish.xml
<?xml version="1.0" encoding="utf-8"?> <?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"> <AutoPublishSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<UploadUser>f-solu-06</UploadUser> <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> <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> <ProjectName>MoyaAdminUI</ProjectName>
<Customers> <Customers>
<Customer> <Customer>
......
MoyaAdmin/MoyaAdminUI/out_moya.nsi
...@@ -22,7 +22,7 @@ ...@@ -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. ; DO NOT CHANGE OutFile "installer_temp.exe" !!! AutoPublish requires this.
...@@ -198,7 +198,7 @@ FunctionEnd ...@@ -198,7 +198,7 @@ FunctionEnd
Section "!MoyaAdminUI moya stable v1_00_28" SecMain Section "!MoyaAdminUI moya stable v1_00_38" SecMain
SetShellVarContext current SetShellVarContext current
...@@ -225,16 +225,17 @@ Section "!MoyaAdminUI moya stable v1_00_28" SecMain ...@@ -225,16 +225,17 @@ Section "!MoyaAdminUI moya stable v1_00_28" SecMain
; that is referenced to the main project. ; 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\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\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\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\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\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\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\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\zxing.pdb"
File "C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\AutoUpdateLib.pdb"
...@@ -323,16 +324,17 @@ Section "Uninstall" ...@@ -323,16 +324,17 @@ Section "Uninstall"
; that is referenced to the main project. ; 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\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\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\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\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\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\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\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\zxing.pdb"
Delete "$INSTDIR\C:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\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!