Merge pull request #27 from Mijo-Software/mjohne-patch-1

Add files via upload
Mijo-Software · Oct 4, 2023 · df24355 · df24355
2 parents b138188 + 105c0e0
commit df24355
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 40 deletions.
diff --git a/DisksizeWatcher/AboutBoxForm.Designer.cs b/DisksizeWatcher/AboutBoxForm.Designer.cs
diff --git a/DisksizeWatcher/AboutBoxForm.resx b/DisksizeWatcher/AboutBoxForm.resx
@@ -120,9 +120,6 @@
   <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>216, 17</value>
   </metadata>

diff --git a/DisksizeWatcher/GlobalSuppressions.cs b/DisksizeWatcher/GlobalSuppressions.cs
diff --git a/DisksizeWatcher/MainForm.Designer.cs b/DisksizeWatcher/MainForm.Designer.cs
diff --git a/DisksizeWatcher/MainForm.cs b/DisksizeWatcher/MainForm.cs
@@ -667,6 +667,7 @@ private void ToolStripButtonInfo_Click(object sender, EventArgs e)
         {
             using (AboutBoxForm aboutBoxForm = new AboutBoxForm())
             {
+                aboutBoxForm.TopMost = TopMost;
                 aboutBoxForm.ShowDialog();
             }
         }

diff --git a/DisksizeWatcher/MainForm.resx b/DisksizeWatcher/MainForm.resx
@@ -118,10 +118,10 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>301, 16</value>
+    <value>228, 13</value>
   </metadata>
   <metadata name="notifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>86, 16</value>
+    <value>13, 13</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="notifyIcon.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -5361,28 +5361,25 @@
 </value>
   </data>
   <metadata name="contextMenuStripFreeSpaceUnits.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>626, 15</value>
+    <value>797, 13</value>
   </metadata>
   <metadata name="contextMenuStripTotalSpaceUnits.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>856, 16</value>
+    <value>1029, 13</value>
   </metadata>
   <metadata name="contextMenuStripUsedSpaceUnits.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>391, 16</value>
+    <value>560, 13</value>
   </metadata>
   <metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>192, 16</value>
+    <value>119, 13</value>
   </metadata>
   <metadata name="contextMenuStripDiffSpaceUnits.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1077, 16</value>
+    <value>17, 52</value>
   </metadata>
   <metadata name="fileSystemWatcher.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>22, 54</value>
-  </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>99</value>
+    <value>408, 13</value>
   </metadata>
   <metadata name="toolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>174, 54</value>
+    <value>310, 13</value>
   </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

diff --git a/DisksizeWatcher/Properties/AssemblyInfo.cs b/DisksizeWatcher/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.4.0.6")]
-[assembly: AssemblyFileVersion("0.4.0.6")]
+[assembly: AssemblyVersion("0.4.1.7")]
+[assembly: AssemblyFileVersion("0.4.1.7")]
 [assembly: NeutralResourcesLanguage("en")]
diff --git a/DisksizeWatcher/SettingsForm.Designer.cs b/DisksizeWatcher/SettingsForm.Designer.cs
diff --git a/DisksizeWatcher/SettingsForm.resx b/DisksizeWatcher/SettingsForm.resx
@@ -120,12 +120,6 @@
   <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>107, 17</value>
   </metadata>
-Original file line number
+Diff line change
@@ Expand Up @@
             {
                 using (AboutBoxForm aboutBoxForm = new AboutBoxForm())
                 {
+                    aboutBoxForm.TopMost = TopMost;
                     aboutBoxForm.ShowDialog();
                 }
             }
@@ Expand Down @@