diff --git a/GUIs.ZooFlow/App.config b/GUIs.ZooFlow/App.config new file mode 100644 index 00000000..803b1280 --- /dev/null +++ b/GUIs.ZooFlow/App.config @@ -0,0 +1,97 @@ + + + + +
+ + + + + + Skin/Office 2019 Colorful + + + Custom/Digital Data Palette + + + + + + + + + + + + + + + + + + + + + UseSegoeUI + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/ClassInitLoader.vb b/GUIs.ZooFlow/ClassInitLoader.vb index b0c7cc73..74fcf30b 100644 --- a/GUIs.ZooFlow/ClassInitLoader.vb +++ b/GUIs.ZooFlow/ClassInitLoader.vb @@ -67,7 +67,7 @@ Public Class ClassInitLoader Dim oPercentComplete As Integer = CInt(Math.Truncate(oStepCounter / Steps.Count * 100)) _Worker.ReportProgress(oPercentComplete) - Threading.Thread.Sleep(600) + Threading.Thread.Sleep(200) Next e.Result = oMyApplication diff --git a/GUIs.ZooFlow/Config/ClassUIConfig.vb b/GUIs.ZooFlow/Config/ClassUIConfig.vb index 342bf1f0..0cf293a3 100644 --- a/GUIs.ZooFlow/Config/ClassUIConfig.vb +++ b/GUIs.ZooFlow/Config/ClassUIConfig.vb @@ -1,5 +1,4 @@ Public Class ClassUIConfig - Public Property SkinName As String = "Office 2016 Colorful" Public Property FlowForm As New FlowFormConfig Public Property SearchForm As New SearchFormConfig Public Class FlowFormConfig diff --git a/GUIs.ZooFlow/My Project/Application.Designer.vb b/GUIs.ZooFlow/My Project/Application.Designer.vb index 2026c404..03a3d167 100644 --- a/GUIs.ZooFlow/My Project/Application.Designer.vb +++ b/GUIs.ZooFlow/My Project/Application.Designer.vb @@ -29,8 +29,8 @@ Namespace My Me.SaveMySettingsOnExit = true Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses End Sub - - + + _ Protected Overrides Sub OnCreateMainForm() Me.MainForm = Global.DigitalData.GUIs.ZooFlow.frmFlowForm End Sub diff --git a/GUIs.ZooFlow/My Project/licenses.licx b/GUIs.ZooFlow/My Project/licenses.licx index 69fa868d..dda02e90 100644 --- a/GUIs.ZooFlow/My Project/licenses.licx +++ b/GUIs.ZooFlow/My Project/licenses.licx @@ -1,12 +1,13 @@ DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.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.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.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.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.FormAssistant, DevExpress.XtraBars.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.ButtonEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.FormAssistant, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.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.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.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 diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 70c60251..78a5d90c 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -189,6 +189,7 @@ Designer Resources.Designer.vb + SettingsSingleFileGenerator diff --git a/GUIs.ZooFlow/frmConfigDatabase.Designer.vb b/GUIs.ZooFlow/frmConfigDatabase.Designer.vb index a4ccd5f4..1d41d0ae 100644 --- a/GUIs.ZooFlow/frmConfigDatabase.Designer.vb +++ b/GUIs.ZooFlow/frmConfigDatabase.Designer.vb @@ -22,7 +22,6 @@ Partial Class frmConfigDatabase 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() Me.txtServerName = New DevExpress.XtraEditors.TextEdit() Me.txtUserName = New DevExpress.XtraEditors.TextEdit() @@ -40,24 +39,24 @@ Partial Class frmConfigDatabase Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() - CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.LayoutControl1.SuspendLayout() - CType(Me.txtServerName.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtUserName.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtPassword.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.cmbDatabase.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtConnectionString.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.chkWinAuth.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SuspendLayout() + CType(Me.LayoutControl1,System.ComponentModel.ISupportInitialize).BeginInit + Me.LayoutControl1.SuspendLayout + CType(Me.txtServerName.Properties,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.txtUserName.Properties,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.txtPassword.Properties,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.cmbDatabase.Properties,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.txtConnectionString.Properties,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.chkWinAuth.Properties,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.LayoutControlGroup1,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.LayoutControlItem1,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.LayoutControlItem2,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.EmptySpaceItem1,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.LayoutControlItem4,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.LayoutControlItem3,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.LayoutControlItem7,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.LayoutControlItem6,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.LayoutControlItem5,System.ComponentModel.ISupportInitialize).BeginInit + Me.SuspendLayout ' 'LayoutControl1 ' @@ -78,40 +77,40 @@ Partial Class frmConfigDatabase ' 'txtServerName ' - Me.txtServerName.Location = New System.Drawing.Point(145, 12) + Me.txtServerName.Location = New System.Drawing.Point(157, 12) Me.txtServerName.Name = "txtServerName" - Me.txtServerName.Size = New System.Drawing.Size(403, 20) + Me.txtServerName.Size = New System.Drawing.Size(391, 20) Me.txtServerName.StyleController = Me.LayoutControl1 Me.txtServerName.TabIndex = 4 ' 'txtUserName ' - Me.txtUserName.Location = New System.Drawing.Point(145, 36) + Me.txtUserName.Location = New System.Drawing.Point(157, 36) Me.txtUserName.Name = "txtUserName" - Me.txtUserName.Size = New System.Drawing.Size(133, 20) + Me.txtUserName.Size = New System.Drawing.Size(121, 20) Me.txtUserName.StyleController = Me.LayoutControl1 Me.txtUserName.TabIndex = 5 ' 'txtPassword ' - Me.txtPassword.Location = New System.Drawing.Point(415, 36) + Me.txtPassword.Location = New System.Drawing.Point(427, 36) Me.txtPassword.Name = "txtPassword" - Me.txtPassword.Size = New System.Drawing.Size(133, 20) + Me.txtPassword.Size = New System.Drawing.Size(121, 20) Me.txtPassword.StyleController = Me.LayoutControl1 Me.txtPassword.TabIndex = 6 ' 'cmbDatabase ' - Me.cmbDatabase.Location = New System.Drawing.Point(145, 60) + Me.cmbDatabase.Location = New System.Drawing.Point(157, 60) Me.cmbDatabase.Name = "cmbDatabase" Me.cmbDatabase.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.cmbDatabase.Size = New System.Drawing.Size(403, 20) + Me.cmbDatabase.Size = New System.Drawing.Size(391, 20) Me.cmbDatabase.StyleController = Me.LayoutControl1 Me.cmbDatabase.TabIndex = 7 ' 'btnTestConnection ' - Me.btnTestConnection.Location = New System.Drawing.Point(12, 107) + Me.btnTestConnection.Location = New System.Drawing.Point(12, 106) Me.btnTestConnection.Name = "btnTestConnection" Me.btnTestConnection.Size = New System.Drawing.Size(536, 22) Me.btnTestConnection.StyleController = Me.LayoutControl1 @@ -120,10 +119,10 @@ Partial Class frmConfigDatabase ' 'txtConnectionString ' - Me.txtConnectionString.Location = New System.Drawing.Point(145, 133) + Me.txtConnectionString.Location = New System.Drawing.Point(157, 132) Me.txtConnectionString.Name = "txtConnectionString" - Me.txtConnectionString.Properties.ReadOnly = True - Me.txtConnectionString.Size = New System.Drawing.Size(403, 20) + Me.txtConnectionString.Properties.ReadOnly = true + Me.txtConnectionString.Size = New System.Drawing.Size(391, 20) Me.txtConnectionString.StyleController = Me.LayoutControl1 Me.txtConnectionString.TabIndex = 9 ' @@ -132,18 +131,18 @@ Partial Class frmConfigDatabase Me.chkWinAuth.Location = New System.Drawing.Point(12, 84) Me.chkWinAuth.Name = "chkWinAuth" Me.chkWinAuth.Properties.Caption = "Windows Authentifizierung" - Me.chkWinAuth.Size = New System.Drawing.Size(536, 19) + Me.chkWinAuth.Size = New System.Drawing.Size(536, 18) Me.chkWinAuth.StyleController = Me.LayoutControl1 Me.chkWinAuth.TabIndex = 10 ' 'LayoutControlGroup1 ' Me.LayoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] - Me.LayoutControlGroup1.GroupBordersVisible = False + Me.LayoutControlGroup1.GroupBordersVisible = false Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.EmptySpaceItem1, Me.LayoutControlItem4, Me.LayoutControlItem3, Me.LayoutControlItem7, Me.LayoutControlItem6, Me.LayoutControlItem5}) Me.LayoutControlGroup1.Name = "LayoutControlGroup1" Me.LayoutControlGroup1.Size = New System.Drawing.Size(560, 186) - Me.LayoutControlGroup1.TextVisible = False + Me.LayoutControlGroup1.TextVisible = false ' 'LayoutControlItem1 ' @@ -152,7 +151,7 @@ Partial Class frmConfigDatabase Me.LayoutControlItem1.Name = "LayoutControlItem1" Me.LayoutControlItem1.Size = New System.Drawing.Size(540, 24) Me.LayoutControlItem1.Text = "Server Name:" - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(130, 13) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(142, 13) ' 'LayoutControlItem2 ' @@ -161,14 +160,14 @@ Partial Class frmConfigDatabase Me.LayoutControlItem2.Name = "LayoutControlItem2" Me.LayoutControlItem2.Size = New System.Drawing.Size(270, 24) Me.LayoutControlItem2.Text = "Benutzername:" - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(130, 13) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(142, 13) ' 'EmptySpaceItem1 ' - Me.EmptySpaceItem1.AllowHotTrack = False - Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 145) + Me.EmptySpaceItem1.AllowHotTrack = false + Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 144) Me.EmptySpaceItem1.Name = "EmptySpaceItem1" - Me.EmptySpaceItem1.Size = New System.Drawing.Size(540, 21) + Me.EmptySpaceItem1.Size = New System.Drawing.Size(540, 22) Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem4 @@ -178,7 +177,7 @@ Partial Class frmConfigDatabase Me.LayoutControlItem4.Name = "LayoutControlItem4" Me.LayoutControlItem4.Size = New System.Drawing.Size(540, 24) Me.LayoutControlItem4.Text = "Datenbank:" - Me.LayoutControlItem4.TextSize = New System.Drawing.Size(130, 13) + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(142, 13) ' 'LayoutControlItem3 ' @@ -187,63 +186,63 @@ Partial Class frmConfigDatabase Me.LayoutControlItem3.Name = "LayoutControlItem3" Me.LayoutControlItem3.Size = New System.Drawing.Size(270, 24) Me.LayoutControlItem3.Text = "Passwort:" - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(130, 13) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(142, 13) ' 'LayoutControlItem7 ' Me.LayoutControlItem7.Control = Me.chkWinAuth Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 72) Me.LayoutControlItem7.Name = "LayoutControlItem7" - Me.LayoutControlItem7.Size = New System.Drawing.Size(540, 23) + Me.LayoutControlItem7.Size = New System.Drawing.Size(540, 22) Me.LayoutControlItem7.TextSize = New System.Drawing.Size(0, 0) - Me.LayoutControlItem7.TextVisible = False + Me.LayoutControlItem7.TextVisible = false ' 'LayoutControlItem6 ' Me.LayoutControlItem6.Control = Me.txtConnectionString - Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 121) + Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 120) Me.LayoutControlItem6.Name = "LayoutControlItem6" Me.LayoutControlItem6.Size = New System.Drawing.Size(540, 24) Me.LayoutControlItem6.Text = "Aktueller Connectionstring:" - Me.LayoutControlItem6.TextSize = New System.Drawing.Size(130, 13) + Me.LayoutControlItem6.TextSize = New System.Drawing.Size(142, 13) ' 'LayoutControlItem5 ' Me.LayoutControlItem5.Control = Me.btnTestConnection - Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 95) + Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 94) Me.LayoutControlItem5.Name = "LayoutControlItem5" Me.LayoutControlItem5.Size = New System.Drawing.Size(540, 26) Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0) - Me.LayoutControlItem5.TextVisible = False + Me.LayoutControlItem5.TextVisible = false ' 'frmConfigDatabase ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(560, 186) Me.Controls.Add(Me.LayoutControl1) Me.Name = "frmConfigDatabase" Me.Text = "Datenbank Verbindung" - CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.LayoutControl1.ResumeLayout(False) - CType(Me.txtServerName.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtUserName.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtPassword.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.cmbDatabase.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtConnectionString.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.chkWinAuth.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() - Me.ResumeLayout(False) + CType(Me.LayoutControl1,System.ComponentModel.ISupportInitialize).EndInit + Me.LayoutControl1.ResumeLayout(false) + CType(Me.txtServerName.Properties,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.txtUserName.Properties,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.txtPassword.Properties,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.cmbDatabase.Properties,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.txtConnectionString.Properties,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.chkWinAuth.Properties,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.LayoutControlGroup1,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.LayoutControlItem1,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.LayoutControlItem2,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.EmptySpaceItem1,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.LayoutControlItem4,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.LayoutControlItem3,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.LayoutControlItem7,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.LayoutControlItem6,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.LayoutControlItem5,System.ComponentModel.ISupportInitialize).EndInit + Me.ResumeLayout(false) - End Sub +End Sub Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index a53215e0..8cefaec2 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -1,6 +1,6 @@  Partial Class frmFlowForm - Inherits System.Windows.Forms.Form + Inherits DevExpress.XtraEditors.XtraForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -23,7 +23,7 @@ Partial Class frmFlowForm Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, Nothing, True, True) + Dim SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, Nothing, true, true) Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFlowForm)) Me.NotifyIcon = New System.Windows.Forms.NotifyIcon(Me.components) Me.ContextMenuSystray = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -36,13 +36,13 @@ Partial Class frmFlowForm Me.PictureBoxGlobix = New System.Windows.Forms.PictureBox() Me.PictureBoxPM = New System.Windows.Forms.PictureBox() Me.PictureBoxSearch = New System.Windows.Forms.PictureBox() - Me.ContextMenuSystray.SuspendLayout() - Me.ContextMenuForm.SuspendLayout() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBoxGlobix, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBoxPM, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBoxSearch, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SuspendLayout() + Me.ContextMenuSystray.SuspendLayout + Me.ContextMenuForm.SuspendLayout + CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.PictureBoxGlobix,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.PictureBoxPM,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.PictureBoxSearch,System.ComponentModel.ISupportInitialize).BeginInit + Me.SuspendLayout ' 'SplashScreenManager ' @@ -51,9 +51,9 @@ Partial Class frmFlowForm 'NotifyIcon ' Me.NotifyIcon.ContextMenuStrip = Me.ContextMenuSystray - Me.NotifyIcon.Icon = CType(resources.GetObject("NotifyIcon.Icon"), System.Drawing.Icon) + Me.NotifyIcon.Icon = CType(resources.GetObject("NotifyIcon.Icon"),System.Drawing.Icon) Me.NotifyIcon.Text = "ZooFlow by Digital Data" - Me.NotifyIcon.Visible = True + Me.NotifyIcon.Visible = true ' 'ContextMenuSystray ' @@ -93,72 +93,74 @@ Partial Class frmFlowForm Me.PictureBox1.Name = "PictureBox1" Me.PictureBox1.Size = New System.Drawing.Size(197, 150) Me.PictureBox1.TabIndex = 10 - Me.PictureBox1.TabStop = False + Me.PictureBox1.TabStop = false ' 'PictureBoxGlobix ' Me.PictureBoxGlobix.BackColor = System.Drawing.Color.Transparent - Me.PictureBoxGlobix.Image = CType(resources.GetObject("PictureBoxGlobix.Image"), System.Drawing.Image) + Me.PictureBoxGlobix.Image = CType(resources.GetObject("PictureBoxGlobix.Image"),System.Drawing.Image) Me.PictureBoxGlobix.Location = New System.Drawing.Point(448, 23) Me.PictureBoxGlobix.Name = "PictureBoxGlobix" Me.PictureBoxGlobix.Size = New System.Drawing.Size(90, 101) Me.PictureBoxGlobix.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom Me.PictureBoxGlobix.TabIndex = 9 - Me.PictureBoxGlobix.TabStop = False - Me.PictureBoxGlobix.Visible = False + Me.PictureBoxGlobix.TabStop = false + Me.PictureBoxGlobix.Visible = false ' 'PictureBoxPM ' Me.PictureBoxPM.BackColor = System.Drawing.Color.Transparent - Me.PictureBoxPM.Image = CType(resources.GetObject("PictureBoxPM.Image"), System.Drawing.Image) + Me.PictureBoxPM.Image = CType(resources.GetObject("PictureBoxPM.Image"),System.Drawing.Image) Me.PictureBoxPM.Location = New System.Drawing.Point(335, 23) Me.PictureBoxPM.Name = "PictureBoxPM" Me.PictureBoxPM.Size = New System.Drawing.Size(90, 101) Me.PictureBoxPM.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom Me.PictureBoxPM.TabIndex = 4 - Me.PictureBoxPM.TabStop = False - Me.PictureBoxPM.Visible = False + Me.PictureBoxPM.TabStop = false + Me.PictureBoxPM.Visible = false ' 'PictureBoxSearch ' Me.PictureBoxSearch.BackColor = System.Drawing.Color.Transparent - Me.PictureBoxSearch.Image = CType(resources.GetObject("PictureBoxSearch.Image"), System.Drawing.Image) + Me.PictureBoxSearch.Image = CType(resources.GetObject("PictureBoxSearch.Image"),System.Drawing.Image) Me.PictureBoxSearch.Location = New System.Drawing.Point(220, 23) Me.PictureBoxSearch.Name = "PictureBoxSearch" Me.PictureBoxSearch.Size = New System.Drawing.Size(90, 101) Me.PictureBoxSearch.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom Me.PictureBoxSearch.TabIndex = 3 - Me.PictureBoxSearch.TabStop = False + Me.PictureBoxSearch.TabStop = false ' 'frmFlowForm ' - Me.AllowDrop = True - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AllowDrop = true + Me.Appearance.BackColor = System.Drawing.Color.FromArgb(CType(CType(255,Byte),Integer), CType(CType(214,Byte),Integer), CType(CType(49,Byte),Integer)) + Me.Appearance.ForeColor = System.Drawing.SystemColors.ControlText + Me.Appearance.Options.UseBackColor = true + Me.Appearance.Options.UseFont = true + Me.Appearance.Options.UseForeColor = true + Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer)) - Me.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center Me.ClientSize = New System.Drawing.Size(577, 150) Me.ContextMenuStrip = Me.ContextMenuForm Me.Controls.Add(Me.PictureBox1) Me.Controls.Add(Me.PictureBoxGlobix) Me.Controls.Add(Me.PictureBoxPM) Me.Controls.Add(Me.PictureBoxSearch) - Me.DoubleBuffered = True - Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.ForeColor = System.Drawing.SystemColors.ControlText + Me.DoubleBuffered = true + Me.Font = New System.Drawing.Font("Tahoma", 8.25!) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Name = "frmFlowForm" Me.Text = "frmFlowForm_Test1" - Me.TopMost = True - Me.ContextMenuSystray.ResumeLayout(False) - Me.ContextMenuForm.ResumeLayout(False) - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBoxGlobix, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBoxPM, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBoxSearch, System.ComponentModel.ISupportInitialize).EndInit() - Me.ResumeLayout(False) + Me.TopMost = true + Me.ContextMenuSystray.ResumeLayout(false) + Me.ContextMenuForm.ResumeLayout(false) + CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.PictureBoxGlobix,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.PictureBoxPM,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.PictureBoxSearch,System.ComponentModel.ISupportInitialize).EndInit + Me.ResumeLayout(false) - End Sub +End Sub Friend WithEvents PictureBoxSearch As PictureBox Friend WithEvents PictureBoxPM As PictureBox Friend WithEvents PictureBoxGlobix As PictureBox diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index bf1c8e2c..bc40f20b 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -45,7 +45,7 @@ Public Class frmFlowForm Init.InitializeApplication() End Sub - Private Sub Init_Completed(sender As Object, e As EventArgs) + Private Sub Init_Completed(sender As Object, e As EventArgs) ' === Initialization Complete === ApplicationLoading = False SplashScreenManager.CloseForm(False) @@ -95,11 +95,11 @@ Public Class frmFlowForm 'TODO: Refresh Data End Sub - Private Sub frmFlowForm_MouseLeave(sender As Object, e As EventArgs) Handles Me.MouseLeave + Private Sub frmFlowForm_MouseLeave(sender As Object, e As EventArgs) Opacity = OPACITY_HIDDEN End Sub - Private Sub frmFlowForm_MouseEnter(sender As Object, e As EventArgs) Handles Me.MouseEnter + Private Sub frmFlowForm_MouseEnter(sender As Object, e As EventArgs) Handles Me.MouseEnter, MyBase.MouseLeave Opacity = OPACITY_SHOWN End Sub @@ -181,7 +181,17 @@ Public Class frmFlowForm frmAdministrationZooFlow.Show() End Sub - Private Sub PictureBox1_DragEnter(sender As Object, e As DragEventArgs) Handles PictureBox1.DragEnter - PictureBox1.BackgroundImage = My.Resources._1_LOGO_ZOO_FLOW_DROP2 + Private Sub frmFlowForm_DragEnter(sender As Object, e As DragEventArgs) Handles MyBase.DragEnter + PictureBox1.image = My.Resources._1_LOGO_ZOO_FLOW_DROP3 + + e.Effect = DragDropEffects.Copy + End Sub + + Private Sub frmFlowForm_DragDrop(sender As Object, e As DragEventArgs) Handles MyBase.DragDrop + PictureBox1.Image = My.Resources._1_LOGO_ZOO_FLOW1 + End Sub + + Private Sub frmFlowForm_DragLeave(sender As Object, e As EventArgs) Handles Me.DragLeave + PictureBox1.Image = My.Resources._1_LOGO_ZOO_FLOW1 End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/frmPreSearch.Designer.vb b/GUIs.ZooFlow/frmPreSearch.Designer.vb index 723948f6..4a71fba1 100644 --- a/GUIs.ZooFlow/frmPreSearch.Designer.vb +++ b/GUIs.ZooFlow/frmPreSearch.Designer.vb @@ -22,20 +22,33 @@ Partial Class frmPreSearch 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmPreSearch)) 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.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.GridControl1 = New DevExpress.XtraGrid.GridControl() - Me.TileView1 = New DevExpress.XtraGrid.Views.Tile.TileView() - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TileView1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SuspendLayout() + Me.ViewMain = New DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView() + Me.gridBand1 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() + Me.BandedGridColumn2 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() + Me.BandedGridColumn3 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() + Me.BandedGridColumn4 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() + Me.BandedGridColumn5 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() + Me.BandedGridColumn6 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() + Me.RepositoryItemDateEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemDateEdit() + Me.BandedGridColumn1 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() + Me.SvgImageCollection = New DevExpress.Utils.SvgImageCollection(Me.components) + CType(Me.RibbonControl1,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.GridControl1,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.ViewMain,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.RepositoryItemDateEdit1,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.RepositoryItemDateEdit1.CalendarTimeProperties,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.SvgImageCollection,System.ComponentModel.ISupportInitialize).BeginInit + Me.SuspendLayout ' 'RibbonControl1 ' @@ -46,9 +59,16 @@ Partial Class frmPreSearch Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] - Me.RibbonControl1.Size = New System.Drawing.Size(800, 158) + Me.RibbonControl1.Size = New System.Drawing.Size(564, 159) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Neue Suche" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"),DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem1.Name = "BarButtonItem1" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) @@ -68,10 +88,10 @@ Partial Class frmPreSearch ' 'RibbonStatusBar1 ' - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 426) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 611) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(800, 24) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(564, 22) ' 'RibbonPage2 ' @@ -81,45 +101,130 @@ Partial Class frmPreSearch 'GridControl1 ' Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.GridControl1.Location = New System.Drawing.Point(0, 158) - Me.GridControl1.MainView = Me.TileView1 + Me.GridControl1.Location = New System.Drawing.Point(0, 159) + Me.GridControl1.MainView = Me.ViewMain Me.GridControl1.MenuManager = Me.RibbonControl1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(800, 268) + Me.GridControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemDateEdit1}) + Me.GridControl1.Size = New System.Drawing.Size(564, 452) Me.GridControl1.TabIndex = 2 - Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.TileView1}) + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewMain}) ' - 'TileView1 + 'ViewMain ' - Me.TileView1.GridControl = Me.GridControl1 - Me.TileView1.Name = "TileView1" + Me.ViewMain.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.gridBand1}) + Me.ViewMain.Columns.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() {Me.BandedGridColumn1, Me.BandedGridColumn2, Me.BandedGridColumn3, Me.BandedGridColumn4, Me.BandedGridColumn5, Me.BandedGridColumn6}) + Me.ViewMain.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFullFocus + Me.ViewMain.GridControl = Me.GridControl1 + Me.ViewMain.Name = "ViewMain" + Me.ViewMain.OptionsBehavior.Editable = false + Me.ViewMain.OptionsBehavior.ReadOnly = true + Me.ViewMain.OptionsView.ShowBands = false + Me.ViewMain.OptionsView.ShowGroupPanel = false + Me.ViewMain.OptionsView.ShowIndicator = false + Me.ViewMain.OptionsView.ShowVerticalLines = DevExpress.Utils.DefaultBoolean.[False] + Me.ViewMain.RowSeparatorHeight = 10 ' - 'BarButtonItem1 + 'gridBand1 ' - Me.BarButtonItem1.Caption = "Neue Suche" - Me.BarButtonItem1.Id = 1 - Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem1.Name = "BarButtonItem1" + Me.gridBand1.Caption = "gridBand1" + Me.gridBand1.Columns.Add(Me.BandedGridColumn2) + Me.gridBand1.Columns.Add(Me.BandedGridColumn3) + Me.gridBand1.Columns.Add(Me.BandedGridColumn4) + Me.gridBand1.Columns.Add(Me.BandedGridColumn5) + Me.gridBand1.Columns.Add(Me.BandedGridColumn6) + Me.gridBand1.Name = "gridBand1" + Me.gridBand1.VisibleIndex = 0 + Me.gridBand1.Width = 336 + ' + 'BandedGridColumn2 + ' + Me.BandedGridColumn2.Caption = "Title" + Me.BandedGridColumn2.FieldName = "Title" + Me.BandedGridColumn2.Name = "BandedGridColumn2" + Me.BandedGridColumn2.Visible = true + Me.BandedGridColumn2.Width = 336 + ' + 'BandedGridColumn3 + ' + Me.BandedGridColumn3.Caption = "Results" + Me.BandedGridColumn3.FieldName = "Results" + Me.BandedGridColumn3.Name = "BandedGridColumn3" + Me.BandedGridColumn3.RowIndex = 1 + Me.BandedGridColumn3.Visible = true + Me.BandedGridColumn3.Width = 84 + ' + 'BandedGridColumn4 + ' + Me.BandedGridColumn4.Caption = "Changes" + Me.BandedGridColumn4.FieldName = "Changes" + Me.BandedGridColumn4.Name = "BandedGridColumn4" + Me.BandedGridColumn4.RowIndex = 1 + Me.BandedGridColumn4.Visible = true + Me.BandedGridColumn4.Width = 84 + ' + 'BandedGridColumn5 + ' + Me.BandedGridColumn5.Caption = "Overdue" + Me.BandedGridColumn5.FieldName = "Overdue" + Me.BandedGridColumn5.Name = "BandedGridColumn5" + Me.BandedGridColumn5.RowIndex = 1 + Me.BandedGridColumn5.Visible = true + Me.BandedGridColumn5.Width = 84 + ' + 'BandedGridColumn6 + ' + Me.BandedGridColumn6.Caption = "LastChange" + Me.BandedGridColumn6.ColumnEdit = Me.RepositoryItemDateEdit1 + Me.BandedGridColumn6.FieldName = "LastChange" + Me.BandedGridColumn6.Name = "BandedGridColumn6" + Me.BandedGridColumn6.RowIndex = 1 + Me.BandedGridColumn6.Visible = true + Me.BandedGridColumn6.Width = 84 + ' + 'RepositoryItemDateEdit1 + ' + Me.RepositoryItemDateEdit1.AutoHeight = false + Me.RepositoryItemDateEdit1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.RepositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.RepositoryItemDateEdit1.Name = "RepositoryItemDateEdit1" + ' + 'BandedGridColumn1 + ' + Me.BandedGridColumn1.Caption = "UserID" + Me.BandedGridColumn1.FieldName = "UserID" + Me.BandedGridColumn1.Name = "BandedGridColumn1" + Me.BandedGridColumn1.Visible = true + ' + 'SvgImageCollection + ' + Me.SvgImageCollection.Add("green_arrow_up", "image://svgimages/icon builder/actions_arrow4up.svg") + Me.SvgImageCollection.Add("warning", "image://svgimages/outlook inspired/highimportance.svg") ' 'frmPreSearch ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AllowFormGlass = DevExpress.Utils.DefaultBoolean.[True] + Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(800, 450) + Me.ClientSize = New System.Drawing.Size(564, 633) Me.Controls.Add(Me.GridControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) + Me.IconOptions.SvgImage = CType(resources.GetObject("frmPreSearch.IconOptions.SvgImage"),DevExpress.Utils.Svg.SvgImage) Me.Name = "frmPreSearch" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 - Me.Text = "frmPreSearch" - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TileView1, System.ComponentModel.ISupportInitialize).EndInit() - Me.ResumeLayout(False) - Me.PerformLayout() + Me.Text = "Vordefinierte Suchen" + CType(Me.RibbonControl1,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.GridControl1,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.ViewMain,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.RepositoryItemDateEdit1.CalendarTimeProperties,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.RepositoryItemDateEdit1,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.SvgImageCollection,System.ComponentModel.ISupportInitialize).EndInit + Me.ResumeLayout(false) + Me.PerformLayout - End Sub +End Sub Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage @@ -129,5 +234,14 @@ Partial Class frmPreSearch Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl - Friend WithEvents TileView1 As DevExpress.XtraGrid.Views.Tile.TileView + Friend WithEvents ViewMain As DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView + Friend WithEvents SvgImageCollection As DevExpress.Utils.SvgImageCollection + Friend WithEvents BandedGridColumn2 As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn + Friend WithEvents BandedGridColumn3 As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn + Friend WithEvents BandedGridColumn4 As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn + Friend WithEvents BandedGridColumn5 As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn + Friend WithEvents BandedGridColumn1 As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn + Friend WithEvents gridBand1 As DevExpress.XtraGrid.Views.BandedGrid.GridBand + Friend WithEvents BandedGridColumn6 As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn + Friend WithEvents RepositoryItemDateEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemDateEdit End Class diff --git a/GUIs.ZooFlow/frmPreSearch.resx b/GUIs.ZooFlow/frmPreSearch.resx index 556a0fb2..6ff9aefd 100644 --- a/GUIs.ZooFlow/frmPreSearch.resx +++ b/GUIs.ZooFlow/frmPreSearch.resx @@ -142,6 +142,29 @@ ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + 17, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPcCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iRmluZCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg + MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cjwvc3R5 + bGU+DQogIDxwYXRoIGQ9Ik0yOS41LDE5LjdMMjkuNSwxOS43TDI5LjUsMTkuN0MyOS41LDE5LjcsMjku + NSwxOS43LDI5LjUsMTkuN0wyMy44LDZsMCwwYy0wLjQtMS4yLTEuNS0yLTIuOC0yICBjLTEuNywwLTMs + MS4zLTMsM3YzaC00VjdjMC0xLjctMS4zLTMtMy0zQzkuNyw0LDguNiw0LjksOC4yLDZsMCwwTDIuNSwx + OS43YzAsMCwwLDAsMCwwbDAsMGgwQzIuMiwyMC40LDIsMjEuMiwyLDIyICBjMCwzLjMsMi43LDYsNiw2 + czYtMi43LDYtNnYtNGg0djRjMCwzLjMsMi43LDYsNiw2czYtMi43LDYtNkMzMCwyMS4yLDI5LjgsMjAu + NCwyOS41LDE5Ljd6IE04LDI2Yy0yLjIsMC00LTEuOC00LTRzMS44LTQsNC00ICBzNCwxLjgsNCw0UzEw + LjIsMjYsOCwyNnogTTI0LDI2Yy0yLjIsMC00LTEuOC00LTRzMS44LTQsNC00czQsMS44LDQsNFMyNi4y + LDI2LDI0LDI2eiIgY2xhc3M9IkJsYWNrIiAvPg0KPC9zdmc+Cw== \ No newline at end of file diff --git a/GUIs.ZooFlow/frmPreSearch.vb b/GUIs.ZooFlow/frmPreSearch.vb index 756d7730..61858212 100644 --- a/GUIs.ZooFlow/frmPreSearch.vb +++ b/GUIs.ZooFlow/frmPreSearch.vb @@ -1,4 +1,7 @@ -Imports DigitalData.Modules.Logging +Imports DevExpress.XtraEditors +Imports DevExpress.XtraGrid +Imports DevExpress.XtraBars.Ribbon +Imports DigitalData.Modules.Logging Public Class frmPreSearch Private Logger As Logger Public Sub New() @@ -6,14 +9,90 @@ Public Class frmPreSearch InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. Logger = My.LogConfig.GetLogger() - End Sub Private Sub frmPreSearch_Load(sender As Object, e As EventArgs) Handles Me.Load - RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Red + GridControl1.DataSource = LoadSearches() + + Dim oChangesColumn = ViewMain.Columns.Item("Changes") + Dim oOverdueColumn = ViewMain.Columns.Item("Overdue") + Dim oResultsColumn = ViewMain.Columns.Item("Results") + Dim oTitleColumn = ViewMain.Columns.Item("Title") + Dim oUserIdColumn = ViewMain.Columns.Item("UserID") + Dim oLastChangeColumn = ViewMain.Columns.Item("LastChange") + + Dim oChangesRule = GetChangesFormatRule() + oChangesRule.Column = oChangesColumn + + Dim oOverdueRule = GetOverdueFormatRule() + oOverdueRule.Column = oOverdueColumn + + Dim oResultsRule = GetResultsFormatRule() + oResultsRule.Column = oResultsColumn + + ViewMain.FormatRules.AddRange({oChangesRule, oResultsRule, oOverdueRule}) + + oTitleColumn.AppearanceCell.FontStyleDelta = FontStyle.Bold + oTitleColumn.AppearanceCell.FontSizeDelta = 1 + End Sub + + Private Function GetResultsFormatRule() As GridFormatRule + Dim gridFormatRule As New GridFormatRule() + Dim formatConditionRuleDataBar As New FormatConditionRuleDataBar With { + .PredefinedName = "Yellow", + .AutomaticType = FormatConditionAutomaticType.ZeroBased + } + gridFormatRule.Rule = formatConditionRuleDataBar + + Return gridFormatRule + End Function + + Private Function GetOverdueFormatRule() As GridFormatRule + Dim oFormatRule As New GridFormatRule() + Dim oRule As New FormatConditionRuleIconSet With { + .IconSet = New FormatConditionIconSet() + } + Dim oIconSet As FormatConditioniconset = oRule.IconSet + oIconSet.ValueType = FormatConditionValueType.Number + + Dim oIcon1 As New FormatConditioniconseticon() With { + .Icon = SvgImageCollection.GetImage("warning"), + .Value = 0, + .ValueComparison = FormatConditionComparisonType.Greater + } + + oIconSet.Icons.AddRange({oIcon1}) + + oFormatRule.Rule = oRule + + Return oFormatRule + End Function + + Private Function GetChangesFormatRule() As GridFormatRule + Dim oFormatRule As New GridFormatRule() + Dim oRule As New FormatConditionRuleIconSet With { + .IconSet = New FormatConditionIconSet() + } + Dim oIconSet As FormatConditioniconset = oRule.IconSet + oIconSet.ValueType = FormatConditionValueType.Number + + Dim oIcon1 As New FormatConditioniconseticon() With { + .Icon = SvgImageCollection.GetImage("green_arrow_up"), + .Value = 2, + .ValueComparison = FormatConditionComparisonType.Greater + } + + oIconSet.Icons.AddRange({oIcon1}) + + oFormatRule.Rule = oRule + + Return oFormatRule + End Function + + Private Function LoadSearches() As DataTable Dim oSQL = $"SELECT * FROM VWIDB_SEARCH_LANDING" Dim oDTLanding As DataTable = My.DatabaseIDB.GetDatatable(oSQL) - GridControl1.DataSource = oDTLanding - End Sub + Return oDTLanding + End Function Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick diff --git a/GUIs.ZooFlow/frmSearchStart.Designer.vb b/GUIs.ZooFlow/frmSearchStart.Designer.vb index fed0e389..2e3c7a5e 100644 --- a/GUIs.ZooFlow/frmSearchStart.Designer.vb +++ b/GUIs.ZooFlow/frmSearchStart.Designer.vb @@ -66,46 +66,46 @@ Partial Class frmSearchStart Me.MehrfachauswahlAktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.MehrfachauswahlInaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SimpleButton1 = New DevExpress.XtraEditors.SimpleButton() - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.RepositoryItemRadioGroup1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.Panel1.SuspendLayout() - CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.XtraTabControl1.SuspendLayout() - CType(Me.GridControlSerchTerms, System.ComponentModel.ISupportInitialize).BeginInit() - Me.ContextMenuStripSearchTerms.SuspendLayout() - CType(Me.GridViewSearchTerms, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SplitContainerControlSearch, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SplitContainerControlSearch.SuspendLayout() - Me.ContextMenuStripMultiselect.SuspendLayout() - Me.SuspendLayout() + CType(Me.RibbonControl1,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.RepositoryItemRadioGroup1,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.RepositoryItemComboBox1,System.ComponentModel.ISupportInitialize).BeginInit + Me.Panel1.SuspendLayout + CType(Me.XtraTabControl1,System.ComponentModel.ISupportInitialize).BeginInit + Me.XtraTabControl1.SuspendLayout + CType(Me.GridControlSerchTerms,System.ComponentModel.ISupportInitialize).BeginInit + Me.ContextMenuStripSearchTerms.SuspendLayout + CType(Me.GridViewSearchTerms,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.SplitContainerControlSearch,System.ComponentModel.ISupportInitialize).BeginInit + Me.SplitContainerControlSearch.SuspendLayout + Me.ContextMenuStripMultiselect.SuspendLayout + Me.SuspendLayout ' 'RibbonControl1 ' - Me.RibbonControl1.AutoSizeItems = True + Me.RibbonControl1.AutoSizeItems = true Me.RibbonControl1.ExpandCollapseItem.Id = 0 Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItemNewSearch, Me.BarButtonItem2, Me.BarHeaderItem1, Me.BarEditItem1, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarEditItem2, Me.BarStaticItemInfo, Me.BarButtonItem4}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 10 + Me.RibbonControl1.MaxItemId = 11 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemRadioGroup1, Me.RepositoryItemComboBox1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] - Me.RibbonControl1.Size = New System.Drawing.Size(1070, 158) + Me.RibbonControl1.Size = New System.Drawing.Size(1070, 159) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'BarButtonItemNewSearch ' Me.BarButtonItemNewSearch.Caption = "Neue Suche" Me.BarButtonItemNewSearch.Id = 1 - Me.BarButtonItemNewSearch.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItemNewSearch.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItemNewSearch.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItemNewSearch.ImageOptions.SvgImage"),DevExpress.Utils.Svg.SvgImage) Me.BarButtonItemNewSearch.Name = "BarButtonItemNewSearch" ' 'BarButtonItem2 ' Me.BarButtonItem2.Caption = "Suchprofil speichern" Me.BarButtonItem2.Id = 2 - Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"),DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem2.Name = "BarButtonItem2" Me.BarButtonItem2.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText ' @@ -130,7 +130,7 @@ Partial Class frmSearchStart ' Me.BarButtonItem1.Caption = "Suche leeren" Me.BarButtonItem1.Id = 5 - Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"),DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem1.Name = "BarButtonItem1" ' 'BarButtonItem3 @@ -144,12 +144,12 @@ Partial Class frmSearchStart Me.BarEditItem2.Caption = "Suchen" Me.BarEditItem2.Edit = Me.RepositoryItemComboBox1 Me.BarEditItem2.Id = 7 - Me.BarEditItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarEditItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarEditItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarEditItem2.ImageOptions.SvgImage"),DevExpress.Utils.Svg.SvgImage) Me.BarEditItem2.Name = "BarEditItem2" ' 'RepositoryItemComboBox1 ' - Me.RepositoryItemComboBox1.AutoHeight = False + Me.RepositoryItemComboBox1.AutoHeight = false Me.RepositoryItemComboBox1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.RepositoryItemComboBox1.Name = "RepositoryItemComboBox1" ' @@ -162,7 +162,7 @@ Partial Class frmSearchStart ' Me.BarButtonItem4.Caption = "Suche starten" Me.BarButtonItem4.Id = 9 - Me.BarButtonItem4.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem4.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"),DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem4.Name = "BarButtonItem4" ' 'RibbonPage1 @@ -189,10 +189,10 @@ Partial Class frmSearchStart 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItemInfo) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 577) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 579) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1070, 24) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1070, 22) ' 'Panel1 ' @@ -200,8 +200,8 @@ Partial Class frmSearchStart Me.Panel1.Controls.Add(Me.cmbProfile) Me.Panel1.Controls.Add(Me.Label1) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top - Me.Panel1.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Panel1.Location = New System.Drawing.Point(0, 158) + Me.Panel1.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) + Me.Panel1.Location = New System.Drawing.Point(0, 159) Me.Panel1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.Panel1.Name = "Panel1" Me.Panel1.Size = New System.Drawing.Size(1070, 57) @@ -209,10 +209,10 @@ Partial Class frmSearchStart ' 'cmbProfile ' - Me.cmbProfile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.cmbProfile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) Me.cmbProfile.DisplayMember = "DOKART_ID" - Me.cmbProfile.FormattingEnabled = True + Me.cmbProfile.FormattingEnabled = true Me.cmbProfile.Location = New System.Drawing.Point(3, 23) Me.cmbProfile.Name = "cmbProfile" Me.cmbProfile.Size = New System.Drawing.Size(1065, 21) @@ -221,7 +221,7 @@ Partial Class frmSearchStart ' 'Label1 ' - Me.Label1.AutoSize = True + Me.Label1.AutoSize = true Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.Label1.Location = New System.Drawing.Point(3, 3) Me.Label1.Name = "Label1" @@ -243,61 +243,61 @@ Partial Class frmSearchStart 'XtraTabPage1 ' Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(748, 285) + Me.XtraTabPage1.Size = New System.Drawing.Size(748, 287) Me.XtraTabPage1.Text = "Search#1" ' 'XtraTabPage2 ' Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(748, 285) + Me.XtraTabPage2.Size = New System.Drawing.Size(748, 287) Me.XtraTabPage2.Text = "Search#2" ' 'XtraTabPage3 ' Me.XtraTabPage3.Name = "XtraTabPage3" - Me.XtraTabPage3.Size = New System.Drawing.Size(748, 285) + Me.XtraTabPage3.Size = New System.Drawing.Size(748, 287) Me.XtraTabPage3.Text = "Search#3" ' 'XtraTabPage4 ' Me.XtraTabPage4.Name = "XtraTabPage4" - Me.XtraTabPage4.Size = New System.Drawing.Size(748, 285) + Me.XtraTabPage4.Size = New System.Drawing.Size(748, 287) Me.XtraTabPage4.Text = "Search#4" ' 'XtraTabPage5 ' Me.XtraTabPage5.Name = "XtraTabPage5" - Me.XtraTabPage5.Size = New System.Drawing.Size(748, 285) + Me.XtraTabPage5.Size = New System.Drawing.Size(748, 287) Me.XtraTabPage5.Text = "Search#5" ' 'XtraTabPage6 ' Me.XtraTabPage6.Name = "XtraTabPage6" - Me.XtraTabPage6.Size = New System.Drawing.Size(748, 285) + Me.XtraTabPage6.Size = New System.Drawing.Size(748, 287) Me.XtraTabPage6.Text = "Search#6" ' 'XtraTabPage7 ' Me.XtraTabPage7.Name = "XtraTabPage7" - Me.XtraTabPage7.Size = New System.Drawing.Size(748, 285) + Me.XtraTabPage7.Size = New System.Drawing.Size(748, 287) Me.XtraTabPage7.Text = "Search#7" ' 'XtraTabPage8 ' Me.XtraTabPage8.Name = "XtraTabPage8" - Me.XtraTabPage8.Size = New System.Drawing.Size(748, 285) + Me.XtraTabPage8.Size = New System.Drawing.Size(748, 287) Me.XtraTabPage8.Text = "Search#8" ' 'XtraTabPage9 ' Me.XtraTabPage9.Name = "XtraTabPage9" - Me.XtraTabPage9.Size = New System.Drawing.Size(748, 285) + Me.XtraTabPage9.Size = New System.Drawing.Size(748, 287) Me.XtraTabPage9.Text = "Search#9" ' 'XtraTabPage10 ' Me.XtraTabPage10.Name = "XtraTabPage10" - Me.XtraTabPage10.Size = New System.Drawing.Size(748, 285) + Me.XtraTabPage10.Size = New System.Drawing.Size(748, 287) Me.XtraTabPage10.Text = "Search#10" ' 'GridControlSerchTerms @@ -344,23 +344,23 @@ Partial Class frmSearchStart ' 'GridViewSearchTerms ' - Me.GridViewSearchTerms.Appearance.EvenRow.BackColor = System.Drawing.Color.FromArgb(CType(CType(236, Byte), Integer), CType(CType(233, Byte), Integer), CType(CType(125, Byte), Integer)) - Me.GridViewSearchTerms.Appearance.EvenRow.Options.UseBackColor = True + Me.GridViewSearchTerms.Appearance.EvenRow.BackColor = System.Drawing.Color.FromArgb(CType(CType(236,Byte),Integer), CType(CType(233,Byte),Integer), CType(CType(125,Byte),Integer)) + Me.GridViewSearchTerms.Appearance.EvenRow.Options.UseBackColor = true Me.GridViewSearchTerms.GridControl = Me.GridControlSerchTerms Me.GridViewSearchTerms.Name = "GridViewSearchTerms" Me.GridViewSearchTerms.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[True] - Me.GridViewSearchTerms.OptionsBehavior.Editable = False - Me.GridViewSearchTerms.OptionsSelection.EnableAppearanceFocusedCell = False - Me.GridViewSearchTerms.OptionsView.EnableAppearanceEvenRow = True - Me.GridViewSearchTerms.OptionsView.ShowGroupPanel = False - Me.GridViewSearchTerms.OptionsView.ShowViewCaption = True + Me.GridViewSearchTerms.OptionsBehavior.Editable = false + Me.GridViewSearchTerms.OptionsSelection.EnableAppearanceFocusedCell = false + Me.GridViewSearchTerms.OptionsView.EnableAppearanceEvenRow = true + Me.GridViewSearchTerms.OptionsView.ShowGroupPanel = false + Me.GridViewSearchTerms.OptionsView.ShowViewCaption = true Me.GridViewSearchTerms.ViewCaption = "Such-Kriterium" ' 'SplitContainerControlSearch ' - Me.SplitContainerControlSearch.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.SplitContainerControlSearch.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) Me.SplitContainerControlSearch.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 Me.SplitContainerControlSearch.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2 Me.SplitContainerControlSearch.Location = New System.Drawing.Point(0, 207) @@ -395,9 +395,9 @@ Partial Class frmSearchStart ' 'SimpleButton1 ' - Me.SimpleButton1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.SimpleButton1.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButton1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.SimpleButton1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) + Me.SimpleButton1.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButton1.ImageOptions.SvgImage"),DevExpress.Utils.Svg.SvgImage) Me.SimpleButton1.Location = New System.Drawing.Point(461, 523) Me.SimpleButton1.Name = "SimpleButton1" Me.SimpleButton1.Size = New System.Drawing.Size(141, 45) @@ -406,8 +406,9 @@ Partial Class frmSearchStart ' 'frmSearchStart ' - Me.Appearance.Options.UseFont = True - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AllowFormGlass = DevExpress.Utils.DefaultBoolean.[True] + Me.Appearance.Options.UseFont = true + Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1070, 601) Me.Controls.Add(Me.SimpleButton1) @@ -415,30 +416,30 @@ Partial Class frmSearchStart Me.Controls.Add(Me.Panel1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) - Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.IconOptions.Icon = CType(resources.GetObject("frmSearchStart.IconOptions.Icon"), System.Drawing.Icon) - Me.IconOptions.SvgImage = CType(resources.GetObject("frmSearchStart.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.Font = New System.Drawing.Font("Tahoma", 8.25!) + Me.IconOptions.Icon = CType(resources.GetObject("frmSearchStart.IconOptions.Icon"),System.Drawing.Icon) + Me.IconOptions.SvgImage = CType(resources.GetObject("frmSearchStart.IconOptions.SvgImage"),DevExpress.Utils.Svg.SvgImage) Me.Name = "frmSearchStart" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 Me.Text = "ZooFlow Suche" - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.RepositoryItemRadioGroup1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit() - Me.Panel1.ResumeLayout(False) - Me.Panel1.PerformLayout() - CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.XtraTabControl1.ResumeLayout(False) - CType(Me.GridControlSerchTerms, System.ComponentModel.ISupportInitialize).EndInit() - Me.ContextMenuStripSearchTerms.ResumeLayout(False) - CType(Me.GridViewSearchTerms, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.SplitContainerControlSearch, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainerControlSearch.ResumeLayout(False) - Me.ContextMenuStripMultiselect.ResumeLayout(False) - Me.ResumeLayout(False) - Me.PerformLayout() + CType(Me.RibbonControl1,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.RepositoryItemRadioGroup1,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.RepositoryItemComboBox1,System.ComponentModel.ISupportInitialize).EndInit + Me.Panel1.ResumeLayout(false) + Me.Panel1.PerformLayout + CType(Me.XtraTabControl1,System.ComponentModel.ISupportInitialize).EndInit + Me.XtraTabControl1.ResumeLayout(false) + CType(Me.GridControlSerchTerms,System.ComponentModel.ISupportInitialize).EndInit + Me.ContextMenuStripSearchTerms.ResumeLayout(false) + CType(Me.GridViewSearchTerms,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.SplitContainerControlSearch,System.ComponentModel.ISupportInitialize).EndInit + Me.SplitContainerControlSearch.ResumeLayout(false) + Me.ContextMenuStripMultiselect.ResumeLayout(false) + Me.ResumeLayout(false) + Me.PerformLayout - End Sub +End Sub Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage diff --git a/GUIs.ZooFlow/frmSearchStart.resx b/GUIs.ZooFlow/frmSearchStart.resx index 4b3137c7..710fdc7b 100644 --- a/GUIs.ZooFlow/frmSearchStart.resx +++ b/GUIs.ZooFlow/frmSearchStart.resx @@ -2008,20 +2008,20 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPcCAAAC77u/ + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iRmluZCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg - MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cjwvc3R5 - bGU+DQogIDxwYXRoIGQ9Ik0yOS41LDE5LjdMMjkuNSwxOS43TDI5LjUsMTkuN0MyOS41LDE5LjcsMjku - NSwxOS43LDI5LjUsMTkuN0wyMy44LDZsMCwwYy0wLjQtMS4yLTEuNS0yLTIuOC0yICBjLTEuNywwLTMs - MS4zLTMsM3YzaC00VjdjMC0xLjctMS4zLTMtMy0zQzkuNyw0LDguNiw0LjksOC4yLDZsMCwwTDIuNSwx - OS43YzAsMCwwLDAsMCwwbDAsMGgwQzIuMiwyMC40LDIsMjEuMiwyLDIyICBjMCwzLjMsMi43LDYsNiw2 - czYtMi43LDYtNnYtNGg0djRjMCwzLjMsMi43LDYsNiw2czYtMi43LDYtNkMzMCwyMS4yLDI5LjgsMjAu - NCwyOS41LDE5Ljd6IE04LDI2Yy0yLjIsMC00LTEuOC00LTRzMS44LTQsNC00ICBzNCwxLjgsNCw0UzEw - LjIsMjYsOCwyNnogTTI0LDI2Yy0yLjIsMC00LTEuOC00LTRzMS44LTQsNC00czQsMS44LDQsNFMyNi4y - LDI2LDI0LDI2eiIgY2xhc3M9IkJsYWNrIiAvPg0KPC9zdmc+Cw== + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM + MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5 + YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu + MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x + LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N + Cjwvc3ZnPgs= \ No newline at end of file diff --git a/GUIs.ZooFlow/frmSplash.Designer.vb b/GUIs.ZooFlow/frmSplash.Designer.vb index ee51fd9c..2e623e7d 100644 --- a/GUIs.ZooFlow/frmSplash.Designer.vb +++ b/GUIs.ZooFlow/frmSplash.Designer.vb @@ -29,46 +29,46 @@ Partial Class frmSplash Me.txtActionName = New DevExpress.XtraEditors.LabelControl() Me.Version = New DevExpress.XtraEditors.LabelControl() Me.ProgressBarControl1 = New DevExpress.XtraEditors.ProgressBarControl() - CType(Me.pictureEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.pictureEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ProgressBarControl1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SuspendLayout() + CType(Me.pictureEdit2.Properties,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.pictureEdit1.Properties,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.ProgressBarControl1.Properties,System.ComponentModel.ISupportInitialize).BeginInit + Me.SuspendLayout ' 'pictureEdit2 ' - Me.pictureEdit2.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.pictureEdit2.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) Me.pictureEdit2.Cursor = System.Windows.Forms.Cursors.Default - Me.pictureEdit2.EditValue = CType(resources.GetObject("pictureEdit2.EditValue"), Object) + Me.pictureEdit2.EditValue = CType(resources.GetObject("pictureEdit2.EditValue"),Object) Me.pictureEdit2.Location = New System.Drawing.Point(12, 12) Me.pictureEdit2.Name = "pictureEdit2" - Me.pictureEdit2.Properties.AllowFocused = False + Me.pictureEdit2.Properties.AllowFocused = false Me.pictureEdit2.Properties.Appearance.BackColor = System.Drawing.Color.Transparent - Me.pictureEdit2.Properties.Appearance.Options.UseBackColor = True + Me.pictureEdit2.Properties.Appearance.Options.UseBackColor = true Me.pictureEdit2.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder - Me.pictureEdit2.Properties.ShowMenu = False + Me.pictureEdit2.Properties.ShowMenu = false Me.pictureEdit2.Size = New System.Drawing.Size(525, 260) Me.pictureEdit2.TabIndex = 14 ' 'pictureEdit1 ' - Me.pictureEdit1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.pictureEdit1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) Me.pictureEdit1.Cursor = System.Windows.Forms.Cursors.Default - Me.pictureEdit1.EditValue = CType(resources.GetObject("pictureEdit1.EditValue"), Object) + Me.pictureEdit1.EditValue = CType(resources.GetObject("pictureEdit1.EditValue"),Object) Me.pictureEdit1.Location = New System.Drawing.Point(335, 346) Me.pictureEdit1.Name = "pictureEdit1" - Me.pictureEdit1.Properties.AllowFocused = False + Me.pictureEdit1.Properties.AllowFocused = false Me.pictureEdit1.Properties.Appearance.BackColor = System.Drawing.Color.Transparent - Me.pictureEdit1.Properties.Appearance.Options.UseBackColor = True + Me.pictureEdit1.Properties.Appearance.Options.UseBackColor = true Me.pictureEdit1.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder - Me.pictureEdit1.Properties.ShowMenu = False + Me.pictureEdit1.Properties.ShowMenu = false Me.pictureEdit1.Size = New System.Drawing.Size(202, 28) Me.pictureEdit1.TabIndex = 13 ' 'labelControl2 ' - Me.labelControl2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.labelControl2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles) Me.labelControl2.Location = New System.Drawing.Point(12, 278) Me.labelControl2.Name = "labelControl2" Me.labelControl2.Size = New System.Drawing.Size(50, 13) @@ -77,16 +77,16 @@ Partial Class frmSplash ' 'txtActionName ' - Me.txtActionName.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.txtActionName.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles) Me.txtActionName.Location = New System.Drawing.Point(12, 321) Me.txtActionName.Name = "txtActionName" - Me.txtActionName.Size = New System.Drawing.Size(45, 13) + Me.txtActionName.Size = New System.Drawing.Size(48, 13) Me.txtActionName.TabIndex = 12 Me.txtActionName.Text = "Loading.." ' 'Version ' - Me.Version.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Version.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles) Me.Version.Location = New System.Drawing.Point(12, 361) Me.Version.Name = "Version" Me.Version.Size = New System.Drawing.Size(54, 13) @@ -97,12 +97,16 @@ Partial Class frmSplash ' Me.ProgressBarControl1.Location = New System.Drawing.Point(12, 297) Me.ProgressBarControl1.Name = "ProgressBarControl1" + Me.ProgressBarControl1.Properties.EndColor = System.Drawing.Color.Empty + Me.ProgressBarControl1.Properties.LookAndFeel.SkinName = "Office 2019 Colorful" + Me.ProgressBarControl1.Properties.LookAndFeel.UseDefaultLookAndFeel = false + Me.ProgressBarControl1.Properties.StartColor = System.Drawing.Color.Empty Me.ProgressBarControl1.Size = New System.Drawing.Size(525, 18) Me.ProgressBarControl1.TabIndex = 15 ' 'frmSplash ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(549, 386) Me.Controls.Add(Me.ProgressBarControl1) @@ -113,13 +117,13 @@ Partial Class frmSplash Me.Controls.Add(Me.labelControl2) Me.Name = "frmSplash" Me.Text = "Form1" - CType(Me.pictureEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.pictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ProgressBarControl1.Properties, System.ComponentModel.ISupportInitialize).EndInit() - Me.ResumeLayout(False) - Me.PerformLayout() + CType(Me.pictureEdit2.Properties,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.pictureEdit1.Properties,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.ProgressBarControl1.Properties,System.ComponentModel.ISupportInitialize).EndInit + Me.ResumeLayout(false) + Me.PerformLayout - End Sub +End Sub Private WithEvents pictureEdit2 As DevExpress.XtraEditors.PictureEdit Private WithEvents pictureEdit1 As DevExpress.XtraEditors.PictureEdit Private WithEvents labelControl2 As DevExpress.XtraEditors.LabelControl diff --git a/GUIs.ZooFlow/frmSplash.vb b/GUIs.ZooFlow/frmSplash.vb index 8cf7d7ab..e49db568 100644 --- a/GUIs.ZooFlow/frmSplash.vb +++ b/GUIs.ZooFlow/frmSplash.vb @@ -1,9 +1,11 @@ -Public Class frmSplash +Imports DevExpress.LookAndFeel + +Public Class frmSplash Sub New InitializeComponent() End Sub - Public Overrides Sub ProcessCommand(ByVal cmd As System.Enum, ByVal arg As Object) + Public Overrides Sub ProcessCommand(ByVal cmd As [Enum], ByVal arg As Object) MyBase.ProcessCommand(cmd, arg) Dim oCommand As SplashScreenCommand = CType(cmd, SplashScreenCommand)