Compare commits

...

3 Commits

Author SHA1 Message Date
06d27df934 Version 1.6.6.0 2023-10-13 10:08:04 +02:00
ba1af665db 2023-10-13 2023-10-13 10:07:18 +02:00
d1517335a8 DD Palette & DarkMode 2023-07-17 16:40:05 +02:00
10 changed files with 211 additions and 73 deletions

View File

@ -15,6 +15,21 @@
Public Const STATE_HIGHLIGHT As String = "HIGHLIGHT" Public Const STATE_HIGHLIGHT As String = "HIGHLIGHT"
End Class 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 Public Enum ReturnTypeEnum
Undefined Undefined
Table Table
@ -59,11 +74,17 @@
End Enum End Enum
Public Enum DesignTypeEnum Public Enum DesignTypeEnum
DefaultColors DefaultColors 'Office
Mixed Mixed
Office2013 Office2013
Aspect Aspect
Solstice Solstice
DDDefault
End Enum
Public Enum SkinModeEnum
LightMode
DarkMode
End Enum End Enum
End Namespace End Namespace

View File

@ -4,4 +4,5 @@ Public Class Config
<ConnectionString> <ConnectionString>
Public Property ConnectionString As String = String.Empty Public Property ConnectionString As String = String.Empty
Public Property Debug As Boolean = False Public Property Debug As Boolean = False
Public Property DarkMode As Boolean = False
End Class End Class

View File

