diff --git a/Global_Indexer/ClassLayout.vb b/Global_Indexer/ClassLayout.vb index 0277711..6bfc84e 100644 --- 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 diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index 24c7d57..8a06c44 100644 --- 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) diff --git a/Global_Indexer/frmStart.resx b/Global_Indexer/frmStart.resx index 4e15bef..4f64d7b 100644 --- a/Global_Indexer/frmStart.resx +++ b/Global_Indexer/frmStart.resx @@ -121,6 +121,43 @@ 400, 17 + + 0, 0 + + + 295, 24 + + + + 5 + + + MenuStrip1 + + + MenuStrip1 + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + 108, 20 + + + Konfiguration + + + 221, 22 + + + Administration + 232, 22 @@ -133,12 +170,6 @@ Hotkey - Einstellungen - - 221, 22 - - - Administration - 218, 6 @@ -166,51 +197,11 @@ Info - - 108, 20 - - - Konfiguration - - - 0, 0 - - - 295, 24 - - - - 5 - - - MenuStrip1 - - - MenuStrip1 - - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - 515, 17 - - 133, 17 - - - FolderWatch ist aktiv - - - False - - 0, 137 + 0, 122 295, 22 @@ -233,6 +224,15 @@ 2 + + 133, 17 + + + FolderWatch ist aktiv + + + False + 1072, 17 @@ -634,7 +634,7 @@ auf dieses Fenster oder... 6, 13 - 295, 159 + 295, 144 Segoe UI, 8.25pt @@ -1531,6 +1531,12 @@ auf dieses Fenster oder... /////////////wA///////////////////8f//////////////////// + + 297, 176 + + + 297, 176 + Global Indexer diff --git a/Global_Indexer/frmStart.vb b/Global_Indexer/frmStart.vb index 9ab2681..6256d3e 100644 --- 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 \ No newline at end of file