From 8dade7c29904db1d0367c43064076a201bc8b82f Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 1 Jun 2023 09:19:46 +0200 Subject: [PATCH] clean up --- app/SetupVS19/Product.wxs | 4 +- app/TaskFlow/Changelog.md | 8 +++ app/TaskFlow/TaskFlow.vbproj | 1 + app/TaskFlow/frmMain.Designer.vb | 7 ++- app/TaskFlow/frmMain.resx | 85 ++++++++++++++------------- app/TaskFlow/frmValidator.Designer.vb | 44 +++++++------- app/TaskFlow/frmValidator.vb | 6 +- 7 files changed, 82 insertions(+), 73 deletions(-) create mode 100644 app/TaskFlow/Changelog.md diff --git a/app/SetupVS19/Product.wxs b/app/SetupVS19/Product.wxs index ce7ea43..e5ed1dd 100644 --- a/app/SetupVS19/Product.wxs +++ b/app/SetupVS19/Product.wxs @@ -125,15 +125,13 @@ - + - - diff --git a/app/TaskFlow/Changelog.md b/app/TaskFlow/Changelog.md new file mode 100644 index 0000000..4a33952 --- /dev/null +++ b/app/TaskFlow/Changelog.md @@ -0,0 +1,8 @@ +# CHANGELOG + +## 2.5.0.0 + +### Features + +- Modernisierung von verschiedenen Elementen (Validator, Startseite) +- Format Strings für Textboxen (Währung, Fließkommazahlen, Datum & Uhrzeit) diff --git a/app/TaskFlow/TaskFlow.vbproj b/app/TaskFlow/TaskFlow.vbproj index f155a49..351f479 100644 --- a/app/TaskFlow/TaskFlow.vbproj +++ b/app/TaskFlow/TaskFlow.vbproj @@ -927,6 +927,7 @@ + PreserveNewest diff --git a/app/TaskFlow/frmMain.Designer.vb b/app/TaskFlow/frmMain.Designer.vb index 8dcc127..a7993d5 100644 --- a/app/TaskFlow/frmMain.Designer.vb +++ b/app/TaskFlow/frmMain.Designer.vb @@ -261,7 +261,9 @@ Partial Class frmMain ' Me.GridView_Docs.Appearance.EvenRow.BackColor = System.Drawing.Color.Azure Me.GridView_Docs.Appearance.EvenRow.Options.UseBackColor = True + Me.GridView_Docs.Appearance.ViewCaption.Font = CType(resources.GetObject("GridView_Docs.Appearance.ViewCaption.Font"), System.Drawing.Font) Me.GridView_Docs.Appearance.ViewCaption.ForeColor = System.Drawing.Color.Black + Me.GridView_Docs.Appearance.ViewCaption.Options.UseFont = True Me.GridView_Docs.Appearance.ViewCaption.Options.UseForeColor = True Me.GridView_Docs.Appearance.ViewCaption.Options.UseTextOptions = True Me.GridView_Docs.Appearance.ViewCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near @@ -293,12 +295,13 @@ Partial Class frmMain Me.NavBarControl1.Items.AddRange(New DevExpress.XtraNavBar.NavBarItem() {Me.NavBarItemOverview}) Me.NavBarControl1.Name = "NavBarControl1" Me.NavBarControl1.OptionsNavPane.ExpandedWidth = CType(resources.GetObject("resource.ExpandedWidth"), Integer) - Me.NavBarControl1.View = New DevExpress.XtraNavBar.ViewInfo.StandardSkinExplorerBarViewInfoRegistrator("DevExpress Style") + Me.NavBarControl1.PaintStyleKind = DevExpress.XtraNavBar.NavBarViewKind.NavigationPane + Me.NavBarControl1.ShowIcons = DevExpress.Utils.DefaultBoolean.[True] + Me.NavBarControl1.View = New DevExpress.XtraNavBar.ViewInfo.StandardSkinExplorerBarViewInfoRegistrator("Office 2019 White") ' 'NavBarGroupProfiles ' resources.ApplyResources(Me.NavBarGroupProfiles, "NavBarGroupProfiles") - Me.NavBarGroupProfiles.Expanded = True Me.NavBarGroupProfiles.GroupStyle = DevExpress.XtraNavBar.NavBarGroupStyle.LargeIconsText Me.NavBarGroupProfiles.ImageOptions.LargeImage = CType(resources.GetObject("NavBarGroupProfiles.ImageOptions.LargeImage"), System.Drawing.Image) Me.NavBarGroupProfiles.Name = "NavBarGroupProfiles" diff --git a/app/TaskFlow/frmMain.resx b/app/TaskFlow/frmMain.resx index bdf87bd..3a77050 100644 --- a/app/TaskFlow/frmMain.resx +++ b/app/TaskFlow/frmMain.resx @@ -124,46 +124,46 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADu - CAAAAk1TRnQBSQFMAgEBAgIAAQoBAAEKARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA - AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA - AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA - AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm - AwABmQMAAcwCAAEzAwACMwIAATMBZgIAATMBmQIAATMBzAIAATMB/wIAAWYDAAFmATMCAAJmAgABZgGZ - AgABZgHMAgABZgH/AgABmQMAAZkBMwIAAZkBZgIAApkCAAGZAcwCAAGZAf8CAAHMAwABzAEzAgABzAFm - AgABzAGZAgACzAIAAcwB/wIAAf8BZgIAAf8BmQIAAf8BzAEAATMB/wIAAf8BAAEzAQABMwEAAWYBAAEz - AQABmQEAATMBAAHMAQABMwEAAf8BAAH/ATMCAAMzAQACMwFmAQACMwGZAQACMwHMAQACMwH/AQABMwFm - AgABMwFmATMBAAEzAmYBAAEzAWYBmQEAATMBZgHMAQABMwFmAf8BAAEzAZkCAAEzAZkBMwEAATMBmQFm - AQABMwKZAQABMwGZAcwBAAEzAZkB/wEAATMBzAIAATMBzAEzAQABMwHMAWYBAAEzAcwBmQEAATMCzAEA - ATMBzAH/AQABMwH/ATMBAAEzAf8BZgEAATMB/wGZAQABMwH/AcwBAAEzAv8BAAFmAwABZgEAATMBAAFm - AQABZgEAAWYBAAGZAQABZgEAAcwBAAFmAQAB/wEAAWYBMwIAAWYCMwEAAWYBMwFmAQABZgEzAZkBAAFm - ATMBzAEAAWYBMwH/AQACZgIAAmYBMwEAA2YBAAJmAZkBAAJmAcwBAAFmAZkCAAFmAZkBMwEAAWYBmQFm - AQABZgKZAQABZgGZAcwBAAFmAZkB/wEAAWYBzAIAAWYBzAEzAQABZgHMAZkBAAFmAswBAAFmAcwB/wEA - AWYB/wIAAWYB/wEzAQABZgH/AZkBAAFmAf8BzAEAAcwBAAH/AQAB/wEAAcwBAAKZAgABmQEzAZkBAAGZ - AQABmQEAAZkBAAHMAQABmQMAAZkCMwEAAZkBAAFmAQABmQEzAcwBAAGZAQAB/wEAAZkBZgIAAZkBZgEz - AQABmQEzAWYBAAGZAWYBmQEAAZkBZgHMAQABmQEzAf8BAAKZATMBAAKZAWYBAAOZAQACmQHMAQACmQH/ - AQABmQHMAgABmQHMATMBAAFmAcwBZgEAAZkBzAGZAQABmQLMAQABmQHMAf8BAAGZAf8CAAGZAf8BMwEA - AZkBzAFmAQABmQH/AZkBAAGZAf8BzAEAAZkC/wEAAcwDAAGZAQABMwEAAcwBAAFmAQABzAEAAZkBAAHM - AQABzAEAAZkBMwIAAcwCMwEAAcwBMwFmAQABzAEzAZkBAAHMATMBzAEAAcwBMwH/AQABzAFmAgABzAFm - ATMBAAGZAmYBAAHMAWYBmQEAAcwBZgHMAQABmQFmAf8BAAHMAZkCAAHMAZkBMwEAAcwBmQFmAQABzAKZ - AQABzAGZAcwBAAHMAZkB/wEAAswCAALMATMBAALMAWYBAALMAZkBAAPMAQACzAH/AQABzAH/AgABzAH/ - ATMBAAGZAf8BZgEAAcwB/wGZAQABzAH/AcwBAAHMAv8BAAHMAQABMwEAAf8BAAFmAQAB/wEAAZkBAAHM - ATMCAAH/AjMBAAH/ATMBZgEAAf8BMwGZAQAB/wEzAcwBAAH/ATMB/wEAAf8BZgIAAf8BZgEzAQABzAJm - AQAB/wFmAZkBAAH/AWYBzAEAAcwBZgH/AQAB/wGZAgAB/wGZATMBAAH/AZkBZgEAAf8CmQEAAf8BmQHM - AQAB/wGZAf8BAAH/AcwCAAH/AcwBMwEAAf8BzAFmAQAB/wHMAZkBAAH/AswBAAH/AcwB/wEAAv8BMwEA - AcwB/wFmAQAC/wGZAQAC/wHMAQACZgH/AQABZgH/AWYBAAFmAv8BAAH/AmYBAAH/AWYB/wEAAv8BZgEA - ASEBAAGlAQADXwEAA3cBAAOGAQADlgEAA8sBAAOyAQAD1wEAA90BAAPjAQAD6gEAA/EBAAP4AQAB8AH7 - Af8BAAGkAqABAAOAAwAB/wIAAf8DAAL/AQAB/wMAAf8BAAH/AQAC/wIAA/9GAAEIBHIBCAoAARoBHAJ0 - ARwBGikAAXIBVQFaAlsBWgFVAU8IAAF0AXkBegLlAXoBeQF0JwACVQFaAVsC5AFbAVoCVQYAAXQCegTl - AXoBeQFSJQABTwFVAloEWwFaAlUBTwQAAVIBWQF6BuUBegJSIwABCAJVCFoCVQEIAgABGgFSAVkBegbl - AVkBWAFSARoiAAFPAlUHWgNVAU8CAAFMAVIKWQFSAUwiAAFPATQKVQE0AS4CAAFMAVIBUwhZAVMBUgFM - IgABLQMzBzQCMwEtAgACKwIyBlMCMgIrIgABTwEtATMIVQE0Ai0CAAFMAisIUwFSAisiAAEIAS0BVQiX - AVUBLQEIAgABGgErAVIIdQFSASsBGiMAAQIBlwiYAZcBLQQAASoBdAiaAXQBKyUAAU8BCAEbBcIB8QFP - BgABTAEaARsEGgEbARoBUicAAU8BCAHzAv8B8wEIAXIIAAFMARoE9gEaAXQpAAEIBHIBCAoAARoEdAEa - ZQABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEAAQEFAAGAFwAD/wEABP8EAAH4AR8B+AEfBAAB8AEP - AfABDwQAAeABBwHgAQcEAAHAAQMBwAEDBAABgAEBAYABAQQAAYABAQGAAQEEAAGAAQEBgAEBBAABgAEB - AYABAQQAAYABAQGAAQEEAAGAAQEBgAEBBAABwAEDAcABAwQAAeABBwHgAQcEAAHwAQ8B8AEPBAAB+AEf - AfgBHwQABP8EAAs= + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw + CAAAAk1TRnQBSQFMAgEBAgEAARgBCgEYAQoBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA + AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 + AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA + AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm + AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM + AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA + ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz + AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ + AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM + AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA + AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA + AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ + AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ + AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA + AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm + ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ + Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz + AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA + AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM + AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM + ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM + Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA + AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM + AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ + AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz + AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm + AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw + AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/0YAAQgEcgEICgABGgEc + AnQBHAEaKQABcgFVAVoCWwFaAVUBTwgAAXQBeQF6AuUBegF5AXQnAAJVAVoBWwLkAVsBWgJVBgABdAJ6 + BOUBegF5AVIlAAFPAVUCWgRbAVoCVQFPBAABUgFZAXoG5QF6AlIjAAEIAlUIWgJVAQgCAAEaAVIBWQF6 + BuUBWQFYAVIBGiIAAU8CVQdaA1UBTwIAAUwBUgpZAVIBTCIAAU8BNApVATQBLgIAAUwBUgFTCFkBUwFS + AUwiAAEtAzMHNAIzAS0CAAIrAjIGUwIyAisiAAFPAS0BMwhVATQCLQIAAUwCKwhTAVICKyIAAQgBLQFV + CJcBVQEtAQgCAAEaASsBUgh1AVIBKwEaIwABAgGXCJgBlwEtBAABKgF0CJoBdAErJQABTwEIARsFwgHx + AU8GAAFMARoBGwQaARsBGgFSJwABTwEIAfMC/wHzAQgBcggAAUwBGgT2ARoBdCkAAQgEcgEICgABGgR0 + ARplAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/AQAE/wQAAfgBHwH4AR8EAAHw + AQ8B8AEPBAAB4AEHAeABBwQAAcABAwHAAQMEAAGAAQEBgAEBBAABgAEBAYABAQQAAYABAQGAAQEEAAGA + AQEBgAEBBAABgAEBAYABAQQAAYABAQGAAQEEAAHAAQMBwAEDBAAB4AEHAeABBwQAAfABDwHwAQ8EAAH4 + AR8B+AEfBAAE/wQACw== @@ -204,6 +204,9 @@ 233, 0 + + Segoe UI, 12pt + Gesamtübersicht Workflows @@ -501,7 +504,7 @@ Out of Range - Fenster wiederherstellen - 283, 98 + 283, 76 ContextMenuNotifyIcon diff --git a/app/TaskFlow/frmValidator.Designer.vb b/app/TaskFlow/frmValidator.Designer.vb index 8e5bbd0..562bfcb 100644 --- a/app/TaskFlow/frmValidator.Designer.vb +++ b/app/TaskFlow/frmValidator.Designer.vb @@ -26,6 +26,8 @@ Partial Class frmValidator Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmValidator)) Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() Me.PanelControl1 = New DevExpress.XtraEditors.PanelControl() + Me.PanelValidatorControlBorder = New DevExpress.XtraEditors.PanelControl() + Me.PanelValidatorControl = New DevExpress.XtraEditors.XtraScrollableControl() Me.btnSave = New DevExpress.XtraEditors.SimpleButton() Me.DESCRIPTIONLabel = New DevExpress.XtraEditors.LabelControl() Me.TITLELabel1 = New DevExpress.XtraEditors.LabelControl() @@ -103,14 +105,14 @@ Partial Class frmValidator Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog() - Me.PanelValidatorControl = New DevExpress.XtraEditors.XtraScrollableControl() - Me.PanelValidatorControlBorder = New DevExpress.XtraEditors.PanelControl() CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() Me.SplitContainer1.SuspendLayout() CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.PanelControl1.SuspendLayout() + CType(Me.PanelValidatorControlBorder, System.ComponentModel.ISupportInitialize).BeginInit() + Me.PanelValidatorControlBorder.SuspendLayout() CType(Me.BarAndDockingController3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.BarAndDockingController2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.BarAndDockingController1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -121,8 +123,6 @@ Partial Class frmValidator CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemComboBox2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemComboBox3, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PanelValidatorControlBorder, System.ComponentModel.ISupportInitialize).BeginInit() - Me.PanelValidatorControlBorder.SuspendLayout() Me.SuspendLayout() ' 'SplitContainer1 @@ -148,6 +148,22 @@ Partial Class frmValidator resources.ApplyResources(Me.PanelControl1, "PanelControl1") Me.PanelControl1.Name = "PanelControl1" ' + 'PanelValidatorControlBorder + ' + resources.ApplyResources(Me.PanelValidatorControlBorder, "PanelValidatorControlBorder") + Me.PanelValidatorControlBorder.Appearance.BorderColor = System.Drawing.Color.Black + Me.PanelValidatorControlBorder.Appearance.Options.UseBorderColor = True + Me.PanelValidatorControlBorder.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Simple + Me.PanelValidatorControlBorder.Controls.Add(Me.PanelValidatorControl) + Me.PanelValidatorControlBorder.Name = "PanelValidatorControlBorder" + ' + 'PanelValidatorControl + ' + Me.PanelValidatorControl.Appearance.BackColor = System.Drawing.Color.WhiteSmoke + Me.PanelValidatorControl.Appearance.Options.UseBackColor = True + resources.ApplyResources(Me.PanelValidatorControl, "PanelValidatorControl") + Me.PanelValidatorControl.Name = "PanelValidatorControl" + ' 'btnSave ' resources.ApplyResources(Me.btnSave, "btnSave") @@ -743,22 +759,6 @@ Partial Class frmValidator Me.RibbonPage2.Name = "RibbonPage2" resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") ' - 'PanelValidatorControl - ' - Me.PanelValidatorControl.Appearance.BackColor = System.Drawing.Color.WhiteSmoke - Me.PanelValidatorControl.Appearance.Options.UseBackColor = True - resources.ApplyResources(Me.PanelValidatorControl, "PanelValidatorControl") - Me.PanelValidatorControl.Name = "PanelValidatorControl" - ' - 'PanelValidatorControlBorder - ' - resources.ApplyResources(Me.PanelValidatorControlBorder, "PanelValidatorControlBorder") - Me.PanelValidatorControlBorder.Appearance.BorderColor = System.Drawing.Color.Black - Me.PanelValidatorControlBorder.Appearance.Options.UseBorderColor = True - Me.PanelValidatorControlBorder.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Simple - Me.PanelValidatorControlBorder.Controls.Add(Me.PanelValidatorControl) - Me.PanelValidatorControlBorder.Name = "PanelValidatorControlBorder" - ' 'frmValidator ' Me.Appearance.Options.UseFont = True @@ -783,6 +783,8 @@ Partial Class frmValidator Me.SplitContainer1.ResumeLayout(False) CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.PanelControl1.ResumeLayout(False) + CType(Me.PanelValidatorControlBorder, System.ComponentModel.ISupportInitialize).EndInit() + Me.PanelValidatorControlBorder.ResumeLayout(False) CType(Me.BarAndDockingController3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.BarAndDockingController2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.BarAndDockingController1, System.ComponentModel.ISupportInitialize).EndInit() @@ -793,8 +795,6 @@ Partial Class frmValidator CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemComboBox2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemComboBox3, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PanelValidatorControlBorder, System.ComponentModel.ISupportInitialize).EndInit() - Me.PanelValidatorControlBorder.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index 3a57176..9530449 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -3823,7 +3823,7 @@ Public Class frmValidator LOGGER.Debug("frmValidation_Shown finished!") End Sub - Private Sub btnSave_Click(sender As Object, e As EventArgs) + Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click btnSave.Enabled = False ' TODO: Use when working on Validation @@ -5883,8 +5883,4 @@ Public Class frmValidator End Using Return tmpImg End Function - - Private Sub BarButtonItem6_ItemClick_2(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem6.ItemClick - - End Sub End Class \ No newline at end of file