@ -23,8 +23,8 @@ Partial Class frmMonitor
<System.Diagnostics.DebuggerStepThrough()> _ <System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container() 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 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.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
Me.ApplicationMenu1 = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components) Me.ApplicationMenu1 = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components)
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
@ -38,11 +38,15 @@ Partial Class frmMonitor
Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
Me.lbVersion = New DevExpress.XtraBars.BarStaticItem() Me.lbVersion = New DevExpress.XtraBars.BarStaticItem()
Me.lbSearchTime = New DevExpress.XtraBars.BarStaticItem() 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.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.ribbonGroupEinstellungen = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.XtraTabControlFileHTML = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabControlFileHTML = New DevExpress.XtraTab.XtraTabControl()
@ -86,8 +90,6 @@ Partial Class frmMonitor
Me.AdornerUIManager2 = New DevExpress.Utils.VisualEffects.AdornerUIManager(Me.components) Me.AdornerUIManager2 = New DevExpress.Utils.VisualEffects.AdornerUIManager(Me.components)
Me.WorkspaceManager1 = New DevExpress.Utils.WorkspaceManager(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.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()
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.XtraTabControlFileHTML, 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.ApplicationButtonDropDownControl = Me.ApplicationMenu1
Me.RibbonControl1.ExpandCollapseItem.Id = 0 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.btnDarkMode})
Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
Me.RibbonControl1.MaxItemId = 16 Me.RibbonControl1.MaxItemId = 21
Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Name = "RibbonControl1"
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
Me.RibbonControl1.ShowToolbarCustomizeItem = False 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.StatusBar = Me.RibbonStatusBar1
Me.RibbonControl1.Toolbar.ShowCustomizeItem = False Me.RibbonControl1.Toolbar.ShowCustomizeItem = False
' '
@ -248,9 +250,32 @@ Partial Class frmMonitor
Me.lbSearchTime.Id = 13 Me.lbSearchTime.Id = 13
Me.lbSearchTime.Name = "lbSearchTime" 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"
'
'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 '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.ribbonGroupEinstellungen})
Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Name = "RibbonPage1"
Me.RibbonPage1.Text = "Start" Me.RibbonPage1.Text = "Start"
' '
@ -285,15 +310,21 @@ Partial Class frmMonitor
Me.RibbonPageGroup4.Name = "RibbonPageGroup4" Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
Me.RibbonPageGroup4.Text = "Suche" Me.RibbonPageGroup4.Text = "Suche"
' '
'ribbonGroupEinstellungen
'
Me.ribbonGroupEinstellungen.ItemLinks.Add(Me.btnDarkMode)
Me.ribbonGroupEinstellungen.Name = "ribbonGroupEinstellungen"
Me.ribbonGroupEinstellungen.Text = "Einstellungen"
'
'RibbonStatusBar1 'RibbonStatusBar1
' '
Me.RibbonStatusBar1.ItemLinks.Add(Me.lbResultCount) Me.RibbonStatusBar1.ItemLinks.Add(Me.lbResultCount)
Me.RibbonStatusBar1.ItemLinks.Add(Me.lbVersion) Me.RibbonStatusBar1.ItemLinks.Add(Me.lbVersion)
Me.RibbonStatusBar1.ItemLinks.Add(Me.lbSearchTime) 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.Name = "RibbonStatusBar1"
Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
Me.RibbonStatusBar1.Size = New System.Drawing.Size(1379, 22) Me.RibbonStatusBar1.Size = New System.Drawing.Size(1379, 24)
' '
'RibbonPage2 'RibbonPage2
' '
@ -314,7 +345,7 @@ Partial Class frmMonitor
' '
Me.XtraTabPageFile1.Controls.Add(Me.DocumentViewer1) Me.XtraTabPageFile1.Controls.Add(Me.DocumentViewer1)
Me.XtraTabPageFile1.Name = "XtraTabPageFile1" 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" Me.XtraTabPageFile1.Text = "File 1"
' '
'DocumentViewer1 'DocumentViewer1
@ -323,14 +354,14 @@ Partial Class frmMonitor
Me.DocumentViewer1.FileLoaded = False Me.DocumentViewer1.FileLoaded = False
Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0) Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0)
Me.DocumentViewer1.Name = "DocumentViewer1" 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 Me.DocumentViewer1.TabIndex = 0
' '
'XtraTabPageFile2 'XtraTabPageFile2
' '
Me.XtraTabPageFile2.Controls.Add(Me.DocumentViewer2) Me.XtraTabPageFile2.Controls.Add(Me.DocumentViewer2)
Me.XtraTabPageFile2.Name = "XtraTabPageFile2" 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" Me.XtraTabPageFile2.Text = "File 2"
' '
'DocumentViewer2 'DocumentViewer2
@ -339,14 +370,14 @@ Partial Class frmMonitor
Me.DocumentViewer2.FileLoaded = False Me.DocumentViewer2.FileLoaded = False
Me.DocumentViewer2.Location = New System.Drawing.Point(0, 0) Me.DocumentViewer2.Location = New System.Drawing.Point(0, 0)
Me.DocumentViewer2.Name = "DocumentViewer2" 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 Me.DocumentViewer2.TabIndex = 1
' '
'XtraTabPageHtml1 'XtraTabPageHtml1
' '
Me.XtraTabPageHtml1.Controls.Add(Me.RichEditControl1) Me.XtraTabPageHtml1.Controls.Add(Me.RichEditControl1)
Me.XtraTabPageHtml1.Name = "XtraTabPageHtml1" 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" Me.XtraTabPageHtml1.Text = "HTML 1"
' '
'RichEditControl1 'RichEditControl1
@ -359,14 +390,14 @@ Partial Class frmMonitor
Me.RichEditControl1.Name = "RichEditControl1" Me.RichEditControl1.Name = "RichEditControl1"
Me.RichEditControl1.Options.HorizontalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden Me.RichEditControl1.Options.HorizontalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden
Me.RichEditControl1.Options.VerticalRuler.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 Me.RichEditControl1.TabIndex = 0
' '
'XtraTabPageHtml2 'XtraTabPageHtml2
' '
Me.XtraTabPageHtml2.Controls.Add(Me.RichEditControl2) Me.XtraTabPageHtml2.Controls.Add(Me.RichEditControl2)
Me.XtraTabPageHtml2.Name = "XtraTabPageHtml2" 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" Me.XtraTabPageHtml2.Text = "HTML 2"
' '
'RichEditControl2 'RichEditControl2
@ -377,7 +408,7 @@ Partial Class frmMonitor
Me.RichEditControl2.Location = New System.Drawing.Point(0, 0) Me.RichEditControl2.Location = New System.Drawing.Point(0, 0)
Me.RichEditControl2.MenuManager = Me.RibbonControl1 Me.RichEditControl2.MenuManager = Me.RibbonControl1
Me.RichEditControl2.Name = "RichEditControl2" 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 Me.RichEditControl2.TabIndex = 1
' '
'GridControl1 'GridControl1
@ -387,7 +418,7 @@ Partial Class frmMonitor
Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.MainView = Me.GridView1
Me.GridControl1.MenuManager = Me.RibbonControl1 Me.GridControl1.MenuManager = Me.RibbonControl1
Me.GridControl1.Name = "GridControl1" 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.TabIndex = 0
Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
' '
@ -554,7 +585,7 @@ Partial Class frmMonitor
' '
Me.XtraTabPageSQL1.Controls.Add(Me.GridControl2) Me.XtraTabPageSQL1.Controls.Add(Me.GridControl2)
Me.XtraTabPageSQL1.Name = "XtraTabPageSQL1" 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" Me.XtraTabPageSQL1.Text = "SQL 1"
' '
'GridControl2 'GridControl2
@ -564,7 +595,7 @@ Partial Class frmMonitor
Me.GridControl2.MainView = Me.GridView2 Me.GridControl2.MainView = Me.GridView2
Me.GridControl2.MenuManager = Me.RibbonControl1 Me.GridControl2.MenuManager = Me.RibbonControl1
Me.GridControl2.Name = "GridControl2" 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.TabIndex = 1
Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2})
' '
@ -577,7 +608,7 @@ Partial Class frmMonitor
' '
Me.XtraTabPageSQL2.Controls.Add(Me.GridControl3) Me.XtraTabPageSQL2.Controls.Add(Me.GridControl3)
Me.XtraTabPageSQL2.Name = "XtraTabPageSQL2" 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" Me.XtraTabPageSQL2.Text = "SQL 2"
' '
'GridControl3 'GridControl3
@ -587,7 +618,7 @@ Partial Class frmMonitor
Me.GridControl3.MainView = Me.GridView3 Me.GridControl3.MainView = Me.GridView3
Me.GridControl3.MenuManager = Me.RibbonControl1 Me.GridControl3.MenuManager = Me.RibbonControl1
Me.GridControl3.Name = "GridControl3" 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.TabIndex = 1
Me.GridControl3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3}) Me.GridControl3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3})
' '
@ -600,7 +631,7 @@ Partial Class frmMonitor
' '
Me.XtraTabPageSQL3.Controls.Add(Me.GridControl4) Me.XtraTabPageSQL3.Controls.Add(Me.GridControl4)
Me.XtraTabPageSQL3.Name = "XtraTabPageSQL3" 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" Me.XtraTabPageSQL3.Text = "SQL 3"
' '
'GridControl4 'GridControl4
@ -610,7 +641,7 @@ Partial Class frmMonitor
Me.GridControl4.MainView = Me.GridView4 Me.GridControl4.MainView = Me.GridView4
Me.GridControl4.MenuManager = Me.RibbonControl1 Me.GridControl4.MenuManager = Me.RibbonControl1
Me.GridControl4.Name = "GridControl4" 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.TabIndex = 1
Me.GridControl4.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView4}) Me.GridControl4.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView4})
' '
@ -623,7 +654,7 @@ Partial Class frmMonitor
' '
Me.XtraTabPageSQL4.Controls.Add(Me.GridControl1) Me.XtraTabPageSQL4.Controls.Add(Me.GridControl1)
Me.XtraTabPageSQL4.Name = "XtraTabPageSQL4" 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" Me.XtraTabPageSQL4.Text = "SQL 4"
' '
'SplitContainerFileHTML 'SplitContainerFileHTML
@ -649,7 +680,7 @@ Partial Class frmMonitor
'XtraTabControl2 'XtraTabControl2
' '
Me.XtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill 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.Name = "XtraTabControl2"
Me.XtraTabControl2.SelectedTabPage = Me.XtraTabPage3 Me.XtraTabControl2.SelectedTabPage = Me.XtraTabPage3
Me.XtraTabControl2.ShowTabHeader = DevExpress.Utils.DefaultBoolean.[False] Me.XtraTabControl2.ShowTabHeader = DevExpress.Utils.DefaultBoolean.[False]
@ -691,22 +722,6 @@ Partial Class frmMonitor
' '
Me.SplashScreenManager1.ClosingDelay = 500 Me.SplashScreenManager1.ClosingDelay = 500
' '
'btnExportChart2PDF
'
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"
'
'frmMonitor 'frmMonitor
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@ -843,4 +858,6 @@ Partial Class frmMonitor
Friend WithEvents lbSearchTime As DevExpress.XtraBars.BarStaticItem Friend WithEvents lbSearchTime As DevExpress.XtraBars.BarStaticItem
Friend WithEvents btnExportChart2PDF As DevExpress.XtraBars.BarButtonItem Friend WithEvents btnExportChart2PDF As DevExpress.XtraBars.BarButtonItem
Friend WithEvents btnExportChart2PNG As DevExpress.XtraBars.BarButtonItem Friend WithEvents btnExportChart2PNG As DevExpress.XtraBars.BarButtonItem
Friend WithEvents ribbonGroupEinstellungen As DevExpress.XtraBars.Ribbon.RibbonPageGroup
Friend WithEvents btnDarkMode As DevExpress.XtraBars.BarButtonItem
End Class End Class

