Update Lib hinzugefügt

2021-03-25 19:01:54 +01:00
parent 69e10af592
commit b7048beede
12 changed files with 597 additions and 29 deletions
--- a/SanSystem/SanSystem.csproj
+++ b/SanSystem/SanSystem.csproj
@@ -400,6 +400,10 @@
      <Project>{e4979419-5eae-4b6d-a6a0-9632c1de87a0}</Project>
      <Name>TempCAN</Name>
    </ProjectReference>
+    <ProjectReference Include="..\UpdateLib\UpdateLib.csproj">
+      <Project>{cf95db30-247b-4382-948e-3bd5eb73c938}</Project>
+      <Name>UpdateLib</Name>
+    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="UCWerkseitigImprägniert.resx">
--- a/SanSystem/frmMain.Designer.cs
+++ b/SanSystem/frmMain.Designer.cs
@@ -37,6 +37,7 @@
            this.öffnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.stammdatenImportierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.auftraggeberToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.prefixSuffixToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.speichernToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.massenstatistikToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.projektordnerÖffnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -48,7 +49,7 @@
            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
            this.toolStripStatus_projekt_Label = new System.Windows.Forms.ToolStripStatusLabel();
            this.toolstrip_gesamtLiner = new System.Windows.Forms.ToolStripStatusLabel();
-            this.prefixSuffixToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.update = new UpdateLib.Updater();
            this.mainmenu.SuspendLayout();
            this.statusStrip1.SuspendLayout();
            this.SuspendLayout();
@@ -67,8 +68,7 @@
            this.berichteToolStripMenuItem});
            this.mainmenu.Location = new System.Drawing.Point(0, 0);
            this.mainmenu.Name = "mainmenu";
-            this.mainmenu.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2);
-            this.mainmenu.Size = new System.Drawing.Size(1084, 36);
+            this.mainmenu.Size = new System.Drawing.Size(813, 29);
            this.mainmenu.TabIndex = 1;
            this.mainmenu.Text = "menuStrip1";
            // 
@@ -81,67 +81,74 @@
            this.auftraggeberToolStripMenuItem,
            this.prefixSuffixToolStripMenuItem});
            this.projektToolStripMenuItem.Name = "projektToolStripMenuItem";
-            this.projektToolStripMenuItem.Size = new System.Drawing.Size(88, 32);
+            this.projektToolStripMenuItem.Size = new System.Drawing.Size(71, 25);
            this.projektToolStripMenuItem.Text = "Projekt";
            // 
            // neuToolStripMenuItem
            // 
            this.neuToolStripMenuItem.Name = "neuToolStripMenuItem";
-            this.neuToolStripMenuItem.Size = new System.Drawing.Size(318, 32);
+            this.neuToolStripMenuItem.Size = new System.Drawing.Size(254, 26);
            this.neuToolStripMenuItem.Text = "Neu";
            this.neuToolStripMenuItem.Click += new System.EventHandler(this.neuToolStripMenuItem_Click);
            // 
            // öffnenToolStripMenuItem
            // 
            this.öffnenToolStripMenuItem.Name = "öffnenToolStripMenuItem";
-            this.öffnenToolStripMenuItem.Size = new System.Drawing.Size(318, 32);
+            this.öffnenToolStripMenuItem.Size = new System.Drawing.Size(254, 26);
            this.öffnenToolStripMenuItem.Text = "Öffnen";
            this.öffnenToolStripMenuItem.Click += new System.EventHandler(this.öffnenToolStripMenuItem_Click);
            // 
            // stammdatenImportierenToolStripMenuItem
            // 
            this.stammdatenImportierenToolStripMenuItem.Name = "stammdatenImportierenToolStripMenuItem";
-            this.stammdatenImportierenToolStripMenuItem.Size = new System.Drawing.Size(318, 32);
+            this.stammdatenImportierenToolStripMenuItem.Size = new System.Drawing.Size(254, 26);
            this.stammdatenImportierenToolStripMenuItem.Text = "Stammdaten importieren";
            this.stammdatenImportierenToolStripMenuItem.Click += new System.EventHandler(this.stammdatenImportierenToolStripMenuItem_Click);
            // 
            // auftraggeberToolStripMenuItem
            // 
            this.auftraggeberToolStripMenuItem.Name = "auftraggeberToolStripMenuItem";
