2023-10-13

GUIs.Monitor/Forms/frmMonitor.vb

@@ -1,9 +1,7 @@
 Imports System.Drawing.Imaging
 Imports System.IO
-Imports System.Runtime.CompilerServices
 Imports System.Text.RegularExpressions
 Imports DevExpress.LookAndFeel
-Imports DevExpress.Office.PInvoke
 Imports DevExpress.Utils
 Imports DevExpress.XtraBars
 Imports DevExpress.XtraCharts
@@ -21,9 +19,9 @@ Imports DevExpress.XtraTreeList.Nodes
 Imports DigitalData.Controls.DocumentViewer
 Imports DigitalData.GUIs.Common
 Imports DigitalData.GUIs.Monitor.Constants
+Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
-Imports DigitalData.Modules.Language
 Imports DigitalData.Modules.Language.Utils
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Patterns
@@ -96,6 +94,7 @@ Public Class frmMonitor
 
     Private Sub frmStart_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Try
+
             LogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, "Digital Data", "Monitor")
             Logger = LogConfig.GetLogger()
 
@@ -134,12 +133,14 @@ Public Class frmMonitor
             Validator = New Validator(LogConfig, LayoutControl1, AdornerUIManager2, ControlHelper)
             GridLoader = New GridLoader(LogConfig, SvgImageCollection1)
 
-            If ConfigManager.Config.DarkMode = False Then
-                SkinMode = SkinModeEnum.LightMode
-            Else
-                SkinMode = SkinModeEnum.DarkMode
-            End If
-            SetDarkMode()
+            btnDarkMode.Visibility = BarItemVisibility.Never    ' DarkMode ist erstmal aus
+            ribbonGroupEinstellungen.Visible = False
+            'If ConfigManager.Config.DarkMode = False Then
+            SkinMode = SkinModeEnum.LightMode
+            'Else
+            'SkinMode = SkinModeEnum.DarkMode
+            'End If
+            'SetDarkMode()
 
             AddHandler GridLoader.ChartControlClicked, AddressOf ChartControl_Click
 
@@ -245,6 +246,7 @@ Public Class frmMonitor
             Dim oStartTime = Now
 
             If oSearch.ReturnType = ReturnTypeEnum.TreeView Then
+
                 ' Baum
                 SetResultVisbility(ReturnTypeEnum.TreeView)
 
@@ -1094,6 +1096,7 @@ Public Class frmMonitor
                 oColor = Color.LightSkyBlue
         End Select
 
+        e.Appearance.ForeColor = GraphicsEx.GetContrastedColor(oColor)
         e.Appearance.BackColor = oColor
         e.Appearance.Options.UseBackColor = True
         e.Handled = False
@@ -1492,7 +1495,7 @@ Public Class frmMonitor
         Return image
     End Function
 
-    Private Sub BarButtonItem4_ItemClick_1(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem4.ItemClick
+    Private Sub btnDarkMode_ItemClick(sender As Object, e As ItemClickEventArgs) Handles btnDarkMode.ItemClick
         SwitchDarkMode()
     End Sub
 
@@ -1510,6 +1513,7 @@ Public Class frmMonitor
         If SkinMode = SkinModeEnum.LightMode Then
             WindowsFormsSettings.DefaultLookAndFeel.SetSkinStyle(SkinSvgPalette.DefaultSkin.BlueDark)
             SkinMode = SkinModeEnum.DarkMode
+
         Else
             WindowsFormsSettings.DefaultLookAndFeel.SetSkinStyle(SkinSvgPalette.DefaultSkin.Default)
             SkinMode = SkinModeEnum.LightMode