View File

@ -121,7 +121,7 @@
<value>362, 17</value> <value>362, 17</value>
</metadata> </metadata>
<assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="BarButtonItem4.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnExportChart2PDF.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@ -159,7 +159,7 @@
CiAgPC9nPg0KPC9zdmc+Cw== CiAgPC9nPg0KPC9zdmc+Cw==
</value> </value>
</data> </data>
<data name="BarButtonItem5.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnExportChart2PNG.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@ -176,6 +176,34 @@
bGFzcz0iWWVsbG93IiAvPg0KICA8cG9seWdvbiBwb2ludHM9IjIwLDI0IDEwLDE0IDYsMTggNiwyNCAi bGFzcz0iWWVsbG93IiAvPg0KICA8cG9seWdvbiBwb2ludHM9IjIwLDI0IDEwLDE0IDYsMTggNiwyNCAi
IGNsYXNzPSJHcmVlbiIgLz4NCiAgPGcgY2xhc3M9InN0MCI+DQogICAgPHBvbHlnb24gcG9pbnRzPSIy IGNsYXNzPSJHcmVlbiIgLz4NCiAgPGcgY2xhc3M9InN0MCI+DQogICAgPHBvbHlnb24gcG9pbnRzPSIy
MiwyNCAxOCwyMCAyMCwxOCAyNiwyNCAgIiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs= MiwyNCAxOCwyMCAyMCwxOCAyNiwyNCAgIiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
</value>
</data>
<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
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==
</value> </value>
</data> </data>
<metadata name="SvgImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="SvgImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

