This commit is contained in:
Jonathan Jenne 2021-05-21 16:31:35 +02:00
parent e53e79b05a
commit f681a6bc69
10 changed files with 230 additions and 46 deletions

View File

@ -177,6 +177,15 @@
<ItemGroup> <ItemGroup>
<None Include="Resources\gettingstarted.svg" /> <None Include="Resources\gettingstarted.svg" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="Resources\enablesearch.svg" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\bo_dashboard.svg" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\managedatasource.svg" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

View File

@ -60,6 +60,16 @@ Namespace My.Resources
End Set End Set
End Property End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
'''</summary>
Friend ReadOnly Property bo_dashboard() As DevExpress.Utils.Svg.SvgImage
Get
Dim obj As Object = ResourceManager.GetObject("bo_dashboard", resourceCulture)
Return CType(obj,DevExpress.Utils.Svg.SvgImage)
End Get
End Property
'''<summary> '''<summary>
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
'''</summary> '''</summary>
@ -70,6 +80,16 @@ Namespace My.Resources
End Get End Get
End Property End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
'''</summary>
Friend ReadOnly Property enablesearch() As DevExpress.Utils.Svg.SvgImage
Get
Dim obj As Object = ResourceManager.GetObject("enablesearch", resourceCulture)
Return CType(obj,DevExpress.Utils.Svg.SvgImage)
End Get
End Property
'''<summary> '''<summary>
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
'''</summary> '''</summary>
@ -79,5 +99,15 @@ Namespace My.Resources
Return CType(obj,DevExpress.Utils.Svg.SvgImage) Return CType(obj,DevExpress.Utils.Svg.SvgImage)
End Get End Get
End Property End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
'''</summary>
Friend ReadOnly Property managedatasource() As DevExpress.Utils.Svg.SvgImage
Get
Dim obj As Object = ResourceManager.GetObject("managedatasource", resourceCulture)
Return CType(obj,DevExpress.Utils.Svg.SvgImage)
End Get
End Property
End Module End Module
End Namespace End Namespace

View File

@ -118,10 +118,19 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="charttype_line" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\charttype_line.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="gettingstarted" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="gettingstarted" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\gettingstarted.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>..\Resources\gettingstarted.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="bo_dashboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bo_dashboard.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="enablesearch" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\enablesearch.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="charttype_line" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\charttype_line.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="managedatasource" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\managedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
</root> </root>

View File

@ -0,0 +1,27 @@
<?xml version='1.0' encoding='UTF-8'?>
<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
<style type="text/css">
.Blue{fill:#1177D7;}
.Yellow{fill:#FFB115;}
.Red{fill:#D11C1C;}
.Green{fill:#039C23;}
.Black{fill:#727272;}
.White{fill:#FFFFFF;}
.st0{opacity:0.5;}
.st1{opacity:0.75;}
.st2{display:none;}
.st3{display:inline;fill:#FFB115;}
.st4{display:inline;}
.st5{display:inline;opacity:0.75;}
.st6{display:inline;opacity:0.5;}
.st7{display:inline;fill:#039C23;}
.st8{display:inline;fill:#D11C1C;}
.st9{display:inline;fill:#1177D7;}
.st10{display:inline;fill:#FFFFFF;}
</style>
<g id="Dashboard">
<path d="M26.3,5.1L16.4,15l9.9,9.9c2.3-2.6,3.7-6.1,3.7-9.9S28.6,7.8,26.3,5.1z" class="Blue" />
<path d="M14,16v-1v-0.4L24.9,3.7C22.2,1.4,18.8,0,15,0C6.7,0,0,6.7,0,15c0,7.9,6.2,14.4,14,14.9V16z" class="Red" />
<path d="M16,29.9c3.4-0.2,6.5-1.6,8.9-3.7L16,17.4V29.9z" class="Yellow" />
</g>
</svg>

View File

@ -0,0 +1,17 @@
<?xml version='1.0' encoding='UTF-8'?>
<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
<style type="text/css">
.Green{fill:#039C23;}
.Black{fill:#727272;}
.Red{fill:#D11C1C;}
.Yellow{fill:#FFB115;}
.Blue{fill:#1177D7;}
.White{fill:#FFFFFF;}
.st0{opacity:0.5;}
.st1{opacity:0.75;}
</style>
<g id="EnableSearch">
<path d="M14.5,17.8C10.8,17.1,8,13.9,8,10c0-4.4,3.6-8,8-8s8,3.6,8,8c0,1.5-0.4,2.8-1.1,4c0,0,0.1,0,0.1,0 c0.7,0,1.4,0.1,2.1,0.2c0.6-1.3,0.9-2.7,0.9-4.2c0-5.5-4.5-10-10-10C10.5,0,6,4.5,6,10c0,2.1,0.7,4.1,1.8,5.7l-7.5,7.6 c-0.4,0.3-0.4,0.9,0,1.3l1.2,1.2c0.3,0.3,0.9,0.3,1.2,0l7.6-7.6c0.9,0.6,1.9,1.1,2.9,1.4C13.6,19,14,18.4,14.5,17.8z" class="Blue" />
<path d="M23,16c-4.4,0-8.1,3-9,7c0.9,4,4.6,7,9,7c4.4,0,8.1-3,9-7C31.1,19,27.4,16,23,16z M23,28c-3.3,0-6.1-2-7-5 c0.9-3,3.7-5,7-5s6.1,2,7,5C29.1,26,26.3,28,23,28z M23,26c-1.7,0-3-1.3-3-3s1.3-3,3-3s3,1.3,3,3S24.7,26,23,26z" class="Black" />
</g>
</svg>

View File

@ -0,0 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Manage_Data_Source" style="enable-background:new 0 0 32 32">
<style type="text/css">
.Yellow{fill:#FFB115;}
.Blue{fill:#1177D7;}
</style>
<path d="M2,10V6c0-2.2,4.5-4,10-4s10,1.8,10,4v4c0,2.2-4.5,4-10,4S2,12.2,2,10z M12,20v-0.7l2.5-0.4L13,16.8l1-0.9 C13.3,16,12.7,16,12,16c-5.5,0-10-1.8-10-4v4C2,18.2,6.5,20,12,20z M14.5,25.1L12,24.7V22c-5.5,0-10-1.8-10-4v4c0,2.2,4.5,4,10,4 c0.7,0,1.3,0,1.9-0.1L14.5,25.1z" class="Yellow" />
<path d="M30,23v-2l-2.2-0.4c-0.2-0.6-0.4-1.3-0.7-1.8l1.3-1.8l-1.4-1.4l-1.8,1.3c-0.5-0.3-1.2-0.6-1.8-0.7L23,14h-2 l-0.4,2.2c-0.6,0.2-1.3,0.4-1.8,0.7l-1.8-1.3l-1.4,1.4l1.3,1.8c-0.3,0.5-0.6,1.2-0.7,1.8L14,21v2l2.2,0.4c0.2,0.6,0.4,1.3,0.7,1.8 l-1.3,1.8l1.4,1.4l1.8-1.3c0.5,0.3,1.2,0.6,1.8,0.7L21,30h2l0.4-2.2c0.6-0.2,1.3-0.4,1.8-0.7l1.8,1.3l1.4-1.4l-1.3-1.8 c0.3-0.5,0.6-1.2,0.7-1.8L30,23z M22,24c-1.1,0-2-0.9-2-2s0.9-2,2-2s2,0.9,2,2S23.1,24,22,24z" class="Blue" />
</svg>

View File

@ -11,7 +11,37 @@
<value>System</value> <value>System</value>
</setting> </setting>
<setting name="RegisterBonusSkins" serializeAs="String"> <setting name="RegisterBonusSkins" serializeAs="String">
<value>True</value> <value></value>
</setting>
<setting name="DefaultAppSkin" serializeAs="String">
<value>Skin/Office 2019 Colorful</value>
</setting>
<setting name="DefaultPalette" serializeAs="String">
<value>Fire Brick</value>
</setting>
<setting name="TouchUI" serializeAs="String">
<value></value>
</setting>
<setting name="CompactUI" serializeAs="String">
<value></value>
</setting>
<setting name="TouchScaleFactor" serializeAs="String">
<value></value>
</setting>
<setting name="DirectX" serializeAs="String">
<value></value>
</setting>
<setting name="RegisterUserSkins" serializeAs="String">
<value></value>
</setting>
<setting name="FontBehavior" serializeAs="String">
<value>UseSegoeUI</value>
</setting>
<setting name="DefaultAppFont" serializeAs="String">
<value></value>
</setting>
<setting name="CustomPaletteCollection" serializeAs="Xml">
<value />
</setting> </setting>
</DevExpress.LookAndFeel.Design.AppSettings> </DevExpress.LookAndFeel.Design.AppSettings>
</applicationSettings> </applicationSettings>

View File

@ -27,6 +27,8 @@ Partial Class frmMonitor
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container() Me.components = New System.ComponentModel.Container()
Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
Me.ApplicationMenu1 = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components)
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
Me.buttonSearch = New DevExpress.XtraBars.BarButtonItem() Me.buttonSearch = 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()
@ -73,6 +75,7 @@ Partial Class frmMonitor
Me.XtraTabPage3 = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPage3 = New DevExpress.XtraTab.XtraTabPage()
Me.XtraTabPage4 = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPage4 = New DevExpress.XtraTab.XtraTabPage()
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.LayoutControl1.SuspendLayout() Me.LayoutControl1.SuspendLayout()
CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
@ -120,14 +123,30 @@ Partial Class frmMonitor
' '
'RibbonControl1 'RibbonControl1
' '
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.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.buttonSearch, Me.BarButtonItem1})
Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
Me.RibbonControl1.MaxItemId = 2 Me.RibbonControl1.MaxItemId = 3
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.Size = New System.Drawing.Size(1379, 158) Me.RibbonControl1.ShowToolbarCustomizeItem = False
Me.RibbonControl1.Size = New System.Drawing.Size(1379, 159)
Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
Me.RibbonControl1.Toolbar.ShowCustomizeItem = False
'
'ApplicationMenu1
'
Me.ApplicationMenu1.ItemLinks.Add(Me.BarButtonItem1)
Me.ApplicationMenu1.Name = "ApplicationMenu1"
Me.ApplicationMenu1.Ribbon = Me.RibbonControl1
'
'BarButtonItem1
'
Me.BarButtonItem1.Caption = "SQL Konfiguration"
Me.BarButtonItem1.Id = 2
Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.managedatasource
Me.BarButtonItem1.Name = "BarButtonItem1"
' '
'buttonSearch 'buttonSearch
' '
@ -140,7 +159,7 @@ Partial Class frmMonitor
' '
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1})
Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Name = "RibbonPage1"
Me.RibbonPage1.Text = "RibbonPage1" Me.RibbonPage1.Text = "Start"
' '
'RibbonPageGroup1 'RibbonPageGroup1
' '
@ -150,10 +169,10 @@ Partial Class frmMonitor
' '
'RibbonStatusBar1 'RibbonStatusBar1
' '
Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 747) Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 749)
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, 24) Me.RibbonStatusBar1.Size = New System.Drawing.Size(1379, 22)
' '
'RibbonPage2 'RibbonPage2
' '
@ -233,7 +252,7 @@ Partial Class frmMonitor
Me.LayoutItemSearchValue_Text.Size = New System.Drawing.Size(215, 46) Me.LayoutItemSearchValue_Text.Size = New System.Drawing.Size(215, 46)
Me.LayoutItemSearchValue_Text.Text = "Suchwert" Me.LayoutItemSearchValue_Text.Text = "Suchwert"
Me.LayoutItemSearchValue_Text.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutItemSearchValue_Text.TextLocation = DevExpress.Utils.Locations.Top
Me.LayoutItemSearchValue_Text.TextSize = New System.Drawing.Size(58, 13) Me.LayoutItemSearchValue_Text.TextSize = New System.Drawing.Size(63, 13)
' '
'LayoutControlItem2 'LayoutControlItem2
' '
@ -244,7 +263,7 @@ Partial Class frmMonitor
Me.LayoutControlItem2.Size = New System.Drawing.Size(215, 46) Me.LayoutControlItem2.Size = New System.Drawing.Size(215, 46)
Me.LayoutControlItem2.Text = "Attribut" Me.LayoutControlItem2.Text = "Attribut"
Me.LayoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top
Me.LayoutControlItem2.TextSize = New System.Drawing.Size(58, 13) Me.LayoutControlItem2.TextSize = New System.Drawing.Size(63, 13)
' '
'LayoutItemSearchValue_Date 'LayoutItemSearchValue_Date
' '
@ -255,7 +274,7 @@ Partial Class frmMonitor
Me.LayoutItemSearchValue_Date.Size = New System.Drawing.Size(215, 46) Me.LayoutItemSearchValue_Date.Size = New System.Drawing.Size(215, 46)
Me.LayoutItemSearchValue_Date.Text = "Suchwert" Me.LayoutItemSearchValue_Date.Text = "Suchwert"
Me.LayoutItemSearchValue_Date.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutItemSearchValue_Date.TextLocation = DevExpress.Utils.Locations.Top
Me.LayoutItemSearchValue_Date.TextSize = New System.Drawing.Size(58, 13) Me.LayoutItemSearchValue_Date.TextSize = New System.Drawing.Size(63, 13)
Me.LayoutItemSearchValue_Date.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never Me.LayoutItemSearchValue_Date.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never
' '
'LayoutControlItem3 'LayoutControlItem3
@ -267,7 +286,7 @@ Partial Class frmMonitor
Me.LayoutControlItem3.Size = New System.Drawing.Size(215, 406) Me.LayoutControlItem3.Size = New System.Drawing.Size(215, 406)
Me.LayoutControlItem3.Text = "Auswertung" Me.LayoutControlItem3.Text = "Auswertung"
Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top
Me.LayoutControlItem3.TextSize = New System.Drawing.Size(58, 13) Me.LayoutControlItem3.TextSize = New System.Drawing.Size(63, 13)
' '
'XtraTabControl1 'XtraTabControl1
' '
@ -283,7 +302,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(407, 539) Me.XtraTabPageFile1.Size = New System.Drawing.Size(407, 541)
Me.XtraTabPageFile1.Text = "File 1" Me.XtraTabPageFile1.Text = "File 1"
' '
'DocumentViewer1 'DocumentViewer1
@ -292,14 +311,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(407, 539) Me.DocumentViewer1.Size = New System.Drawing.Size(407, 541)
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(407, 539) Me.XtraTabPageFile2.Size = New System.Drawing.Size(407, 541)
Me.XtraTabPageFile2.Text = "File 2" Me.XtraTabPageFile2.Text = "File 2"
' '
'DocumentViewer2 'DocumentViewer2
@ -308,14 +327,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(407, 539) Me.DocumentViewer2.Size = New System.Drawing.Size(407, 541)
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(407, 539) Me.XtraTabPageHtml1.Size = New System.Drawing.Size(407, 541)
Me.XtraTabPageHtml1.Text = "HTML 1" Me.XtraTabPageHtml1.Text = "HTML 1"
' '
'RichEditControl1 'RichEditControl1
@ -328,7 +347,7 @@ 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(407, 539) Me.RichEditControl1.Size = New System.Drawing.Size(407, 541)
Me.RichEditControl1.TabIndex = 0 Me.RichEditControl1.TabIndex = 0
Me.RichEditControl1.Text = "RichEditControl1" Me.RichEditControl1.Text = "RichEditControl1"
' '
@ -336,7 +355,7 @@ Partial Class frmMonitor
' '
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(407, 539) Me.XtraTabPageHtml2.Size = New System.Drawing.Size(407, 541)
Me.XtraTabPageHtml2.Text = "HTML 2" Me.XtraTabPageHtml2.Text = "HTML 2"
' '
'RichEditControl2 'RichEditControl2
@ -345,7 +364,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(407, 539) Me.RichEditControl2.Size = New System.Drawing.Size(407, 541)
Me.RichEditControl2.TabIndex = 1 Me.RichEditControl2.TabIndex = 1
Me.RichEditControl2.Text = "RichEditControl2" Me.RichEditControl2.Text = "RichEditControl2"
' '
@ -384,6 +403,7 @@ Partial Class frmMonitor
Me.SvgImageCollection1.Add("success", "image://svgimages/icon builder/actions_checkcircled.svg") Me.SvgImageCollection1.Add("success", "image://svgimages/icon builder/actions_checkcircled.svg")
Me.SvgImageCollection1.Add("failure", "image://svgimages/icon builder/actions_deletecircled.svg") Me.SvgImageCollection1.Add("failure", "image://svgimages/icon builder/actions_deletecircled.svg")
Me.SvgImageCollection1.Add("warning", "image://svgimages/business objects/bo_attention.svg") Me.SvgImageCollection1.Add("warning", "image://svgimages/business objects/bo_attention.svg")
Me.SvgImageCollection1.Add("waiting", "image://svgimages/business objects/bo_audit_changehistory.svg")
' '
'SplitContainerControl1 'SplitContainerControl1
' '
@ -518,25 +538,29 @@ 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, 158) Me.XtraTabControl2.Location = New System.Drawing.Point(0, 159)
Me.XtraTabControl2.Name = "XtraTabControl2" Me.XtraTabControl2.Name = "XtraTabControl2"
Me.XtraTabControl2.SelectedTabPage = Me.XtraTabPage3 Me.XtraTabControl2.SelectedTabPage = Me.XtraTabPage3
Me.XtraTabControl2.Size = New System.Drawing.Size(1379, 589) Me.XtraTabControl2.Size = New System.Drawing.Size(1379, 590)
Me.XtraTabControl2.TabIndex = 11 Me.XtraTabControl2.TabIndex = 11
Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage3, Me.XtraTabPage4}) Me.XtraTabControl2.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage3, Me.XtraTabPage4})
' '
'XtraTabPage3 'XtraTabPage3
' '
Me.XtraTabPage3.Controls.Add(Me.SplitContainerControl2) Me.XtraTabPage3.Controls.Add(Me.SplitContainerControl2)
Me.XtraTabPage3.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.enablesearch
Me.XtraTabPage3.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
Me.XtraTabPage3.Name = "XtraTabPage3" Me.XtraTabPage3.Name = "XtraTabPage3"
Me.XtraTabPage3.Size = New System.Drawing.Size(1377, 564) Me.XtraTabPage3.Size = New System.Drawing.Size(1377, 564)
Me.XtraTabPage3.Text = "XtraTabPage3" Me.XtraTabPage3.Text = "Attribut Suche"
' '
'XtraTabPage4 'XtraTabPage4
' '
Me.XtraTabPage4.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.bo_dashboard
Me.XtraTabPage4.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
Me.XtraTabPage4.Name = "XtraTabPage4" Me.XtraTabPage4.Name = "XtraTabPage4"
Me.XtraTabPage4.Size = New System.Drawing.Size(1377, 564) Me.XtraTabPage4.Size = New System.Drawing.Size(1377, 564)
Me.XtraTabPage4.Text = "XtraTabPage4" Me.XtraTabPage4.Text = "Auswertungen"
' '
'frmMonitor 'frmMonitor
' '
@ -552,6 +576,7 @@ Partial Class frmMonitor
Me.StatusBar = Me.RibbonStatusBar1 Me.StatusBar = Me.RibbonStatusBar1
Me.Text = "Monitor" Me.Text = "Monitor"
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit()
Me.LayoutControl1.ResumeLayout(False) Me.LayoutControl1.ResumeLayout(False)
CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
@ -646,4 +671,6 @@ Partial Class frmMonitor
Friend WithEvents DateEdit1 As DevExpress.XtraEditors.DateEdit Friend WithEvents DateEdit1 As DevExpress.XtraEditors.DateEdit
Friend WithEvents LayoutItemSearchValue_Date As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutItemSearchValue_Date As DevExpress.XtraLayout.LayoutControlItem
Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection
Friend WithEvents ApplicationMenu1 As DevExpress.XtraBars.Ribbon.ApplicationMenu
Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
End Class End Class

View File

@ -117,6 +117,9 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="ApplicationMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>183, 17</value>
</metadata>
<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">
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>

View File

@ -27,7 +27,10 @@ Public Class frmMonitor
Concat(HtmlViewColumns). Concat(HtmlViewColumns).
ToList ToList
Private ReadOnly DisplayColumns As New List(Of String) From {"COLUMN1", "COLUMN2", "COLUMN3"} Private ReadOnly DisplayColumns As New List(Of String) From {"COLUMN1", "COLUMN2", "COLUMN3", "ADDED_WHEN"}
Private SQLResultGrids As List(Of GridControl) Private SQLResultGrids As List(Of GridControl)
Private SQLResultTabs As List(Of XtraTabPage) Private SQLResultTabs As List(Of XtraTabPage)
@ -38,6 +41,9 @@ Public Class frmMonitor
Private HtmlResultViewers As List(Of RichEditControl) Private HtmlResultViewers As List(Of RichEditControl)
Private HtmlResultTabs As List(Of XtraTabPage) Private HtmlResultTabs As List(Of XtraTabPage)
Private Const STATE_SUCCESS As String = "SUCCESS"
Private Const STATE_FAILURE As String = "FAILURE"
Private Enum NodeImage Private Enum NodeImage
[Default] = 0 [Default] = 0
SQL = 1 SQL = 1
@ -46,8 +52,14 @@ Public Class frmMonitor
Success = 4 Success = 4
Failure = 5 Failure = 5
Warning = 6 Warning = 6
Waiting = 7
End Enum End Enum
Private ReadOnly StateIcons As New Dictionary(Of String, NodeImage) From {
{STATE_SUCCESS, NodeImage.Success},
{STATE_FAILURE, NodeImage.Failure}
}
Private GridBuilder As GridBuilder Private GridBuilder As GridBuilder
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
@ -99,7 +111,7 @@ Public Class frmMonitor
Private Function LoadGDPicture() As String Private Function LoadGDPicture() As String
Dim oSQL = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'" Dim oSQL = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'"
Return Database.GetScalarValue(oSQL) Return Database.GetScalarValue(oSQL).ToString()
End Function End Function
Private Sub buttonSearch_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles buttonSearch.ItemClick Private Sub buttonSearch_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles buttonSearch.ItemClick
@ -270,9 +282,9 @@ Public Class frmMonitor
ExpandNodes(oNode) ExpandNodes(oNode)
Dim oColumn = TreeListResults.Columns.Item("COLOR") Dim oColumn = TreeListResults.Columns.Item("COLOR")
Dim oColorString = NotNull(oNode.GetValue(oColumn), Nothing) Dim oColorString As String = NotNull(oNode.GetValue(oColumn), String.Empty)
If oColorString IsNot Nothing AndAlso oColorString = "Red" Then If oColorString = "Red" Then
oNode.Expand() oNode.Expand()
ExpandParentNode(oNode) ExpandParentNode(oNode)
End If End If
@ -338,19 +350,19 @@ Public Class frmMonitor
End Function End Function
Private Sub TreeListResults_CustomDrawNodeCell(sender As Object, e As DevExpress.XtraTreeList.CustomDrawNodeCellEventArgs) Handles TreeListResults.CustomDrawNodeCell Private Sub TreeListResults_CustomDrawNodeCell(sender As Object, e As DevExpress.XtraTreeList.CustomDrawNodeCellEventArgs) Handles TreeListResults.CustomDrawNodeCell
Dim oColumn = TreeListResults.Columns.Item("COLOR") Dim oColumn = TreeListResults.Columns.Item("STATE")
Dim oColorString = NotNull(e.Node.GetValue(oColumn), Nothing) Dim oState = NotNull(e.Node.GetValue(oColumn), Nothing)
If oColorString Is Nothing Then If oState Is Nothing Then
Exit Sub Exit Sub
End If End If
Dim oColor As Color = Nothing Dim oColor As Color = Nothing
Select Case oColorString.ToString Select Case oState.ToString
Case "Green" Case STATE_SUCCESS
oColor = Color.LightGreen oColor = Color.LightGreen
Case "Red" Case STATE_FAILURE
oColor = Color.LightCoral oColor = Color.LightCoral
End Select End Select
@ -376,8 +388,10 @@ Public Class frmMonitor
Where(Function(v) v.Value IsNot Nothing). Where(Function(v) v.Value IsNot Nothing).
Count() Count()
Dim oColumn = TreeListResults.Columns.Item("COLOR") Dim oIconColumn = TreeListResults.Columns.Item("ICON")
Dim oColorString = NotNull(e.Node.GetValue(oColumn), Nothing) Dim oIcon = NotNull(e.Node.GetValue(oIconColumn), Nothing)
Dim oStateColumn = TreeListResults.Columns.Item("STATE")
Dim oState = NotNull(e.Node.GetValue(oStateColumn), Nothing)
If oSQLCommands > 0 Then If oSQLCommands > 0 Then
e.NodeImageIndex = NodeImage.SQL e.NodeImageIndex = NodeImage.SQL
@ -386,17 +400,26 @@ Public Class frmMonitor
ElseIf oHtmlDocuments > 0 Then ElseIf oHtmlDocuments > 0 Then
e.NodeImageIndex = NodeImage.Mail e.NodeImageIndex = NodeImage.Mail
Else Else
If oColorString Is Nothing Then If oState IsNot Nothing AndAlso StateIcons.ContainsKey(oState) Then
Dim oIconIndex = StateIcons.Item(oState)
e.NodeImageIndex = oIconIndex
Else
e.NodeImageIndex = NodeImage.Default e.NodeImageIndex = NodeImage.Default
ElseIf oColorString = "Red" Then
e.NodeImageIndex = NodeImage.Failure
ElseIf oColorString = "Green" Then
e.NodeImageIndex = NodeImage.Success
ElseIf oColorString = "Yellow" Then
e.NodeImageIndex = NodeImage.Warning
End If End If
End If End If
End Sub End Sub
Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
Dim oSQLConfig As New frmSQLConfig(LogConfig)
If oSQLConfig.ShowDialog() = DialogResult.OK Then
ConfigManager.Config.ConnectionString = oSQLConfig.ConnectionString
ConfigManager.Save()
Database = New MSSQLServer(LogConfig, oSQLConfig.ConnectionString)
LoadSearchKeys()
End If
End Sub
End Class End Class
Friend Class SearchKey Friend Class SearchKey