diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index 8e3cfd1..daa8e66 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -87,6 +87,7 @@ Partial Class frmMain Me.BarButtonItemWFGroup = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItemFileLink = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItemMassValidation = New DevExpress.XtraBars.BarButtonItem() + Me.BarCheckItemShowSearch = New DevExpress.XtraBars.BarCheckItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -95,7 +96,6 @@ Partial Class frmMain Me.RibbonPageGroup7 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup6 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPage4 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup8 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -174,7 +174,6 @@ 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.BarCheckItemShowSearch = New DevExpress.XtraBars.BarCheckItem() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() CType(Me.GridControl_Docs, System.ComponentModel.ISupportInitialize).BeginInit() @@ -689,6 +688,13 @@ Partial Class frmMain Me.BarButtonItemMassValidation.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItemMassValidation.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItemMassValidation.Name = "BarButtonItemMassValidation" ' + 'BarCheckItemShowSearch + ' + resources.ApplyResources(Me.BarCheckItemShowSearch, "BarCheckItemShowSearch") + Me.BarCheckItemShowSearch.Id = 39 + Me.BarCheckItemShowSearch.ImageOptions.SvgImage = CType(resources.GetObject("BarCheckItemShowSearch.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarCheckItemShowSearch.Name = "BarCheckItemShowSearch" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroupBasicConf, Me.RibbonPageGroup7, Me.RibbonPageGroup4}) @@ -745,24 +751,19 @@ Partial Class frmMain ' 'RibbonPage3 ' - Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup5, Me.RibbonPageGroup6}) + Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup6}) Me.RibbonPage3.Name = "RibbonPage3" resources.ApplyResources(Me.RibbonPage3, "RibbonPage3") ' - 'RibbonPageGroup5 - ' - Me.RibbonPageGroup5.ItemLinks.Add(Me.BarCheckItemAutofilter) - Me.RibbonPageGroup5.ItemLinks.Add(Me.BarButtonItem7) - Me.RibbonPageGroup5.ItemLinks.Add(Me.BarCheckItemShowSearch) - Me.RibbonPageGroup5.Name = "RibbonPageGroup5" - resources.ApplyResources(Me.RibbonPageGroup5, "RibbonPageGroup5") - ' 'RibbonPageGroup6 ' - Me.RibbonPageGroup6.ItemLinks.Add(Me.BarButtonItem3) + Me.RibbonPageGroup6.ItemLinks.Add(Me.BarButtonItem7) + Me.RibbonPageGroup6.ItemLinks.Add(Me.BarCheckItemAutofilter) + Me.RibbonPageGroup6.ItemLinks.Add(Me.BarCheckItemShowSearch) Me.RibbonPageGroup6.ItemLinks.Add(Me.BarButtonItem4) - Me.RibbonPageGroup6.ItemLinks.Add(Me.BarButtonItem5) + Me.RibbonPageGroup6.ItemLinks.Add(Me.BarButtonItem3) Me.RibbonPageGroup6.ItemLinks.Add(Me.BarButtonItem6) + Me.RibbonPageGroup6.ItemLinks.Add(Me.BarButtonItem5) Me.RibbonPageGroup6.Name = "RibbonPageGroup6" resources.ApplyResources(Me.RibbonPageGroup6, "RibbonPageGroup6") ' @@ -1401,13 +1402,6 @@ Partial Class frmMain 'TimerInactivity ' ' - 'BarCheckItemShowSearch - ' - resources.ApplyResources(Me.BarCheckItemShowSearch, "BarCheckItemShowSearch") - Me.BarCheckItemShowSearch.Id = 39 - Me.BarCheckItemShowSearch.ImageOptions.SvgImage = CType(resources.GetObject("BarCheckItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarCheckItemShowSearch.Name = "BarCheckItemShowSearch" - ' 'frmMain ' Me.Appearance.Options.UseFont = True @@ -1581,7 +1575,6 @@ Partial Class frmMain Friend WithEvents BarCheckItemAutofilter As DevExpress.XtraBars.BarCheckItem Friend WithEvents BarCheckItem2 As DevExpress.XtraBars.BarCheckItem Friend WithEvents RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup6 As DevExpress.XtraBars.Ribbon.RibbonPageGroup diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index be93520..1bbf5f0 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAUwBCAFMAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAVQBCAFUAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1391,7 +1391,7 @@ - Export + Export Übersicht @@ -1482,7 +1482,7 @@ - Spaltenauswahl + Spaltenauswahl-Dialog @@ -1706,7 +1706,7 @@ Suche einblenden - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -1732,9 +1732,6 @@ Start - - Einstellungen Tabelle - Funktionen @@ -2399,6 +2396,12 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BarCheckItemShowSearch + + + DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage1 @@ -2447,12 +2450,6 @@ DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup5 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - RibbonPageGroup6 @@ -2891,12 +2888,6 @@ System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - BarCheckItemShowSearch - - - DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - frmMain diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 13150f6..ce2dc64 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -1176,9 +1176,9 @@ Public Class frmMain If SHOW_MASS_VALIDATOR = False Then GridViewWFItems.OptionsSelection.MultiSelect = False GridViewWFItems.OptionsSelection.MultiSelectMode = GridMultiSelectMode.RowSelect - BarButtonItemMassValidation.Enabled = False + BarButtonItemMassValidation.Visibility = DevExpress.XtraBars.BarItemVisibility.Never Else - BarButtonItemMassValidation.Enabled = True + BarButtonItemMassValidation.Visibility = DevExpress.XtraBars.BarItemVisibility.Always GridViewWFItems.OptionsSelection.MultiSelect = True GridViewWFItems.OptionsSelection.MultiSelectMode = GridMultiSelectMode.CheckBoxRowSelect @@ -2765,7 +2765,7 @@ Public Class frmMain If ribbon.SelectedPage Is RibbonPage4 Then Select Case GridViewItem_Clicked Case "GROUP" - BarButtonItemMassValidation.Enabled = True + BarButtonItemMassValidation.Visibility = DevExpress.XtraBars.BarItemVisibility.Always Case "ROW" ' If selectedRows.Count > 1 Then ' CMFileStart.Enabled = False