View File

@ -1,5 +1,11 @@
Imports System.Text.RegularExpressions Imports System.Drawing.Imaging
Imports System.IO
Imports System.Text.RegularExpressions
Imports DevExpress.LookAndFeel
Imports DevExpress.Utils Imports DevExpress.Utils
Imports DevExpress.XtraBars
Imports DevExpress.XtraCharts
Imports DevExpress.XtraEditors
Imports DevExpress.XtraEditors.Controls Imports DevExpress.XtraEditors.Controls
Imports DevExpress.XtraEditors.Repository Imports DevExpress.XtraEditors.Repository
Imports DevExpress.XtraGrid Imports DevExpress.XtraGrid
@ -10,22 +16,15 @@ Imports DevExpress.XtraTab
Imports DevExpress.XtraTreeList Imports DevExpress.XtraTreeList
Imports DevExpress.XtraTreeList.Columns Imports DevExpress.XtraTreeList.Columns
Imports DevExpress.XtraTreeList.Nodes Imports DevExpress.XtraTreeList.Nodes
Imports DevExpress.XtraCharts
Imports DigitalData.Controls.DocumentViewer Imports DigitalData.Controls.DocumentViewer
Imports DigitalData.GUIs.Common Imports DigitalData.GUIs.Common
Imports DigitalData.GUIs.Monitor.Constants Imports DigitalData.GUIs.Monitor.Constants
Imports DigitalData.Modules.Base
Imports DigitalData.Modules.Config Imports DigitalData.Modules.Config
Imports DigitalData.Modules.Database Imports DigitalData.Modules.Database
Imports DigitalData.Modules.Language
Imports DigitalData.Modules.Language.Utils Imports DigitalData.Modules.Language.Utils
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Patterns 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 Public Class frmMonitor
@ -91,8 +90,11 @@ Public Class frmMonitor
Private SelectedChart As ChartControl Private SelectedChart As ChartControl
Private SkinMode As SkinModeEnum
Private Sub frmStart_Load(sender As Object, e As EventArgs) Handles MyBase.Load Private Sub frmStart_Load(sender As Object, e As EventArgs) Handles MyBase.Load
Try Try
LogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, "Digital Data", "Monitor") LogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, "Digital Data", "Monitor")
Logger = LogConfig.GetLogger() Logger = LogConfig.GetLogger()
@ -131,6 +133,15 @@ Public Class frmMonitor
Validator = New Validator(LogConfig, LayoutControl1, AdornerUIManager2, ControlHelper) Validator = New Validator(LogConfig, LayoutControl1, AdornerUIManager2, ControlHelper)
GridLoader = New GridLoader(LogConfig, SvgImageCollection1) GridLoader = New GridLoader(LogConfig, SvgImageCollection1)
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 AddHandler GridLoader.ChartControlClicked, AddressOf ChartControl_Click
InitGrid() InitGrid()
@ -235,6 +246,7 @@ Public Class frmMonitor
Dim oStartTime = Now Dim oStartTime = Now
If oSearch.ReturnType = ReturnTypeEnum.TreeView Then If oSearch.ReturnType = ReturnTypeEnum.TreeView Then
' Baum ' Baum
SetResultVisbility(ReturnTypeEnum.TreeView) SetResultVisbility(ReturnTypeEnum.TreeView)
@ -431,6 +443,8 @@ Public Class frmMonitor
pChartView.PaletteName = "Office 2013" pChartView.PaletteName = "Office 2013"
Case DesignTypeEnum.Solstice Case DesignTypeEnum.Solstice
pChartView.PaletteName = "Solstice" pChartView.PaletteName = "Solstice"
Case DesignTypeEnum.DDDefault
pChartView.PaletteName = "DDDefault Palette"
Case Else Case Else
pChartView.PaletteName = "Office" pChartView.PaletteName = "Office"
End Select End Select
@ -1082,6 +1096,7 @@ Public Class frmMonitor
oColor = Color.LightSkyBlue oColor = Color.LightSkyBlue
End Select End Select
e.Appearance.ForeColor = GraphicsEx.GetContrastedColor(oColor)
e.Appearance.BackColor = oColor e.Appearance.BackColor = oColor
e.Appearance.Options.UseBackColor = True e.Appearance.Options.UseBackColor = True
e.Handled = False e.Handled = False
@ -1479,5 +1494,40 @@ Public Class frmMonitor
' Return the image. ' Return the image.
Return image Return image
End Function End Function
Private Sub btnDarkMode_ItemClick(sender As Object, e As ItemClickEventArgs) Handles btnDarkMode.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 End Class