-            this.auftraggeberToolStripMenuItem.Size = new System.Drawing.Size(318, 32);
+            this.auftraggeberToolStripMenuItem.Size = new System.Drawing.Size(254, 26);
            this.auftraggeberToolStripMenuItem.Text = "Auftraggeber";
            this.auftraggeberToolStripMenuItem.Click += new System.EventHandler(this.auftraggeberToolStripMenuItem_Click);
            // 
+            // prefixSuffixToolStripMenuItem
+            // 
+            this.prefixSuffixToolStripMenuItem.Name = "prefixSuffixToolStripMenuItem";
+            this.prefixSuffixToolStripMenuItem.Size = new System.Drawing.Size(254, 26);
+            this.prefixSuffixToolStripMenuItem.Text = "Prefix / Suffix";
+            this.prefixSuffixToolStripMenuItem.Click += new System.EventHandler(this.PrefixSuffixToolStripMenuItem_Click);
+            // 
            // speichernToolStripMenuItem
            // 
            this.speichernToolStripMenuItem.Name = "speichernToolStripMenuItem";
-            this.speichernToolStripMenuItem.Size = new System.Drawing.Size(112, 32);
+            this.speichernToolStripMenuItem.Size = new System.Drawing.Size(91, 25);
            this.speichernToolStripMenuItem.Text = "Speichern";
            this.speichernToolStripMenuItem.Click += new System.EventHandler(this.speichernToolStripMenuItem_Click);
            // 
            // massenstatistikToolStripMenuItem
            // 
            this.massenstatistikToolStripMenuItem.Name = "massenstatistikToolStripMenuItem";
-            this.massenstatistikToolStripMenuItem.Size = new System.Drawing.Size(158, 32);
+            this.massenstatistikToolStripMenuItem.Size = new System.Drawing.Size(128, 25);
            this.massenstatistikToolStripMenuItem.Text = "Massenstatistik";
            this.massenstatistikToolStripMenuItem.Click += new System.EventHandler(this.massenstatistikToolStripMenuItem_Click);
            // 
            // projektordnerÖffnenToolStripMenuItem
            // 
            this.projektordnerÖffnenToolStripMenuItem.Name = "projektordnerÖffnenToolStripMenuItem";
-            this.projektordnerÖffnenToolStripMenuItem.Size = new System.Drawing.Size(211, 32);
+            this.projektordnerÖffnenToolStripMenuItem.Size = new System.Drawing.Size(170, 25);
            this.projektordnerÖffnenToolStripMenuItem.Text = "Projektordner Öffnen";
            this.projektordnerÖffnenToolStripMenuItem.Click += new System.EventHandler(this.ProjektordnerÖffnenToolStripMenuItem_Click);
            // 
            // toolStripMenuItem1
            // 
            this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(14, 32);
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(12, 25);
            // 
            // imprägnierberichteToolStripMenuItem
            // 
            this.imprägnierberichteToolStripMenuItem.Name = "imprägnierberichteToolStripMenuItem";
-            this.imprägnierberichteToolStripMenuItem.Size = new System.Drawing.Size(193, 32);
+            this.imprägnierberichteToolStripMenuItem.Size = new System.Drawing.Size(155, 25);
            this.imprägnierberichteToolStripMenuItem.Text = "Imprägnierberichte";
            this.imprägnierberichteToolStripMenuItem.Click += new System.EventHandler(this.ImprägnierberichteToolStripMenuItem_Click);
            // 
@@ -151,20 +158,20 @@
            this.massenberichteToolStripMenuItem,
            this.verbrauchToolStripMenuItem});
            this.berichteToolStripMenuItem.Name = "berichteToolStripMenuItem";
-            this.berichteToolStripMenuItem.Size = new System.Drawing.Size(101, 32);
+            this.berichteToolStripMenuItem.Size = new System.Drawing.Size(82, 25);
            this.berichteToolStripMenuItem.Text = "Berichte ";
            // 
            // massenberichteToolStripMenuItem
            // 
            this.massenberichteToolStripMenuItem.Name = "massenberichteToolStripMenuItem";
