diff --git a/Controls.SQLEditor/frmSQLEditor.vb b/Controls.SQLEditor/frmSQLEditor.vb index 3e636e24..68a984ae 100644 --- a/Controls.SQLEditor/frmSQLEditor.vb +++ b/Controls.SQLEditor/frmSQLEditor.vb @@ -47,7 +47,7 @@ Public Class frmSQLEditor Private Sub frmSQLEditor_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try - Init(LogConfig) + InitializeBaseForm(LogConfig) txtSQL.Text = SQLString diff --git a/GUIs.Common/Base/BaseRibbonForm.vb b/GUIs.Common/Base/BaseRibbonForm.vb index 161be621..6e6b586f 100644 --- a/GUIs.Common/Base/BaseRibbonForm.vb +++ b/GUIs.Common/Base/BaseRibbonForm.vb @@ -30,7 +30,7 @@ Namespace Base Public Sub New() End Sub - Public Sub Init(LogConfig As LogConfig) + Public Sub InitializeBaseForm(LogConfig As LogConfig) ' Get the full name of the inheriting form ' so the log messages have the right classname Dim oClassName = [GetType]().FullName diff --git a/GUIs.Monitor/frmMonitor.vb b/GUIs.Monitor/frmMonitor.vb index 15af0f75..d727ac60 100644 --- a/GUIs.Monitor/frmMonitor.vb +++ b/GUIs.Monitor/frmMonitor.vb @@ -77,7 +77,7 @@ Public Class frmMonitor Try LogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, "Digital Data", "Monitor") ConfigManager = New ConfigManager(Of Config)(LogConfig, Application.UserAppDataPath, Application.UserAppDataPath, Application.StartupPath) - Init(LogConfig) + InitializeBaseForm(LogConfig) If ConfigManager.Config.ConnectionString = String.Empty Then Dim oSQLConfig As New frmSQLConfig(LogConfig) diff --git a/GUIs.ZooFlow/Administration/ClassDetailPage.vb b/GUIs.ZooFlow/Administration/ClassDetailPage.vb index aab3eb75..0b69f017 100644 --- a/GUIs.ZooFlow/Administration/ClassDetailPage.vb +++ b/GUIs.ZooFlow/Administration/ClassDetailPage.vb @@ -88,6 +88,10 @@ Public Class ClassDetailPages Continue For End If + If TypeOf oContainer.Control IsNot BaseEdit Then + Continue For + End If + Dim oControl As BaseEdit = oContainer.Control AddHandler oControl.GotFocus, AddressOf Handle_Focus AddHandler oControl.EditValueChanged, AddressOf Handle_EditValueChanged diff --git a/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.Designer.vb index ffc2e946..f9f843e9 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.Designer.vb @@ -1344,6 +1344,7 @@ Partial Class frmAdmin_ClipboardWatcher Me.Controls.Add(Me.XtraTabControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) + Me.IconOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_CW_DevExpress Me.Name = "frmAdmin_ClipboardWatcher" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 diff --git a/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.vb b/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.vb index c440635d..b6bef685 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.vb @@ -57,12 +57,14 @@ Public Class frmAdmin_ClipboardWatcher InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + InitializeBaseForm(My.LogConfig) + Me.PrimaryKey = PrimaryKey Me.IsInsert = IsInsert End Sub Private Sub frmAdmin_CWProfile_Load(sender As Object, e As EventArgs) Handles Me.Load - Init(My.LogConfig) + InitializeBaseForm(My.LogConfig) 'TODO: Diese Codezeile lädt Daten in die Tabelle "DSDD_Stammdaten.TBDD_CONNECTION". Sie können sie bei Bedarf verschieben oder entfernen. diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb index 31784a8e..b3482748 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb @@ -59,6 +59,7 @@ Partial Class frmAdmin_Globix Me.TextEdit8 = New DevExpress.XtraEditors.TextEdit() Me.TextEdit13 = New DevExpress.XtraEditors.TextEdit() Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit() + Me.ComboBoxEdit2 = New DevExpress.XtraEditors.ComboBoxEdit() Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem22 = New DevExpress.XtraLayout.LayoutControlItem() @@ -74,6 +75,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem26 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem25 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem30 = New DevExpress.XtraLayout.LayoutControlItem() + Me.Filestore = New DevExpress.XtraLayout.LayoutControlItem() Me.XtraTabControl2 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPageManIndexe = New DevExpress.XtraTab.XtraTabPage() Me.LayoutControlManIndexe = New DevExpress.XtraLayout.LayoutControl() @@ -92,6 +94,8 @@ Partial Class frmAdmin_Globix Me.TextEdit11 = New DevExpress.XtraEditors.TextEdit() Me.TextEdit12 = New DevExpress.XtraEditors.TextEdit() Me.SpinEdit1 = New DevExpress.XtraEditors.SpinEdit() + Me.ComboBoxEdit3 = New DevExpress.XtraEditors.ComboBoxEdit() + Me.ComboBoxEdit4 = New DevExpress.XtraEditors.ComboBoxEdit() Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem17 = New DevExpress.XtraLayout.LayoutControlItem() @@ -107,6 +111,8 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem15 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem14 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem13 = New DevExpress.XtraLayout.LayoutControlItem() Me.ListBoxAutoIndexe = New System.Windows.Forms.ListBox() Me.XtraTabPageRework = New DevExpress.XtraTab.XtraTabPage() Me.LayoutControlRework = New DevExpress.XtraLayout.LayoutControl() @@ -117,12 +123,6 @@ Partial Class frmAdmin_Globix Me.XtraTabPageDynamicFolder = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPageAutoSelect = New DevExpress.XtraTab.XtraTabPage() Me.TBDD_INDEX_MANTableAdapter = New DigitalData.GUIs.ZooFlow.GlobixDatasetTableAdapters.TBDD_INDEX_MANTableAdapter() - Me.ComboBoxEdit2 = New DevExpress.XtraEditors.ComboBoxEdit() - Me.Filestore = New DevExpress.XtraLayout.LayoutControlItem() - Me.ComboBoxEdit3 = New DevExpress.XtraEditors.ComboBoxEdit() - Me.LayoutControlItem14 = New DevExpress.XtraLayout.LayoutControlItem() - Me.ComboBoxEdit4 = New DevExpress.XtraEditors.ComboBoxEdit() - Me.LayoutControlItem13 = New DevExpress.XtraLayout.LayoutControlItem() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_DOKUMENTARTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GlobixDataset, System.ComponentModel.ISupportInitialize).BeginInit() @@ -142,6 +142,7 @@ Partial Class frmAdmin_Globix CType(Me.TextEdit8.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit13.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ComboBoxEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).BeginInit() @@ -157,6 +158,7 @@ Partial Class frmAdmin_Globix CType(Me.LayoutControlItem26, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem25, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem30, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.Filestore, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl2.SuspendLayout() Me.XtraTabPageManIndexe.SuspendLayout() @@ -171,6 +173,8 @@ Partial Class frmAdmin_Globix CType(Me.TextEdit11.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit12.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SpinEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ComboBoxEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ComboBoxEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem17, System.ComponentModel.ISupportInitialize).BeginInit() @@ -186,18 +190,14 @@ Partial Class frmAdmin_Globix CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem15, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabPageRework.SuspendLayout() CType(Me.LayoutControlRework, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabPageAutoIndexe.SuspendLayout() CType(Me.LayoutControlAutoIndexe, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ComboBoxEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Filestore, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ComboBoxEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ComboBoxEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl1 @@ -497,6 +497,17 @@ Partial Class frmAdmin_Globix Me.ComboBoxEdit1.StyleController = Me.LayoutControlProfile Me.ComboBoxEdit1.TabIndex = 54 ' + 'ComboBoxEdit2 + ' + Me.ComboBoxEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_DOKUMENTARTBindingSource, "IDB_FILESTORE_ID", True)) + Me.ComboBoxEdit2.Location = New System.Drawing.Point(746, 182) + Me.ComboBoxEdit2.MenuManager = Me.RibbonControl1 + Me.ComboBoxEdit2.Name = "ComboBoxEdit2" + Me.ComboBoxEdit2.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.ComboBoxEdit2.Size = New System.Drawing.Size(446, 20) + Me.ComboBoxEdit2.StyleController = Me.LayoutControlProfile + Me.ComboBoxEdit2.TabIndex = 55 + ' 'Root ' Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] @@ -636,6 +647,14 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem30.Text = "Namenkonvention" Me.LayoutControlItem30.TextSize = New System.Drawing.Size(139, 13) ' + 'Filestore + ' + Me.Filestore.Control = Me.ComboBoxEdit2 + Me.Filestore.Location = New System.Drawing.Point(592, 170) + Me.Filestore.Name = "Filestore" + Me.Filestore.Size = New System.Drawing.Size(592, 110) + Me.Filestore.TextSize = New System.Drawing.Size(139, 13) + ' 'XtraTabControl2 ' Me.XtraTabControl2.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ @@ -834,6 +853,28 @@ Partial Class frmAdmin_Globix Me.SpinEdit1.StyleController = Me.LayoutControlManIndexe Me.SpinEdit1.TabIndex = 25 ' + 'ComboBoxEdit3 + ' + Me.ComboBoxEdit3.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "WD_INDEX", True)) + Me.ComboBoxEdit3.Location = New System.Drawing.Point(542, 60) + Me.ComboBoxEdit3.MenuManager = Me.RibbonControl1 + Me.ComboBoxEdit3.Name = "ComboBoxEdit3" + Me.ComboBoxEdit3.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.ComboBoxEdit3.Size = New System.Drawing.Size(416, 20) + Me.ComboBoxEdit3.StyleController = Me.LayoutControlManIndexe + Me.ComboBoxEdit3.TabIndex = 26 + ' + 'ComboBoxEdit4 + ' + Me.ComboBoxEdit4.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_INDEX_MANBindingSource, "DATATYPE", True)) + Me.ComboBoxEdit4.Location = New System.Drawing.Point(85, 108) + Me.ComboBoxEdit4.MenuManager = Me.RibbonControl1 + Me.ComboBoxEdit4.Name = "ComboBoxEdit4" + Me.ComboBoxEdit4.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.ComboBoxEdit4.Size = New System.Drawing.Size(185, 20) + Me.ComboBoxEdit4.StyleController = Me.LayoutControlManIndexe + Me.ComboBoxEdit4.TabIndex = 27 + ' 'LayoutControlGroup1 ' Me.LayoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] @@ -977,6 +1018,24 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem9.Text = "Reihenfolge" Me.LayoutControlItem9.TextSize = New System.Drawing.Size(70, 13) ' + 'LayoutControlItem14 + ' + Me.LayoutControlItem14.Control = Me.ComboBoxEdit3 + Me.LayoutControlItem14.Location = New System.Drawing.Point(457, 48) + Me.LayoutControlItem14.Name = "LayoutControlItem14" + Me.LayoutControlItem14.Size = New System.Drawing.Size(493, 24) + Me.LayoutControlItem14.Text = "Attribut" + Me.LayoutControlItem14.TextSize = New System.Drawing.Size(70, 13) + ' + 'LayoutControlItem13 + ' + Me.LayoutControlItem13.Control = Me.ComboBoxEdit4 + Me.LayoutControlItem13.Location = New System.Drawing.Point(0, 96) + Me.LayoutControlItem13.Name = "LayoutControlItem13" + Me.LayoutControlItem13.Size = New System.Drawing.Size(262, 24) + Me.LayoutControlItem13.Text = "Datentyp" + Me.LayoutControlItem13.TextSize = New System.Drawing.Size(70, 13) + ' 'ListBoxAutoIndexe ' Me.ListBoxAutoIndexe.DataSource = Me.TBDD_INDEX_MANBindingSource @@ -1062,65 +1121,6 @@ Partial Class frmAdmin_Globix ' Me.TBDD_INDEX_MANTableAdapter.ClearBeforeFill = True ' - 'ComboBoxEdit2 - ' - Me.ComboBoxEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_DOKUMENTARTBindingSource, "IDB_FILESTORE_ID", True)) - Me.ComboBoxEdit2.Location = New System.Drawing.Point(746, 182) - Me.ComboBoxEdit2.MenuManager = Me.RibbonControl1 - Me.ComboBoxEdit2.Name = "ComboBoxEdit2" - Me.ComboBoxEdit2.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.ComboBoxEdit2.Size = New System.Drawing.Size(446, 20) - Me.ComboBoxEdit2.StyleController = Me.LayoutControlProfile - Me.ComboBoxEdit2.TabIndex = 55 - ' - 'Filestore - ' - Me.Filestore.Control = Me.ComboBoxEdit2 - Me.Filestore.Location = New System.Drawing.Point(592, 170) - Me.Filestore.Name = "Filestore" - Me.Filestore.Size = New System.Drawing.Size(592, 110) - Me.Filestore.TextSize = New System.Drawing.Size(139, 13) - ' - 'ComboBoxEdit3 - ' - Me.ComboBoxEdit3.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_MANBindingSource, "WD_INDEX", True)) - Me.ComboBoxEdit3.Location = New System.Drawing.Point(542, 60) - Me.ComboBoxEdit3.MenuManager = Me.RibbonControl1 - Me.ComboBoxEdit3.Name = "ComboBoxEdit3" - Me.ComboBoxEdit3.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.ComboBoxEdit3.Size = New System.Drawing.Size(416, 20) - Me.ComboBoxEdit3.StyleController = Me.LayoutControlManIndexe - Me.ComboBoxEdit3.TabIndex = 26 - ' - 'LayoutControlItem14 - ' - Me.LayoutControlItem14.Control = Me.ComboBoxEdit3 - Me.LayoutControlItem14.Location = New System.Drawing.Point(457, 48) - Me.LayoutControlItem14.Name = "LayoutControlItem14" - Me.LayoutControlItem14.Size = New System.Drawing.Size(493, 24) - Me.LayoutControlItem14.Text = "Attribut" - Me.LayoutControlItem14.TextSize = New System.Drawing.Size(70, 13) - ' - 'ComboBoxEdit4 - ' - Me.ComboBoxEdit4.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_INDEX_MANBindingSource, "DATATYPE", True)) - Me.ComboBoxEdit4.Location = New System.Drawing.Point(85, 108) - Me.ComboBoxEdit4.MenuManager = Me.RibbonControl1 - Me.ComboBoxEdit4.Name = "ComboBoxEdit4" - Me.ComboBoxEdit4.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.ComboBoxEdit4.Size = New System.Drawing.Size(185, 20) - Me.ComboBoxEdit4.StyleController = Me.LayoutControlManIndexe - Me.ComboBoxEdit4.TabIndex = 27 - ' - 'LayoutControlItem13 - ' - Me.LayoutControlItem13.Control = Me.ComboBoxEdit4 - Me.LayoutControlItem13.Location = New System.Drawing.Point(0, 96) - Me.LayoutControlItem13.Name = "LayoutControlItem13" - Me.LayoutControlItem13.Size = New System.Drawing.Size(262, 24) - Me.LayoutControlItem13.Text = "Datentyp" - Me.LayoutControlItem13.TextSize = New System.Drawing.Size(70, 13) - ' 'frmAdmin_Globix ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1129,10 +1129,11 @@ Partial Class frmAdmin_Globix Me.Controls.Add(Me.XtraTabControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) + Me.IconOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_G_DevExpress Me.Name = "frmAdmin_Globix" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 - Me.Text = "frmAdmin_Attribute" + Me.Text = "Global Indexer - Profil" CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBDD_DOKUMENTARTBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GlobixDataset, System.ComponentModel.ISupportInitialize).EndInit() @@ -1152,6 +1153,7 @@ Partial Class frmAdmin_Globix CType(Me.TextEdit8.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit13.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ComboBoxEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).EndInit() @@ -1167,6 +1169,7 @@ Partial Class frmAdmin_Globix CType(Me.LayoutControlItem26, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem25, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem30, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.Filestore, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl2.ResumeLayout(False) Me.XtraTabPageManIndexe.ResumeLayout(False) @@ -1181,6 +1184,8 @@ Partial Class frmAdmin_Globix CType(Me.TextEdit11.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit12.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SpinEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ComboBoxEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ComboBoxEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem17, System.ComponentModel.ISupportInitialize).EndInit() @@ -1196,18 +1201,14 @@ Partial Class frmAdmin_Globix CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem15, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabPageRework.ResumeLayout(False) CType(Me.LayoutControlRework, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabPageAutoIndexe.ResumeLayout(False) CType(Me.LayoutControlAutoIndexe, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ComboBoxEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Filestore, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ComboBoxEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ComboBoxEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb b/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb index 674988c1..b5e13d10 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb @@ -18,10 +18,10 @@ Public Class frmAdmin_Globix End Sub Private Sub frmAdmin_Globix_Load(sender As Object, e As EventArgs) Handles MyBase.Load - Init(My.LogConfig) + InitializeBaseForm(My.LogConfig) Try TBDD_DOKUMENTARTTableAdapter.Connection.ConnectionString = My.DatabaseECM.CurrentSQLConnectionString - Me.TBDD_DOKUMENTARTTableAdapter.Fill(Me.GlobixDataset.TBDD_DOKUMENTART, PrimaryKey) + TBDD_DOKUMENTARTTableAdapter.Fill(Me.GlobixDataset.TBDD_DOKUMENTART, PrimaryKey) TBDD_INDEX_MANTableAdapter.Connection.ConnectionString = My.DatabaseECM.CurrentSQLConnectionString Load_TabData() diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb index f3476bc0..dc354da0 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb @@ -10,13 +10,16 @@ InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + InitializeBaseForm(My.LogConfig) Me.PrimaryKey = PrimaryKey Me.IsInsert = IsInsert End Sub Private Sub frmAdmin_Attribute_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try + TBIDB_ATTRIBUTE_TYPETableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString TBIDB_ATTRIBUTE_TYPETableAdapter.Fill(DSIDB_Stammdaten.TBIDB_ATTRIBUTE_TYPE) + VWIDB_BE_ATTRIBUTETableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString VWIDB_BE_ATTRIBUTETableAdapter.FillByAttributeId(DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE, PrimaryKey, 1) Catch ex As Exception ShowErrorMessage(ex) diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb index 6bb0a288..4cb551f8 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb @@ -11,13 +11,13 @@ Public Class frmAdmin_IDBEntity InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + InitializeBaseForm(My.LogConfig) Me.PrimaryKey = PrimaryKey Me.IsInsert = IsInsert End Sub Private Sub frmAdmin_IDBEntity_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try - Init(My.LogConfig) TBIDB_BUSINESS_ENTITYTableAdapter.Fill(DSIDB_Stammdaten.TBIDB_BUSINESS_ENTITY, PrimaryKey) Catch ex As Exception ShowErrorMessage(ex) diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb index a1a2fc98..e87e9f09 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb @@ -243,6 +243,8 @@ Partial Class frmAdmin_SourceSQL Me.MemoEdit1.Location = New System.Drawing.Point(105, 220) Me.MemoEdit1.MenuManager = Me.RibbonControl Me.MemoEdit1.Name = "MemoEdit1" + Me.MemoEdit1.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.MemoEdit1.Properties.Appearance.Options.UseFont = True Me.MemoEdit1.Size = New System.Drawing.Size(643, 127) Me.MemoEdit1.StyleController = Me.LayoutControl1 Me.MemoEdit1.TabIndex = 9 diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb index 0a83b730..acca7327 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb @@ -17,6 +17,7 @@ Public Class frmAdmin_SourceSQL InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + InitializeBaseForm(My.LogConfig) Me.PrimaryKey = PrimaryKey End Sub @@ -33,9 +34,12 @@ Public Class frmAdmin_SourceSQL .TabPage = Nothing }) + TBZF_ADMIN_SOURCE_SQLTableAdapter.Connection.ConnectionString = My.DatabaseECM.CurrentSQLConnectionString + If IsInsert Then TBZF_ADMIN_SOURCE_SQLBindingSource.AddNew() Else + TBZF_ADMIN_SOURCE_SQLTableAdapter.Fill(DSIDB_Stammdaten.TBZF_ADMIN_SOURCE_SQL, PrimaryKey) End If diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index b332d2b9..fd5023bf 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -99,8 +99,8 @@ Partial Class frmAdmin_Start Me.RibbonPageGroup17 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup18 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup19 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.GridControl1 = New DevExpress.XtraGrid.GridControl() - Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.GridMain = New DevExpress.XtraGrid.GridControl() + Me.ViewMain = New DevExpress.XtraGrid.Views.Grid.GridView() Me.RibbonPageGroupAttributes = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPage_IDB = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonGroup_ClipboardWatcher_Process = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -125,8 +125,8 @@ Partial Class frmAdmin_Start Me.Panel1.SuspendLayout() CType(Me.ActiveImages, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TypeImages, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridMain, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ViewMain, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl1 @@ -713,22 +713,22 @@ Partial Class frmAdmin_Start Me.RibbonPageGroup19.Name = "RibbonPageGroup19" Me.RibbonPageGroup19.Text = "Prozess-Zuordnung" ' - 'GridControl1 + 'GridMain ' - Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.GridControl1.Location = New System.Drawing.Point(200, 199) - Me.GridControl1.MainView = Me.GridView1 - Me.GridControl1.MenuManager = Me.RibbonControl1 - Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(877, 455) - Me.GridControl1.TabIndex = 12 - Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + Me.GridMain.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridMain.Location = New System.Drawing.Point(200, 199) + Me.GridMain.MainView = Me.ViewMain + Me.GridMain.MenuManager = Me.RibbonControl1 + Me.GridMain.Name = "GridMain" + Me.GridMain.Size = New System.Drawing.Size(877, 455) + Me.GridMain.TabIndex = 12 + Me.GridMain.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewMain}) ' - 'GridView1 + 'ViewMain ' - Me.GridView1.GridControl = Me.GridControl1 - Me.GridView1.Name = "GridView1" - Me.GridView1.OptionsSelection.EnableAppearanceFocusedCell = False + Me.ViewMain.GridControl = Me.GridMain + Me.ViewMain.Name = "ViewMain" + Me.ViewMain.OptionsSelection.EnableAppearanceFocusedCell = False ' 'RibbonPageGroupAttributes ' @@ -782,7 +782,7 @@ Partial Class frmAdmin_Start Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1077, 676) - Me.Controls.Add(Me.GridControl1) + Me.Controls.Add(Me.GridMain) Me.Controls.Add(Me.Panel1) Me.Controls.Add(Me.DockPanel1) Me.Controls.Add(Me.RibbonStatusBar1) @@ -807,8 +807,8 @@ Partial Class frmAdmin_Start Me.Panel1.ResumeLayout(False) CType(Me.ActiveImages, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TypeImages, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridMain, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ViewMain, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -885,8 +885,8 @@ Partial Class frmAdmin_Start Friend WithEvents RibbonPageGroup19 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonItem24 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem25 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents GridControl1 As GridControl - Friend WithEvents GridView1 As GridView + Friend WithEvents GridMain As GridControl + Friend WithEvents ViewMain As GridView Friend WithEvents btnAddRecord As DevExpress.XtraBars.BarButtonItem Friend WithEvents btnEditRecord As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx index a8b98bc6..836a7329 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx @@ -254,6 +254,9 @@ 122, 17 + + 122, 17 + 396, 17 @@ -263,6 +266,9 @@ 531, 17 + + 531, 17 + 1141, 17 diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index 74a193a7..7ea8efaa 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -15,8 +15,15 @@ Public Class frmAdmin_Start Private DetailForm As ClassDetailForm + Public Sub New() + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + InitializeBaseForm(My.LogConfig) + End Sub + Private Sub frmAdministration_Load(sender As Object, e As EventArgs) Handles MyBase.Load - Init(My.LogConfig) DetailForm = New ClassDetailForm(My.LogConfig) AddHandler DetailForm.DetailFormClosed, AddressOf DetailForm_Closed @@ -32,21 +39,21 @@ Public Class frmAdmin_Start End Sub Private Function Handle_LoadPage(Page As String) As Boolean - Dim oKey = $"{Page}-OVERVIEW" - If DetailForm.DetailSettingsList.ContainsKey(Page) Then Dim oNode = DetailForm.DetailSettingsList.Item(Page) CurrentModule = oNode.Module labelTitle.Text = oNode.GridTitle btnAddRecord.Caption = oNode.NewRecordTitle Else - MsgBox($"Page [{Page}] not found in AdminNodes! Exiting." & vbNewLine & - "Check your definitions in the TreeList NodeEditor and in SourceSQL", MsgBoxStyle.Critical, Text) + MsgBox($"Page [{Page}] not found! Exiting." & vbNewLine & + "Check the [ENTITY_TITLE] Column in Table [TBZF_ADMIN_SOURCE_SQL]. It must match with the Tag of the corresponding Tree List nodes!", MsgBoxStyle.Critical, Text) Return False End If ' This dictionary can contain the same entity multiple times to save ' OVERVIEW, INSERT, UPDATE, etc. data records, so we specifically look for the overview key + Dim oKey = $"{Page}-OVERVIEW" + If DetailForm.DetailDataList.ContainsKey(oKey) Then Dim oItem = DetailForm.DetailDataList.Item(oKey) @@ -140,34 +147,36 @@ Public Class frmAdmin_Start Exit Sub End If - GridControl1.DataSource = Source.SQLResult - GridControl1.ForceInitialize() - GridView1.PopulateColumns() + ViewMain.ShowLoadingPanel() - If GridView1.Columns.Item(COLUMN_NAME_ACTIVE) Is Nothing Then + GridMain.DataSource = Source.SQLResult + GridMain.ForceInitialize() + ViewMain.PopulateColumns() + + If ViewMain.Columns.Item(COLUMN_NAME_ACTIVE) Is Nothing Then Dim oActiveColumn = New GridColumn() With {.FieldName = COLUMN_NAME_ACTIVE} - GridView1.Columns.Add(oActiveColumn) + ViewMain.Columns.Add(oActiveColumn) Style_ActiveColumn(oActiveColumn) Else - Style_ActiveColumn(GridView1.Columns.Item(COLUMN_NAME_ACTIVE)) + Style_ActiveColumn(ViewMain.Columns.Item(COLUMN_NAME_ACTIVE)) End If - With GridView1.Appearance.EvenRow + With ViewMain.Appearance.EvenRow .BackColor = Color.Snow .Options.UseBackColor = True End With - With GridView1.Appearance.FocusedCell + With ViewMain.Appearance.FocusedCell .BackColor = Color.Gold .Options.UseBackColor = True End With - With GridView1.OptionsBehavior + With ViewMain.OptionsBehavior .Editable = False .ReadOnly = True End With - With GridView1.OptionsView + With ViewMain.OptionsView .ShowAutoFilterRow = True .EnableAppearanceEvenRow = True .ShowIndicator = False @@ -175,17 +184,18 @@ Public Class frmAdmin_Start .ShowVerticalLines = DefaultBoolean.True End With - With GridView1.OptionsClipboard + With ViewMain.OptionsClipboard .CopyColumnHeaders = DefaultBoolean.False End With - With GridView1.OptionsFind + With ViewMain.OptionsFind .AlwaysVisible = True End With - AddHandler GridView1.KeyDown, AddressOf GridView1_KeyDown + AddHandler ViewMain.KeyDown, AddressOf GridView1_KeyDown - GridView1.BestFitColumns() + ViewMain.BestFitColumns() + ViewMain.HideLoadingPanel() End Sub Public Sub GridView1_KeyDown(sender As GridView, e As KeyEventArgs) @@ -199,7 +209,7 @@ Public Class frmAdmin_Start End If End Sub - Private Sub GridView1_RowClick(sender As Object, e As RowClickEventArgs) Handles GridView1.RowClick + Private Sub GridView1_RowClick(sender As Object, e As RowClickEventArgs) Handles ViewMain.RowClick Try If e.Clicks = 2 And e.Button = MouseButtons.Left Then Dim oPrimaryKey = Get_PrimaryKey(e.RowHandle) @@ -217,7 +227,7 @@ Public Class frmAdmin_Start Private Function Get_PrimaryKey(RowHandle As Integer) Try - Dim oView As GridView = GridView1 + Dim oView As GridView = ViewMain Dim oRowView As DataRowView = oView.GetRow(RowHandle) Dim oItem As ClassDetailForm.DetailData = CurrentItem Dim oGuid = oRowView.Row.Item(oItem.PrimaryKey) @@ -253,11 +263,11 @@ Public Class frmAdmin_Start Private Sub btnEditRecord_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnEditRecord.ItemClick Try - If GridView1.FocusedRowHandle = GridControl.InvalidRowHandle Then + If ViewMain.FocusedRowHandle = GridControl.InvalidRowHandle Then Exit Sub End If - Dim oPrimaryKey = Get_PrimaryKey(GridView1.FocusedRowHandle) + Dim oPrimaryKey = Get_PrimaryKey(ViewMain.FocusedRowHandle) If oPrimaryKey IsNot Nothing Then DetailForm.Handle_OpenDetail(oPrimaryKey, CurrentPage, False) diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb index cd73e331..1d77cbbd 100644 --- a/GUIs.ZooFlow/ClassInit.vb +++ b/GUIs.ZooFlow/ClassInit.vb @@ -1,42 +1,38 @@ Imports System.ComponentModel +Imports System.Threading +Imports System.Globalization Imports DevExpress.XtraSplashScreen Imports DigitalData.Modules.Database Imports DigitalData.Modules.Filesystem Imports DigitalData.Modules.Language.Utils Imports DigitalData.Modules.Logging -Imports DigitalData.Controls.SQLConfig -Imports DigitalData.GUIs.ZooFlow.ClassInitLoader -Imports DigitalData.GUIs.ZooFlow.ClassConstants -Imports System.Threading -Imports System.Globalization Imports DigitalData.Modules.EDMI.API +Imports DigitalData.Modules.EDMI.API.Constants Imports DigitalData.Modules.Encryption +Imports DigitalData.GUIs.ZooFlow.ClassConstants +Imports DigitalData.GUIs.ZooFlow.ClassInitLoader +Imports DigitalData.Controls.SQLConfig Public Class ClassInit - Private _MainForm As frmFlowForm - Private _Logger As Logger - Private _LogConfig As LogConfig - Private _DataASorDB As ClassDataASorDB + Private ReadOnly _MainForm As frmFlowForm + Private ReadOnly _Logger As Logger + Private ReadOnly _LogConfig As LogConfig + Private ReadOnly _DataASorDB As ClassDataASorDB + Private ReadOnly _Database As DatabaseWithFallback Private _Loader As ClassInitLoader Public Event Completed As EventHandler Public Sub New(LogConfig As LogConfig, ParentForm As frmFlowForm) _MainForm = ParentForm - _Logger = LogConfig.GetLogger() _LogConfig = LogConfig - _DataASorDB = New ClassDataASorDB(LogConfig) - clsDataASorDB = _DataASorDB + _Logger = LogConfig.GetLogger() + + 'TODO: Remove when Globix uses DatabaseWithFallback + clsDataASorDB = New ClassDataASorDB(LogConfig) End Sub Public Sub InitializeApplication() - ' Init Connectivity - ' - Database / Service / Application Server - ' (Init Licensing) - ' Init User - ' Init IDB - ' Zeile -> Objekt / NameValue List - If Not SetupDatabase() Then MsgBox("Keine Verbindungs-Informationen hinterlegt. Anwendung wird beendet.", MsgBoxStyle.Critical, _MainForm.Text) Application.Exit() @@ -50,7 +46,7 @@ Public Class ClassInit _Loader.AddStep("Initializing User", AddressOf InitializeUser, True) _Loader.AddStep("Initializing Language", AddressOf InitializeLanguage, False) _Loader.AddStep("Initializing 3rd-party licenses", AddressOf Initialize3rdParty, False) - _Loader.AddStep("Initializing Basic Config", AddressOf InitBasicData, False) + _Loader.AddStep("Initializing Basic Config", AddressOf InitBasicConfig, False) ' === Init Schritte definieren AddHandler _Loader.ProgressChanged, AddressOf ProgressChanged @@ -60,6 +56,104 @@ Public Class ClassInit End If End Sub + +#Region "=== Init Steps ===" + Private Sub InitializeDatabase(MyApplication As My.MyApplication) + Dim oConnectionString = MSSQLServer.DecryptConnectionString(My.SystemConfig.ConnectionString) + My.DatabaseECM = New MSSQLServer(My.LogConfig, oConnectionString) + + If My.DatabaseECM.DBInitialized = False Then + _Logger.Warn("Could not initialize DD_ECM-Database!") + Throw New InitException("Could not initialize ECM-Database!") + + Else + Dim oSQl = "SELECT * FROM TBDD_CONNECTION WHERE BEZEICHNUNG = 'IDB'" + Dim oDatatable As DataTable = My.DatabaseECM.GetDatatable(oSQl) + + If IsNothing(oDatatable) OrElse oDatatable.Rows.Count = 0 Then + _Logger.Warn("No IDB connection entries in TBDD_CONNECTION found!") + Throw New InitException("Fehler beim Laden der IDB Verbindungsdaten!") + End If + + If oDatatable.Rows.Count > 1 Then + _Logger.Warn("Multiple IDB connection entries in TBDD_CONNECTION found!") + Throw New InitException("Fehler beim Laden der IDB Verbindungsdaten!") + End If + + Dim oDataRow As DataRow = oDatatable.Rows.Item(0) + Dim oConString = My.DatabaseECM.GetConnectionString( + oDataRow.Item("SERVER").ToString, + oDataRow.Item("DATENBANK").ToString, + oDataRow.Item("USERNAME").ToString, + oDataRow.Item("PASSWORD").ToString) + + My.DatabaseIDB = New MSSQLServer(My.LogConfig, oConString) + End If + + If My.DatabaseIDB.DBInitialized = False Then + _Logger.Warn("Could not initialize IDB-Database!") + Throw New InitException("Could not initialize IDB-Database!") + End If + End Sub + Private Sub InitializeService(MyApplication As My.MyApplication) + Try + MyApplication.Service.Address = My.SystemConfig.AppServerConfig + Dim oServerData = Client.ParseServiceAddress(My.SystemConfig.AppServerConfig) + + My.Application.Service.Client = New Client(_LogConfig, oServerData.Item1, oServerData.Item2) + + If Not IsNothing(My.Application.Service.Client) Then + If My.Application.Service.Client.Connect() Then + MyApplication.Service.IsActive = True + End If + End If + Catch ex As Exception + _Logger.Error(ex) + Throw New InitException("Error in InitializeService", ex) + End Try + End Sub + Private Sub InitializeDatabaseWithFallback(MyApplication As My.MyApplication) + Try + My.Database = New DatabaseWithFallback(_LogConfig, My.Application.Service.Client, My.DatabaseECM, My.DatabaseIDB) + Catch ex As Exception + _Logger.Error(ex) + Throw New InitException("Error InitializeDatabaseWithFallback!", ex) + End Try + End Sub + Private Sub InitializeUser(MyApplication As My.MyApplication) + Try + Dim oSql As String = My.Queries.Common.FNDD_MODULE_INIT(Environment.UserName) + Dim oDatatable As DataTable = My.DatabaseECM.GetDatatable(oSql) + + If oDatatable Is Nothing Then + Throw New InitException("Benutzer konnte nicht geladen werden!") + End If + + If oDatatable.Rows.Count <= 1 Then + Throw New InitException("Benutzer konnte nicht gefunden werden!") + End If + + For Each oRow As DataRow In oDatatable.Rows + Dim oType As String = oRow("TYPE").ToString + + Select Case oType + Case "USER" + HandleUserInfo(MyApplication, oRow) + + Case MODULE_CLIPBOARDWATCHER + HandleModuleInfo(MyApplication, oType, oRow) + Case MODULE_GLOBAL_INDEXER + HandleModuleInfo(MyApplication, oType, oRow) + Case MODULE_ZOOFLOW + HandleModuleInfo(MyApplication, oType, oRow) + End Select + Next + + Catch ex As Exception + _Logger.Error(ex) + Throw New InitException("Error while initializing user!", ex) + End Try + End Sub Private Sub InitializeLanguage(MyApplication As My.MyApplication) Dim oLanguage = MyApplication.User.Language Dim oDateFormat = MyApplication.User.DateFormat @@ -70,6 +164,44 @@ Public Class ClassInit CultureInfo.DefaultThreadCurrentCulture = oCultureInfo CultureInfo.DefaultThreadCurrentUICulture = oCultureInfo End Sub + Private Sub Initialize3rdParty(MyApplication As My.MyApplication) + Try + Dim oSql = "Select LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'" + Dim oDatatable As DataTable = My.DatabaseECM.GetDatatable(oSql) + + If oDatatable.Rows.Count = 0 Then + Throw New InitException("Konfiguration konnte nicht geladen werden!") + End If + + Dim oRow As DataRow = oDatatable.Rows.Item(0) + + MyApplication.Settings.GdPictureKey = NotNull(oRow.Item("LICENSE"), String.Empty) + Catch ex As Exception + _Logger.Error(ex) + Throw New InitException("Error Initialize3rdParty!", ex) + End Try + End Sub + Private Sub InitBasicConfig(MyApplication As My.MyApplication) + Try + My.Tables.DTIDB_COMMON_SQL = My.DatabaseIDB.GetDatatable("SELECT * FROM TBIDB_COMMON_SQL WHERE ACTIVE = 1") + My.Tables.DTIDB_FILESTORE = My.DatabaseIDB.GetDatatable("SELECT * FROM TBIDB_FILESTORE_CONFIG WHERE ACTIVE = 1") + + 'Get FilesStores + For Each oRow As DataRow In My.Tables.DTIDB_FILESTORE.Rows + Select Case oRow.Item("TITLE").ToString + Case "ARCHIVE" + My.Filestore_Archive = oRow.Item("STORAGE_PATH") + + Case "WORK" + My.Filestore_Work = oRow.Item("STORAGE_PATH") + End Select + Next + Catch ex As Exception + _Logger.Error(ex) + Throw New InitException("Error in InitBasicData", ex) + End Try + End Sub +#End Region Private Function SetupDatabase() As Boolean If My.SystemConfig.ConnectionString = String.Empty Then @@ -115,182 +247,6 @@ Public Class ClassInit End If End Sub - Private Sub InitializeDatabase(MyApplication As My.MyApplication) - Dim oConnectionString = MSSQLServer.DecryptConnectionString(My.SystemConfig.ConnectionString) - My.DatabaseECM = New MSSQLServer(My.LogConfig, oConnectionString) - - If My.DatabaseECM.DBInitialized = False Then - _Logger.Warn("Could not initialize DD_ECM-Database!") - Throw New InitException("Could not initialize ECM-Database!") - - Else - Dim oSQl = "SELECT * FROM TBDD_CONNECTION WHERE BEZEICHNUNG = 'IDB'" - Dim oDatatable As DataTable = My.DatabaseECM.GetDatatable(oSQl) - - If IsNothing(oDatatable) OrElse oDatatable.Rows.Count = 0 Then - _Logger.Warn("No IDB connection entries in TBDD_CONNECTION found!") - Throw New InitException("Fehler beim Laden der IDB Verbindungsdaten!") - End If - - If oDatatable.Rows.Count > 1 Then - _Logger.Warn("Multiple IDB connection entries in TBDD_CONNECTION found!") - Throw New InitException("Fehler beim Laden der IDB Verbindungsdaten!") - End If - - Dim oDataRow As DataRow = oDatatable.Rows.Item(0) - Dim oConString = My.DatabaseECM.GetConnectionString( - oDataRow.Item("SERVER").ToString, - oDataRow.Item("DATENBANK").ToString, - oDataRow.Item("USERNAME").ToString, - oDataRow.Item("PASSWORD").ToString) - - My.DatabaseIDB = New MSSQLServer(My.LogConfig, oConString) - End If - - If My.DatabaseIDB.DBInitialized = False Then - _Logger.Warn("Could not initialize IDB-Database!") - Throw New InitException("Could not initialize IDB-Database!") - End If - End Sub - - Private Sub Initialize3rdParty(MyApplication As My.MyApplication) - Try - Dim oSql = "Select LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'" - Dim oDatatable As DataTable = My.DatabaseECM.GetDatatable(oSql) - - If oDatatable.Rows.Count = 0 Then - Throw New InitException("Konfiguration konnte nicht geladen werden!") - End If - - Dim oRow As DataRow = oDatatable.Rows.Item(0) - - MyApplication.Settings.GdPictureKey = NotNull(oRow.Item("LICENSE"), String.Empty) - Catch ex As Exception - _Logger.Error(ex) - Throw New InitException("Error Initialize3rdParty!", ex) - End Try - End Sub - - Private Sub InitializeDatabaseWithFallback(MyApplication As My.MyApplication) - Try - My.Database = New DatabaseWithFallback(_LogConfig, My.Application.Service.Client, My.DatabaseECM, My.DatabaseIDB) - Catch ex As Exception - _Logger.Error(ex) - Throw New InitException("Error InitializeDatabaseWithFallback!", ex) - End Try - End Sub - - Private Sub InitBasicData(MyApplication As My.MyApplication) - Try - Dim oSQL = "SELECT * FROM TBIDB_COMMON_SQL WHERE ACTIVE = 1" - My.Tables.DTIDB_COMMON_SQL = _DataASorDB.GetDatatable("IDB", oSQL, "TBIDB_COMMON_SQL", "", "") - oSQL = "SELECT * FROM TBIDB_FILESTORE_CONFIG WHERE ACTIVE = 1" - My.Tables.DTIDB_FILESTORE = _DataASorDB.GetDatatable("IDB", oSQL, "TBIDB_FILESTORE_CONFIG", "", "") - - 'Get FilesStores - For Each oRow As DataRow In My.Tables.DTIDB_FILESTORE.Rows - Select Case oRow.Item("TITLE").ToString - Case "ARCHIVE" - My.Filestore_Archive = oRow.Item("STORAGE_PATH") - - Case "WORK" - My.Filestore_Work = oRow.Item("STORAGE_PATH") - End Select - Next - Catch ex As Exception - _Logger.Error(ex) - Throw New InitException("Error in InitBasicData", ex) - End Try - End Sub - - Private Sub InitializeService(MyApplication As My.MyApplication) - Try - MyApplication.Service.Address = My.SystemConfig.AppServerConfig - Dim oServerData = Client.ParseServiceAddress(My.SystemConfig.AppServerConfig) - - My.Application.Service.Client = New Client(_LogConfig, oServerData.Item1, oServerData.Item2) - - If Not IsNothing(My.Application.Service.Client) Then - If My.Application.Service.Client.Connect() Then - MyApplication.Service.IsActive = True - End If - End If - Catch ex As Exception - _Logger.Error(ex) - Throw New InitException("Error in InitializeService", ex) - End Try - End Sub - - Private Sub InitializeIDBDatabase(MyApplication As My.MyApplication) - If MyApplication.ModulesActive.Contains(MODULE_ZOOFLOW) Then - If My.DatabaseECM.DBInitialized Then - Dim oSQl = "SELECT * FROM TBDD_CONNECTION WHERE BEZEICHNUNG = 'IDB'" - Dim oDatatable As DataTable = My.DatabaseECM.GetDatatable(oSQl) - - If IsNothing(oDatatable) OrElse oDatatable.Rows.Count = 0 Then - _Logger.Warn("No IDB connection entries in TBDD_CONNECTION found!") - Throw New InitException("Fehler beim Laden der IDB Verbindungsdaten!") - End If - - If oDatatable.Rows.Count > 1 Then - _Logger.Warn("Multiple IDB connection entries in TBDD_CONNECTION found!") - Throw New InitException("Fehler beim Laden der IDB Verbindungsdaten!") - End If - - Dim oDataRow As DataRow = oDatatable.Rows.Item(0) - Dim oConString = My.DatabaseECM.GetConnectionString( - oDataRow.Item("SERVER").ToString, - oDataRow.Item("DATENBANK").ToString, - oDataRow.Item("USERNAME").ToString, - oDataRow.Item("PASSWORD").ToString) - - My.DatabaseIDB = New MSSQLServer(My.LogConfig, oConString) - If My.DatabaseIDB.DBInitialized = False Then - _Logger.Warn("Could not initialize IDB-Database!") - Throw New InitException("Could not initialize IDB-Database!") - End If - End If - Else - _Logger.Warn("ZooFlow missing from Active Modules!") - Throw New InitException("ZooFlow Modul ist nicht aktiv oder nicht lizensiert!") - End If - End Sub - - Private Sub InitializeUser(MyApplication As My.MyApplication) - Try - Dim oSql As String = My.Queries.Common.FNDD_MODULE_INIT(Environment.UserName) - Dim oDatatable As DataTable = My.DatabaseECM.GetDatatable(oSql) - - If oDatatable Is Nothing Then - Throw New InitException("Benutzer konnte nicht geladen werden!") - End If - - If oDatatable.Rows.Count <= 1 Then - Throw New InitException("Benutzer konnte nicht gefunden werden!") - End If - - For Each oRow As DataRow In oDatatable.Rows - Dim oType As String = oRow("TYPE").ToString - - Select Case oType - Case "USER" - HandleUserInfo(MyApplication, oRow) - - Case MODULE_CLIPBOARDWATCHER - HandleModuleInfo(MyApplication, oType, oRow) - Case MODULE_GLOBAL_INDEXER - HandleModuleInfo(MyApplication, oType, oRow) - Case MODULE_ZOOFLOW - HandleModuleInfo(MyApplication, oType, oRow) - End Select - Next - - Catch ex As Exception - _Logger.Error(ex) - Throw New InitException("Error while initializing user!", ex) - End Try - End Sub - Private Sub HandleUserInfo(MyApplication As My.MyApplication, Row As DataRow) Dim oValue As Object = Row.Item("VALUE") Dim oName As String = Row.Item("NAME").ToString diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index 9bcd7f59..60a918c5 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -530,6 +530,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property bo_appearance1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("bo_appearance1", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx index 621959e3..61b03850 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -118,6 +118,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\actions_database.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\save5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -136,14 +139,14 @@ ..\Resources\doublenext2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\Checked-outforEdit_Color_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -154,6 +157,9 @@ ..\Resources\definednameuseinformula.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\DD_Icons_ICO_PMANAGER_128px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -169,8 +175,11 @@ ..\Resources\about2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\actions_check5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -181,9 +190,6 @@ ..\Resources\actions_window.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\ZOO_FLOW_ sysicon_256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -208,8 +214,8 @@ ..\Resources\actions_check3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_check2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\1_LOGO_ZOO_FLOW_DROP3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\actions_addcircled3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -238,15 +244,12 @@ ..\Resources\save2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\doublenext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\del1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Checked-outforEdit_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -256,11 +259,11 @@ ..\Resources\2_LUPE_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\editnames.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\1_LOGO_ZOO_FLOW_DROP3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_addcircled5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -268,6 +271,9 @@ ..\Resources\about1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\save7.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -280,8 +286,8 @@ ..\Resources\actions_deletecircled5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\4_GLOBIX_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\about4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -292,11 +298,8 @@ ..\Resources\ZooFlow_CW_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\editnames.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\save4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\ZooFlow-25.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -304,15 +307,9 @@ ..\Resources\insertsheet.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\3_PERSON_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_edit.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\actions_edit2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -322,27 +319,33 @@ ..\Resources\managedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\ZooFlow_g-64 - Kopie.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Editdatasetwithdesigner_8449.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\about3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\doublenext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_add1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\del4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -352,8 +355,8 @@ ..\Resources\bo_document.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\save4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\pagesetup1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -367,6 +370,9 @@ ..\Resources\actions_deletecircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -376,23 +382,23 @@ ..\Resources\1_LOGO_ZOO_FLOW1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_edit.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_deletecircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_check2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_addcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -400,23 +406,23 @@ ..\Resources\crossdatasourcefiltering.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\Flow.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_database.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\3_PERSON_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\highimportance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -430,19 +436,16 @@ ..\Resources\windows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\4_GLOBIX_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ZooFlow_g-64 - Kopie.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bo_appearance1.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.ZooFlow/Resources/bo_appearance1.svg b/GUIs.ZooFlow/Resources/bo_appearance1.svg new file mode 100644 index 00000000..76c4cb8f --- /dev/null +++ b/GUIs.ZooFlow/Resources/bo_appearance1.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 4ce5ec1c..0886c015 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -866,6 +866,9 @@ + + +