View File

@ -1,4 +1,5 @@
Imports DevExpress.Utils Imports DevExpress.LookAndFeel
Imports DevExpress.Utils
Imports DevExpress.Utils.Extensions Imports DevExpress.Utils.Extensions
Imports DevExpress.XtraCharts Imports DevExpress.XtraCharts
Imports DevExpress.XtraEditors Imports DevExpress.XtraEditors
@ -8,6 +9,7 @@ Imports DevExpress.XtraGrid
Imports DevExpress.XtraGrid.Views.Grid Imports DevExpress.XtraGrid.Views.Grid
Imports DevExpress.XtraTreeList Imports DevExpress.XtraTreeList
Imports DigitalData.GUIs.Common Imports DigitalData.GUIs.Common
Imports DigitalData.GUIs.Monitor.Constants
Imports DigitalData.Modules.Base Imports DigitalData.Modules.Base
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
@ -133,6 +135,12 @@ Public Class GridLoader
.Dock = DockStyle.Fill .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 oChartControlTopLeft.Click, AddressOf ChartControl_Click
AddHandler oChartControlTopRight.Click, AddressOf ChartControl_Click AddHandler oChartControlTopRight.Click, AddressOf ChartControl_Click
AddHandler oChartControlBottomLeft.Click, AddressOf ChartControl_Click AddHandler oChartControlBottomLeft.Click, AddressOf ChartControl_Click
@ -247,4 +255,16 @@ Public Class GridLoader
Return oStateEdit Return oStateEdit
End Function 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 End Class

View File

