what?

2020-05-25 13:33:05 +02:00
parent cc8c3527c1
commit 1be142bb97
4 changed files with 66 additions and 53 deletions
--- a/Global_Indexer/ClassLayout.vb
+++ b/Global_Indexer/ClassLayout.vb
@@ -2,7 +2,7 @@
 Imports System.IO

 Public Class ClassWindowLocation
-    Public Shared Sub LoadFormLocationSize(ByRef form As Form)
+    Public Shared Sub LoadFormLocationSize(ByRef form As Form, Optional LoadSize As Boolean = True)
        Try
            Dim _path, _pathold As String

@@ -53,7 +53,7 @@ Public Class ClassWindowLocation
                    If x >= 0 And y >= 0 Then
                        form.Location = New Point(x, y)
                    End If
-                    If w > 0 And h > 0 Then
+                    If w > 0 And h > 0 And LoadSize = True Then
                        form.Size = New Size(w, h)
                    End If
                End If
--- a/Global_Indexer/frmIndex.vb
+++ b/Global_Indexer/frmIndex.vb
@@ -1217,9 +1217,12 @@ Public Class frmIndex
            End If

            Dim oStreamSuccessful = WINDREAM.NewFileStream(CURRENT_WORKFILE, CURRENT_NEWFILENAME)
-            Dim oAbsFilename = $"\\windream\objects{CURRENT_NEWFILENAME}"

-            If File.Exists(oAbsFilename) And oStreamSuccessful Then
+            LOGGER.Debug("File streamed to Windream: {0}", oStreamSuccessful)
+            LOGGER.Debug("File exists in Destination: {0}", File.Exists(CURRENT_NEWFILENAME))
+            LOGGER.Debug("File should be deleted: {0}", CONFIG.Config.DeleteOriginalFile)
+
+            If File.Exists(CURRENT_NEWFILENAME) And oStreamSuccessful Then
                If CONFIG.Config.DeleteOriginalFile = True Then
                    Try
                        My.Computer.FileSystem.DeleteFile(CURRENT_WORKFILE)
--- a/Global_Indexer/frmStart.resx
+++ b/Global_Indexer/frmStart.resx
@@ -121,6 +121,43 @@
    <value>400, 17</value>
  </metadata>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="MenuStrip1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="MenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>295, 24</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="MenuStrip1.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="MenuStrip1.Text" xml:space="preserve">
+    <value>MenuStrip1</value>
+  </data>
+  <data name="&gt;&gt;MenuStrip1.Name" xml:space="preserve">
+    <value>MenuStrip1</value>
+  </data>
+  <data name="&gt;&gt;MenuStrip1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;MenuStrip1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;MenuStrip1.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="KonfigurationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>108, 20</value>
+  </data>
+  <data name="KonfigurationToolStripMenuItem.Text" xml:space="preserve">
+    <value>Konfiguration</value>
+  </data>
+  <data name="AdministrationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>221, 22</value>
+  </data>
+  <data name="AdministrationToolStripMenuItem.Text" xml:space="preserve">
+    <value>Administration</value>
+  </data>
  <data name="GlobalIndexerEinstellungenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>232, 22</value>
  </data>
@@ -133,12 +170,6 @@
  <data name="HotkeyEisntellungenToolStripMenuItem.Text" xml:space="preserve">
    <value>Hotkey - Einstellungen</value>
  </data>
-  <data name="AdministrationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>221, 22</value>
-  </data>
-  <data name="AdministrationToolStripMenuItem.Text" xml:space="preserve">
-    <value>Administration</value>
-  </data>
  <data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
    <value>218, 6</value>
  </data>
@@ -166,51 +197,11 @@
  <data name="InfoToolStripMenuItem.Text" xml:space="preserve">
    <value>Info</value>
  </data>
-  <data name="KonfigurationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>108, 20</value>
-  </data>
-  <data name="KonfigurationToolStripMenuItem.Text" xml:space="preserve">
-    <value>Konfiguration</value>
-  </data>
-  <data name="MenuStrip1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="MenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>295, 24</value>
-  </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="MenuStrip1.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
-  <data name="MenuStrip1.Text" xml:space="preserve">
-    <value>MenuStrip1</value>
-  </data>
-  <data name="&gt;&gt;MenuStrip1.Name" xml:space="preserve">
-    <value>MenuStrip1</value>
-  </data>
-  <data name="&gt;&gt;MenuStrip1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;MenuStrip1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;MenuStrip1.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
  <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>515, 17</value>
  </metadata>
-  <data name="tslblFW.Size" type="System.Drawing.Size, System.Drawing">
-    <value>133, 17</value>
-  </data>
-  <data name="tslblFW.Text" xml:space="preserve">
-    <value>FolderWatch ist aktiv</value>
-  </data>
-  <data name="tslblFW.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
  <data name="StatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 137</value>
+    <value>0, 122</value>
  </data>
  <data name="StatusStrip1.Size" type="System.Drawing.Size, System.Drawing">
    <value>295, 22</value>
@@ -233,6 +224,15 @@
  <data name="&gt;&gt;StatusStrip1.ZOrder" xml:space="preserve">
    <value>2</value>
  </data>
+  <data name="tslblFW.Size" type="System.Drawing.Size, System.Drawing">
+    <value>133, 17</value>
+  </data>
+  <data name="tslblFW.Text" xml:space="preserve">
+    <value>FolderWatch ist aktiv</value>
+  </data>
+  <data name="tslblFW.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
  <metadata name="TimerFolderWatch.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>1072, 17</value>
  </metadata>
@@ -634,7 +634,7 @@ auf dieses Fenster oder...</value>
    <value>6, 13</value>
  </data>
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>295, 159</value>
+    <value>295, 144</value>
  </data>
  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt</value>
@@ -1531,6 +1531,12 @@ auf dieses Fenster oder...</value>
        /////////////wA///////////////////8f////////////////////
 </value>
  </data>
+  <data name="$this.MaximumSize" type="System.Drawing.Size, System.Drawing">
+    <value>297, 176</value>
+  </data>
+  <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
+    <value>297, 176</value>
+  </data>
  <data name="$this.Text" xml:space="preserve">
    <value>Global Indexer</value>
  </data>
--- a/Global_Indexer/frmStart.vb
+++ b/Global_Indexer/frmStart.vb
@@ -677,7 +677,7 @@ Public Class frmStart
        ClassHelper.Refresh_RegexTable()

        Start_Folderwatch()
-        ClassWindowLocation.LoadFormLocationSize(Me)
+        ClassWindowLocation.LoadFormLocationSize(Me, LoadSize:=False)
        Try
            Me.LabelControl1.Location = New Point(13, 37)
        Catch ex As Exception
@@ -738,4 +738,8 @@ Public Class frmStart
            End If
        End If
    End Sub
+
+    Private Sub frmStart_SizeChanged(sender As Object, e As EventArgs) Handles Me.SizeChanged
+        Console.WriteLine()
+    End Sub
 End Class