From d49297816a3ffacca645e9f08d4db0640db0abd9 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 13 Dec 2017 12:43:33 +0100 Subject: [PATCH] jj 13.12 devexpress themes --- app/DD-Record-Organizer/ModuleMySettings.vb | 21 +- .../frmConfig_Basic.Designer.vb | 36 +- app/DD-Record-Organizer/frmConfig_Basic.resx | 1643 +++++++++++------ app/DD-Record-Organizer/frmConfig_Basic.vb | 16 + .../frmConstructor_Main.Designer.vb | 44 - .../frmConstructor_Main.resx | 112 +- .../frmConstructor_Main.vb | 588 +++--- app/DD-Record-Organizer/frmMain.Designer.vb | 8 - app/DD-Record-Organizer/frmMain.resx | 347 ++-- app/DD-Record-Organizer/frmMain.vb | 5 + 10 files changed, 1638 insertions(+), 1182 deletions(-) diff --git a/app/DD-Record-Organizer/ModuleMySettings.vb b/app/DD-Record-Organizer/ModuleMySettings.vb index 9c309af..93a4f9d 100644 --- a/app/DD-Record-Organizer/ModuleMySettings.vb +++ b/app/DD-Record-Organizer/ModuleMySettings.vb @@ -1,11 +1,14 @@ Imports System.IO Imports System.Xml Imports DD_LIB_Standards +Imports DevExpress.LookAndFeel + Module ModuleMySettings Public PATH_FileExclusions As String = Path.Combine(Application.UserAppDataPath(), "FileExclusions.xml") Dim ConfigPath As String = Path.Combine(Application.UserAppDataPath(), "UserConfig.xml") Public MyConnectionString As String = "" + Public MyFormsDesign As String = "" Public LogErrorsOnly As Boolean = True Public Sett_TaskOverviewKeepInFront As Boolean = True @@ -52,9 +55,9 @@ Module ModuleMySettings Dim rowresult As String = "" Try 'if file doesn't exist, create the file with its default xml table - If Not File.Exists(path_FileExclusions) Then + If Not File.Exists(PATH_FileExclusions) Then DTEXCLUDE_FILES = CreateExclusionTable() - DTEXCLUDE_FILES.WriteXml(path_FileExclusions) + DTEXCLUDE_FILES.WriteXml(PATH_FileExclusions) End If DTEXCLUDE_FILES = GetTablefromXML(PATH_FileExclusions) @@ -204,6 +207,10 @@ Module ModuleMySettings Else MY_ADDON_PATH = Row.Item("Value") End If + Case "MyFormsDesign" + If Row.Item("Value") <> String.Empty Then + MyFormsDesign = Row.Item("Value") + End If End Select Next 'update 1.1 @@ -256,6 +263,13 @@ Module ModuleMySettings DT.Rows.Add(newRow) DT.WriteXml(ConfigPath) End If + If rowresult.Contains("MyFormsDesign") = False Then + Dim newRow As DataRow = DT.NewRow() + newRow("ConfigName") = "MyFormsDesign" + newRow("Value") = "" + DT.Rows.Add(newRow) + DT.WriteXml(ConfigPath) + End If Catch ex As Exception @@ -349,6 +363,9 @@ Module ModuleMySettings newRow15("ConfigName") = "MyLinkedServer" newRow15("Value") = "" table.Rows.Add(newRow15) + Dim newRow16 As DataRow = table.NewRow() + newRow16("ConfigName") = "MyFormsDesign" + newRow16("Value") = "" table.AcceptChanges() ClassLogger.Add(">> CreateConfigTable su...", False) diff --git a/app/DD-Record-Organizer/frmConfig_Basic.Designer.vb b/app/DD-Record-Organizer/frmConfig_Basic.Designer.vb index 38cb29b..e89eff2 100644 --- a/app/DD-Record-Organizer/frmConfig_Basic.Designer.vb +++ b/app/DD-Record-Organizer/frmConfig_Basic.Designer.vb @@ -23,7 +23,7 @@ Partial Class frmConfig_Basic Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConfig_Basic)) - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.lblLinkedServer = New System.Windows.Forms.Label() @@ -49,6 +49,9 @@ Partial Class frmConfig_Basic Me.Label11 = New System.Windows.Forms.Label() Me.Label10 = New System.Windows.Forms.Label() Me.txtTask_Popup = New System.Windows.Forms.TextBox() + Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.Button5 = New System.Windows.Forms.Button() + Me.cmbDesign = New System.Windows.Forms.ComboBox() Me.GroupBox4 = New System.Windows.Forms.GroupBox() Me.Button3 = New System.Windows.Forms.Button() Me.cmbLanguage = New System.Windows.Forms.ComboBox() @@ -77,6 +80,7 @@ Partial Class frmConfig_Basic Me.TabPage1.SuspendLayout() Me.TabPage2.SuspendLayout() Me.GroupBox5.SuspendLayout() + Me.GroupBox1.SuspendLayout() Me.GroupBox4.SuspendLayout() Me.GroupBox3.SuspendLayout() Me.TabPage3.SuspendLayout() @@ -221,6 +225,7 @@ Partial Class frmConfig_Basic ' Me.TabPage2.Controls.Add(Me.Button4) Me.TabPage2.Controls.Add(Me.GroupBox5) + Me.TabPage2.Controls.Add(Me.GroupBox1) Me.TabPage2.Controls.Add(Me.GroupBox4) Me.TabPage2.Controls.Add(Me.GroupBox3) Me.TabPage2.Controls.Add(Me.chkLogErrorsOnly) @@ -262,6 +267,27 @@ Partial Class frmConfig_Basic resources.ApplyResources(Me.txtTask_Popup, "txtTask_Popup") Me.txtTask_Popup.Name = "txtTask_Popup" ' + 'GroupBox1 + ' + Me.GroupBox1.Controls.Add(Me.Button5) + Me.GroupBox1.Controls.Add(Me.cmbDesign) + resources.ApplyResources(Me.GroupBox1, "GroupBox1") + Me.GroupBox1.Name = "GroupBox1" + Me.GroupBox1.TabStop = False + ' + 'Button5 + ' + resources.ApplyResources(Me.Button5, "Button5") + Me.Button5.Name = "Button5" + Me.Button5.UseVisualStyleBackColor = True + ' + 'cmbDesign + ' + Me.cmbDesign.FormattingEnabled = True + Me.cmbDesign.Items.AddRange(New Object() {resources.GetString("cmbDesign.Items"), resources.GetString("cmbDesign.Items1"), resources.GetString("cmbDesign.Items2"), resources.GetString("cmbDesign.Items3"), resources.GetString("cmbDesign.Items4"), resources.GetString("cmbDesign.Items5"), resources.GetString("cmbDesign.Items6")}) + resources.ApplyResources(Me.cmbDesign, "cmbDesign") + Me.cmbDesign.Name = "cmbDesign" + ' 'GroupBox4 ' Me.GroupBox4.Controls.Add(Me.Button3) @@ -365,8 +391,8 @@ Partial Class frmConfig_Basic ' 'DataGridView1 ' - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua - Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.Aqua + Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 resources.ApplyResources(Me.DataGridView1, "DataGridView1") Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.DataGridView1.Name = "DataGridView1" @@ -441,6 +467,7 @@ Partial Class frmConfig_Basic Me.TabPage2.PerformLayout() Me.GroupBox5.ResumeLayout(False) Me.GroupBox5.PerformLayout() + Me.GroupBox1.ResumeLayout(False) Me.GroupBox4.ResumeLayout(False) Me.GroupBox3.ResumeLayout(False) Me.GroupBox3.PerformLayout() @@ -501,4 +528,7 @@ Partial Class frmConfig_Basic Friend WithEvents btncheckWDFolderexists As System.Windows.Forms.Button Friend WithEvents txtwdFolder As System.Windows.Forms.TextBox Friend WithEvents Label12 As System.Windows.Forms.Label + Friend WithEvents GroupBox1 As GroupBox + Friend WithEvents Button5 As Button + Friend WithEvents cmbDesign As ComboBox End Class diff --git a/app/DD-Record-Organizer/frmConfig_Basic.resx b/app/DD-Record-Organizer/frmConfig_Basic.resx index 2a98646..7f64141 100644 --- a/app/DD-Record-Organizer/frmConfig_Basic.resx +++ b/app/DD-Record-Organizer/frmConfig_Basic.resx @@ -117,30 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - - NoControl - - - - 6, 168 - - - 117, 13 - - - 52 - - - Name/IP Proxy-Server: - - - False - lblLinkedServer @@ -153,18 +129,6 @@ 0 - - 9, 184 - - - 288, 22 - - - 51 - - - False - txtLinkedServer @@ -177,43 +141,6 @@ 1 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 - JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsTAAALEwEAmpwYAAACLUlE - QVQ4T52TvY/ScBjHuVIRKHA9JAgnL+VoC7TX0kLLS6EvFBTa0uj5J7gYF+PsfpOTMrg4ORgHY+LCYJwc - TYyJiYuDLu7GxHgxd/Hnr5fA8TZcrsmnzfN9nufTNPnVBwDw2ZYljGzr3ciyTNu2EC87L75eb+DvD67f - hU9g9vt/HNs5cMaOf9Owohro7YNbe8PhjfuzzBOgkDuabk6bbRXoxuBkNLIeus6yhKyIwY5umo5tHxmG - +Wwu8G5QkIa0jN5gqnR1oOkGuOk6b1x3jHl9uaWGhpb1UtXNY1luPmJ4KbIkmAElAcgD3egfa5oJxq77 - oq3ovKJoE7XbBbwoTWhG2F7cWRJ4dFR1S9fNCvykT41mB9TqjSOxXvtJM9zrYokLrc4vFYtUBcngq9Lf - tqICvlr7RhQr8U1za4FHXZIIurT/mePFf1AEJLkFGJb7uml2LRBrcp4us1+g4KRcYV8lkmkplyenglgH - VIm9tzq/VJRZLpUlih9yBQrAt79Pp3bjkVgM244nsPwe/VQQ6r8pRsgu7pwtC61grkA/T10r/NrnxB8s - V2VmvQiOB0MhLMZVxY/pDPEkU6DnZ2Qu2M0STjJFAIpmAUmXD0NY9PQMzEBRPwJzkiSp71F8J1/ipNMj - f9rE8XggkUgexq9cBXmi+DYYjtCRGL72T+D4jr/RaE+waFgu8c0zgUcmT9UuBS4/9m0hmh9Fo7N8FXih - CIKE5/Vi8yJsDM8P8P0HLGwR4Wl3ICYAAAAASUVORK5CYII= - - - - MiddleLeft - - - 559, 141 - - - 97, 23 - - - 50 - - - Lösche Proxy - - - MiddleRight - - - False - btndeleteProxy @@ -226,21 +153,6 @@ 2 - - True - - - 141, 6 - - - 115, 17 - - - 49 - - - Proxy Connection - rbConn_Proxy @@ -253,21 +165,6 @@ 3 - - True - - - 9, 6 - - - 126, 17 - - - 48 - - - Default Connection - rbConnDefault @@ -280,24 +177,6 @@ 4 - - True - - - NoControl - - - 511, 48 - - - 170, 17 - - - 47 - - - Windows-Authentifizierung - chkbxUserAut @@ -310,24 +189,6 @@ 5 - - True - - - NoControl - - - 6, 127 - - - 150, 13 - - - 46 - - - Aktueller ConnectionString: - Label5 @@ -340,15 +201,6 @@ 6 - - 9, 94 - - - 288, 21 - - - 39 - cmbDatenbank @@ -361,24 +213,6 @@ 7 - - True - - - NoControl - - - 6, 74 - - - 67, 13 - - - 44 - - - Datenbank: - Label4 @@ -391,24 +225,6 @@ 8 - - True - - - NoControl - - - 6, 26 - - - 74, 13 - - - 41 - - - Server-Name: - Label1 @@ -421,24 +237,6 @@ 9 - - True - - - NoControl - - - 300, 26 - - - 84, 13 - - - 42 - - - Benutzername: - Label2 @@ -451,24 +249,6 @@ 10 - - True - - - NoControl - - - 424, 26 - - - 56, 13 - - - 43 - - - Passwort: - Label3 @@ -481,18 +261,6 @@ 11 - - Top, Left, Right - - - 9, 143 - - - 547, 22 - - - 45 - txtActualConnection @@ -505,15 +273,6 @@ 12 - - 9, 46 - - - 288, 22 - - - 36 - txtServer @@ -526,15 +285,6 @@ 13 - - 303, 46 - - - 118, 22 - - - 37 - txtUser @@ -547,17 +297,8 @@ 14 - - 427, 46 - - - 64, 22 - - - 38 - - - txtPasswort + + txtPasswort System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -568,27 +309,6 @@ 15 - - MiddleLeft - - - NoControl - - - 303, 90 - - - 253, 25 - - - 40 - - - Verbindung zur Datenbank herstellen - - - MiddleRight - BtnConnect @@ -601,15 +321,18 @@ 16 + 4, 22 + 3, 3, 3, 3 687, 259 + 0 @@ -661,24 +384,6 @@ 0 - - True - - - NoControl - - - 64, 25 - - - 157, 13 - - - 8 - - - Minuten ein Popup anzeigen - Label11 @@ -691,24 +396,6 @@ 0 - - True - - - NoControl - - - 6, 25 - - - 25, 13 - - - 7 - - - alle - Label10 @@ -721,15 +408,6 @@ 1 - - 33, 22 - - - 25, 22 - - - 6 - txtTask_Popup @@ -766,6 +444,54 @@ 1 + + Button5 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 0 + + + cmbDesign + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 1 + + + 363, 71 + + + 300, 50 + + + 12 + + + Aktuelles Design: + + + GroupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 2 + NoControl @@ -842,25 +568,7 @@ TabPage2 - 2 - - - True - - - NoControl - - - 284, 14 - - - 216, 13 - - - 4 - - - Folgende Sicht bei Programmstart laden: + 3 Label7 @@ -874,15 +582,6 @@ 0 - - 287, 30 - - - 248, 21 - - - 1 - cmbConstructor @@ -895,25 +594,6 @@ 1 - - True - - - NoControl - - - 10, 21 - - - 184, 30 - - - 0 - - - Kalender als Child aufrufen -(Eingebettet in Hauptformular) - CheckBox1 @@ -944,167 +624,1090 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPage2 + + TabPage2 + + + 4 + + + True + + + NoControl + + + 14, 17 + + + 105, 17 + + + 7 + + + Log Errors Only + + + chkLogErrorsOnly + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 5 + + + MiddleLeft + + + NoControl + + + 363, 42 + + + 133, 23 + + + 6 + + + Open Log-Folder + + + MiddleRight + + + Button1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 6 + + + MiddleLeft + + + NoControl + + + 502, 42 + + + 161, 23 + + + 2 + + + Open AppFolder User + + + MiddleRight + + + btnApplicationFolder + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 7 + + + True + + + Segoe UI, 9.75pt + + + NoControl + + + 138, 15 + + + 200, 17 + + + 1 + + + Link zu Support-Tool Digital Data + + + LinkLabel1 + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 8 + + + 4, 22 + + + 3, 3, 3, 3 + + + 687, 259 + + + 1 + + + Weitere Einstellungen + + + TabPage2 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 1 + + + chkSubfolder + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 0 + + + Label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 1 + + + DataGridView1 + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 2 + + + btnSaveExclusionFiles + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 3 + + + Button2 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 4 + + + txtScanFolderWatch + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 5 + + + Label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 6 + + + btnstartstop2 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 7 + + + 4, 22 + + + 3, 3, 3, 3 + + + 687, 259 + + + 2 + + + Hot Folder - Scan + + + TabPage3 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 2 + + + btncheckWDFolderexists + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 0 + + + txtwdFolder + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 1 + + + Label12 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage4 + + + 2 + + + 4, 22 + + + 3, 3, 3, 3 + + + 687, 259 + + + 3 + + + Weiteres + + + TabPage4 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 3 + + + Fill + + + 0, 0 + + + 695, 285 + + + 0 + + + TabControl1 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + NoControl + + + 6, 168 + + + 117, 13 + + + 52 + + + Name/IP Proxy-Server: + + + False + + + lblLinkedServer + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 0 + + + 9, 184 + + + 288, 22 + + + 51 + + + False + + + txtLinkedServer + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 1 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 + JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsTAAALEwEAmpwYAAACLUlE + QVQ4T52TvY/ScBjHuVIRKHA9JAgnL+VoC7TX0kLLS6EvFBTa0uj5J7gYF+PsfpOTMrg4ORgHY+LCYJwc + TYyJiYuDLu7GxHgxd/Hnr5fA8TZcrsmnzfN9nufTNPnVBwDw2ZYljGzr3ciyTNu2EC87L75eb+DvD67f + hU9g9vt/HNs5cMaOf9Owohro7YNbe8PhjfuzzBOgkDuabk6bbRXoxuBkNLIeus6yhKyIwY5umo5tHxmG + +Wwu8G5QkIa0jN5gqnR1oOkGuOk6b1x3jHl9uaWGhpb1UtXNY1luPmJ4KbIkmAElAcgD3egfa5oJxq77 + oq3ovKJoE7XbBbwoTWhG2F7cWRJ4dFR1S9fNCvykT41mB9TqjSOxXvtJM9zrYokLrc4vFYtUBcngq9Lf + tqICvlr7RhQr8U1za4FHXZIIurT/mePFf1AEJLkFGJb7uml2LRBrcp4us1+g4KRcYV8lkmkplyenglgH + VIm9tzq/VJRZLpUlih9yBQrAt79Pp3bjkVgM244nsPwe/VQQ6r8pRsgu7pwtC61grkA/T10r/NrnxB8s + V2VmvQiOB0MhLMZVxY/pDPEkU6DnZ2Qu2M0STjJFAIpmAUmXD0NY9PQMzEBRPwJzkiSp71F8J1/ipNMj + f9rE8XggkUgexq9cBXmi+DYYjtCRGL72T+D4jr/RaE+waFgu8c0zgUcmT9UuBS4/9m0hmh9Fo7N8FXih + CIKE5/Vi8yJsDM8P8P0HLGwR4Wl3ICYAAAAASUVORK5CYII= + + + + MiddleLeft + + + 559, 141 + + + 97, 23 + + + 50 + + + Lösche Proxy + + + MiddleRight + + + False + + + btndeleteProxy + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 2 + + + True + + + 141, 6 + + + 115, 17 + + + 49 + + + Proxy Connection + + + rbConn_Proxy + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 3 + + + True + + + 9, 6 + + + 126, 17 + + + 48 + + + Default Connection + + + rbConnDefault + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 4 + + + True + + + NoControl + + + 511, 48 + + + 170, 17 + + + 47 + + + Windows-Authentifizierung + + + chkbxUserAut + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 5 + + + True + + + NoControl + + + 6, 127 + + + 150, 13 + + + 46 + + + Aktueller ConnectionString: + + + Label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 6 + + + 9, 94 + + + 288, 21 + + + 39 + + + cmbDatenbank + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 7 + + + True + + + NoControl + + + 6, 74 + + + 67, 13 + + + 44 + + + Datenbank: + + + Label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 8 + + + True + + + NoControl + + + 6, 26 + + + 74, 13 + + + 41 + + + Server-Name: + + + Label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 9 + + + True + + + NoControl + + + 300, 26 + + + 84, 13 + + + 42 + + + Benutzername: + + + Label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 10 + + + True + + + NoControl + + + 424, 26 + + + 56, 13 + + + 43 + + + Passwort: + + + Label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 11 + + + Top, Left, Right + + + 9, 143 + + + 547, 22 + + + 45 + + + txtActualConnection + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 12 + + + 9, 46 + + + 288, 22 + + + 36 + + + txtServer + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 13 + + + 303, 46 + + + 118, 22 + + + 37 + + + txtUser + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 14 + + + 427, 46 + + + 64, 22 + + + 38 + + + txtPasswort + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 15 + + + MiddleLeft + + + NoControl + + + 303, 90 + + + 253, 25 + + + 40 + + + Verbindung zur Datenbank herstellen + + + MiddleRight + + + BtnConnect + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 16 + + + True + + + NoControl + + + 64, 25 + + + 157, 13 + + + 8 + + + Minuten ein Popup anzeigen + + + Label11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 0 + + + True + + + NoControl + + + 6, 25 + + + 25, 13 + + + 7 + + + alle + + + Label10 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 1 + + + 33, 22 + + + 25, 22 + + + 6 + + + txtTask_Popup + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 3 + + GroupBox5 - - True + + 2 - + NoControl - - 14, 17 - - - 105, 17 + + 149, 19 - - 7 + + 134, 23 - - Log Errors Only + + 47 - - chkLogErrorsOnly + + Design jetzt wechseln - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Button5 - - TabPage2 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4 + + GroupBox1 - - MiddleLeft + + 0 - - NoControl + + DevExpress Style - - 363, 42 + + DevExpress Dark Style - - 133, 23 + + Office 2016 Colorful - - 6 + + Office 2013 - - Open Log-Folder + + Office 2010 Blue - - MiddleRight + + Seven Classic - - Button1 + + Visual Studio 2013 Light - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 9, 21 - - TabPage2 + + 134, 21 - - 5 + + 46 - - MiddleLeft + + cmbDesign - - NoControl + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 502, 42 + + GroupBox1 - - 161, 23 + + 1 - - 2 + + True - - Open AppFolder User + + NoControl - - MiddleRight + + 284, 14 - - btnApplicationFolder + + 216, 13 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4 - - TabPage2 + + Folgende Sicht bei Programmstart laden: - - 6 + + Label7 - - True + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Segoe UI, 9.75pt + + GroupBox3 - - NoControl + + 0 - - 138, 15 + + 287, 30 - - 200, 17 + + 248, 21 - + 1 - - Link zu Support-Tool Digital Data + + cmbConstructor - - LinkLabel1 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GroupBox3 - - TabPage2 + + 1 - - 7 + + True - - 4, 22 + + NoControl - - 3, 3, 3, 3 + + 10, 21 - - 687, 259 + + 184, 30 - - 1 + + 0 - - Weitere Einstellungen + + Kalender als Child aufrufen +(Eingebettet in Hauptformular) - - TabPage2 + + CheckBox1 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabControl1 + + GroupBox3 - - 1 + + 2 True @@ -1334,33 +1937,6 @@ 7 - - 4, 22 - - - 3, 3, 3, 3 - - - 687, 259 - - - 2 - - - Hot Folder - Scan - - - TabPage3 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 2 - 466, 19 @@ -1433,57 +2009,6 @@ 2 - - 4, 22 - - - 3, 3, 3, 3 - - - 687, 259 - - - 3 - - - Weiteres - - - TabPage4 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 3 - - - Fill - - - 0, 0 - - - 695, 285 - - - 0 - - - TabControl1 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - True diff --git a/app/DD-Record-Organizer/frmConfig_Basic.vb b/app/DD-Record-Organizer/frmConfig_Basic.vb index 51a6a8e..a9935b3 100644 --- a/app/DD-Record-Organizer/frmConfig_Basic.vb +++ b/app/DD-Record-Organizer/frmConfig_Basic.vb @@ -1,5 +1,6 @@ Imports System.Threading Imports System.Globalization +Imports DevExpress.LookAndFeel Imports DD_LIB_Standards Public Class frmConfig_Basic Dim formloaded As Boolean = False @@ -154,6 +155,9 @@ Public Class frmConfig_Basic Else cmbConstructor.Enabled = False End If + + cmbDesign.Text = MyFormsDesign + 'Catch ex As Exception ' MsgBox("Fehler in FormLoad: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) 'End Try @@ -514,4 +518,16 @@ Public Class frmConfig_Basic Private Sub btnTest_Anmeldung_Click(sender As Object, e As EventArgs) End Sub + + Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click + If cmbDesign.SelectedIndex <> -1 Then + UserLookAndFeel.Default.SetSkinStyle(cmbDesign.Text) + SaveMySettingsValue("MyFormsDesign", cmbDesign.Text, "ConfigMain") + End If + + End Sub + + Private Sub cmbLanguage_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbLanguage.SelectedIndexChanged + + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb index 5a35cdb..e4646ec 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb @@ -202,9 +202,6 @@ Partial Class frmConstructor_Main Me.ToolStripSeparator16 = New System.Windows.Forms.ToolStripSeparator() Me.docCM_PropertiesFile = New System.Windows.Forms.ToolStripMenuItem() Me.docCM_ResetView = New System.Windows.Forms.ToolStripMenuItem() - Me.NavPane = New DevExpress.XtraBars.Navigation.TileNavPane() - Me.NavButtonHome = New DevExpress.XtraBars.Navigation.NavButton() - Me.NavButtonRefresh = New DevExpress.XtraBars.Navigation.NavButton() Me.StatusStrip_Main = New System.Windows.Forms.StatusStrip() Me.ContextMenuStripClipboard = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.tsslblStatus = New System.Windows.Forms.ToolStripStatusLabel() @@ -1414,43 +1411,6 @@ Partial Class frmConstructor_Main Me.docCM_ResetView.Name = "docCM_ResetView" resources.ApplyResources(Me.docCM_ResetView, "docCM_ResetView") ' - 'NavPane - ' - Me.NavPane.ButtonPadding = New System.Windows.Forms.Padding(12) - Me.NavPane.Buttons.Add(Me.NavButtonHome) - Me.NavPane.Buttons.Add(Me.NavButtonRefresh) - ' - 'TileNavCategory1 - ' - Me.NavPane.DefaultCategory.Name = "TileNavCategory1" - Me.NavPane.DefaultCategory.OptionsDropDown.BackColor = System.Drawing.Color.Empty - Me.NavPane.DefaultCategory.OwnerCollection = Nothing - ' - ' - ' - Me.NavPane.DefaultCategory.Tile.DropDownOptions.BeakColor = System.Drawing.Color.Empty - Me.NavPane.DefaultCategory.Tile.ItemSize = DevExpress.XtraBars.Navigation.TileBarItemSize.[Default] - resources.ApplyResources(Me.NavPane, "NavPane") - Me.NavPane.Name = "NavPane" - Me.NavPane.OptionsPrimaryDropDown.BackColor = System.Drawing.Color.Empty - Me.NavPane.OptionsSecondaryDropDown.BackColor = System.Drawing.Color.Empty - ' - 'NavButtonHome - ' - Me.NavButtonHome.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.[True] - Me.NavButtonHome.Caption = "" - Me.NavButtonHome.Glyph = CType(resources.GetObject("NavButtonHome.Glyph"), System.Drawing.Image) - Me.NavButtonHome.IsMain = True - Me.NavButtonHome.Name = "NavButtonHome" - ' - 'NavButtonRefresh - ' - Me.NavButtonRefresh.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right - Me.NavButtonRefresh.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.[True] - Me.NavButtonRefresh.Caption = "" - Me.NavButtonRefresh.Glyph = CType(resources.GetObject("NavButtonRefresh.Glyph"), System.Drawing.Image) - Me.NavButtonRefresh.Name = "NavButtonRefresh" - ' 'StatusStrip_Main ' Me.StatusStrip_Main.ContextMenuStrip = Me.ContextMenuStripClipboard @@ -1586,7 +1546,6 @@ Partial Class frmConstructor_Main Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.SplitContainerFORM) Me.Controls.Add(Me.StatusStrip_Main) - Me.Controls.Add(Me.NavPane) Me.KeyPreview = True Me.Name = "frmConstructor_Main" CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).EndInit() @@ -1653,8 +1612,6 @@ Partial Class frmConstructor_Main Me.PerformLayout() End Sub - Friend WithEvents NavPane As DevExpress.XtraBars.Navigation.TileNavPane - Friend WithEvents NavButtonHome As DevExpress.XtraBars.Navigation.NavButton Friend WithEvents StatusStrip_Main As System.Windows.Forms.StatusStrip Friend WithEvents TreeViewMain As System.Windows.Forms.TreeView Friend WithEvents GridControlMain As DevExpress.XtraGrid.GridControl @@ -1662,7 +1619,6 @@ Partial Class frmConstructor_Main Friend WithEvents grvwGrid As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents tsslblStatus As System.Windows.Forms.ToolStripStatusLabel Friend WithEvents tsslblRecord As System.Windows.Forms.ToolStripStatusLabel - Friend WithEvents NavButtonRefresh As DevExpress.XtraBars.Navigation.NavButton Friend WithEvents DD_ECMAdmin As DD_Record_Organizer.DD_ECMAdmin Friend WithEvents ContextMenuGrid As System.Windows.Forms.ContextMenuStrip Friend WithEvents FunktionenDataGridToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem diff --git a/app/DD-Record-Organizer/frmConstructor_Main.resx b/app/DD-Record-Organizer/frmConstructor_Main.resx index bcdf970..23e03cf 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.resx +++ b/app/DD-Record-Organizer/frmConstructor_Main.resx @@ -534,7 +534,7 @@ 0, 25 - 988, 212 + 981, 212 2 @@ -677,7 +677,7 @@ 0, 0 - 988, 25 + 981, 25 1 @@ -761,7 +761,7 @@ 0, 0 - 699, 343 + 699, 376 4 @@ -791,7 +791,7 @@ 0, 26 - 562, 293 + 555, 326 5 @@ -838,10 +838,10 @@ Ansicht eingeschränkt - Klick Bearbeiten für Entsperren - 0, 319 + 0, 352 - 562, 24 + 555, 24 0 @@ -868,7 +868,7 @@ 0, 0 - 562, 26 + 555, 26 0 @@ -889,7 +889,7 @@ Panel2 - 1270, 347 + 1270, 380 1 @@ -1065,7 +1065,7 @@ 1 - 1270, 372 + 1270, 405 Detailansicht @@ -1083,7 +1083,7 @@ 0 - 1276, 403 + 1276, 436 3 @@ -1101,7 +1101,7 @@ 255, 128, 0 - 1270, 347 + 1270, 380 0 @@ -1355,7 +1355,7 @@ - 1270, 372 + 1270, 405 Positionen @@ -1417,7 +1417,7 @@ Aqua - 1270, 347 + 1270, 380 7 @@ -1519,7 +1519,7 @@ 1 - 1270, 372 + 1270, 405 Dateien @@ -1950,7 +1950,7 @@ 2 - 1270, 372 + 1270, 405 Wiedervorlage @@ -2061,7 +2061,7 @@ 5 - 1270, 347 + 1270, 380 90 @@ -2133,7 +2133,7 @@ 1 - 1270, 372 + 1270, 405 Vorgängervarianten @@ -2166,7 +2166,7 @@ Panel2 - 1276, 645 + 1276, 685 2 @@ -2190,7 +2190,7 @@ Fill - 0, 40 + 0, 0 Panel1 @@ -2199,7 +2199,7 @@ Panel2 - 1276, 645 + 1276, 685 4 @@ -2438,60 +2438,6 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEhvbWU7HnRkOAAAAWlJREFUWEfF - lNFOxDAMBO/D+m1IfHmIT5mTvWzS9DiVhxG1O/WuQOLRWvtX7PJOynAch6MJ+d1XsPjWkjPL4OTOrECE - s4vn/M2SnFkGJ3dyOEE5XN+dkjPL4OSOBrhw2CqRM8vg5E4+vAqH0xI5swxO7lwJh2WJnFkGJw9m4d8D - 925aImeWwcmdVTjOpRI5swxGnoYPP97zf2C7RM4sQxb6z51wdqcl9D6UASE+6LhDLhy2fxM5swxDeCcc - tkrkzDIMwX24Ew5bfw7QAu6DK+GwLEFecFbgnXCYliAvWBX4SzjYEuQFswKfCIdfJcgLXIFPhkMpQV6g - BZ7h49kdeoKjOBeS88oIXg+KHsioC84FdcEuA3cE1AXngrpgl4E7AuqCc0FdsMvAHQF1wbmgLthl4I6A - uuBcUBfsMnBHQF1wLqgLdhm4I6AuOBfUBbsM3BFQF5wL6oJdBu4IqAvOBXXBLu/ELu+jPX4ATMNRVtCQ - oP8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAndEVYdFRpdGxlAFJlZnJlc2g7UmVwZWF0O0JhcnM7 - UmliYm9uO1JlbG9hZM1N9ukAAAGxSURBVFhHxZYxTsNAEEVzACSuk8LcJCegJE1ocg5OQZUCbkLHEaiQ - 6Mx/1tqaGY9jC5tN8STv+P/5jnez3l3btjclLdYkLdYkLdZkVGia5hp7cRKv4kN8F7imxj00mbcj5o0K - mUk8iBfxJdoZ0KDFk/U62zwXDonhUfALs7Br4MFre52FYpY/wLP4EVnAEvDSYwgHm+fCoYiBp8/C38WT - YK7vC1xT417U0+NiazbPhYMEwPzF1/4pjuIuenq4VzRorddhPa4BSAAsImui4SFqI9L0HIrH9hiwHtcA - JOB1xtV+jLoM6SxvwvYYsB7XACTgv2wNzOvka7dI1zMsuAzrcQ3Wouaz4WA9rsFa1Hw2HKzHNbgFabEm - bpC9rgS3l6/FDZKwCHPsPGtxgxAW6cLBeqaQjl0xbs2nqHODILawqXThYD1TSMeWbHuwue2jzg2CwdJt - xWLRAxRt3IrZ3kdaNwiGCA3/+jHiw9YdUKLHDYwB+IRu9TkeDiY2D9ygGKBfcFseSBY/wLDaC1seyVwe - uIEEMbxns0OpzYNRITMZmOv/PZbXJi3WJC3WJC3Wo939Ao+TPgKX3Mi+AAAAAElFTkSuQmCC - - - - Top - - - 0, 0 - - - 1276, 40 - - - 0 - - - TileNavPane1 - - - NavPane - - - DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - $this - - - 9 - 17, 17 @@ -3894,24 +3840,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TileNavCategory1 - - - DevExpress.XtraBars.Navigation.TileNavCategory, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - NavButtonHome - - - DevExpress.XtraBars.Navigation.NavButton, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - NavButtonRefresh - - - DevExpress.XtraBars.Navigation.NavButton, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - tsslblStatus diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index 49c278e..e153c69 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -1,9 +1,5 @@ Imports DevExpress.Utils -Imports DevExpress.XtraBars.Navigation Imports DevExpress.XtraEditors -Imports DevExpress.XtraEditors.Controls -Imports DevExpress.XtraEditors.Repository -Imports DevExpress.XtraGrid.Columns Imports DevExpress.XtraGrid.Views.Base Imports DevExpress.XtraGrid.Views.Tile Imports DevExpress.XtraGrid.Views.Grid @@ -17,13 +13,10 @@ Imports WINDREAMLib Imports System.Runtime.InteropServices Imports DD_Rights Imports DD_LIB_Standards +Imports DevExpress.LookAndFeel Public Class frmConstructor_Main - - - - - _ + Public Shared Function ShellExecuteEx(ByRef lpExecInfo As SHELLEXECUTEINFO) As Boolean End Function Public Structure SHELLEXECUTEINFO @@ -326,10 +319,10 @@ Public Class frmConstructor_Main CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS = ClassDatabase.Return_Datatable(String.Format("SELECT * FROM TBPMO_ENTITY_RIGHT_CONTROLS where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTORID), False) - Sql = String.Format("SELECT * FROM TBPMO_ENTITY_USERRIGHT_ADDING where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTORID) - DT_ADDING_USERS = ClassDatabase.Return_Datatable(Sql, False) - Sql = String.Format("SELECT * FROM TBPMO_STRUCTURE_NODES_CONFIGURATION where TYPE_NODE = 1000 AND ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTORID) - CURRENT_DT_NODE_CONFIGURABLE_NODES = ClassDatabase.Return_Datatable(Sql, False) + SQL = String.Format("SELECT * FROM TBPMO_ENTITY_USERRIGHT_ADDING where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTORID) + DT_ADDING_USERS = ClassDatabase.Return_Datatable(SQL, False) + SQL = String.Format("SELECT * FROM TBPMO_STRUCTURE_NODES_CONFIGURATION where TYPE_NODE = 1000 AND ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTORID) + CURRENT_DT_NODE_CONFIGURABLE_NODES = ClassDatabase.Return_Datatable(SQL, False) Catch ex As System.Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Error in Loading Form part 2") End Try @@ -635,57 +628,23 @@ Public Class frmConstructor_Main End Function #End Region -#Region "NavPane" - Sub Refresh_Navpane() - 'Die aktuelle Ebene überprüfen und das NAvpane aktualisieren - Select Case ACT_EBENE - Case 1 - If Not EBENE1_COLUMNNAME Is Nothing Then - EBENE1_GRID_RESULT = Get_GridResult(EBENE1_COLUMNNAME) - Dim cat As TileNavCategory = LoadLevel1Nav() - NavPane.Categories.Clear() - NavPane.Categories.Add(cat) - End If - Case 2 - If Not EBENE2_COLUMNNAME Is Nothing Then - EBENE2_GRID_RESULT = Get_GridResult(EBENE2_COLUMNNAME) - Dim cat As TileNavCategory = LoadLevel1Nav() - NavPane.Categories.Clear() - NavPane.Categories.Add(cat) - - Dim item As TileNavItem = LoadLevel2Nav() - cat.Items.Add(item) - End If - Case 3 - EBENE3_RECID = SELECTED_RECORD_ID - If Not EBENE3_COLUMNNAME Is Nothing Then - EBENE3_GRID_RESULT = Get_GridResult(EBENE3_COLUMNNAME) - Dim cat As TileNavCategory = LoadLevel1Nav() - NavPane.Categories.Clear() - NavPane.Categories.Add(cat) - - Dim item As TileNavItem = LoadLevel2Nav() - cat.Items.Add(item) - - Dim subitem As TileNavSubItem = LoadLevel3Nav() - item.SubItems.Add(subitem) + Sub Refresh_Entity_Data() + If TrySave_Automatic() = True Then + Save_Grid_Layout() + ' Setzt die RECORD_ID auf Null + ' damit beim Refresh keine alten Werte + ' in die Datenbank geschrieben werden + SELECTED_RECORD_ID = 0 + RECORD_ID = 0 + CURRENT_RECORD_ID = 0 - End If - End Select - End Sub - Private Function FindNode(tncoll As TreeNodeCollection, strText As [String]) As TreeNode - Dim tnFound As TreeNode - For Each tnCurr As TreeNode In tncoll - If tnCurr.Text.StartsWith(strText) Then - Return tnCurr - End If - tnFound = FindNode(tnCurr.Nodes, strText) - If tnFound IsNot Nothing Then - Return tnFound + If CtrlCommandUI.IsInsert Then + ActivateAllTabs() End If - Next - Return Nothing - End Function + Load_Datafor_Entity() + End If + End Sub + Dim NodesThatMatch As New List(Of TreeNode) Private Function SearchTheTreeView(ByVal TV As TreeView, ByVal TextToFind As String) As List(Of TreeNode) ' Empty previous @@ -716,110 +675,147 @@ Public Class frmConstructor_Main RecursiveSearch(TN, TextToFind) Next End Sub - Private Sub NavPane_MouseUp(sender As Object, e As MouseEventArgs) Handles NavPane.MouseUp - Dim pane As TileNavPane = TryCast(sender, TileNavPane) - Dim hitInfo As TileNavPaneHitInfo = pane.ViewInfo.CalcHitInfo(e.Location) - If hitInfo.InButton Then - Dim element = hitInfo.ButtonInfo.Element - NavPane.HideDropDownWindow() - - Save_Grid_Layout() - - If TypeOf element Is NavButton Then - Dim btn As NavButton = TryCast(element, NavButton) - If btn.IsMain Then - ResetNav() - ElseIf btn.Name = "NavButtonRefresh" Then - Refresh_Entity_Data() - End If - - Else - Dim Entity As String = element.Tag - Dim Node = FindNode(TreeViewMain.Nodes, Entity) - - If Node IsNot Nothing Then - TreeViewMain.SelectedNode = Node - Load_Datafor_Entity() - End If - End If - - End If - End Sub - Sub Refresh_Entity_Data() - If TrySave_Automatic() = True Then - Save_Grid_Layout() - ' Setzt die RECORD_ID auf Null - ' damit beim Refresh keine alten Werte - ' in die Datenbank geschrieben werden - SELECTED_RECORD_ID = 0 - RECORD_ID = 0 - CURRENT_RECORD_ID = 0 - - If CtrlCommandUI.IsInsert Then - ActivateAllTabs() - End If - Load_Datafor_Entity() - End If - End Sub - Private Function LoadLevel1Nav() - Dim cat As New TileNavCategory() - cat.Caption = EBENE1_GRID_RESULT - cat.Name = EBENE1_GRID_RESULT - cat.TileText = EBENE1_GRID_RESULT - cat.Tag = EBENE1_ENTITY - - NavPane.SelectedElement = cat - - Return cat - End Function - - Private Function LoadLevel2Nav() - Dim item As New TileNavItem() - item.Caption = EBENE2_GRID_RESULT - item.Name = EBENE2_GRID_RESULT - item.TileText = EBENE2_GRID_RESULT - item.Tag = EBENE2_ENTITY - - NavPane.SelectedElement = item - - Return item - End Function - - Private Function LoadLevel3Nav() - Dim subitem As New TileNavSubItem() - subitem.Caption = EBENE3_GRID_RESULT - subitem.Name = EBENE3_GRID_RESULT - subitem.TileText = EBENE3_GRID_RESULT - subitem.Tag = EBENE3_ENTITY - - NavPane.SelectedElement = subitem + '#Region "NavPane" + ' Sub Refresh_Navpane() + ' 'Die aktuelle Ebene überprüfen und das NAvpane aktualisieren + ' Select Case ACT_EBENE + ' Case 1 + ' If Not EBENE1_COLUMNNAME Is Nothing Then + ' EBENE1_GRID_RESULT = Get_GridResult(EBENE1_COLUMNNAME) + ' Dim cat As TileNavCategory = LoadLevel1Nav() + ' NavPane.Categories.Clear() + ' NavPane.Categories.Add(cat) + ' End If + ' Case 2 + ' If Not EBENE2_COLUMNNAME Is Nothing Then + ' EBENE2_GRID_RESULT = Get_GridResult(EBENE2_COLUMNNAME) + ' Dim cat As TileNavCategory = LoadLevel1Nav() + ' NavPane.Categories.Clear() + ' NavPane.Categories.Add(cat) + + ' Dim item As TileNavItem = LoadLevel2Nav() + ' cat.Items.Add(item) + ' End If + ' Case 3 + ' EBENE3_RECID = SELECTED_RECORD_ID + ' If Not EBENE3_COLUMNNAME Is Nothing Then + ' EBENE3_GRID_RESULT = Get_GridResult(EBENE3_COLUMNNAME) + ' Dim cat As TileNavCategory = LoadLevel1Nav() + ' NavPane.Categories.Clear() + ' NavPane.Categories.Add(cat) + + ' Dim item As TileNavItem = LoadLevel2Nav() + ' cat.Items.Add(item) + + ' Dim subitem As TileNavSubItem = LoadLevel3Nav() + ' item.SubItems.Add(subitem) + + ' End If + ' End Select + ' End Sub + ' Private Function FindNode(tncoll As TreeNodeCollection, strText As [String]) As TreeNode + ' Dim tnFound As TreeNode + ' For Each tnCurr As TreeNode In tncoll + ' If tnCurr.Text.StartsWith(strText) Then + ' Return tnCurr + ' End If + ' tnFound = FindNode(tnCurr.Nodes, strText) + ' If tnFound IsNot Nothing Then + ' Return tnFound + ' End If + ' Next + ' Return Nothing + ' End Function + ' Private Sub NavPane_MouseUp(sender As Object, e As MouseEventArgs) + ' Dim pane As TileNavPane = TryCast(sender, TileNavPane) + ' Dim hitInfo As TileNavPaneHitInfo = pane.ViewInfo.CalcHitInfo(e.Location) + ' If hitInfo.InButton Then + ' Dim element = hitInfo.ButtonInfo.Element + ' NavPane.HideDropDownWindow() + + ' Save_Grid_Layout() + + ' If TypeOf element Is NavButton Then + ' Dim btn As NavButton = TryCast(element, NavButton) + + ' If btn.IsMain Then + ' ResetNav() + ' ElseIf btn.Name = "NavButtonRefresh" Then + ' Refresh_Entity_Data() + ' End If - Return subitem - End Function + ' Else + ' Dim Entity As String = element.Tag + ' Dim Node = FindNode(TreeViewMain.Nodes, Entity) - Private Sub ResetNav() - 'Grid zurücksetzen - Clear_Grid_View() - ACT_EBENE = 0 - CURRENT_ACT_LEVEL = 0 - ACT_EBENE_STRING = "" - EBENE1_ENTITY = "" - EBENE1_RECID = 0 - EBENE2_ENTITY = "" - EBENE2_RECID = 0 - EBENE3_ENTITY = "" - EBENE3_RECID = 0 - 'Navigation zurücksetzen - NavPane.Categories.Clear() - 'TreeView zurücksetzen - 'Load_Tree_View(CONSTRUCTORID) - TreeViewMain.SelectedNode = Nothing - SetSelectedNodeStyle(TreeViewMain.Nodes) + ' If Node IsNot Nothing Then + ' TreeViewMain.SelectedNode = Node + ' Load_Datafor_Entity() + ' End If + ' End If - Load_Tree_View(CONSTRUCTORID) - End Sub -#End Region + ' End If + ' End Sub + + ' Private Function LoadLevel1Nav() + ' Dim cat As New TileNavCategory() + ' cat.Caption = EBENE1_GRID_RESULT + ' cat.Name = EBENE1_GRID_RESULT + ' cat.TileText = EBENE1_GRID_RESULT + ' cat.Tag = EBENE1_ENTITY + + ' NavPane.SelectedElement = cat + + ' Return cat + ' End Function + + ' Private Function LoadLevel2Nav() + ' Dim item As New TileNavItem() + ' item.Caption = EBENE2_GRID_RESULT + ' item.Name = EBENE2_GRID_RESULT + ' item.TileText = EBENE2_GRID_RESULT + ' item.Tag = EBENE2_ENTITY + + ' NavPane.SelectedElement = item + + ' Return item + ' End Function + + ' Private Function LoadLevel3Nav() + ' Dim subitem As New TileNavSubItem() + ' subitem.Caption = EBENE3_GRID_RESULT + ' subitem.Name = EBENE3_GRID_RESULT + ' subitem.TileText = EBENE3_GRID_RESULT + ' subitem.Tag = EBENE3_ENTITY + + ' NavPane.SelectedElement = subitem + + ' Return subitem + ' End Function + + ' Private Sub ResetNav() + ' 'Grid zurücksetzen + ' Clear_Grid_View() + ' ACT_EBENE = 0 + ' CURRENT_ACT_LEVEL = 0 + ' ACT_EBENE_STRING = "" + ' EBENE1_ENTITY = "" + ' EBENE1_RECID = 0 + ' EBENE2_ENTITY = "" + ' EBENE2_RECID = 0 + ' EBENE3_ENTITY = "" + ' EBENE3_RECID = 0 + ' 'Navigation zurücksetzen + ' NavPane.Categories.Clear() + ' 'TreeView zurücksetzen + ' 'Load_Tree_View(CONSTRUCTORID) + ' TreeViewMain.SelectedNode = Nothing + ' SetSelectedNodeStyle(TreeViewMain.Nodes) + + ' Load_Tree_View(CONSTRUCTORID) + ' End Sub + '#End Region #Region "GridControl" @@ -1379,110 +1375,110 @@ Public Class frmConstructor_Main 'CURRENT_DATE_FORMAT = USER_DATE_FORMAT If NODE_NAVIGATION = True Then - If NODE_NAVIGATION_LOADED = True Then - Exit Sub - Else - NODE_NAVIGATION_LOADED = True - End If + If NODE_NAVIGATION_LOADED = True Then + Exit Sub + Else + NODE_NAVIGATION_LOADED = True End If + End If - Dim sw As New Stopwatch - sw.Start() - Dim SelectedNode As TreeNode = TryCast(TreeViewMain.SelectedNode, TreeNode) + Dim sw As New Stopwatch + sw.Start() + Dim SelectedNode As TreeNode = TryCast(TreeViewMain.SelectedNode, TreeNode) - If SelectedNode IsNot Nothing Then - ENTITY_LOADED = False - ENTITY_ID = ClassNodeNavigation.Return_ENTITY_FOR_TAG(SelectedNode.Tag) - CURRENT_ENTITY_ID = ENTITY_ID - Dim result = (From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable() - Select form - Where form.Item("FORM_ID") = ENTITY_ID).Single() - CONSTRUCTOR_DETAIL_ID = result.Item("GUID") - ' CONSTRUCT_EXPAND = result.Item("EXPAND") - Dim FORM_DATE_FORMAT = result.Item("DATE_FORMAT") - If FORM_DATE_FORMAT <> USER_DATE_FORMAT Then + If SelectedNode IsNot Nothing Then + ENTITY_LOADED = False + ENTITY_ID = ClassNodeNavigation.Return_ENTITY_FOR_TAG(SelectedNode.Tag) + CURRENT_ENTITY_ID = ENTITY_ID + Dim result = (From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable() + Select form + Where form.Item("FORM_ID") = ENTITY_ID).Single() + CONSTRUCTOR_DETAIL_ID = result.Item("GUID") + ' CONSTRUCT_EXPAND = result.Item("EXPAND") + Dim FORM_DATE_FORMAT = result.Item("DATE_FORMAT") + If FORM_DATE_FORMAT <> USER_DATE_FORMAT Then CURRENT_DATE_FORMAT = USER_DATE_FORMAT Else CURRENT_DATE_FORMAT = FORM_DATE_FORMAT End If - LOCK_CONTROLS_BG_LOAD = result.Item("LOCK_CONTROLS_BG_LOAD") - If NODE_NAVIGATION = True Then - If SelectedNode.Tag.ToString.Contains("RECORD_ID") Then - Console.WriteLine("Record beinhaltet") + LOCK_CONTROLS_BG_LOAD = result.Item("LOCK_CONTROLS_BG_LOAD") + If NODE_NAVIGATION = True Then + If SelectedNode.Tag.ToString.Contains("RECORD_ID") Then + Console.WriteLine("Record beinhaltet") + End If + Console.WriteLine("CONTROL Navigacion") + Else + Dim parentNode As TreeNode = TryCast(SelectedNode.Parent, TreeNode) + + ACT_EBENE = 2 + CURRENT_ACT_LEVEL = 2 + If parentNode IsNot Nothing Then + Dim grandParentNode As TreeNode = TryCast(parentNode.Parent, TreeNode) + If grandParentNode IsNot Nothing Then + ACT_EBENE = 3 + CURRENT_ACT_LEVEL = 3 End If - Console.WriteLine("CONTROL Navigacion") Else - Dim parentNode As TreeNode = TryCast(SelectedNode.Parent, TreeNode) - - ACT_EBENE = 2 - CURRENT_ACT_LEVEL = 2 - If parentNode IsNot Nothing Then - Dim grandParentNode As TreeNode = TryCast(parentNode.Parent, TreeNode) - If grandParentNode IsNot Nothing Then - ACT_EBENE = 3 - CURRENT_ACT_LEVEL = 3 - End If - Else - ACT_EBENE = 1 - CURRENT_ACT_LEVEL = 1 - End If - + ACT_EBENE = 1 + CURRENT_ACT_LEVEL = 1 End If - ' LINQ für Zugriff auf DT_VWPMO_CONSTRUCTOR_FORMS - Dim query2 = From form In DT_WORKFLOWS_MANUAL.AsEnumerable() - Select form Where form.Item("ENTITY_ID") = ENTITY_ID - Dim Rows = query2.ToList() - _MANUAL_WORKFLOW = False - For Each _row In Rows - _MANUAL_WORKFLOW = _row.Item("MANUALLY") + End If + + ' LINQ für Zugriff auf DT_VWPMO_CONSTRUCTOR_FORMS + Dim query2 = From form In DT_WORKFLOWS_MANUAL.AsEnumerable() + Select form Where form.Item("ENTITY_ID") = ENTITY_ID + Dim Rows = query2.ToList() + _MANUAL_WORKFLOW = False + For Each _row In Rows + _MANUAL_WORKFLOW = _row.Item("MANUALLY") + Next + FAU_AD_DOMAIN = "" + FAU_AD_SERVER = "" + FAU_AD_USER = "" + FAU_AD_USER_PW = "" + + If DT_ADDING_USERS.Rows.Count > 0 Then + 'Überprüfen ob für diese Entität ein spezifischer windream-User verwendet wird, wenn Dateien abgelegt werden? + Dim query1 = From _user In DT_ADDING_USERS.AsEnumerable() + Select _user Where _user.Item("ENTITY_ID") = ENTITY_ID + Dim Rows1 = query1.ToList() + For Each _row In Rows1 + FAU_AD_DOMAIN = _row.Item("AD_DOMAIN").ToString() + FAU_AD_SERVER = _row.Item("AD_SERVER").ToString() + FAU_AD_USER = _row.Item("AD_USER").ToString() + Dim wrapper As New ClassEncryption("!35452didalog=") + Dim PWplainText As String + ' DecryptData throws if the wrong password is used. + Try + PWplainText = wrapper.DecryptData(_row.Item("AD_USER_PW").ToString()) + Catch ex As Exception + ClassLogger.Add("- the Password for FileAddingUser '" & FAU_AD_USER & "' could not be decrypted", False) + PWplainText = "" + End Try + FAU_AD_USER_PW = PWplainText Next - FAU_AD_DOMAIN = "" - FAU_AD_SERVER = "" - FAU_AD_USER = "" - FAU_AD_USER_PW = "" - - If DT_ADDING_USERS.Rows.Count > 0 Then - 'Überprüfen ob für diese Entität ein spezifischer windream-User verwendet wird, wenn Dateien abgelegt werden? - Dim query1 = From _user In DT_ADDING_USERS.AsEnumerable() - Select _user Where _user.Item("ENTITY_ID") = ENTITY_ID - Dim Rows1 = query1.ToList() - For Each _row In Rows1 - FAU_AD_DOMAIN = _row.Item("AD_DOMAIN").ToString() - FAU_AD_SERVER = _row.Item("AD_SERVER").ToString() - FAU_AD_USER = _row.Item("AD_USER").ToString() - Dim wrapper As New ClassEncryption("!35452didalog=") - Dim PWplainText As String - ' DecryptData throws if the wrong password is used. - Try - PWplainText = wrapper.DecryptData(_row.Item("AD_USER_PW").ToString()) - Catch ex As Exception - ClassLogger.Add("- the Password for FileAddingUser '" & FAU_AD_USER & "' could not be decrypted", False) - PWplainText = "" - End Try - FAU_AD_USER_PW = PWplainText - Next - End If + End If - Dim elapsed As Double - elapsed = sw.Elapsed.TotalSeconds - If LogErrorsOnly = False Then ClassLogger.Add(" >> Load_Datafor_Entity1 took " & Format(elapsed, "0.000000000") & " seconds", False) - If NODE_NAVIGATION = True Then - If SelectedNode.Tag.ToString.Contains("RECORD_ID") Then - Console.WriteLine("Record beinhaltet") - End If - Console.WriteLine("CONTROL Navigacion") - Else - Get_RecordCounts_Nodes() + Dim elapsed As Double + elapsed = sw.Elapsed.TotalSeconds + If LogErrorsOnly = False Then ClassLogger.Add(" >> Load_Datafor_Entity1 took " & Format(elapsed, "0.000000000") & " seconds", False) + If NODE_NAVIGATION = True Then + If SelectedNode.Tag.ToString.Contains("RECORD_ID") Then + Console.WriteLine("Record beinhaltet") End If - Load_Entity_Data(ACT_EBENE) - - sw.Stop() - sw.Reset() - elapsed = elapsed - sw.Elapsed.TotalSeconds - If LogErrorsOnly = False Then ClassLogger.Add(" >> Load_Datafor_Entity2 took " & Format(elapsed, "0.000000000") & " seconds", False) + Console.WriteLine("CONTROL Navigacion") + Else + Get_RecordCounts_Nodes() End If + Load_Entity_Data(ACT_EBENE) + + sw.Stop() + sw.Reset() + elapsed = elapsed - sw.Elapsed.TotalSeconds + If LogErrorsOnly = False Then ClassLogger.Add(" >> Load_Datafor_Entity2 took " & Format(elapsed, "0.000000000") & " seconds", False) + End If 'Catch ex As Exception ' ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Load_Datafor_Entity: " & ex.StackTrace) 'End Try @@ -1492,52 +1488,52 @@ Public Class frmConstructor_Main Sub Get_RecordCounts_Nodes() 'Try If NODE_NAVIGATION = True Then - Exit Sub - End If - Dim selnode As TreeNode = TreeViewMain.SelectedNode - Dim a As Integer = 0 - For Each childNodeLevel1 As TreeNode In selnode.Nodes - Dim PARENT_ID1 As Integer - Dim TYPE_ID1 As Integer - If a = 0 Then - Dim sql As String = "SELECT PARENT_ID, FORM_TYPE_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & ClassNodeNavigation.Return_ENTITY_FOR_TAG(childNodeLevel1.Tag) & " AND SCREEN_ID = " & CURRENT_SCREEN_ID - Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, True) - PARENT_ID1 = DT.Rows(0).Item(0) - TYPE_ID1 = DT.Rows(0).Item(1) - End If - If TYPE_ID1 <> 5 Then - If childNodeLevel1.Text = "Allgemein" Then - Console.WriteLine("Allgemein-Reiter") - End If - Dim result As Integer = ReturnAmountofRecords(ClassNodeNavigation.Return_ENTITY_FOR_TAG(childNodeLevel1.Tag)) - If result <> 99999999 Then - Dim origtext As String = childNodeLevel1.Text - If origtext.Contains(" (") Then - Dim existingstring = origtext.Substring(0, origtext.IndexOf("(") - 1) - childNodeLevel1.Text = existingstring & " (" & result.ToString & ")" - Else - childNodeLevel1.Text = childNodeLevel1.Text & " (" & result.ToString & ")" - End If + Exit Sub + End If + Dim selnode As TreeNode = TreeViewMain.SelectedNode + Dim a As Integer = 0 + For Each childNodeLevel1 As TreeNode In selnode.Nodes + Dim PARENT_ID1 As Integer + Dim TYPE_ID1 As Integer + If a = 0 Then + Dim sql As String = "SELECT PARENT_ID, FORM_TYPE_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & ClassNodeNavigation.Return_ENTITY_FOR_TAG(childNodeLevel1.Tag) & " AND SCREEN_ID = " & CURRENT_SCREEN_ID + Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, True) + PARENT_ID1 = DT.Rows(0).Item(0) + TYPE_ID1 = DT.Rows(0).Item(1) + End If + If TYPE_ID1 <> 5 Then + If childNodeLevel1.Text = "Allgemein" Then + Console.WriteLine("Allgemein-Reiter") + End If + Dim result As Integer = ReturnAmountofRecords(ClassNodeNavigation.Return_ENTITY_FOR_TAG(childNodeLevel1.Tag)) + If result <> 99999999 Then + Dim origtext As String = childNodeLevel1.Text + If origtext.Contains(" (") Then + Dim existingstring = origtext.Substring(0, origtext.IndexOf("(") - 1) + childNodeLevel1.Text = existingstring & " (" & result.ToString & ")" + Else + childNodeLevel1.Text = childNodeLevel1.Text & " (" & result.ToString & ")" End If + End If - For Each childNodeLevel2 As TreeNode In childNodeLevel1.Nodes - Dim origtext As String = childNodeLevel2.Text - If origtext.Contains(" (") Then - Dim existingstring = origtext.Substring(0, origtext.IndexOf("(") - 1) - childNodeLevel2.Text = existingstring + For Each childNodeLevel2 As TreeNode In childNodeLevel1.Nodes + Dim origtext As String = childNodeLevel2.Text + If origtext.Contains(" (") Then + Dim existingstring = origtext.Substring(0, origtext.IndexOf("(") - 1) + childNodeLevel2.Text = existingstring + End If + For Each childNodeLevel3 As TreeNode In childNodeLevel2.Nodes + Dim origtext1 As String = childNodeLevel3.Text + If origtext1.Contains(" (") Then + Dim existingstring = origtext1.Substring(0, origtext1.IndexOf("(") - 1) + childNodeLevel1.Text = existingstring End If - For Each childNodeLevel3 As TreeNode In childNodeLevel2.Nodes - Dim origtext1 As String = childNodeLevel3.Text - If origtext1.Contains(" (") Then - Dim existingstring = origtext1.Substring(0, origtext1.IndexOf("(") - 1) - childNodeLevel1.Text = existingstring - End If - Next Next - a += 1 - End If + Next + a += 1 + End If - Next + Next 'Catch ex As Exception ' ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Load_Datafor_Entity: " & ex.StackTrace) 'End Try @@ -2413,7 +2409,7 @@ Public Class frmConstructor_Main Else SELECTED_RECORD_ID = 0 PARENT_RECORDID = 0 - NavPane.Categories.Clear() + 'NavPane.Categories.Clear() tsslblRecord.Text = "" Update_Status_Label(True, "Entity 1 skipped - All Records loaded", EditState.Update) PARENT_SKIPPED = True @@ -2458,7 +2454,7 @@ Public Class frmConstructor_Main SELECTED_RECORD_ID = 0 PARENT_RECORDID = 0 - NavPane.Categories.Clear() + 'NavPane.Categories.Clear() Update_Status_Label(True, "Entity 2 skipped - All Records loaded", EditState.Update) tsslblRecord.Text = "" PARENT_SKIPPED = True @@ -2506,7 +2502,7 @@ Public Class frmConstructor_Main If IS_SINGLE_RECORD Then Show_Selected_Record_Data(RECORD_ID, True) Else - Refresh_Navpane() + 'Refresh_Navpane() Update_Record_Label(SELECTED_RECORD_ID) End If Get_RecordCounts_Nodes() @@ -3239,7 +3235,7 @@ Public Class frmConstructor_Main sw.Start() ' Laden der Daten bedeutet nicht dass Daten vom Benutzer geändert wurden! RECORD_CHANGED = False - Refresh_Navpane() + 'Refresh_Navpane() Update_Record_Label(SELECTED_RECORD_ID) Show_act_WFTask() @@ -4580,7 +4576,7 @@ Public Class frmConstructor_Main EBENE2_RECID = 0 EBENE3_ENTITY = "" EBENE3_RECID = 0 - NavPane.Categories.Clear() + 'NavPane.Categories.Clear() Load_Tree_View(CONSTRUCTORID) End Sub diff --git a/app/DD-Record-Organizer/frmMain.Designer.vb b/app/DD-Record-Organizer/frmMain.Designer.vb index 1aa98b5..9ea78cd 100644 --- a/app/DD-Record-Organizer/frmMain.Designer.vb +++ b/app/DD-Record-Organizer/frmMain.Designer.vb @@ -77,7 +77,6 @@ Partial Class frmMain Me.BarButtonItem25 = New DevExpress.XtraBars.BarButtonItem() Me.StatusPersonifiedLogin = New DevExpress.XtraBars.BarStaticItem() Me.BarButtonItem13 = New DevExpress.XtraBars.BarButtonItem() - Me.RibbonPageCategory1 = New DevExpress.XtraBars.Ribbon.RibbonPageCategory() Me.pageHome = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.groupQuickAccessForm = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -197,7 +196,6 @@ Partial Class frmMain resources.ApplyResources(Me.ribbonMain, "ribbonMain") Me.ribbonMain.MaxItemId = 8 Me.ribbonMain.Name = "ribbonMain" - Me.ribbonMain.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategory1}) Me.ribbonMain.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.pageHome, Me.pageForms, Me.pageAdmin}) Me.ribbonMain.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2010 Me.ribbonMain.StatusBar = Me.RibbonStatusBar1 @@ -542,11 +540,6 @@ Partial Class frmMain Me.BarButtonItem13.Id = 7 Me.BarButtonItem13.Name = "BarButtonItem13" ' - 'RibbonPageCategory1 - ' - Me.RibbonPageCategory1.Name = "RibbonPageCategory1" - resources.ApplyResources(Me.RibbonPageCategory1, "RibbonPageCategory1") - ' 'pageHome ' Me.pageHome.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.groupQuickAccessForm, Me.groupSearchAllOver}) @@ -772,7 +765,6 @@ Partial Class frmMain Friend WithEvents BarButtonItem9 As DevExpress.XtraBars.BarButtonItem Friend WithEvents itemAbout As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem19 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageCategory1 As DevExpress.XtraBars.Ribbon.RibbonPageCategory Friend WithEvents btnGlobalSearch As DevExpress.XtraBars.BarButtonItem Friend WithEvents groupSearchAllOver As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents LabelUser As DevExpress.XtraBars.BarButtonItem diff --git a/app/DD-Record-Organizer/frmMain.resx b/app/DD-Record-Organizer/frmMain.resx index 524b1f7..367abe0 100644 --- a/app/DD-Record-Organizer/frmMain.resx +++ b/app/DD-Record-Organizer/frmMain.resx @@ -124,18 +124,6 @@ 17, 56 - - 165, 22 - - - ADDI beenden - - - 165, 22 - - - Cockpit anzeigen - 166, 48 @@ -1044,6 +1032,18 @@ True + + 165, 22 + + + ADDI beenden + + + 165, 22 + + + Cockpit anzeigen + 1208, 17 @@ -2286,10 +2286,29 @@ z5X+PxSF4t+qN/szT9oWSwAAAABJRU5ErkJggg== - - Synchronisation windream-Dateien + + Globale Suche - + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACZ0RVh0VGl0 + bGUARmluZDtCYXJzO1JpYmJvbjtTdGFuZGFyZDtTZWFyY2i7ZZwIAAAC7klEQVQ4T6WTe0iTURjGP+1i + miD0RzdJCkVRA7EbzUuSRowuaGgNW27aalhupTOzpXYxL5kVol3I0UKtxJmbbLWZVJRlYJdptnIrU0uz + tVIso6kVT+9nGQX+UfTCj+98z3Pe853zfu9hAPwXv4cDMZGYTEwiHImxYL0x/gz5sSvsw3FT0hFPWb7a + kFagHdmRo7oaJcjwIX1iWn61x76iel1mcf2w/LheJ8ks9yDdQZZfy+YxjOzw6MBJkq26e+fBC5jbe6Gs + aoDkoGqYdNfM4rqhpkddeNb5FqfPX0NyrrqB9AmS/dVs3mg4xiTkLj9UUgfru0E0NFlQUFIFsfwie0Dv + 3YWX0f1mAJYOG85VXock6yLiUk5yyPt1HCf+zlPnawwt6Ozuh+HWE0h2lyAsOhuLV6YiamsxLF3vYe54 + hwu1d5C4RwF+suIs5bH1ok8ERMyJT6sYMj23wtjWC5XhIQRJhQhak4UNwjysFhbCaH4LU7sNl642Q5px + Bjypwh4QHDOd0h2YtcLC8grNPfR/tOPL12941mXD3hwlFnPTsWSZGCtic9FssaJvwI7hka8wmjrBEx/B + 0tWppbTAJCZSdGKox/qBtteKaIkKlXoT6m8+REB4Cub6rkHougPoJr+s5jEiE9Uo05qg0Tdi4QqpnRZw + Zrj8oi+fPg+BL1NDrHkDwX4tFXOAdrCLLSJ3fVIpBsnfkKzFFo0Vsfv0VCsb/EJEI+RPZcJicjoetXVD + qTaCJ9dAqWvB7aY2+AYldNEE91WCo+bWtldQ1LQgOl2HUm0rGu8/hecCnoV8F2Z+iFCafKAC1xtNePm6 + D4YbzRClFGG2d3g6TXDjcFNEsoNluHHXhB5rP+roeHHb8zDLOyKefLZjGTevwBiZf2ii2S90G7wWbbTM + 9ApLI30aMYGY4s8RbPYP3tLsw0nAvMD1LbN8IkSkOxOjvcD2vAvB/hZ3YgYxlRi7C+wk9n6wmhvh+vP9 + RyONd8P+hXHFvwfMd61HCl7ECOjpAAAAAElFTkSuQmCC + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACZ0RVh0VGl0 bGUARmluZDtCYXJzO1JpYmJvbjtTdGFuZGFyZDtTZWFyY2i7ZZwIAAAJwElEQVRYR8VWaVSU1xm2xsZU @@ -2337,7 +2356,51 @@ qy3lS/H/Rm5QvyqWfPjLAcv+Bd859emhr0AKAAAAAElFTkSuQmCC - + + StatusUser + + + Extra Views User + + + + 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 + kmkAAAAASUVORK5CYII= + + + + Synchronisation windream-Dateien + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACZ0RVh0VGl0 bGUARmluZDtCYXJzO1JpYmJvbjtTdGFuZGFyZDtTZWFyY2i7ZZwIAAAJwElEQVRYR8VWaVSU1xm2xsZU @@ -2385,29 +2448,7 @@ qy3lS/H/Rm5QvyqWfPjLAcv+Bd859emhr0AKAAAAAElFTkSuQmCC - - Globale Suche - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACZ0RVh0VGl0 - bGUARmluZDtCYXJzO1JpYmJvbjtTdGFuZGFyZDtTZWFyY2i7ZZwIAAAC7klEQVQ4T6WTe0iTURjGP+1i - miD0RzdJCkVRA7EbzUuSRowuaGgNW27aalhupTOzpXYxL5kVol3I0UKtxJmbbLWZVJRlYJdptnIrU0uz - tVIso6kVT+9nGQX+UfTCj+98z3Pe853zfu9hAPwXv4cDMZGYTEwiHImxYL0x/gz5sSvsw3FT0hFPWb7a - kFagHdmRo7oaJcjwIX1iWn61x76iel1mcf2w/LheJ8ks9yDdQZZfy+YxjOzw6MBJkq26e+fBC5jbe6Gs - aoDkoGqYdNfM4rqhpkddeNb5FqfPX0NyrrqB9AmS/dVs3mg4xiTkLj9UUgfru0E0NFlQUFIFsfwie0Dv - 3YWX0f1mAJYOG85VXock6yLiUk5yyPt1HCf+zlPnawwt6Ozuh+HWE0h2lyAsOhuLV6YiamsxLF3vYe54 - hwu1d5C4RwF+suIs5bH1ok8ERMyJT6sYMj23wtjWC5XhIQRJhQhak4UNwjysFhbCaH4LU7sNl642Q5px - Bjypwh4QHDOd0h2YtcLC8grNPfR/tOPL12941mXD3hwlFnPTsWSZGCtic9FssaJvwI7hka8wmjrBEx/B - 0tWppbTAJCZSdGKox/qBtteKaIkKlXoT6m8+REB4Cub6rkHougPoJr+s5jEiE9Uo05qg0Tdi4QqpnRZw - Zrj8oi+fPg+BL1NDrHkDwX4tFXOAdrCLLSJ3fVIpBsnfkKzFFo0Vsfv0VCsb/EJEI+RPZcJicjoetXVD - qTaCJ9dAqWvB7aY2+AYldNEE91WCo+bWtldQ1LQgOl2HUm0rGu8/hecCnoV8F2Z+iFCafKAC1xtNePm6 - D4YbzRClFGG2d3g6TXDjcFNEsoNluHHXhB5rP+roeHHb8zDLOyKefLZjGTevwBiZf2ii2S90G7wWbbTM - 9ApLI30aMYGY4s8RbPYP3tLsw0nAvMD1LbN8IkSkOxOjvcD2vAvB/hZ3YgYxlRi7C+wk9n6wmhvh+vP9 - RyONd8P+hXHFvwfMd61HCl7ECOjpAAAAAElFTkSuQmCC - - - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACZ0RVh0VGl0 bGUARmluZDtCYXJzO1JpYmJvbjtTdGFuZGFyZDtTZWFyY2i7ZZwIAAAJwElEQVRYR8VWaVSU1xm2xsZU @@ -2453,47 +2494,6 @@ f9moomYYtXX3sfZtGhbYqm4GFbXD7R9v2R/z0trXPiAcGrlycqU/Y0xVJPgdAZ2EqqSJhn5qGwioI92z H96GlUb79Bl9R69plEs/sTcJ3iKg49AD+2P+T005EBVCV4RGRUH79NmPOi7a//rTSCnoGM/i/9QoaSk8 qy3lS/H/Rm5QvyqWfPjLAcv+Bd859emhr0AKAAAAAElFTkSuQmCC - - - - StatusUser - - - Extra Views User - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAARdEVYdFRpdGxlAE1hbjtQZXJzb2478+0UpAAABotJ - REFUWEe9VllMlFcUruwMw8zgsC+zMAyzA8MmimKtCiIosskyDLggQrUudbfDotBIgyLLAJWiQm0b+tSk - TRPTpOlDk9r0ofGhxSbta5PGpC+mphFJTs85/MPg/48P0qZfcjLzn3PP/b577rn3/18DgBfMB5WtNaAh - 1iUVd6VlHRzvz+2cWXC0jS0Y9vX3x+cf0FDsJTkMMRfzSRwCXjLROrQga/Nwf/7xOSh6ex6KzsyD48AE - aEsv92MsmMYEyGOIuZhP4hAgnkSYiASE2Fw3FwpPfQKFKKDw9DzkH5sDXZlngWI0JkAeQ8zFfBKHAPEk - wkQsQLfLs1Bw8mMkRxFoeSggefPJRxSjMQHyGGIu5pM4BIgnESYiAcHrsw8O6Ct6IefINGS3T4Nm5yWI - cbQNYOz/ERCdUaVVWprfVdncj8joP/kwFkRjAuQxxFzMJ3EICDAJNyBaKFoEWpRgMrRwtIANKOQyxFzM - J3EIEE3AK4+1l6scbZNf5XbNQv7xjyDr0C0w7LnyZXyey4DxgOUX8hliLuaTOASsSmZytbUUt3niu2Xy - e2x5x+5BNorQV175Vq7flYzjSIRkG3wQczGfxCFgFXmI2lIaY2/1PiDyPIE4780PIZdtFvQVfUvBkWpl - 6razZ3F8GNoL2+GDmIv5JA4/lsvu2BNL5M7Ou0yqLfNAbhcRz4Gza9l05b2UqDLsHcATcfE8/qceWRHh - g5iL+SQOP0hAmLVl9L7z6B1ebcrWM6Aw1fVmHZoGZ+fssh2d9QlQW1vGwVR/HdK2n7uIz5Fo3BdoDDEX - 80kcftBeRtjd489ycZXm/TdAadrfjb71thYvEt+FHCTPwV/drh5KjM2ouoZ3wx3IrB+C1G1nLqGPRHAl - 0CRczCdx+EECZDa39zmVX1fe8xyfVWhKWmnOERTQgYaE2mUBamyU70111yHr8G3IrEURr78oQszFfBKH - H5QURavN6cAyL5MoyKzNY5CNxNnttyEbybRl3RRThcfakkmEsW4IHAdnIGPfICQWdXZhjBpzbQKsrjEU - sLJKJZm5aRSJZyALBWThr7aUBZC4yIg4RxKJSK+8Coa910DtPPwF+umiChJzMZ/E4QcLMDeO8Eq1pR4W - ECpPicvERiPirEMzvFLNzneWMEYCaKXhEfHZiXg9f6qytjxUZNbuRR/dnq9cAe6BtO2XFokocdOJRXzm - LYjNPfLY7p5C8g/A3jaNW9Dztzy1QI8x3/HzXde0/ySK5pJwMZ/E4QclhSstTTfxLAP94rNcnrYhSWWq - KFY72/+yuifBfmAaTI1jkPbGhW9CZOoYHEPklLva1nQK+CJCo/2jFw69eBSanZfvJ23scMm1JcXxG449 - sbdMga31FmTUDEFKyekRHCNH45L/q5tQSCQRtAKaMCq93HPK1DCKXz+9T9SOqpJoQ0VLytZzSzb3+2BF - 01cMQFJRx2Eai7bycvJBzMV8EoeAVepJQEScsz7XVD/81Oa+BebmceyJk78FR8SkYJMNaMv6wOqaAksz - fhuW9z6Ly2+rpBzK/S8qEIp7u95YPfjA4prAlU6BAW88ldU1jzE6ljH4/3Nj7XWwuCbB3OjFW/DiU/RT - w4asWQCCyKmMUfry7j4qvRX329wwDuqc9t8jYu06jHGnhyo0qYkbT/xhbvKCpWkC3wUekCUXmjDGFxAa - Q8zFfBKHH1T6yISCls3G2huLXGJcYVLx6aXo9N11GKPGpCYlkXKlpf6CsXYYT4QXj2UfqMw11egngWsS - QElh4SpNgmHf4M9UVkvzJL4ProLS3DCNMSovdzoa94gseVNhetV7YGrwgm73AFaplV5c1IwUZ4i5mE/i - 8Jc+WlfePWHaPwJmLKux7ibg1/CvIbL4JIzx1bqqT8KCwuQJmrK+p5koQL9nEOILO+fQT0KpSlwFMRfz - SRxC6ROL2iuMNcNL5sYJbqyEohOLUdrtZRjj0hO5zxAkOCa55OxPxtpRMFQP4Vad+oF8QuyVBJDiaH3l - wC8mbDgqadqObsDjNoh+7my01ZeMr2KKuILOzzJqhsFYOwLJW87/iT61EHtlAYqEoreeUFPRfqrs7h+D - wqLj0c+lRxMLoJwoFOnR7OgBY/UIxOZ10lFccwVkCmP1cZXV/VhpcT2UpW7JQ9/Kh4WPXCQiLCQqkd6C - X6NvUWGs8aCPmpBz0CRczCdxLA8m1bTXdNFQ2X1vOZ4oAMhPlaEK0Xj6clp5J6AxxFwA8No/K4uTvqJI - kmkAAAAASUVORK5CYII= @@ -2573,59 +2573,32 @@ 0, 0 - - RibbonPageCategory1 - - - Kalender - - - Views/Sichten - - - Weitere Views - Home Yellow - - Views/Sichten - Weitere Sichten - - Programm Konfiguration - - - Tasks und windream-Konfigurationen - - - Menü Konfiguration - - - Connections - Administration - 1484, 150 + 1492, 150 - 0, 787 + 0, 791 - 1484, 23 + 1492, 23 RibbonStatusBar1 - DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -2637,7 +2610,7 @@ ribbonMain - DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -2645,6 +2618,30 @@ 4 + + Kalender + + + Views/Sichten + + + Weitere Views + + + Views/Sichten + + + Programm Konfiguration + + + Tasks und windream-Konfigurationen + + + Menü Konfiguration + + + Connections + 242, 17 @@ -2688,7 +2685,7 @@ 6, 13 - 1484, 810 + 1492, 814 Segoe UI, 8.25pt @@ -3640,343 +3637,337 @@ MainMenu - DevExpress.XtraBars.Ribbon.ApplicationMenu, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Ribbon.ApplicationMenu, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a itemSettings - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a itemScanInbox - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem19 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a itemInfo - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a itemAbout - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a itemExit - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a LabelMachine - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a LabelLoggedIn - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a LabelVersion - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem1 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem3 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem4 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem5 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem6 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem7 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem2 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem10 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem12 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItemConnections - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem15 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem16 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem17 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem18 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a LabelLanguage - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem20 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItemSAPConnect - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItemStructureNOdes - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarSubItem1 - DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem14 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem21 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem22 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem8 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem9 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem23 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a btnGlobalSearch - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a LabelUser - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a bbtnItemViewsUser - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a LabelProxyServer - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarSubItem2 - DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarSubItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem25 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a StatusPersonifiedLogin - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem13 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageCategory1 - - - DevExpress.XtraBars.Ribbon.RibbonPageCategory, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a pageHome - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a RibbonPageGroup2 - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a groupQuickAccessForm - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a groupSearchAllOver - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a pageForms - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a groupQuickAccessForm2 - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a pageAdmin - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a RibbonPageGroupProgram - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a RibbonPageGroupTask - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a RibbonPageGroupMenue - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a RibbonPageGroup1 - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DefaultLookAndFeel1 - DevExpress.LookAndFeel.DefaultLookAndFeel, DevExpress.Utils.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.LookAndFeel.DefaultLookAndFeel, DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarButtonItem11 - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TimerClose3Minutes @@ -3988,13 +3979,13 @@ RibbonPageGroup3 - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BarStaticItem1 - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TimerInformation @@ -4006,6 +3997,6 @@ frmMain - DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmMain.vb b/app/DD-Record-Organizer/frmMain.vb index 192b391..31c671c 100644 --- a/app/DD-Record-Organizer/frmMain.vb +++ b/app/DD-Record-Organizer/frmMain.vb @@ -9,6 +9,7 @@ Imports System.Globalization Imports System.Net Imports System.Net.Sockets Imports DD_LIB_Standards +Imports DevExpress.LookAndFeel Public Class frmMain Dim strIPAddress As String @@ -65,6 +66,10 @@ Public Class frmMain ' Form Titel setzen ClassWindowLocation.LoadFormLocationSize(Me, 1, CURRENT_SCREEN_ID, "frmMain") Dim i = My.Application.UICulture.ToString() + + UserLookAndFeel.Default.SetSkinStyle(MyFormsDesign) + + ' GetIPv4Address() 'Dim splash As New frmSplash() 'splash.ShowDialog()