@ -1,7 +1,6 @@
Imports DigitalData.Modules.Base Imports DigitalData.Modules.Base
Imports DigitalData.Modules.Database Imports DigitalData.Modules.Database
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Language
Imports DigitalData.GUIs.Monitor.Constants Imports DigitalData.GUIs.Monitor.Constants
Public Class SearchLoader Public Class SearchLoader
@ -197,6 +196,8 @@ Public Class SearchLoader
Return DesignTypeEnum.Office2013 Return DesignTypeEnum.Office2013
Case "SOLSTICE" Case "SOLSTICE"
Return DesignTypeEnum.Solstice Return DesignTypeEnum.Solstice
Case "DDDEFAULT"
Return DesignTypeEnum.DDDefault
Case Else Case Else
Return DesignTypeEnum.DefaultColors Return DesignTypeEnum.DefaultColors
End Select End Select

View File

@ -86,7 +86,7 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath> <HintPath>..\..\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Base, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath> <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
</Reference> </Reference>

View File

@ -11,7 +11,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Digital Data")> <Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("Monitor")> <Assembly: AssemblyProduct("Monitor")>
<Assembly: AssemblyCopyright("Copyright © 2023")> <Assembly: AssemblyCopyright("Copyright © 2023")>
<Assembly: AssemblyTrademark("1.6.5.0")> <Assembly: AssemblyTrademark("1.6.6.0")>
<Assembly: AssemblyCulture("")> <Assembly: AssemblyCulture("")>
' Setting ComVisible to false makes the types in this assembly not visible ' Setting ComVisible to false makes the types in this assembly not visible
@ -32,5 +32,5 @@ Imports System.Runtime.InteropServices
' You can specify all the values or you can default the Build and Revision Numbers ' You can specify all the values or you can default the Build and Revision Numbers
' by using the '*' as shown below: ' by using the '*' as shown below:
' [assembly: AssemblyVersion("1.0.*")] ' [assembly: AssemblyVersion("1.0.*")]
<Assembly: AssemblyVersion("1.6.5.0")> <Assembly: AssemblyVersion("1.6.6.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.6.6.0")>

View File

@ -2,7 +2,7 @@
<configuration> <configuration>
<configSections> <configSections>
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System"> <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System">
<section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/> <section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</sectionGroup> </sectionGroup>
</configSections> </configSections>
<applicationSettings> <applicationSettings>
@ -14,10 +14,10 @@
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="DefaultAppSkin" serializeAs="String"> <setting name="DefaultAppSkin" serializeAs="String">
<value>Skin/Office 2019 Colorful</value> <value></value>
</setting> </setting>
<setting name="DefaultPalette" serializeAs="String"> <setting name="DefaultPalette" serializeAs="String">
<value>Yale</value> <value></value>
</setting> </setting>
<setting name="TouchUI" serializeAs="String"> <setting name="TouchUI" serializeAs="String">
<value></value> <value></value>
@ -41,29 +41,29 @@
<value></value> <value></value>
</setting> </setting>
<setting name="CustomPaletteCollection" serializeAs="Xml"> <setting name="CustomPaletteCollection" serializeAs="Xml">
<value/> <value />
</setting> </setting>
</DevExpress.LookAndFeel.Design.AppSettings> </DevExpress.LookAndFeel.Design.AppSettings>
</applicationSettings> </applicationSettings>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
</startup> </startup>
<system.diagnostics> <system.diagnostics>
<sources> <sources>
<!-- This section defines the logging configuration for My.Application.Log --> <!-- This section defines the logging configuration for My.Application.Log -->
<source name="DefaultSource" switchName="DefaultSwitch"> <source name="DefaultSource" switchName="DefaultSwitch">
<listeners> <listeners>
<add name="FileLog"/> <add name="FileLog" />
<!-- Uncomment the below section to write to the Application Event Log --> <!-- Uncomment the below section to write to the Application Event Log -->
<!--<add name="EventLog"/>--> <!--<add name="EventLog"/>-->
</listeners> </listeners>
</source> </source>
</sources> </sources>
<switches> <switches>
<add name="DefaultSwitch" value="Information"/> <add name="DefaultSwitch" value="Information" />
</switches> </switches>
<sharedListeners> <sharedListeners>
<add name="FileLog" type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" initializeData="FileLogWriter"/> <add name="FileLog" type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" initializeData="FileLogWriter" />
<!-- Uncomment the below section and replace APPLICATION_NAME with the name of your application to write to the Application Event Log --> <!-- Uncomment the below section and replace APPLICATION_NAME with the name of your application to write to the Application Event Log -->
<!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> --> <!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
</sharedListeners> </sharedListeners>
@ -71,12 +71,12 @@
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral"/> <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0"/> <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral"/> <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/> <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>