From 4cf03c39047295e4c00afbfe3b048982837c9b4e Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 4 May 2021 16:31:30 +0200 Subject: [PATCH] Monitor: First UI draft --- GUIs.Monitor/Config.vb | 6 + GUIs.Monitor/Form1.Designer.vb | 76 ---- GUIs.Monitor/Form1.vb | 6 - GUIs.Monitor/Monitor.vbproj | 45 ++- .../My Project/Application.Designer.vb | 2 +- GUIs.Monitor/My Project/Application.myapp | 5 +- GUIs.Monitor/My Project/Resources.Designer.vb | 20 ++ GUIs.Monitor/My Project/Resources.resx | 42 ++- GUIs.Monitor/My Project/licenses.licx | 5 + GUIs.Monitor/Resources/charttype_line.svg | 20 ++ GUIs.Monitor/Resources/gettingstarted.svg | 19 + GUIs.Monitor/app.config | 14 +- GUIs.Monitor/frmStart.Designer.vb | 327 ++++++++++++++++++ GUIs.Monitor/{Form1.resx => frmStart.resx} | 3 + GUIs.Monitor/frmStart.vb | 33 ++ GUIs.Monitor/packages.config | 4 + 16 files changed, 511 insertions(+), 116 deletions(-) create mode 100644 GUIs.Monitor/Config.vb delete mode 100644 GUIs.Monitor/Form1.Designer.vb delete mode 100644 GUIs.Monitor/Form1.vb create mode 100644 GUIs.Monitor/Resources/charttype_line.svg create mode 100644 GUIs.Monitor/Resources/gettingstarted.svg create mode 100644 GUIs.Monitor/frmStart.Designer.vb rename GUIs.Monitor/{Form1.resx => frmStart.resx} (96%) create mode 100644 GUIs.Monitor/frmStart.vb create mode 100644 GUIs.Monitor/packages.config diff --git a/GUIs.Monitor/Config.vb b/GUIs.Monitor/Config.vb new file mode 100644 index 00000000..aa127cc9 --- /dev/null +++ b/GUIs.Monitor/Config.vb @@ -0,0 +1,6 @@ +Imports DigitalData.Modules.Config.ConfigAttributes + +Public Class Config + + Public Property ConnectionString As String = String.Empty +End Class diff --git a/GUIs.Monitor/Form1.Designer.vb b/GUIs.Monitor/Form1.Designer.vb deleted file mode 100644 index d1926fb6..00000000 --- a/GUIs.Monitor/Form1.Designer.vb +++ /dev/null @@ -1,76 +0,0 @@ -Imports DigitalData.GUIs.Common.Base - -Partial Public Class Form1 - Inherits BaseRibbonForm - - ''' - ''' Required designer variable. - ''' - Private components As System.ComponentModel.IContainer = Nothing - - ''' - ''' Clean up any resources being used. - ''' - ''' true if managed resources should be disposed; otherwise, false. - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - If disposing AndAlso (components IsNot Nothing) Then - components.Dispose() - End If - MyBase.Dispose(disposing) - End Sub - -#Region "Windows Form Designer generated code" - - ''' - ''' Required method for Designer support - do not modify - ''' the contents of this method with the code editor. - ''' - Private Sub InitializeComponent() - Me.ribbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() - Me.ribbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.ribbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - CType(Me.ribbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SuspendLayout() - ' - 'ribbonControl1 - ' - Me.ribbonControl1.ExpandCollapseItem.Id = 0 - Me.ribbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonControl1.ExpandCollapseItem, Me.ribbonControl1.SearchEditItem}) - Me.ribbonControl1.Location = New System.Drawing.Point(0, 0) - Me.ribbonControl1.MaxItemId = 1 - Me.ribbonControl1.Name = "ribbonControl1" - Me.ribbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.ribbonPage1}) - Me.ribbonControl1.Size = New System.Drawing.Size(1034, 158) - ' - 'ribbonPage1 - ' - Me.ribbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.ribbonPageGroup1}) - Me.ribbonPage1.Name = "ribbonPage1" - Me.ribbonPage1.Text = "ribbonPage1" - ' - 'ribbonPageGroup1 - ' - Me.ribbonPageGroup1.Name = "ribbonPageGroup1" - Me.ribbonPageGroup1.Text = "ribbonPageGroup1" - ' - 'Form1 - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1034, 619) - Me.Controls.Add(Me.ribbonControl1) - Me.Name = "Form1" - Me.Ribbon = Me.ribbonControl1 - Me.Text = "Monitor" - CType(Me.ribbonControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.ResumeLayout(False) - Me.PerformLayout() - - End Sub - -#End Region - - Private WithEvents ribbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl - Private WithEvents ribbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage - Private WithEvents ribbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup -End Class diff --git a/GUIs.Monitor/Form1.vb b/GUIs.Monitor/Form1.vb deleted file mode 100644 index b3b74198..00000000 --- a/GUIs.Monitor/Form1.vb +++ /dev/null @@ -1,6 +0,0 @@ -Imports System.ComponentModel -Imports System.Text - - -Partial Public Class Form1 -End Class diff --git a/GUIs.Monitor/Monitor.vbproj b/GUIs.Monitor/Monitor.vbproj index 3840206d..ad5ffddf 100644 --- a/GUIs.Monitor/Monitor.vbproj +++ b/GUIs.Monitor/Monitor.vbproj @@ -8,13 +8,14 @@ WinExe DigitalData.GUIs.Monitor DigitalData.GUIs.Monitor - v4.5.2 + v4.6.1 Monitor.Program 512 On Binary Off On + AnyCPU @@ -49,8 +50,18 @@ + + + + ..\packages\NLog.4.7.5\lib\net45\NLog.dll + + + + + + @@ -72,11 +83,12 @@ - - Form + + + frmStart.vb - - Form1.vb + + Form True @@ -84,8 +96,8 @@ True - - Form1.vb + + frmStart.vb @@ -109,6 +121,7 @@ Settings.settings True + @@ -121,11 +134,29 @@ {d20a6bf2-c7c6-4a7a-b34d-fa27d775a049} Common + + {44982f9b-6116-44e2-85d0-f39650b1ef99} + Config + + + {eaf0ea75-5fa7-485d-89c7-b2d843b03a96} + Database + + + {903b2d7d-3b80-4be9-8713-7447b704e1b0} + Logging + {65efb268-c0e0-40c1-8981-9f70dee5c74a} SQLConfig + + + + + + + - + - - - + + + + - - + + - - + + - - - + + + + - + - + @@ -109,9 +112,16 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\charttype_line.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\gettingstarted.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + \ No newline at end of file diff --git a/GUIs.Monitor/My Project/licenses.licx b/GUIs.Monitor/My Project/licenses.licx index 3f51afe8..fe84aa59 100644 --- a/GUIs.Monitor/My Project/licenses.licx +++ b/GUIs.Monitor/My Project/licenses.licx @@ -1 +1,6 @@ +DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.Monitor/Resources/charttype_line.svg b/GUIs.Monitor/Resources/charttype_line.svg new file mode 100644 index 00000000..8e1af17b --- /dev/null +++ b/GUIs.Monitor/Resources/charttype_line.svg @@ -0,0 +1,20 @@ + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Monitor/Resources/gettingstarted.svg b/GUIs.Monitor/Resources/gettingstarted.svg new file mode 100644 index 00000000..b9b88d44 --- /dev/null +++ b/GUIs.Monitor/Resources/gettingstarted.svg @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.Monitor/app.config b/GUIs.Monitor/app.config index 8f96d242..48d7e205 100644 --- a/GUIs.Monitor/app.config +++ b/GUIs.Monitor/app.config @@ -1,8 +1,8 @@ - + -
+
@@ -16,26 +16,26 @@ - + - + - + - + - \ No newline at end of file + diff --git a/GUIs.Monitor/frmStart.Designer.vb b/GUIs.Monitor/frmStart.Designer.vb new file mode 100644 index 00000000..90a87087 --- /dev/null +++ b/GUIs.Monitor/frmStart.Designer.vb @@ -0,0 +1,327 @@ +Imports DigitalData.GUIs.Common.Base + + +Partial Class frmStart + 'Inherits DevExpress.XtraBars.Ribbon.RibbonForm + Inherits BaseRibbonForm + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.DockManager1 = New DevExpress.XtraBars.Docking.DockManager(Me.components) + Me.DockPanel1 = New DevExpress.XtraBars.Docking.DockPanel() + Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer() + Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() + Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() + Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit() + Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() + Me.TextEdit2 = New DevExpress.XtraEditors.ComboBoxEdit() + Me.DockPanel2 = New DevExpress.XtraBars.Docking.DockPanel() + Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer() + Me.TreeList1 = New DevExpress.XtraTreeList.TreeList() + Me.DockPanel3 = New DevExpress.XtraBars.Docking.DockPanel() + Me.DockPanel3_Container = New DevExpress.XtraBars.Docking.ControlContainer() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.DockPanel1.SuspendLayout() + Me.DockPanel1_Container.SuspendLayout() + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.LayoutControl1.SuspendLayout() + CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + Me.DockPanel2.SuspendLayout() + CType(Me.TreeList1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.DockPanel3.SuspendLayout() + Me.SuspendLayout() + ' + 'RibbonControl1 + ' + Me.RibbonControl1.ExpandCollapseItem.Id = 0 + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1}) + Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) + Me.RibbonControl1.MaxItemId = 2 + Me.RibbonControl1.Name = "RibbonControl1" + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl1.Size = New System.Drawing.Size(1085, 159) + Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Suchen" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.gettingstarted + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) + Me.RibbonPage1.Name = "RibbonPage1" + Me.RibbonPage1.Text = "RibbonPage1" + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + ' + 'RibbonStatusBar1 + ' + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 654) + Me.RibbonStatusBar1.Name = "RibbonStatusBar1" + Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1085, 22) + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + Me.RibbonPage2.Text = "RibbonPage2" + ' + 'DockManager1 + ' + Me.DockManager1.Form = Me + Me.DockManager1.HiddenPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.DockPanel1}) + Me.DockManager1.RootPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.DockPanel2, Me.DockPanel3}) + Me.DockManager1.TopZIndexControls.AddRange(New String() {"DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.StatusBar", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl"}) + ' + 'DockPanel1 + ' + Me.DockPanel1.Controls.Add(Me.DockPanel1_Container) + Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left + Me.DockPanel1.ID = New System.Guid("52706dba-4c71-4145-b8a3-5f5423d32fce") + Me.DockPanel1.Location = New System.Drawing.Point(0, 159) + Me.DockPanel1.Name = "DockPanel1" + Me.DockPanel1.OriginalSize = New System.Drawing.Size(200, 200) + Me.DockPanel1.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Left + Me.DockPanel1.SavedIndex = 0 + Me.DockPanel1.Size = New System.Drawing.Size(200, 495) + Me.DockPanel1.Text = "Suche" + Me.DockPanel1.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden + ' + 'DockPanel1_Container + ' + Me.DockPanel1_Container.Controls.Add(Me.LayoutControl1) + Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 46) + Me.DockPanel1_Container.Name = "DockPanel1_Container" + Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 446) + Me.DockPanel1_Container.TabIndex = 0 + ' + 'LayoutControl1 + ' + Me.LayoutControl1.Controls.Add(Me.TextEdit1) + Me.LayoutControl1.Controls.Add(Me.ComboBoxEdit1) + Me.LayoutControl1.Controls.Add(Me.TextEdit2) + Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.LayoutControl1.Location = New System.Drawing.Point(0, 0) + Me.LayoutControl1.Name = "LayoutControl1" + Me.LayoutControl1.Root = Me.Root + Me.LayoutControl1.Size = New System.Drawing.Size(193, 446) + Me.LayoutControl1.TabIndex = 0 + Me.LayoutControl1.Text = "LayoutControl1" + ' + 'TextEdit1 + ' + Me.TextEdit1.Location = New System.Drawing.Point(15, 123) + Me.TextEdit1.MenuManager = Me.RibbonControl1 + Me.TextEdit1.Name = "TextEdit1" + Me.TextEdit1.Size = New System.Drawing.Size(163, 20) + Me.TextEdit1.StyleController = Me.LayoutControl1 + Me.TextEdit1.TabIndex = 4 + ' + 'ComboBoxEdit1 + ' + Me.ComboBoxEdit1.Location = New System.Drawing.Point(15, 31) + Me.ComboBoxEdit1.MenuManager = Me.RibbonControl1 + Me.ComboBoxEdit1.Name = "ComboBoxEdit1" + Me.ComboBoxEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.ComboBoxEdit1.Size = New System.Drawing.Size(163, 20) + Me.ComboBoxEdit1.StyleController = Me.LayoutControl1 + Me.ComboBoxEdit1.TabIndex = 5 + ' + 'Root + ' + Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.Root.GroupBordersVisible = False + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3}) + Me.Root.Name = "Root" + Me.Root.Size = New System.Drawing.Size(193, 446) + Me.Root.TextVisible = False + ' + 'LayoutControlItem1 + ' + Me.LayoutControlItem1.Control = Me.TextEdit1 + Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 92) + Me.LayoutControlItem1.Name = "LayoutControlItem1" + Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem1.Size = New System.Drawing.Size(173, 334) + Me.LayoutControlItem1.Text = "Suchwert" + Me.LayoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(63, 13) + ' + 'LayoutControlItem2 + ' + Me.LayoutControlItem2.Control = Me.ComboBoxEdit1 + Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem2.Name = "LayoutControlItem2" + Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem2.Size = New System.Drawing.Size(173, 46) + Me.LayoutControlItem2.Text = "Attribut" + Me.LayoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(63, 13) + ' + 'LayoutControlItem3 + ' + Me.LayoutControlItem3.Control = Me.TextEdit2 + Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 46) + Me.LayoutControlItem3.Name = "LayoutControlItem3" + Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem3.Size = New System.Drawing.Size(173, 46) + Me.LayoutControlItem3.Text = "Auswertung" + Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(63, 13) + ' + 'TextEdit2 + ' + Me.TextEdit2.Location = New System.Drawing.Point(15, 77) + Me.TextEdit2.MenuManager = Me.RibbonControl1 + Me.TextEdit2.Name = "TextEdit2" + Me.TextEdit2.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.TextEdit2.Size = New System.Drawing.Size(163, 20) + Me.TextEdit2.StyleController = Me.LayoutControl1 + Me.TextEdit2.TabIndex = 6 + ' + 'DockPanel2 + ' + Me.DockPanel2.Controls.Add(Me.DockPanel2_Container) + Me.DockPanel2.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right + Me.DockPanel2.ID = New System.Guid("157c74a2-d255-4e6b-b789-bde43010b2af") + Me.DockPanel2.Location = New System.Drawing.Point(885, 159) + Me.DockPanel2.Name = "DockPanel2" + Me.DockPanel2.OriginalSize = New System.Drawing.Size(200, 200) + Me.DockPanel2.Size = New System.Drawing.Size(200, 495) + Me.DockPanel2.Text = "Details" + ' + 'DockPanel2_Container + ' + Me.DockPanel2_Container.Location = New System.Drawing.Point(4, 46) + Me.DockPanel2_Container.Name = "DockPanel2_Container" + Me.DockPanel2_Container.Size = New System.Drawing.Size(193, 446) + Me.DockPanel2_Container.TabIndex = 0 + ' + 'TreeList1 + ' + Me.TreeList1.Dock = System.Windows.Forms.DockStyle.Fill + Me.TreeList1.Location = New System.Drawing.Point(200, 159) + Me.TreeList1.MenuManager = Me.RibbonControl1 + Me.TreeList1.Name = "TreeList1" + Me.TreeList1.Size = New System.Drawing.Size(685, 495) + Me.TreeList1.TabIndex = 4 + ' + 'DockPanel3 + ' + Me.DockPanel3.Controls.Add(Me.DockPanel3_Container) + Me.DockPanel3.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left + Me.DockPanel3.ID = New System.Guid("d2ef8b04-1b9f-49ee-8a72-31210e059dbe") + Me.DockPanel3.Location = New System.Drawing.Point(0, 159) + Me.DockPanel3.Name = "DockPanel3" + Me.DockPanel3.OriginalSize = New System.Drawing.Size(200, 200) + Me.DockPanel3.Size = New System.Drawing.Size(200, 495) + Me.DockPanel3.Text = "DockPanel3" + ' + 'DockPanel3_Container + ' + Me.DockPanel3_Container.Location = New System.Drawing.Point(3, 46) + Me.DockPanel3_Container.Name = "DockPanel3_Container" + Me.DockPanel3_Container.Size = New System.Drawing.Size(193, 446) + Me.DockPanel3_Container.TabIndex = 0 + ' + 'frmStart + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(1085, 676) + Me.Controls.Add(Me.TreeList1) + Me.Controls.Add(Me.DockPanel3) + Me.Controls.Add(Me.DockPanel2) + Me.Controls.Add(Me.RibbonStatusBar1) + Me.Controls.Add(Me.RibbonControl1) + Me.IconOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.charttype_line + Me.Name = "frmStart" + Me.Ribbon = Me.RibbonControl1 + Me.StatusBar = Me.RibbonStatusBar1 + Me.Text = "Monitor" + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).EndInit() + Me.DockPanel1.ResumeLayout(False) + Me.DockPanel1_Container.ResumeLayout(False) + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.LayoutControl1.ResumeLayout(False) + CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() + Me.DockPanel2.ResumeLayout(False) + CType(Me.TreeList1, System.ComponentModel.ISupportInitialize).EndInit() + Me.DockPanel3.ResumeLayout(False) + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents DockManager1 As DevExpress.XtraBars.Docking.DockManager + Friend WithEvents DockPanel1 As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents DockPanel1_Container As DevExpress.XtraBars.Docking.ControlContainer + Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl + Friend WithEvents TextEdit1 As DevExpress.XtraEditors.TextEdit + Friend WithEvents ComboBoxEdit1 As DevExpress.XtraEditors.ComboBoxEdit + Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents TextEdit2 As DevExpress.XtraEditors.ComboBoxEdit + Friend WithEvents DockPanel2 As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents DockPanel2_Container As DevExpress.XtraBars.Docking.ControlContainer + Friend WithEvents TreeList1 As DevExpress.XtraTreeList.TreeList + Friend WithEvents DockPanel3 As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents DockPanel3_Container As DevExpress.XtraBars.Docking.ControlContainer +End Class diff --git a/GUIs.Monitor/Form1.resx b/GUIs.Monitor/frmStart.resx similarity index 96% rename from GUIs.Monitor/Form1.resx rename to GUIs.Monitor/frmStart.resx index 1af7de15..d361575c 100644 --- a/GUIs.Monitor/Form1.resx +++ b/GUIs.Monitor/frmStart.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/GUIs.Monitor/frmStart.vb b/GUIs.Monitor/frmStart.vb new file mode 100644 index 00000000..042e7fb5 --- /dev/null +++ b/GUIs.Monitor/frmStart.vb @@ -0,0 +1,33 @@ +Imports DigitalData.Controls.SQLConfig +Imports DigitalData.Modules.Config +Imports DigitalData.Modules.Database +Imports DigitalData.Modules.Logging + +Public Class frmStart + Public Property LogConfig As LogConfig + Public Property ConfigManager As ConfigManager(Of Config) + Public Property Database As MSSQLServer + + 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") + ConfigManager = New ConfigManager(Of Config)(LogConfig, Application.UserAppDataPath) + + If ConfigManager.Config.ConnectionString = String.Empty Then + Dim oSQLConfig As New frmSQLConfig(LogConfig) + If oSQLConfig.ShowDialog() = DialogResult.OK Then + ConfigManager.Config.ConnectionString = oSQLConfig.ConnectionString + ConfigManager.Save() + Else + ShowErrorMessage("No Database configured. Application will close!") + Application.Exit() + + End If + End If + + Database = New MSSQLServer(LogConfig, ConfigManager.Config.ConnectionString) + Catch ex As Exception + ShowErrorMessage(ex) + End Try + End Sub +End Class \ No newline at end of file diff --git a/GUIs.Monitor/packages.config b/GUIs.Monitor/packages.config new file mode 100644 index 00000000..abeaf568 --- /dev/null +++ b/GUIs.Monitor/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file