From ef804638b36668b2d10c62e927345fc0d5ed6547 Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Thu, 21 Sep 2023 12:07:24 +0200 Subject: [PATCH] MS Skins --- Global_Indexer/App.config | 4 +- Global_Indexer/ClassConfig.vb | 1 + Global_Indexer/frmConfig_Basic.designer.vb | 33 +- Global_Indexer/frmConfig_Basic.resx | 889 +++++++++++++++------ Global_Indexer/frmConfig_Basic.vb | 16 + Global_Indexer/frmIndex.resx | 4 +- Global_Indexer/frmStart.resx | 10 +- Global_Indexer/frmStart.vb | 9 + 8 files changed, 712 insertions(+), 254 deletions(-) diff --git a/Global_Indexer/App.config b/Global_Indexer/App.config index a993409..918a5cd 100644 --- a/Global_Indexer/App.config +++ b/Global_Indexer/App.config @@ -8,10 +8,10 @@ - Skin/Office 2019 White + Skin/Office 2016 Colorful - Yale + diff --git a/Global_Indexer/ClassConfig.vb b/Global_Indexer/ClassConfig.vb index a2d7afc..73206e5 100644 --- a/Global_Indexer/ClassConfig.vb +++ b/Global_Indexer/ClassConfig.vb @@ -19,4 +19,5 @@ Public Class ClassConfig ' Misc Settings Public Property LogDEBUG As Boolean = True Public Property WindreamSearchMaximized As Boolean = False + Public Property MyFormsDesign As String = "" End Class diff --git a/Global_Indexer/frmConfig_Basic.designer.vb b/Global_Indexer/frmConfig_Basic.designer.vb index f712fd0..d3cdaf9 100644 --- a/Global_Indexer/frmConfig_Basic.designer.vb +++ b/Global_Indexer/frmConfig_Basic.designer.vb @@ -22,8 +22,8 @@ Partial Class frmConfig_Basic 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() 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() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.chkbxUserAut = New System.Windows.Forms.CheckBox() @@ -63,6 +63,9 @@ Partial Class frmConfig_Basic Me.btnstartstop2 = New System.Windows.Forms.Button() Me.btnstartstop1 = New System.Windows.Forms.Button() Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() + Me.Button5 = New System.Windows.Forms.Button() + Me.cmbDesign = New System.Windows.Forms.ComboBox() + Me.Label10 = New System.Windows.Forms.Label() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() Me.TabPage2.SuspendLayout() @@ -169,6 +172,9 @@ Partial Class frmConfig_Basic ' 'TabPage2 ' + Me.TabPage2.Controls.Add(Me.Label10) + Me.TabPage2.Controls.Add(Me.Button5) + Me.TabPage2.Controls.Add(Me.cmbDesign) Me.TabPage2.Controls.Add(Me.LinkLabel1) Me.TabPage2.Controls.Add(Me.Button3) Me.TabPage2.Controls.Add(Me.cmbLanguage) @@ -266,8 +272,8 @@ Partial Class frmConfig_Basic ' 'DataGridView1 ' - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua - Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle3.BackColor = System.Drawing.Color.Aqua + Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 resources.ApplyResources(Me.DataGridView1, "DataGridView1") Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.DataGridView1.Name = "DataGridView1" @@ -343,6 +349,24 @@ Partial Class frmConfig_Basic ' Me.OpenFileDialog1.FileName = "OpenFileDialog1" ' + 'Button5 + ' + resources.ApplyResources(Me.Button5, "Button5") + Me.Button5.Name = "Button5" + Me.Button5.UseVisualStyleBackColor = True + ' + 'cmbDesign + ' + resources.ApplyResources(Me.cmbDesign, "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")}) + Me.cmbDesign.Name = "cmbDesign" + ' + 'Label10 + ' + resources.ApplyResources(Me.Label10, "Label10") + Me.Label10.Name = "Label10" + ' 'frmConfig_Basic ' resources.ApplyResources(Me, "$this") @@ -401,4 +425,7 @@ Partial Class frmConfig_Basic Friend WithEvents Label9 As System.Windows.Forms.Label Friend WithEvents Button3 As System.Windows.Forms.Button Friend WithEvents LinkLabel1 As System.Windows.Forms.LinkLabel + Friend WithEvents Label10 As Label + Friend WithEvents Button5 As Button + Friend WithEvents cmbDesign As ComboBox End Class diff --git a/Global_Indexer/frmConfig_Basic.resx b/Global_Indexer/frmConfig_Basic.resx index 4194471..6c88bab 100644 --- a/Global_Indexer/frmConfig_Basic.resx +++ b/Global_Indexer/frmConfig_Basic.resx @@ -117,23 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - - 255, 58 - - - 170, 17 - - - 47 - - - Windows-Authentifizierung - chkbxUserAut @@ -146,21 +129,6 @@ 0 - - True - - - 5, 115 - - - 150, 13 - - - 46 - - - Aktueller ConnectionString: - Label5 @@ -173,15 +141,6 @@ 1 - - 8, 78 - - - 244, 21 - - - 39 - cmbDatenbank @@ -194,21 +153,6 @@ 2 - - True - - - 5, 62 - - - 67, 13 - - - 44 - - - Datenbank: - Label4 @@ -221,21 +165,6 @@ 3 - - True - - - 5, 14 - - - 74, 13 - - - 41 - - - Server-Name: - Label1 @@ -248,21 +177,6 @@ 4 - - True - - - 255, 14 - - - 83, 13 - - - 42 - - - Benutzername: - Label2 @@ -275,21 +189,6 @@ 5 - - True - - - 379, 14 - - - 56, 13 - - - 43 - - - Passwort: - Label3 @@ -302,19 +201,6 @@ 6 - - - Top, Left, Right - - - 8, 131 - - - 500, 22 - - - 45 - txtActualConnection @@ -327,15 +213,6 @@ 7 - - 6, 30 - - - 246, 22 - - - 36 - txtServer @@ -348,15 +225,6 @@ 8 - - 255, 30 - - - 118, 22 - - - 37 - txtUser @@ -369,15 +237,6 @@ 9 - - 382, 30 - - - 64, 22 - - - 38 - txtPasswort @@ -390,24 +249,6 @@ 10 - - MiddleLeft - - - 255, 75 - - - 253, 25 - - - 40 - - - Verbindung zur Datenbank herstellen - - - MiddleRight - BtnConnect @@ -420,15 +261,18 @@ 11 + 4, 22 + 3, 3, 3, 3 582, 280 + 0 @@ -447,11 +291,116 @@ 0 + + True + + + NoControl + + + 8, 127 + + + 96, 13 + + + 48 + + + Aktuelles Design: + + + Label10 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 0 + + + Segoe UI, 8.25pt + + + NoControl + + + 197, 141 + + + 134, 23 + + + 47 + + + Design jetzt wechseln + + + Button5 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 1 + + + Segoe UI, 8.25pt + + + DevExpress Style + + + DevExpress Dark Style + + + Office 2016 Colorful + + + Office 2013 + + + Office 2010 Blue + + + Seven Classic + + + Visual Studio 2013 Light + + + 11, 143 + + + 180, 21 + + + 46 + + + cmbDesign + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 2 + True - 8, 166 + 8, 222 153, 13 @@ -472,7 +421,7 @@ TabPage2 - 0 + 3 197, 95 @@ -496,7 +445,7 @@ TabPage2 - 1 + 4 German @@ -523,7 +472,7 @@ TabPage2 - 2 + 5 True @@ -550,7 +499,7 @@ TabPage2 - 3 + 6 True @@ -577,7 +526,7 @@ TabPage2 - 4 + 7 True @@ -605,7 +554,7 @@ TabPage2 - 5 + 8 True @@ -632,13 +581,13 @@ TabPage2 - 6 + 9 MiddleLeft - 11, 140 + 11, 196 180, 23 @@ -662,7 +611,7 @@ TabPage2 - 7 + 10 MiddleLeft @@ -671,7 +620,7 @@ NoControl - 197, 140 + 197, 196 180, 23 @@ -695,7 +644,7 @@ TabPage2 - 8 + 11 4, 22 @@ -724,22 +673,6 @@ 1 - - True - - - 8, 197 - - - 453, 26 - - - 13 - - - Definieren Sie hier Inhalte von Dateinamen welche von der Folderwatch-Überwachung -ausgenommen werden sollen: - Label8 @@ -752,11 +685,534 @@ ausgenommen werden sollen: 0 - - Top, Bottom, Left + + DataGridView1 - - 11, 226 + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 1 + + + Button2 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 2 + + + txtScanFolderWatch + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 3 + + + Label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 4 + + + btnsetFW_Folder + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 5 + + + btnFW_OwnFiles + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 6 + + + btnFW_Desktop + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 7 + + + txtFolderWatch + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 8 + + + Label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 9 + + + btnSaveExclusionFiles + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 10 + + + btnstartstop2 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 11 + + + btnstartstop1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 12 + + + 4, 22 + + + 3, 3, 3, 3 + + + 582, 280 + + + 2 + + + Überwachte Ordner - Folderwatch + + + TabPage3 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 2 + + + Fill + + + 0, 0 + + + 590, 306 + + + 0 + + + TabControl1 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 255, 58 + + + 170, 17 + + + 47 + + + Windows-Authentifizierung + + + chkbxUserAut + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 0 + + + True + + + 5, 115 + + + 150, 13 + + + 46 + + + Aktueller ConnectionString: + + + Label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 1 + + + 8, 78 + + + 244, 21 + + + 39 + + + cmbDatenbank + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 2 + + + True + + + 5, 62 + + + 67, 13 + + + 44 + + + Datenbank: + + + Label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 3 + + + True + + + 5, 14 + + + 74, 13 + + + 41 + + + Server-Name: + + + Label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 4 + + + True + + + 255, 14 + + + 83, 13 + + + 42 + + + Benutzername: + + + Label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 5 + + + True + + + 379, 14 + + + 56, 13 + + + 43 + + + Passwort: + + + Label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 6 + + + Top, Left, Right + + + 8, 131 + + + 500, 22 + + + 45 + + + txtActualConnection + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 7 + + + 6, 30 + + + 246, 22 + + + 36 + + + txtServer + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 8 + + + 255, 30 + + + 118, 22 + + + 37 + + + txtUser + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 9 + + + 382, 30 + + + 64, 22 + + + 38 + + + txtPasswort + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 10 + + + MiddleLeft + + + 255, 75 + + + 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 + + + 11 + + + True + + + 8, 197 + + + 453, 26 + + + 13 + + + Definieren Sie hier Inhalte von Dateinamen welche von der Folderwatch-Überwachung +ausgenommen werden sollen: + + + Label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 0 + + + Top, Bottom, Left + + + 11, 226 192, 48 @@ -1064,57 +1520,6 @@ ausgenommen werden sollen: 12 - - 4, 22 - - - 3, 3, 3, 3 - - - 582, 280 - - - 2 - - - Überwachte Ordner - Folderwatch - - - TabPage3 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 2 - - - Fill - - - 0, 0 - - - 590, 306 - - - 0 - - - TabControl1 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - 17, 17 diff --git a/Global_Indexer/frmConfig_Basic.vb b/Global_Indexer/frmConfig_Basic.vb index 91442ab..c906744 100644 --- a/Global_Indexer/frmConfig_Basic.vb +++ b/Global_Indexer/frmConfig_Basic.vb @@ -2,6 +2,7 @@ Imports System.Threading Imports System.Globalization Imports DigitalData.Modules.Database +Imports DevExpress.LookAndFeel Public Class frmConfig_Basic Dim formloaded = False @@ -149,6 +150,8 @@ Public Class frmConfig_Basic Else cmbLanguage.SelectedIndex = 1 End If + cmbDesign.Text = CONFIG.Config.MyFormsDesign + 'chkdelete_origin.Checked = CURR_DELETE_ORIGIN Case 2 If ERROR_STATE = "NO DB-CONNECTION" Then @@ -521,4 +524,17 @@ Public Class frmConfig_Basic ' Navigate to a URL. Process.Start("https://digitaldata.works/support") End Sub + + Private Sub Label10_Click(sender As Object, e As EventArgs) Handles Label10.Click + + 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) + CONFIG.Config.MyFormsDesign = cmbDesign.Text + CONFIG.Save() + + End If + End Sub End Class \ No newline at end of file diff --git a/Global_Indexer/frmIndex.resx b/Global_Indexer/frmIndex.resx index 52b8762..a30ca9c 100644 --- a/Global_Indexer/frmIndex.resx +++ b/Global_Indexer/frmIndex.resx @@ -421,7 +421,7 @@ Multi-Indexing - Alle nachfolgenden Dateien (0) identisch indexieren - 441, 18 + 441, 20 12 @@ -610,7 +610,7 @@ DocumentViewer1 - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.1.0, Culture=neutral, PublicKeyToken=null + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.0.0, Culture=neutral, PublicKeyToken=null SplitContainer1.Panel2 diff --git a/Global_Indexer/frmStart.resx b/Global_Indexer/frmStart.resx index 2e0e362..3a32714 100644 --- a/Global_Indexer/frmStart.resx +++ b/Global_Indexer/frmStart.resx @@ -543,10 +543,10 @@ Bottom - 0, 136 + 0, 135 - 294, 25 + 294, 26 barDockControlBottom @@ -567,7 +567,7 @@ 0, 0 - 0, 136 + 0, 135 barDockControlLeft @@ -588,7 +588,7 @@ 294, 0 - 0, 136 + 0, 135 barDockControlRight @@ -634,7 +634,7 @@ 25, 20, 20, 20 - 294, 136 + 294, 135 8 diff --git a/Global_Indexer/frmStart.vb b/Global_Indexer/frmStart.vb index 035949d..6c9719d 100644 --- a/Global_Indexer/frmStart.vb +++ b/Global_Indexer/frmStart.vb @@ -8,6 +8,7 @@ Imports DigitalData.Modules.Language Imports DigitalData.Modules.Windows Imports DigitalData.Modules.License Imports DigitalData.GUIs.Common +Imports DevExpress.LookAndFeel Public Class frmStart Public LicenseManager As LicenseManagerLegacy @@ -93,6 +94,10 @@ Public Class frmStart End If DATABASE_ECM.ExecuteNonQuery("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')") + If CONFIG.Config.MyFormsDesign <> "" Then + UserLookAndFeel.Default.SetSkinStyle(CONFIG.Config.MyFormsDesign) + End If + TopMost = True Catch ex As Exception @@ -674,4 +679,8 @@ Public Class frmStart Private Sub LabelControl1_DragLeave(sender As Object, e As EventArgs) Handles LabelControl1.DragLeave 'PictureEdit1.Visible = False End Sub + + Private Sub frmStart_GiveFeedback(sender As Object, e As GiveFeedbackEventArgs) Handles Me.GiveFeedback + + End Sub End Class \ No newline at end of file