From 89dd39b081b4a7ef6305752d9d73ab436b7a79c9 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 6 Apr 2022 12:07:50 +0200 Subject: [PATCH] Move Grid Fontsizedelta to frmMain --- app/DD_PM_WINDREAM/frmKonfig.Designer.vb | 23 --- app/DD_PM_WINDREAM/frmKonfig.resx | 75 ++------ app/DD_PM_WINDREAM/frmKonfig.vb | 27 --- app/DD_PM_WINDREAM/frmMain.Designer.vb | 49 +++++- app/DD_PM_WINDREAM/frmMain.resx | 211 +++++++++++++++-------- app/DD_PM_WINDREAM/frmMain.vb | 31 +++- 6 files changed, 221 insertions(+), 195 deletions(-) diff --git a/app/DD_PM_WINDREAM/frmKonfig.Designer.vb b/app/DD_PM_WINDREAM/frmKonfig.Designer.vb index 8064560..ab28018 100644 --- a/app/DD_PM_WINDREAM/frmKonfig.Designer.vb +++ b/app/DD_PM_WINDREAM/frmKonfig.Designer.vb @@ -42,7 +42,6 @@ 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() @@ -64,7 +63,6 @@ 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() @@ -74,7 +72,6 @@ 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 @@ -196,8 +193,6 @@ 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) @@ -212,13 +207,6 @@ 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") @@ -351,14 +339,6 @@ 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") @@ -377,7 +357,6 @@ 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 @@ -420,6 +399,4 @@ 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 22bb578..e09513f 100644 --- a/app/DD_PM_WINDREAM/frmKonfig.resx +++ b/app/DD_PM_WINDREAM/frmKonfig.resx @@ -507,61 +507,6 @@ 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 @@ -587,7 +532,7 @@ TabPage3 - 2 + 0 True @@ -614,7 +559,7 @@ TabPage3 - 3 + 1 8, 162 @@ -638,7 +583,7 @@ TabPage3 - 4 + 2 True @@ -665,7 +610,7 @@ TabPage3 - 5 + 3 MiddleLeft @@ -692,7 +637,7 @@ TabPage3 - 6 + 4 True @@ -719,7 +664,7 @@ TabPage3 - 7 + 5 8, 64 @@ -743,7 +688,7 @@ TabPage3 - 8 + 6 True @@ -770,7 +715,7 @@ TabPage3 - 9 + 7 438, 64 @@ -794,7 +739,7 @@ TabPage3 - 10 + 8 MiddleLeft @@ -824,7 +769,7 @@ TabPage3 - 11 + 9 4, 26 diff --git a/app/DD_PM_WINDREAM/frmKonfig.vb b/app/DD_PM_WINDREAM/frmKonfig.vb index 456d280..a39d7ab 100644 --- a/app/DD_PM_WINDREAM/frmKonfig.vb +++ b/app/DD_PM_WINDREAM/frmKonfig.vb @@ -26,17 +26,7 @@ Public Class frmKonfig 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 @@ -45,15 +35,6 @@ Public Class frmKonfig 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 @@ -273,12 +254,4 @@ 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.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index 92c36b3..76acf7e 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -174,6 +174,10 @@ Partial Class frmMain Me.bwBasicData = New System.ComponentModel.BackgroundWorker() Me.XtraSaveFileDialog1 = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components) Me.TimerInactivity = New System.Windows.Forms.Timer(Me.components) + Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RepositoryItemTrackBar1 = New DevExpress.XtraEditors.Repository.RepositoryItemTrackBar() + Me.barItemGridFontSize = New DevExpress.XtraBars.BarEditItem() + Me.cmbGridFontSize = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() CType(Me.GridControl_Docs, System.ComponentModel.ISupportInitialize).BeginInit() @@ -189,6 +193,8 @@ Partial Class frmMain CType(Me.RepositoryItemZoomTrackBar1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PrintPreviewRepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemTrackBar1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.cmbGridFontSize, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'ImageListProfile @@ -366,12 +372,12 @@ Partial Class frmMain 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.bbtnitDashboardInv, Me.bsiGeneralInfo, Me.bbtnitmGhostMode, Me.bsi_GhostMode, Me.BarButtonItemGhostMode, Me.SearchItem1, Me.SearchItem2, Me.BarStaticItemAppServer, Me.bbtniCW, Me.bsiInactivityCheck, Me.BarButtonItem2, Me.BarCheckItemAutofilter, Me.BarCheckItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItemWFSingle, Me.BarButtonItemWFGroup, Me.BarButtonItemFileLink, Me.BarButtonItemMassValidation, Me.BarCheckItemShowSearch}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.bbtnitDashboardInv, Me.bsiGeneralInfo, Me.bbtnitmGhostMode, Me.bsi_GhostMode, Me.BarButtonItemGhostMode, Me.SearchItem1, Me.SearchItem2, Me.BarStaticItemAppServer, Me.bbtniCW, Me.bsiInactivityCheck, Me.BarButtonItem2, Me.BarCheckItemAutofilter, Me.BarCheckItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItemWFSingle, Me.BarButtonItemWFGroup, Me.BarButtonItemFileLink, Me.BarButtonItemMassValidation, Me.BarCheckItemShowSearch, Me.barItemGridFontSize}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") - Me.RibbonControl1.MaxItemId = 40 + Me.RibbonControl1.MaxItemId = 42 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3, Me.RibbonPage4}) - Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemProgressBar1}) + Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemProgressBar1, Me.RepositoryItemTrackBar1, Me.cmbGridFontSize}) Me.RibbonControl1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2013 Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowToolbarCustomizeItem = False @@ -753,7 +759,7 @@ Partial Class frmMain ' 'RibbonPage3 ' - Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup6}) + Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup6, Me.RibbonPageGroup5}) Me.RibbonPage3.Name = "RibbonPage3" resources.ApplyResources(Me.RibbonPage3, "RibbonPage3") ' @@ -1404,6 +1410,35 @@ Partial Class frmMain 'TimerInactivity ' ' + 'RibbonPageGroup5 + ' + Me.RibbonPageGroup5.ItemLinks.Add(Me.barItemGridFontSize) + Me.RibbonPageGroup5.Name = "RibbonPageGroup5" + resources.ApplyResources(Me.RibbonPageGroup5, "RibbonPageGroup5") + ' + 'RepositoryItemTrackBar1 + ' + Me.RepositoryItemTrackBar1.LabelAppearance.Options.UseTextOptions = True + Me.RepositoryItemTrackBar1.LabelAppearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center + Me.RepositoryItemTrackBar1.Maximum = 1 + Me.RepositoryItemTrackBar1.Minimum = -1 + Me.RepositoryItemTrackBar1.Name = "RepositoryItemTrackBar1" + Me.RepositoryItemTrackBar1.ShowLabels = True + ' + 'barItemGridFontSize + ' + resources.ApplyResources(Me.barItemGridFontSize, "barItemGridFontSize") + Me.barItemGridFontSize.CaptionToEditorIndent = 0 + Me.barItemGridFontSize.Edit = Me.cmbGridFontSize + Me.barItemGridFontSize.Id = 41 + Me.barItemGridFontSize.Name = "barItemGridFontSize" + ' + 'cmbGridFontSize + ' + resources.ApplyResources(Me.cmbGridFontSize, "cmbGridFontSize") + Me.cmbGridFontSize.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("cmbGridFontSize.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.cmbGridFontSize.Name = "cmbGridFontSize" + ' 'frmMain ' Me.Appearance.Options.UseFont = True @@ -1437,6 +1472,8 @@ Partial Class frmMain CType(Me.RepositoryItemZoomTrackBar1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PrintPreviewRepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemTrackBar1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.cmbGridFontSize, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -1591,4 +1628,8 @@ Partial Class frmMain Friend WithEvents RibbonPageGroup8 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonItemMassValidation As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarCheckItemShowSearch As DevExpress.XtraBars.BarCheckItem + Friend WithEvents barItemGridFontSize As DevExpress.XtraBars.BarEditItem + Friend WithEvents cmbGridFontSize As DevExpress.XtraEditors.Repository.RepositoryItemComboBox + Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RepositoryItemTrackBar1 As DevExpress.XtraEditors.Repository.RepositoryItemTrackBar End Class diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 04c5ce6..c5ed289 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAXQBCAF0AQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAXwBCAF8AQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -172,7 +172,60 @@ 179, 17 + + GridControl_Docs + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Panel1 + + + 0 + + + NavBarControl1 + + + DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Panel1 + + + 1 + + + Fill + + + + Tahoma, 9pt + + + 0, 151 + + + 1233, 355 + + + + 4 + + + Panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + Zoom @@ -200,7 +253,6 @@ Application - 233, 0 @@ -210,7 +262,6 @@ 1000, 355 - 8 @@ -284,12 +335,6 @@ 1012, 17 - - 219, 26 - - - Starte Validierung für Profil - 220, 30 @@ -443,32 +488,11 @@ 1 - - Fill - - - Tahoma, 9pt - - - 0, 151 - - - 1233, 355 - - - 4 - - - Panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this + + 219, 26 - - 2 + + Starte Validierung für Profil 171, 56 @@ -479,27 +503,6 @@ 404, 56 - - 234, 22 - - - Popup Erinnerung inaktivieren - - - 231, 6 - - - 234, 22 - - - Bring to Front - - - 234, 22 - - - Out of Range - PM fixieren - 235, 76 @@ -681,6 +684,27 @@ True + + 234, 22 + + + Popup Erinnerung inaktivieren + + + 231, 6 + + + 234, 22 + + + Bring to Front + + + 234, 22 + + + Out of Range - PM fixieren + 605, 17 @@ -1705,26 +1729,20 @@ Cjwvc3ZnPgs= - - 0, 0 + + Schriftgröße - - Allgemein - - - Auswertungen - - - Verwaltung + + False - - Grundeinstellungen + + Combo - - Workflow + + 100 - - Funktionen/App Start + + 0, 0 Start @@ -1732,6 +1750,9 @@ Funktionen + + Workflow Tabelle + Tabelle @@ -1771,6 +1792,24 @@ 4 + + Allgemein + + + Auswertungen + + + Verwaltung + + + Grundeinstellungen + + + Workflow + + + Funktionen/App Start + Top @@ -2867,6 +2906,30 @@ System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + RibbonPageGroup5 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RepositoryItemTrackBar1 + + + DevExpress.XtraEditors.Repository.RepositoryItemTrackBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + barItemGridFontSize + + + DevExpress.XtraBars.BarEditItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + cmbGridFontSize + + + DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + frmMain @@ -3078,6 +3141,9 @@ &Ansicht + + &Hintergrund + &Seiten Layout @@ -3090,9 +3156,6 @@ Bars - - &Hintergrund - PDF Dokument diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 67f8334..b5fc9cf 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -143,6 +143,17 @@ Public Class frmMain GridBuilder = New GridBuilder(GridViewWFItems) GridBuilder.WithFontSizeDelta(CONFIG.Config.GridFontSizeDelta) + 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} + } + + cmbGridFontSize.Items.Clear() + cmbGridFontSize.Items.AddRange(oFontSettings) + barItemGridFontSize.EditValue = oFontSettings. + Where(Function(item) item.Value = CONFIG.Config.GridFontSizeDelta). + FirstOrDefault() ' Create helper to save/load expanded GroupColumns at runtime RefreshHelper = New RefreshHelper(LOGCONFIG, GridViewWFItems, "GUID") @@ -374,6 +385,16 @@ Public Class frmMain FormOpenClose = False 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 + Sub Check_Timer_Notification() Try If CONFIG.Config.ReminderTimer <> 0 Then @@ -2260,7 +2281,6 @@ Public Class frmMain frmKonfig.ShowDialog() ' Load_Profil() - GridBuilder.WithFontSizeDelta(CONFIG.Config.GridFontSizeDelta) Check_Timer_Notification() Catch ex As Exception LOGGER.Error(ex) @@ -2798,5 +2818,12 @@ Public Class frmMain End If End Sub - + Private Sub barItemGridFontSize_EditValueChanged(sender As Object, e As EventArgs) Handles barItemGridFontSize.EditValueChanged + Try + CONFIG.Config.GridFontSizeDelta = DirectCast(barItemGridFontSize.EditValue, FontSetting).Value + CONFIG.Save() + GridBuilder.WithFontSizeDelta(CONFIG.Config.GridFontSizeDelta) + Catch ex As Exception + End Try + End Sub End Class \ No newline at end of file