2023-10-13

GUIs.Monitor/Forms/frmMonitor.Designer.vb

@@ -40,12 +40,13 @@ Partial Class frmMonitor
         Me.lbSearchTime = New DevExpress.XtraBars.BarStaticItem()
         Me.btnExportChart2PDF = New DevExpress.XtraBars.BarButtonItem()
         Me.btnExportChart2PNG = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnDarkMode = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.ribbonGroupEinstellungen = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
         Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.XtraTabControlFileHTML = New DevExpress.XtraTab.XtraTabControl()
@@ -89,7 +90,6 @@ Partial Class frmMonitor
         Me.AdornerUIManager2 = New DevExpress.Utils.VisualEffects.AdornerUIManager(Me.components)
         Me.WorkspaceManager1 = New DevExpress.Utils.WorkspaceManager(Me.components)
         Me.SplashScreenManager1 = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.DigitalData.GUIs.Monitor.frmLoading), True, True)
-        Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.XtraTabControlFileHTML, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -149,7 +149,7 @@ Partial Class frmMonitor
         '
         Me.RibbonControl1.ApplicationButtonDropDownControl = Me.ApplicationMenu1
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.buttonSearch, Me.BarButtonItem1, Me.btnExportDetails, Me.btnExportMain, Me.lbResultCount, Me.btnReloadSearches, Me.btnResetLayout, Me.BarButtonItem2, Me.lbVersion, Me.BarButtonItem3, Me.lbSearchTime, Me.btnExportChart2PDF, Me.btnExportChart2PNG, Me.BarButtonItem4})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.buttonSearch, Me.BarButtonItem1, Me.btnExportDetails, Me.btnExportMain, Me.lbResultCount, Me.btnReloadSearches, Me.btnResetLayout, Me.BarButtonItem2, Me.lbVersion, Me.BarButtonItem3, Me.lbSearchTime, Me.btnExportChart2PDF, Me.btnExportChart2PNG, Me.btnDarkMode})
         Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
         Me.RibbonControl1.MaxItemId = 21
         Me.RibbonControl1.Name = "RibbonControl1"
@@ -266,9 +266,16 @@ Partial Class frmMonitor
         Me.btnExportChart2PNG.ImageOptions.SvgImage = CType(resources.GetObject("btnExportChart2PNG.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.btnExportChart2PNG.Name = "btnExportChart2PNG"
         '
+        'btnDarkMode
+        '
+        Me.btnDarkMode.Caption = "Dark Mode"
+        Me.btnDarkMode.Id = 20
+        Me.btnDarkMode.ImageOptions.SvgImage = CType(resources.GetObject("btnDarkMode.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.btnDarkMode.Name = "btnDarkMode"
+        '
         'RibbonPage1
         '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3, Me.RibbonPageGroup2, Me.RibbonPageGroup4, Me.RibbonPageGroup5})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3, Me.RibbonPageGroup2, Me.RibbonPageGroup4, Me.ribbonGroupEinstellungen})
         Me.RibbonPage1.Name = "RibbonPage1"
         Me.RibbonPage1.Text = "Start"
         '
@@ -303,11 +310,11 @@ Partial Class frmMonitor
         Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
         Me.RibbonPageGroup4.Text = "Suche"
         '
-        'RibbonPageGroup5
+        'ribbonGroupEinstellungen
         '
-        Me.RibbonPageGroup5.ItemLinks.Add(Me.BarButtonItem4)
+        Me.ribbonGroupEinstellungen.ItemLinks.Add(Me.btnDarkMode)
-        Me.RibbonPageGroup5.Name = "RibbonPageGroup5"
+        Me.ribbonGroupEinstellungen.Name = "ribbonGroupEinstellungen"
-        Me.RibbonPageGroup5.Text = "Einstellungen"
+        Me.ribbonGroupEinstellungen.Text = "Einstellungen"
         '
         'RibbonStatusBar1
         '
@@ -715,13 +722,6 @@ Partial Class frmMonitor
         '
         Me.SplashScreenManager1.ClosingDelay = 500
         '
-        'BarButtonItem4
-        '
-        Me.BarButtonItem4.Caption = "Dark Mode"
-        Me.BarButtonItem4.Id = 20
-        Me.BarButtonItem4.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.BarButtonItem4.Name = "BarButtonItem4"
-        '
         'frmMonitor
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -858,6 +858,6 @@ Partial Class frmMonitor
     Friend WithEvents lbSearchTime As DevExpress.XtraBars.BarStaticItem
     Friend WithEvents btnExportChart2PDF As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents btnExportChart2PNG As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents ribbonGroupEinstellungen As DevExpress.XtraBars.Ribbon.RibbonPageGroup
-    Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents btnDarkMode As DevExpress.XtraBars.BarButtonItem
 End Class

GUIs.Monitor/Forms/frmMonitor.resx

@@ -178,7 +178,7 @@
         MiwyNCAxOCwyMCAyMCwxOCAyNiwyNCAgIiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
 </value>
   </data>
-  <data name="BarButtonItem4.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btnDarkMode.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl

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
+            btnDarkMode.Visibility = BarItemVisibility.Never    ' DarkMode ist erstmal aus
-                SkinMode = SkinModeEnum.LightMode
+            ribbonGroupEinstellungen.Visible = False
-            Else
+            'If ConfigManager.Config.DarkMode = False Then
-                SkinMode = SkinModeEnum.DarkMode
+            SkinMode = SkinModeEnum.LightMode
-            End If
+            'Else
-            SetDarkMode()
+            '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

GUIs.Monitor/Helper/GridLoader.vb

@@ -1,4 +1,5 @@
-Imports DevExpress.Utils
+Imports DevExpress.LookAndFeel
+Imports DevExpress.Utils
 Imports DevExpress.Utils.Extensions
 Imports DevExpress.XtraCharts
 Imports DevExpress.XtraEditors