MS_1708

app/DD-Record-Organiser/frmMain.vb

@@ -13,7 +13,7 @@ Public Class frmMain
 
     Public Shared Sub RUN_TIMER()
         Try
-            If TIMER_SCAN.Enabled = False And CURRENT_SCAN_FOLDERWATCH <> "" Then
+            If TIMER_SCAN.Enabled = False And CURRENT_SCAN_FOLDERWATCH <> "" And FWSCAN_started = True Then
                 If System.IO.Directory.Exists(CURRENT_SCAN_FOLDERWATCH) = False Then
                     ClassLogger.Add(">> SCAN PATH '" & CURRENT_SCAN_FOLDERWATCH & "'not accessable!", False)
                     Exit Sub
@@ -22,7 +22,7 @@ Public Class frmMain
                 TIMER_SCAN.Enabled = True
                 AddHandler TIMER_SCAN.Tick, AddressOf Scan_TickHandler
             Else
-                If TIMER_SCAN.Enabled = True And CURRENT_SCAN_FOLDERWATCH <> "" Then
+                If TIMER_SCAN.Enabled = True And CURRENT_SCAN_FOLDERWATCH <> "" And FWSCAN_started = True Then
                     TIMER_SCAN.Enabled = False
                     RUN_TIMER()
                 Else
@@ -357,15 +357,6 @@ Public Class frmMain
 
     End Sub
 
-
-    Private Sub BarButtonItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs)
-        Dim formId As Integer = Integer.Parse(e.Item.Tag)
-
-        Cursor = Cursors.WaitCursor
-        OpenFormInputFor(formId, 1)
-        Cursor = Cursors.Default
-    End Sub
-
     Private Sub ToolbarButtonItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs)
         Dim formId As Integer = Integer.Parse(e.Item.Tag)
 
@@ -382,14 +373,14 @@ Public Class frmMain
         Cursor = Cursors.Default
     End Sub
 
-    Private Sub MenuItemClick(sender As Object, e As EventArgs)
-        Dim item As ToolStripMenuItem = DirectCast(sender, ToolStripMenuItem)
-        Dim formId As Integer = Integer.Parse(item.Tag)
+    'Private Sub MenuItemClick(sender As Object, e As EventArgs)
+    '    Dim item As ToolStripMenuItem = DirectCast(sender, ToolStripMenuItem)
+    '    Dim formId As Integer = Integer.Parse(item.Tag)
 
-        Cursor = Cursors.WaitCursor
-        OpenFormInputFor(formId, 1)
-        Cursor = Cursors.Default
-    End Sub
+    '    Cursor = Cursors.WaitCursor
+    '    OpenFormInputFor(formId, 1)
+    '    Cursor = Cursors.Default
+    'End Sub
     Private Sub MenuItem2Click(sender As Object, e As EventArgs)
         Dim item As ToolStripMenuItem = DirectCast(sender, ToolStripMenuItem)
         Dim formId As Integer = Integer.Parse(item.Tag)
@@ -637,17 +628,6 @@ Public Class frmMain
     Private Sub BarButtonItem7_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem7.ItemClick
         OpenImageManager()
     End Sub
-
-    Private Sub BarButtonItem8_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem8.ItemClick
-        Close_Maximized_Forms()
-        OpenDokumentartt()
-    End Sub
-
-    Private Sub BarButtonItem9_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem9.ItemClick
-        Close_Maximized_Forms()
-        OpenObjecttypeConfig()
-    End Sub
-
     Private Sub BarButtonItem2_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem2.ItemClick
         frmConfiguration_Basic.ShowDialog()
     End Sub
@@ -715,15 +695,18 @@ Public Class frmMain
     Public Sub New()
         Dim splash As New frmSplash()
         splash.ShowDialog()
-        Dim cultureInfo As System.Globalization.CultureInfo
-        cultureInfo = New System.Globalization.CultureInfo(USER_LANGUAGE)
+        If ERROR_INIT <> "INVALID USER" Then
+            Dim cultureInfo As System.Globalization.CultureInfo
+            cultureInfo = New System.Globalization.CultureInfo(USER_LANGUAGE)
 
-        cultureInfo.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT
+            cultureInfo.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT
 
-        Thread.CurrentThread.CurrentCulture = cultureInfo
-        Thread.CurrentThread.CurrentUICulture = cultureInfo
-        cultureInfo.DefaultThreadCurrentCulture = cultureInfo
-        cultureInfo.DefaultThreadCurrentUICulture = cultureInfo
+            Thread.CurrentThread.CurrentCulture = cultureInfo
+            Thread.CurrentThread.CurrentUICulture = cultureInfo
+            cultureInfo.DefaultThreadCurrentCulture = cultureInfo
+            cultureInfo.DefaultThreadCurrentUICulture = cultureInfo
+        End If
+      
         ' Dieser Aufruf ist für den Designer erforderlich.
         InitializeComponent()
 
@@ -734,12 +717,6 @@ Public Class frmMain
     Private Sub NotifyIcon_BalloonTipClicked(sender As Object, e As EventArgs) Handles NotifyIcon.BalloonTipClicked
         OpenFormCockpit()
     End Sub
-
-    Private Sub BarButtonItem19_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem19.ItemClick
-        Close_Maximized_Forms()
-        OpenWindream_Files()
-    End Sub
-
     Private Sub CockpitAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles CockpitAnzeigenToolStripMenuItem.Click
         OpenFormCockpit()
     End Sub
@@ -768,4 +745,24 @@ Public Class frmMain
         frm.MdiParent = MAIN_FORM
         frm.Show()
     End Sub
+
+    Private Sub BarButtonItem14_ItemClick_1(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem14.ItemClick
+        Close_Maximized_Forms()
+        OpenDokumentartt()
+    End Sub
+
+    Private Sub BarButtonItem21_ItemClick_1(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem21.ItemClick
+        Close_Maximized_Forms()
+        OpenObjecttypeConfig()
+    End Sub
+
+    Private Sub BarButtonItem22_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem22.ItemClick
+        Close_Maximized_Forms()
+        OpenWindream_Files()
+    End Sub
+
+    Private Sub BarButtonItem8_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem8.ItemClick
+        Close_Maximized_Forms()
+        OpenRightsmanager()
+    End Sub
 End Class