From a705621ec8905a2b0b3366b812539162fc86b25c Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 4 Apr 2022 15:59:02 +0200 Subject: [PATCH 1/6] Fix SQL Command for Column config not updating in UI --- app/DD_PM_WINDREAM/frmColumn_Detail.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/DD_PM_WINDREAM/frmColumn_Detail.vb b/app/DD_PM_WINDREAM/frmColumn_Detail.vb index e85c490..6b3c316 100644 --- a/app/DD_PM_WINDREAM/frmColumn_Detail.vb +++ b/app/DD_PM_WINDREAM/frmColumn_Detail.vb @@ -170,6 +170,7 @@ Public Class frmColumn_Detail If DatabaseFallback.ExecuteNonQueryECM(oUpdate) = True Then tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Always tslblAenderungen.Caption = "Changes saved - " & Now + SQL_COMMANDTextBox.Text = oForm.SQLCommand End If End If From 041b306924a85b1e17cbe9b5fed5aed52df8fa3e Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 4 Apr 2022 16:09:32 +0200 Subject: [PATCH 2/6] Properly clear columns for Result grid in frmSQL_DESIGNER --- app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb index 8a451d6..9a1b28f 100644 --- a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb +++ b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb @@ -157,6 +157,8 @@ Public Class frmSQL_DESIGNER Dim ds As DataSet = ExecuteWithConnection(cmbConnection.SelectedValue, query) If ds IsNot Nothing Then + GridView1.Columns.Clear() + GridView1.PopulateColumns(ds.Tables(0)) GridControl1.DataSource = ds.Tables(0) End If From d8e667cafbee14e83b36cff3d536388000882388 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 5 Apr 2022 13:12:18 +0200 Subject: [PATCH 3/6] Correct name to Task Flow --- app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index 3a902d5..b2a3399 100644 --- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb +++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb @@ -8,10 +8,10 @@ Imports System.Runtime.InteropServices ' Die Werte der Assemblyattribute überprüfen - + - + From f25609283094a0056044f694150e648425e22058 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 5 Apr 2022 13:12:38 +0200 Subject: [PATCH 4/6] Add GridFontSizeDelta setting --- app/DD_PM_WINDREAM/ClassConfig.vb | 1 + app/DD_PM_WINDREAM/frmMain.vb | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/app/DD_PM_WINDREAM/ClassConfig.vb b/app/DD_PM_WINDREAM/ClassConfig.vb index 366b4e9..8e389c4 100644 --- a/app/DD_PM_WINDREAM/ClassConfig.vb +++ b/app/DD_PM_WINDREAM/ClassConfig.vb @@ -35,5 +35,6 @@ Public Class ClassConfig Public Property LastExportPath As String = "" Public Property ADDITIONAL_SEARCHES_LOAD_ONCLICK As Boolean = True + Public Property GridFontSizeDelta As Integer = 0 End Class diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 2909966..4ba45b0 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -11,6 +11,7 @@ Imports System.IO Imports DevExpress.XtraPrinting Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback Imports DigitalData.Modules.EDMI.API.Constants +Imports DigitalData.GUIs.Common Imports DevExpress.XtraGrid.Views.BandedGrid Imports DevExpress.XtraBars.Ribbon @@ -36,6 +37,7 @@ Public Class frmMain Private FormShown As Boolean = False Private GridIsLoaded As Boolean = False Private OverviewOrDEtail As String = "OVERVIEW" + Private GridBuilder As GridBuilder Private allgFunk As New ClassAllgemeineFunktionen Private _Init As New ClassInit @@ -138,6 +140,10 @@ Public Class frmMain FormOpenClose = True LOGGER.Debug("Initializing MainForm....") + GridBuilder = New GridBuilder(GridViewWFItems) + GridBuilder.WithFontSizeDelta(CONFIG.Config.GridFontSizeDelta) + + ' Create helper to save/load expanded GroupColumns at runtime RefreshHelper = New RefreshHelper(LOGCONFIG, GridViewWFItems, "GUID") Dim oVErsion = String.Format("{0}.{1}.{2}", My.Application.Info.Version.Major, My.Application.Info.Version.Minor, My.Application.Info.Version.Build) @@ -923,6 +929,7 @@ Public Class frmMain RestoreLayout() + GridViewWFItems.Columns.Item("PROFILE_ID").Visible = False GridViewWFItems.Columns.Item("GUID").Visible = False Try From 2b52b2a71ff317ab5aaa78bd0c944dcaa6e1e987 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 5 Apr 2022 14:00:04 +0200 Subject: [PATCH 5/6] Add UI for setting font size --- app/DD_PM_WINDREAM/My Project/licenses.licx | 15 +++-- app/DD_PM_WINDREAM/frmKonfig.Designer.vb | 23 +++++++ app/DD_PM_WINDREAM/frmKonfig.resx | 75 ++++++++++++++++++--- app/DD_PM_WINDREAM/frmKonfig.vb | 31 +++++++++ app/DD_PM_WINDREAM/frmMain.vb | 2 + 5 files changed, 129 insertions(+), 17 deletions(-) diff --git a/app/DD_PM_WINDREAM/My Project/licenses.licx b/app/DD_PM_WINDREAM/My Project/licenses.licx index 5d20b3f..9cd1a8e 100644 --- a/app/DD_PM_WINDREAM/My Project/licenses.licx +++ b/app/DD_PM_WINDREAM/My Project/licenses.licx @@ -1,10 +1,11 @@ -DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD_PM_WINDREAM/frmKonfig.Designer.vb b/app/DD_PM_WINDREAM/frmKonfig.Designer.vb index ab28018..8064560 100644 --- a/app/DD_PM_WINDREAM/frmKonfig.Designer.vb +++ b/app/DD_PM_WINDREAM/frmKonfig.Designer.vb @@ -42,6 +42,7 @@ Partial Class frmKonfig Me.txtActualConnection = New System.Windows.Forms.TextBox() Me.txtServer = New System.Windows.Forms.TextBox() Me.TabPage3 = New System.Windows.Forms.TabPage() + Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl() Me.Button4 = New System.Windows.Forms.Button() Me.Label7 = New System.Windows.Forms.Label() Me.txtIntervall = New System.Windows.Forms.TextBox() @@ -63,6 +64,7 @@ Partial Class frmKonfig Me.TBPM_KONFIGURATIONTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter() Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog() + Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit() Me.TabControl1.SuspendLayout() Me.TabPage2.SuspendLayout() Me.TabPage3.SuspendLayout() @@ -72,6 +74,7 @@ Partial Class frmKonfig CType(Me.gvLogs, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'OpenFileDialog1 @@ -193,6 +196,8 @@ Partial Class frmKonfig ' 'TabPage3 ' + Me.TabPage3.Controls.Add(Me.ComboBoxEdit1) + Me.TabPage3.Controls.Add(Me.LabelControl1) Me.TabPage3.Controls.Add(Me.Button4) Me.TabPage3.Controls.Add(Me.Label7) Me.TabPage3.Controls.Add(Me.txtIntervall) @@ -207,6 +212,13 @@ Partial Class frmKonfig Me.TabPage3.Name = "TabPage3" Me.TabPage3.UseVisualStyleBackColor = True ' + 'LabelControl1 + ' + Me.LabelControl1.Appearance.Font = CType(resources.GetObject("LabelControl1.Appearance.Font"), System.Drawing.Font) + Me.LabelControl1.Appearance.Options.UseFont = True + resources.ApplyResources(Me.LabelControl1, "LabelControl1") + Me.LabelControl1.Name = "LabelControl1" + ' 'Button4 ' resources.ApplyResources(Me.Button4, "Button4") @@ -339,6 +351,14 @@ Partial Class frmKonfig Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' + 'ComboBoxEdit1 + ' + resources.ApplyResources(Me.ComboBoxEdit1, "ComboBoxEdit1") + Me.ComboBoxEdit1.Name = "ComboBoxEdit1" + Me.ComboBoxEdit1.Properties.Appearance.Font = CType(resources.GetObject("ComboBoxEdit1.Properties.Appearance.Font"), System.Drawing.Font) + Me.ComboBoxEdit1.Properties.Appearance.Options.UseFont = True + Me.ComboBoxEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("ComboBoxEdit1.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + ' 'frmKonfig ' resources.ApplyResources(Me, "$this") @@ -357,6 +377,7 @@ Partial Class frmKonfig CType(Me.gvLogs, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPM_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -399,4 +420,6 @@ Partial Class frmKonfig Friend WithEvents LogNachrichtenLeerenToolStripMenuItem As ToolStripMenuItem Friend WithEvents SpeichereLogAlsToolStripMenuItem As ToolStripMenuItem Friend WithEvents SaveFileDialog1 As SaveFileDialog + Friend WithEvents LabelControl1 As DevExpress.XtraEditors.LabelControl + Friend WithEvents ComboBoxEdit1 As DevExpress.XtraEditors.ComboBoxEdit End Class diff --git a/app/DD_PM_WINDREAM/frmKonfig.resx b/app/DD_PM_WINDREAM/frmKonfig.resx index e09513f..22bb578 100644 --- a/app/DD_PM_WINDREAM/frmKonfig.resx +++ b/app/DD_PM_WINDREAM/frmKonfig.resx @@ -507,6 +507,61 @@ 0 + + 8, 225 + + + Tahoma, 9.75pt + + + + Combo + + + 146, 22 + + + 49 + + + ComboBoxEdit1 + + + DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TabPage3 + + + 0 + + + Tahoma, 9.75pt + + + 8, 203 + + + 146, 16 + + + 48 + + + Schriftgröße in Übersicht: + + + LabelControl1 + + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TabPage3 + + + 1 + NoControl @@ -532,7 +587,7 @@ TabPage3 - 0 + 2 True @@ -559,7 +614,7 @@ TabPage3 - 1 + 3 8, 162 @@ -583,7 +638,7 @@ TabPage3 - 2 + 4 True @@ -610,7 +665,7 @@ TabPage3 - 3 + 5 MiddleLeft @@ -637,7 +692,7 @@ TabPage3 - 4 + 6 True @@ -664,7 +719,7 @@ TabPage3 - 5 + 7 8, 64 @@ -688,7 +743,7 @@ TabPage3 - 6 + 8 True @@ -715,7 +770,7 @@ TabPage3 - 7 + 9 438, 64 @@ -739,7 +794,7 @@ TabPage3 - 8 + 10 MiddleLeft @@ -769,7 +824,7 @@ TabPage3 - 9 + 11 4, 26 diff --git a/app/DD_PM_WINDREAM/frmKonfig.vb b/app/DD_PM_WINDREAM/frmKonfig.vb index 8bf8fb9..456d280 100644 --- a/app/DD_PM_WINDREAM/frmKonfig.vb +++ b/app/DD_PM_WINDREAM/frmKonfig.vb @@ -25,12 +25,35 @@ Public Class frmKonfig chkLogErrorsOnly.Checked = CBool(DEBUG) txtIntervall.Text = CONFIG.Config.ReminderTimer + + Dim oFontSettings = New List(Of FontSetting) From { + New FontSetting With {.Title = "Kleiner", .Value = -2}, + New FontSetting With {.Title = "Normal", .Value = 0}, + New FontSetting With {.Title = "Größer", .Value = 2} + } + + ComboBoxEdit1.Properties.Items.Clear() + ComboBoxEdit1.Properties.Items.AddRange(oFontSettings) + ComboBoxEdit1.SelectedItem = oFontSettings. + Where(Function(item) item.Value = CONFIG.Config.GridFontSizeDelta). + FirstOrDefault() + + Catch ex As Exception LOGGER.Error(ex) MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei Formload Grundkonfig:") End Try End Sub + Public Class FontSetting + Public Property Title As String + Public Property Value As Integer + + Public Overrides Function ToString() As String + Return Title + End Function + End Class + Private Sub cmbDatenbank_Click(sender As System.Object, e As System.EventArgs) Handles cmbDatenbank.Click Try @@ -250,4 +273,12 @@ Public Class frmKonfig MsgBox("Error in Export: " & ex.Message) End Try End Sub + + Private Sub ComboBoxEdit1_SelectedValueChanged(sender As Object, e As EventArgs) Handles ComboBoxEdit1.SelectedValueChanged + Try + CONFIG.Config.GridFontSizeDelta = DirectCast(ComboBoxEdit1.EditValue, FontSetting).Value + CONFIG.Save() + Catch ex As Exception + End Try + End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 4ba45b0..67f8334 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -1906,6 +1906,7 @@ Public Class frmMain Await Reset_GridLayout(False) Await Decide_Load(False, True) SaveGridLayout() + GridBuilder.WithFontSizeDelta(CONFIG.Config.GridFontSizeDelta) If GridControl_Docs.Visible = True And FormOpenClose = False Then RefreshHelper.LoadViewInfo() FRONTEND_ACTION = "NONE" End Sub @@ -2259,6 +2260,7 @@ Public Class frmMain frmKonfig.ShowDialog() ' Load_Profil() + GridBuilder.WithFontSizeDelta(CONFIG.Config.GridFontSizeDelta) Check_Timer_Notification() Catch ex As Exception LOGGER.Error(ex) From 494c90e40747946b3a8cb61ebb3169ee0083e975 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 5 Apr 2022 14:00:51 +0200 Subject: [PATCH 6/6] Version 2.3.5.3 --- app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index b2a3399..ae0c1a7 100644 --- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb +++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - +