From d1517335a80cf857086218a7add0758b272d1687 Mon Sep 17 00:00:00 2001 From: MPitz Date: Mon, 17 Jul 2023 16:40:05 +0200 Subject: [PATCH] DD Palette & DarkMode --- GUIs.Monitor/Constants.vb | 23 +++++- GUIs.Monitor/Data/Config.vb | 1 + GUIs.Monitor/Forms/frmMonitor.Designer.vb | 97 +++++++++++++---------- GUIs.Monitor/Forms/frmMonitor.resx | 32 +++++++- GUIs.Monitor/Forms/frmMonitor.vb | 62 +++++++++++++-- GUIs.Monitor/Helper/GridLoader.vb | 19 +++++ GUIs.Monitor/Helper/SearchLoader.vb | 3 +- GUIs.Monitor/Monitor.vbproj | 2 +- GUIs.Monitor/app.config | 26 +++--- 9 files changed, 199 insertions(+), 66 deletions(-) diff --git a/GUIs.Monitor/Constants.vb b/GUIs.Monitor/Constants.vb index a7c2718..e677b10 100644 --- a/GUIs.Monitor/Constants.vb +++ b/GUIs.Monitor/Constants.vb @@ -15,6 +15,21 @@ Public Const STATE_HIGHLIGHT As String = "HIGHLIGHT" End Class + Public Class DDDefaultColors + Public Const CHART_BACKGROUND_COLOR As String = "#172146" + Public Const CHART_TEXT_COLOR As String = "#8E9EB0" + + Public Const CHART_LEGEND_BACKGROUND_COLOR As String = "#172146" + Public Const CHART_LEGEND_TEXT_COLOR As String = "#8E9EB0" + + Public Const PALETTE_COLOR_1 As String = "#6859F6" + Public Const PALETTE_COLOR_2 As String = "#F046C1" + Public Const PALETTE_COLOR_3 As String = "#5E246C" + Public Const PALETTE_COLOR_4 As String = "#5051A5" + Public Const PALETTE_COLOR_5 As String = "#5E6A83" + + End Class + Public Enum ReturnTypeEnum Undefined Table @@ -59,11 +74,17 @@ End Enum Public Enum DesignTypeEnum - DefaultColors + DefaultColors 'Office Mixed Office2013 Aspect Solstice + DDDefault + End Enum + + Public Enum SkinModeEnum + LightMode + DarkMode End Enum End Namespace diff --git a/GUIs.Monitor/Data/Config.vb b/GUIs.Monitor/Data/Config.vb index d3ddb28..1b52b4c 100644 --- a/GUIs.Monitor/Data/Config.vb +++ b/GUIs.Monitor/Data/Config.vb @@ -4,4 +4,5 @@ Public Class Config Public Property ConnectionString As String = String.Empty Public Property Debug As Boolean = False + Public Property DarkMode As Boolean = False End Class diff --git a/GUIs.Monitor/Forms/frmMonitor.Designer.vb b/GUIs.Monitor/Forms/frmMonitor.Designer.vb index ada7aab..ebc5989 100644 --- a/GUIs.Monitor/Forms/frmMonitor.Designer.vb +++ b/GUIs.Monitor/Forms/frmMonitor.Designer.vb @@ -23,8 +23,8 @@ Partial Class frmMonitor _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim PushTransition1 As DevExpress.Utils.Animation.PushTransition = New DevExpress.Utils.Animation.PushTransition() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMonitor)) + Dim PushTransition1 As DevExpress.Utils.Animation.PushTransition = New DevExpress.Utils.Animation.PushTransition() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.ApplicationMenu1 = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components) Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() @@ -38,11 +38,14 @@ Partial Class frmMonitor Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.lbVersion = New DevExpress.XtraBars.BarStaticItem() Me.lbSearchTime = New DevExpress.XtraBars.BarStaticItem() + Me.btnExportChart2PDF = New DevExpress.XtraBars.BarButtonItem() + Me.btnExportChart2PNG = 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.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.XtraTabControlFileHTML = New DevExpress.XtraTab.XtraTabControl() @@ -86,8 +89,7 @@ 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.btnExportChart2PDF = New DevExpress.XtraBars.BarButtonItem() - Me.btnExportChart2PNG = New DevExpress.XtraBars.BarButtonItem() + 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() @@ -147,13 +149,13 @@ 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.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.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 16 + Me.RibbonControl1.MaxItemId = 21 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowToolbarCustomizeItem = False - Me.RibbonControl1.Size = New System.Drawing.Size(1379, 160) + Me.RibbonControl1.Size = New System.Drawing.Size(1379, 158) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' @@ -248,9 +250,25 @@ Partial Class frmMonitor Me.lbSearchTime.Id = 13 Me.lbSearchTime.Name = "lbSearchTime" ' + 'btnExportChart2PDF + ' + Me.btnExportChart2PDF.Caption = "Export Charts als PDF" + Me.btnExportChart2PDF.Enabled = False + Me.btnExportChart2PDF.Id = 14 + Me.btnExportChart2PDF.ImageOptions.SvgImage = CType(resources.GetObject("btnExportChart2PDF.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.btnExportChart2PDF.Name = "btnExportChart2PDF" + ' + 'btnExportChart2PNG + ' + Me.btnExportChart2PNG.Caption = "Export Charts als Bild" + Me.btnExportChart2PNG.Enabled = False + Me.btnExportChart2PNG.Id = 15 + Me.btnExportChart2PNG.ImageOptions.SvgImage = CType(resources.GetObject("btnExportChart2PNG.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.btnExportChart2PNG.Name = "btnExportChart2PNG" + ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3, Me.RibbonPageGroup2, Me.RibbonPageGroup4}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3, Me.RibbonPageGroup2, Me.RibbonPageGroup4, Me.RibbonPageGroup5}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "Start" ' @@ -285,15 +303,21 @@ Partial Class frmMonitor Me.RibbonPageGroup4.Name = "RibbonPageGroup4" Me.RibbonPageGroup4.Text = "Suche" ' + 'RibbonPageGroup5 + ' + Me.RibbonPageGroup5.ItemLinks.Add(Me.BarButtonItem4) + Me.RibbonPageGroup5.Name = "RibbonPageGroup5" + Me.RibbonPageGroup5.Text = "Einstellungen" + ' 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.lbResultCount) Me.RibbonStatusBar1.ItemLinks.Add(Me.lbVersion) Me.RibbonStatusBar1.ItemLinks.Add(Me.lbSearchTime) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 749) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 747) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1379, 22) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1379, 24) ' 'RibbonPage2 ' @@ -314,7 +338,7 @@ Partial Class frmMonitor ' Me.XtraTabPageFile1.Controls.Add(Me.DocumentViewer1) Me.XtraTabPageFile1.Name = "XtraTabPageFile1" - Me.XtraTabPageFile1.Size = New System.Drawing.Size(388, 564) + Me.XtraTabPageFile1.Size = New System.Drawing.Size(388, 562) Me.XtraTabPageFile1.Text = "File 1" ' 'DocumentViewer1 @@ -323,14 +347,14 @@ Partial Class frmMonitor Me.DocumentViewer1.FileLoaded = False Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0) Me.DocumentViewer1.Name = "DocumentViewer1" - Me.DocumentViewer1.Size = New System.Drawing.Size(388, 564) + Me.DocumentViewer1.Size = New System.Drawing.Size(388, 562) Me.DocumentViewer1.TabIndex = 0 ' 'XtraTabPageFile2 ' Me.XtraTabPageFile2.Controls.Add(Me.DocumentViewer2) Me.XtraTabPageFile2.Name = "XtraTabPageFile2" - Me.XtraTabPageFile2.Size = New System.Drawing.Size(388, 564) + Me.XtraTabPageFile2.Size = New System.Drawing.Size(388, 562) Me.XtraTabPageFile2.Text = "File 2" ' 'DocumentViewer2 @@ -339,14 +363,14 @@ Partial Class frmMonitor Me.DocumentViewer2.FileLoaded = False Me.DocumentViewer2.Location = New System.Drawing.Point(0, 0) Me.DocumentViewer2.Name = "DocumentViewer2" - Me.DocumentViewer2.Size = New System.Drawing.Size(388, 564) + Me.DocumentViewer2.Size = New System.Drawing.Size(388, 562) Me.DocumentViewer2.TabIndex = 1 ' 'XtraTabPageHtml1 ' Me.XtraTabPageHtml1.Controls.Add(Me.RichEditControl1) Me.XtraTabPageHtml1.Name = "XtraTabPageHtml1" - Me.XtraTabPageHtml1.Size = New System.Drawing.Size(388, 564) + Me.XtraTabPageHtml1.Size = New System.Drawing.Size(388, 562) Me.XtraTabPageHtml1.Text = "HTML 1" ' 'RichEditControl1 @@ -359,14 +383,14 @@ Partial Class frmMonitor Me.RichEditControl1.Name = "RichEditControl1" Me.RichEditControl1.Options.HorizontalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden Me.RichEditControl1.Options.VerticalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden - Me.RichEditControl1.Size = New System.Drawing.Size(388, 564) + Me.RichEditControl1.Size = New System.Drawing.Size(388, 562) Me.RichEditControl1.TabIndex = 0 ' 'XtraTabPageHtml2 ' Me.XtraTabPageHtml2.Controls.Add(Me.RichEditControl2) Me.XtraTabPageHtml2.Name = "XtraTabPageHtml2" - Me.XtraTabPageHtml2.Size = New System.Drawing.Size(388, 564) + Me.XtraTabPageHtml2.Size = New System.Drawing.Size(388, 562) Me.XtraTabPageHtml2.Text = "HTML 2" ' 'RichEditControl2 @@ -377,7 +401,7 @@ Partial Class frmMonitor Me.RichEditControl2.Location = New System.Drawing.Point(0, 0) Me.RichEditControl2.MenuManager = Me.RibbonControl1 Me.RichEditControl2.Name = "RichEditControl2" - Me.RichEditControl2.Size = New System.Drawing.Size(388, 564) + Me.RichEditControl2.Size = New System.Drawing.Size(388, 562) Me.RichEditControl2.TabIndex = 1 ' 'GridControl1 @@ -387,7 +411,7 @@ Partial Class frmMonitor Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.MenuManager = Me.RibbonControl1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(730, 373) + Me.GridControl1.Size = New System.Drawing.Size(730, 371) Me.GridControl1.TabIndex = 0 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' @@ -554,7 +578,7 @@ Partial Class frmMonitor ' Me.XtraTabPageSQL1.Controls.Add(Me.GridControl2) Me.XtraTabPageSQL1.Name = "XtraTabPageSQL1" - Me.XtraTabPageSQL1.Size = New System.Drawing.Size(730, 373) + Me.XtraTabPageSQL1.Size = New System.Drawing.Size(730, 371) Me.XtraTabPageSQL1.Text = "SQL 1" ' 'GridControl2 @@ -564,7 +588,7 @@ Partial Class frmMonitor Me.GridControl2.MainView = Me.GridView2 Me.GridControl2.MenuManager = Me.RibbonControl1 Me.GridControl2.Name = "GridControl2" - Me.GridControl2.Size = New System.Drawing.Size(730, 373) + Me.GridControl2.Size = New System.Drawing.Size(730, 371) Me.GridControl2.TabIndex = 1 Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) ' @@ -577,7 +601,7 @@ Partial Class frmMonitor ' Me.XtraTabPageSQL2.Controls.Add(Me.GridControl3) Me.XtraTabPageSQL2.Name = "XtraTabPageSQL2" - Me.XtraTabPageSQL2.Size = New System.Drawing.Size(730, 373) + Me.XtraTabPageSQL2.Size = New System.Drawing.Size(730, 371) Me.XtraTabPageSQL2.Text = "SQL 2" ' 'GridControl3 @@ -587,7 +611,7 @@ Partial Class frmMonitor Me.GridControl3.MainView = Me.GridView3 Me.GridControl3.MenuManager = Me.RibbonControl1 Me.GridControl3.Name = "GridControl3" - Me.GridControl3.Size = New System.Drawing.Size(730, 373) + Me.GridControl3.Size = New System.Drawing.Size(730, 371) Me.GridControl3.TabIndex = 1 Me.GridControl3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3}) ' @@ -600,7 +624,7 @@ Partial Class frmMonitor ' Me.XtraTabPageSQL3.Controls.Add(Me.GridControl4) Me.XtraTabPageSQL3.Name = "XtraTabPageSQL3" - Me.XtraTabPageSQL3.Size = New System.Drawing.Size(730, 373) + Me.XtraTabPageSQL3.Size = New System.Drawing.Size(730, 371) Me.XtraTabPageSQL3.Text = "SQL 3" ' 'GridControl4 @@ -610,7 +634,7 @@ Partial Class frmMonitor Me.GridControl4.MainView = Me.GridView4 Me.GridControl4.MenuManager = Me.RibbonControl1 Me.GridControl4.Name = "GridControl4" - Me.GridControl4.Size = New System.Drawing.Size(730, 373) + Me.GridControl4.Size = New System.Drawing.Size(730, 371) Me.GridControl4.TabIndex = 1 Me.GridControl4.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView4}) ' @@ -623,7 +647,7 @@ Partial Class frmMonitor ' Me.XtraTabPageSQL4.Controls.Add(Me.GridControl1) Me.XtraTabPageSQL4.Name = "XtraTabPageSQL4" - Me.XtraTabPageSQL4.Size = New System.Drawing.Size(730, 373) + Me.XtraTabPageSQL4.Size = New System.Drawing.Size(730, 371) Me.XtraTabPageSQL4.Text = "SQL 4" ' 'SplitContainerFileHTML @@ -649,7 +673,7 @@ Partial Class frmMonitor 'XtraTabControl2 ' Me.XtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill - Me.XtraTabControl2.Location = New System.Drawing.Point(0, 160) + Me.XtraTabControl2.Location = New System.Drawing.Point(0, 158) Me.XtraTabControl2.Name = "XtraTabControl2" Me.XtraTabControl2.SelectedTabPage = Me.XtraTabPage3 Me.XtraTabControl2.ShowTabHeader = DevExpress.Utils.DefaultBoolean.[False] @@ -691,21 +715,12 @@ Partial Class frmMonitor ' Me.SplashScreenManager1.ClosingDelay = 500 ' - 'btnExportChart2PDF + 'BarButtonItem4 ' - Me.btnExportChart2PDF.Caption = "Export Charts als PDF" - Me.btnExportChart2PDF.Enabled = False - Me.btnExportChart2PDF.Id = 14 - Me.btnExportChart2PDF.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.btnExportChart2PDF.Name = "btnExportChart2PDF" - ' - 'btnExportChart2PNG - ' - Me.btnExportChart2PNG.Caption = "Export Charts als Bild" - Me.btnExportChart2PNG.Enabled = False - Me.btnExportChart2PNG.Id = 15 - Me.btnExportChart2PNG.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem5.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.btnExportChart2PNG.Name = "btnExportChart2PNG" + 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 ' @@ -843,4 +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 BarButtonItem4 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/GUIs.Monitor/Forms/frmMonitor.resx b/GUIs.Monitor/Forms/frmMonitor.resx index 28b3162..938088c 100644 --- a/GUIs.Monitor/Forms/frmMonitor.resx +++ b/GUIs.Monitor/Forms/frmMonitor.resx @@ -121,7 +121,7 @@ 362, 17 - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -159,7 +159,7 @@ CiAgPC9nPg0KPC9zdmc+Cw== - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -176,6 +176,34 @@ bGFzcz0iWWVsbG93IiAvPg0KICA8cG9seWdvbiBwb2ludHM9IjIwLDI0IDEwLDE0IDYsMTggNiwyNCAi IGNsYXNzPSJHcmVlbiIgLz4NCiAgPGcgY2xhc3M9InN0MCI+DQogICAgPHBvbHlnb24gcG9pbnRzPSIy MiwyNCAxOCwyMCAyMCwxOCAyNiwyNCAgIiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOYEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3 + RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm + aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyAvPg0KICA8ZyBpZD0iTG9jYWxDb2xvcnMiPg0KICAg + IDxwYXRoIGQ9Ik0zMSwxMEgxMWMtMC41LDAtMSwwLjUtMSwxdjIwYzAsMC41LDAuNSwxLDEsMWgyMGMw + LjUsMCwxLTAuNSwxLTFWMTFDMzIsMTAuNSwzMS41LDEwLDMxLDEweiBNMzAsMzBIMTJWMTIgICBoMThW + MzB6IE0xMCwyMkgxYy0wLjUsMC0xLTAuNS0xLTFWMWMwLTAuNSwwLjUtMSwxLTFoMjBjMC41LDAsMSww + LjUsMSwxdjloLTJWMkgydjE4aDhWMjJ6IiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBhdGggZD0iTTgs + MThINHYtNmg0VjE4eiBNMjgsMjBoLTZ2LTZoNlYyMHogTTIwLDI4aC02di02aDZWMjh6IE05LDhoMVY0 + SDR2Nmg0VjlDOCw4LjQsOC40LDgsOSw4eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgICA8cGF0aCBkPSJN + MTgsOGgtNlY0aDZWOHoiIGNsYXNzPSJSZWQiIC8+DQogICAgPHBhdGggZD0iTTIwLDIwaC02di02aDZW + MjB6IE0yOCwyMGgtNnYtNmg2VjIweiIgY2xhc3M9IkdyZWVuIiAvPg0KICAgIDxwYXRoIGQ9Ik0yOCwy + OGgtNnYtNmg2VjI4eiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPGcgY2xhc3M9InN0MSI+DQogICAgICA8 + cGF0aCBkPSJNMjAsMjhoLTZ2LTZoNlYyOHoiIGNsYXNzPSJHcmVlbiIgLz4NCiAgICAgIDxwYXRoIGQ9 + Ik0yOCwyMGgtNnYtNmg2VjIweiIgY2xhc3M9IkJsdWUiIC8+DQogICAgICA8cGF0aCBkPSJNOCwxOEg0 + di02aDRWMTh6IiBjbGFzcz0iUmVkIiAvPg0KICAgIDwvZz4NCiAgPC9nPg0KPC9zdmc+Cw== diff --git a/GUIs.Monitor/Forms/frmMonitor.vb b/GUIs.Monitor/Forms/frmMonitor.vb index d68c4c4..d4d9678 100644 --- a/GUIs.Monitor/Forms/frmMonitor.vb +++ b/GUIs.Monitor/Forms/frmMonitor.vb @@ -1,5 +1,13 @@ -Imports System.Text.RegularExpressions +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 +Imports DevExpress.XtraEditors Imports DevExpress.XtraEditors.Controls Imports DevExpress.XtraEditors.Repository Imports DevExpress.XtraGrid @@ -10,7 +18,6 @@ Imports DevExpress.XtraTab Imports DevExpress.XtraTreeList Imports DevExpress.XtraTreeList.Columns Imports DevExpress.XtraTreeList.Nodes -Imports DevExpress.XtraCharts Imports DigitalData.Controls.DocumentViewer Imports DigitalData.GUIs.Common Imports DigitalData.GUIs.Monitor.Constants @@ -20,12 +27,6 @@ Imports DigitalData.Modules.Language Imports DigitalData.Modules.Language.Utils Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Patterns -Imports DevExpress.XtraEditors -Imports System.Drawing.Imaging -Imports System.IO -Imports DevExpress.XtraBars -Imports System.Net -Imports System.Runtime.InteropServices.ComTypes Public Class frmMonitor @@ -91,6 +92,8 @@ Public Class frmMonitor Private SelectedChart As ChartControl + Private SkinMode As SkinModeEnum + 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") @@ -131,6 +134,13 @@ 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() + AddHandler GridLoader.ChartControlClicked, AddressOf ChartControl_Click InitGrid() @@ -431,6 +441,8 @@ Public Class frmMonitor pChartView.PaletteName = "Office 2013" Case DesignTypeEnum.Solstice pChartView.PaletteName = "Solstice" + Case DesignTypeEnum.DDDefault + pChartView.PaletteName = "DDDefault Palette" Case Else pChartView.PaletteName = "Office" End Select @@ -1479,5 +1491,39 @@ Public Class frmMonitor ' Return the image. Return image End Function + + Private Sub BarButtonItem4_ItemClick_1(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem4.ItemClick + SwitchDarkMode() + End Sub + + Private Sub frmMonitor_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing + If SkinMode = SkinModeEnum.LightMode Then + ConfigManager.Config.DarkMode = False + Else + ConfigManager.Config.DarkMode = True + End If + ConfigManager.Save() + + End Sub + + Private Sub SwitchDarkMode() + If SkinMode = SkinModeEnum.LightMode Then + WindowsFormsSettings.DefaultLookAndFeel.SetSkinStyle(SkinSvgPalette.DefaultSkin.BlueDark) + SkinMode = SkinModeEnum.DarkMode + Else + WindowsFormsSettings.DefaultLookAndFeel.SetSkinStyle(SkinSvgPalette.DefaultSkin.Default) + SkinMode = SkinModeEnum.LightMode + End If + End Sub + + Private Sub SetDarkMode() + If SkinMode = SkinModeEnum.LightMode Then + WindowsFormsSettings.DefaultLookAndFeel.SetSkinStyle(SkinSvgPalette.DefaultSkin.Default) + Else + WindowsFormsSettings.DefaultLookAndFeel.SetSkinStyle(SkinSvgPalette.DefaultSkin.BlueDark) + End If + End Sub + + End Class diff --git a/GUIs.Monitor/Helper/GridLoader.vb b/GUIs.Monitor/Helper/GridLoader.vb index 5f453de..971885e 100644 --- a/GUIs.Monitor/Helper/GridLoader.vb +++ b/GUIs.Monitor/Helper/GridLoader.vb @@ -8,6 +8,7 @@ Imports DevExpress.XtraGrid Imports DevExpress.XtraGrid.Views.Grid Imports DevExpress.XtraTreeList Imports DigitalData.GUIs.Common +Imports DigitalData.GUIs.Monitor.Constants Imports DigitalData.Modules.Base Imports DigitalData.Modules.Logging @@ -133,6 +134,12 @@ Public Class GridLoader .Dock = DockStyle.Fill } + ' Registrieren der Haus-eigenen Palette + oChartControlTopLeft.PaletteRepository.RegisterPalette(GetDDDefaulPalette()) + oChartControlTopRight.PaletteRepository.RegisterPalette(GetDDDefaulPalette()) + oChartControlBottomLeft.PaletteRepository.RegisterPalette(GetDDDefaulPalette()) + oChartControlBottomRight.PaletteRepository.RegisterPalette(GetDDDefaulPalette()) + AddHandler oChartControlTopLeft.Click, AddressOf ChartControl_Click AddHandler oChartControlTopRight.Click, AddressOf ChartControl_Click AddHandler oChartControlBottomLeft.Click, AddressOf ChartControl_Click @@ -247,4 +254,16 @@ Public Class GridLoader Return oStateEdit End Function + + Public Function GetDDDefaulPalette() As Palette + ' Digital Data Default Palette für Dark Mode + Dim palette As Palette = New Palette("DDDefault Palette") + palette.Add(ColorTranslator.FromHtml(DDDefaultColors.PALETTE_COLOR_1)) + palette.Add(ColorTranslator.FromHtml(DDDefaultColors.PALETTE_COLOR_2)) + palette.Add(ColorTranslator.FromHtml(DDDefaultColors.PALETTE_COLOR_3)) + palette.Add(ColorTranslator.FromHtml(DDDefaultColors.PALETTE_COLOR_4)) + palette.Add(ColorTranslator.FromHtml(DDDefaultColors.PALETTE_COLOR_5)) + Return palette + End Function + End Class diff --git a/GUIs.Monitor/Helper/SearchLoader.vb b/GUIs.Monitor/Helper/SearchLoader.vb index 9211866..7391ad6 100644 --- a/GUIs.Monitor/Helper/SearchLoader.vb +++ b/GUIs.Monitor/Helper/SearchLoader.vb @@ -1,7 +1,6 @@ Imports DigitalData.Modules.Base Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging -Imports DigitalData.Modules.Language Imports DigitalData.GUIs.Monitor.Constants Public Class SearchLoader @@ -197,6 +196,8 @@ Public Class SearchLoader Return DesignTypeEnum.Office2013 Case "SOLSTICE" Return DesignTypeEnum.Solstice + Case "DDDEFAULT" + Return DesignTypeEnum.DDDefault Case Else Return DesignTypeEnum.DefaultColors End Select diff --git a/GUIs.Monitor/Monitor.vbproj b/GUIs.Monitor/Monitor.vbproj index 00b6931..3d1a450 100644 --- a/GUIs.Monitor/Monitor.vbproj +++ b/GUIs.Monitor/Monitor.vbproj @@ -86,7 +86,7 @@ False ..\..\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll - + False ..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll diff --git a/GUIs.Monitor/app.config b/GUIs.Monitor/app.config index 4cd4723..de17687 100644 --- a/GUIs.Monitor/app.config +++ b/GUIs.Monitor/app.config @@ -2,7 +2,7 @@ -
+
@@ -14,10 +14,10 @@ True - Skin/Office 2019 Colorful + - Yale + @@ -41,29 +41,29 @@ - + - + - + - + - + @@ -71,13 +71,13 @@ - - + + - - + + - + \ No newline at end of file