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)