-            this.massenberichteToolStripMenuItem.Size = new System.Drawing.Size(234, 32);
+            this.massenberichteToolStripMenuItem.Size = new System.Drawing.Size(189, 26);
            this.massenberichteToolStripMenuItem.Text = "Massenberichte";
            this.massenberichteToolStripMenuItem.Click += new System.EventHandler(this.MassenberichteToolStripMenuItem_Click);
            // 
            // verbrauchToolStripMenuItem
            // 
            this.verbrauchToolStripMenuItem.Name = "verbrauchToolStripMenuItem";
-            this.verbrauchToolStripMenuItem.Size = new System.Drawing.Size(234, 32);
+            this.verbrauchToolStripMenuItem.Size = new System.Drawing.Size(189, 26);
            this.verbrauchToolStripMenuItem.Text = "Verbrauch";
            this.verbrauchToolStripMenuItem.Click += new System.EventHandler(this.VerbrauchToolStripMenuItem_Click);
            // 
@@ -174,42 +181,38 @@
            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.toolStripStatus_projekt_Label,
            this.toolstrip_gesamtLiner});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 532);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 431);
            this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0);
-            this.statusStrip1.Size = new System.Drawing.Size(1084, 26);
+            this.statusStrip1.Size = new System.Drawing.Size(813, 22);
            this.statusStrip1.TabIndex = 3;
            this.statusStrip1.Text = "statusStrip1";
            // 
            // toolStripStatus_projekt_Label
            // 
            this.toolStripStatus_projekt_Label.Name = "toolStripStatus_projekt_Label";
-            this.toolStripStatus_projekt_Label.Size = new System.Drawing.Size(55, 20);
+            this.toolStripStatus_projekt_Label.Size = new System.Drawing.Size(44, 17);
            this.toolStripStatus_projekt_Label.Text = "Projekt";
            // 
            // toolstrip_gesamtLiner
            // 
            this.toolstrip_gesamtLiner.Name = "toolstrip_gesamtLiner";
-            this.toolstrip_gesamtLiner.Size = new System.Drawing.Size(138, 20);
+            this.toolstrip_gesamtLiner.Size = new System.Drawing.Size(111, 17);
            this.toolstrip_gesamtLiner.Text = "Insgesammt Einbau";
            // 
-            // prefixSuffixToolStripMenuItem
+            // update
            // 
-            this.prefixSuffixToolStripMenuItem.Name = "prefixSuffixToolStripMenuItem";
-            this.prefixSuffixToolStripMenuItem.Size = new System.Drawing.Size(318, 32);
-            this.prefixSuffixToolStripMenuItem.Text = "Prefix / Suffix";
-            this.prefixSuffixToolStripMenuItem.Click += new System.EventHandler(this.PrefixSuffixToolStripMenuItem_Click);
+            this.update.UpdateUrl = "http://home.cosysda.de/sanverwaltung/UpdateInfo.dat";
            // 
            // frmMain
            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1084, 558);
+            this.ClientSize = new System.Drawing.Size(813, 453);
            this.Controls.Add(this.statusStrip1);
            this.Controls.Add(this.mainmenu);
            this.IsMdiContainer = true;
            this.MainMenuStrip = this.mainmenu;
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.Name = "frmMain";
            this.Text = "Kanalsanierungsverwaltung";
            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frm_main_FormClosing);
@@ -243,6 +246,7 @@
        private System.Windows.Forms.ToolStripMenuItem verbrauchToolStripMenuItem;
        private System.Windows.Forms.ToolStripStatusLabel toolstrip_gesamtLiner;
        private System.Windows.Forms.ToolStripMenuItem prefixSuffixToolStripMenuItem;
+        private UpdateLib.Updater update;
    }
 }

--- a/SanSystem/frmMain.cs
+++ b/SanSystem/frmMain.cs
@@ -30,6 +30,7 @@ namespace SanSystem
        public frmMain()
        {
            InitializeComponent();
+            update.CheckForUpdates();
            string sx = Properties.Settings.Default.DATABASEMAIN;
            
            
--- a/SanSystem/frmMain.resx
+++ b/SanSystem/frmMain.resx
@@ -123,4 +123,7 @@
  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>127, 17</value>
  </metadata>
+  <metadata name="update.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>243, 17</value>
+  </metadata>
 </root>