diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index cfab5e6..b982ff9 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -60,9 +60,11 @@ Partial Class frmMain Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.CMGroupStart = New System.Windows.Forms.ToolStripMenuItem() Me.CMFileStart = New System.Windows.Forms.ToolStripMenuItem() - Me.TabellenlayoutZurücksetzenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator() Me.tsmiMarkedFilesFinish = New System.Windows.Forms.ToolStripMenuItem() - Me.GroupToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() + Me.TabellenlayoutZurücksetzenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.LayoutSpeichernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GridView_Docs = New DevExpress.XtraGrid.Views.Grid.GridView() Me.BindingNavigator1 = New System.Windows.Forms.BindingNavigator(Me.components) Me.bindsourcegrid = New System.Windows.Forms.BindingSource(Me.components) @@ -392,7 +394,7 @@ Partial Class frmMain 'ContextMenuGrid ' Me.ContextMenuGrid.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.ContextMenuGrid.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.CMGroupStart, Me.CMFileStart, Me.TabellenlayoutZurücksetzenToolStripMenuItem, Me.tsmiMarkedFilesFinish, Me.GroupToolStripMenuItem}) + Me.ContextMenuGrid.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.CMGroupStart, Me.CMFileStart, Me.ToolStripSeparator4, Me.tsmiMarkedFilesFinish, Me.ToolStripSeparator3, Me.TabellenlayoutZurücksetzenToolStripMenuItem, Me.LayoutSpeichernToolStripMenuItem}) Me.ContextMenuGrid.Name = "ContextMenuStrip1" resources.ApplyResources(Me.ContextMenuGrid, "ContextMenuGrid") ' @@ -408,20 +410,31 @@ Partial Class frmMain Me.CMFileStart.Name = "CMFileStart" resources.ApplyResources(Me.CMFileStart, "CMFileStart") ' - 'TabellenlayoutZurücksetzenToolStripMenuItem + 'ToolStripSeparator4 ' - Me.TabellenlayoutZurücksetzenToolStripMenuItem.Name = "TabellenlayoutZurücksetzenToolStripMenuItem" - resources.ApplyResources(Me.TabellenlayoutZurücksetzenToolStripMenuItem, "TabellenlayoutZurücksetzenToolStripMenuItem") + Me.ToolStripSeparator4.Name = "ToolStripSeparator4" + resources.ApplyResources(Me.ToolStripSeparator4, "ToolStripSeparator4") ' 'tsmiMarkedFilesFinish ' resources.ApplyResources(Me.tsmiMarkedFilesFinish, "tsmiMarkedFilesFinish") Me.tsmiMarkedFilesFinish.Name = "tsmiMarkedFilesFinish" ' - 'GroupToolStripMenuItem + 'ToolStripSeparator3 ' - Me.GroupToolStripMenuItem.Name = "GroupToolStripMenuItem" - resources.ApplyResources(Me.GroupToolStripMenuItem, "GroupToolStripMenuItem") + Me.ToolStripSeparator3.Name = "ToolStripSeparator3" + resources.ApplyResources(Me.ToolStripSeparator3, "ToolStripSeparator3") + ' + 'TabellenlayoutZurücksetzenToolStripMenuItem + ' + Me.TabellenlayoutZurücksetzenToolStripMenuItem.Name = "TabellenlayoutZurücksetzenToolStripMenuItem" + resources.ApplyResources(Me.TabellenlayoutZurücksetzenToolStripMenuItem, "TabellenlayoutZurücksetzenToolStripMenuItem") + ' + 'LayoutSpeichernToolStripMenuItem + ' + Me.LayoutSpeichernToolStripMenuItem.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.save + Me.LayoutSpeichernToolStripMenuItem.Name = "LayoutSpeichernToolStripMenuItem" + resources.ApplyResources(Me.LayoutSpeichernToolStripMenuItem, "LayoutSpeichernToolStripMenuItem") ' 'GridView_Docs ' @@ -432,6 +445,7 @@ Partial Class frmMain Me.GridView_Docs.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] Me.GridView_Docs.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] Me.GridView_Docs.OptionsBehavior.AllowFixedGroups = DevExpress.Utils.DefaultBoolean.[True] + Me.GridView_Docs.OptionsBehavior.AllowGroupExpandAnimation = DevExpress.Utils.DefaultBoolean.[True] Me.GridView_Docs.OptionsBehavior.Editable = False Me.GridView_Docs.OptionsSelection.MultiSelect = True Me.GridView_Docs.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect @@ -721,6 +735,8 @@ Partial Class frmMain Friend WithEvents BindingNavigatorMoveLastItem As ToolStripButton Friend WithEvents BindingNavigatorSeparator2 As ToolStripSeparator Friend WithEvents bindsourcegrid As BindingSource - Friend WithEvents GroupToolStripMenuItem As ToolStripMenuItem Friend WithEvents ToolStripLabelViewTape As ToolStripLabel + Friend WithEvents ToolStripSeparator4 As ToolStripSeparator + Friend WithEvents ToolStripSeparator3 As ToolStripSeparator + Friend WithEvents LayoutSpeichernToolStripMenuItem As ToolStripMenuItem End Class diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index b5087dc..6da56ca 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -488,7 +488,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAfwBAwH8AQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAASQBBAEkAQQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -547,30 +547,6 @@ Tahoma, 9pt - - 0, 0 - - - 1023, 27 - - - 2 - - - ToolStrip1 - - - ToolStrip1 - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 3 - Segoe UI, 9pt, style=Bold, Italic @@ -628,36 +604,36 @@ Aktualisieren + + 0, 0 + + + 1023, 27 + + + 2 + + + ToolStrip1 + + + ToolStrip1 + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 3 + 1015, 17 Tahoma, 9pt - - 0, 498 - - - 1023, 29 - - - 3 - - - StatusStrip1 - - - StatusStrip1 - - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 4 - 150, 24 @@ -703,11 +679,80 @@ 0, 24 + + 0, 498 + + + 1023, 29 + + + 3 + + + StatusStrip1 + + + StatusStrip1 + + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 4 + 152, 95 + + 269, 26 + + + Validierung für Gruppe/Profil starten + + + 269, 26 + + + Validierung für Datei starten + + + 266, 6 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAM5JREFUOE9jwAa+fv3a8O3bt/9I+D0QCECl8QOQQpAG+fTl/xmC5/yvXnryP8hA + qDRhALJx1s4rYM38sYv+P3/zAcUlX758MYAqhQAkSbACEI1se2Rk5H8nJycwTklJ+f/8+XNUQ0CakDUg + 2754xVq4ZpyGgPyHrAnZsI8fPv3/8P4jHOfl5mEagh5oyLYja0Y2AGYISB+GK2C2g/yObgAMwwwBhRfY + AJgrQAIgvHnzZrACbJpBGMMAZAAShCnAphmER5IBhDDtDCAef/sPAEGjQ6y45GCmAAAAAElFTkSuQmCC + + + + 269, 26 + + + Massenabschluss markierte Dateien + + + 266, 6 + + + 269, 26 + + + Layout zurücksetzen + + + 269, 26 + + + Layout speichern + - 270, 134 + 270, 146 ContextMenuGrid @@ -942,6 +987,12 @@ 301, 95 + + 219, 26 + + + Starte Validierung für Profil + 220, 30 @@ -1166,51 +1217,6 @@ 2 - - 269, 26 - - - Validierung für Gruppe/Profil starten - - - 269, 26 - - - Validierung für Datei starten - - - 269, 26 - - - Tabellenlayout zurücksetzen - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAM5JREFUOE9jwAa+fv3a8O3bt/9I+D0QCECl8QOQQpAG+fTl/xmC5/yvXnryP8hA - qDRhALJx1s4rYM38sYv+P3/zAcUlX758MYAqhQAkSbACEI1se2Rk5H8nJycwTklJ+f/8+XNUQ0CakDUg - 2754xVq4ZpyGgPyHrAnZsI8fPv3/8P4jHOfl5mEagh5oyLYja0Y2AGYISB+GK2C2g/yObgAMwwwBhRfY - AJgrQAIgvHnzZrACbJpBGMMAZAAShCnAphmER5IBhDDtDCAef/sPAEGjQ6y45GCmAAAAAElFTkSuQmCC - - - - 269, 26 - - - Massenabschluss markierte Dateien - - - 269, 26 - - - Group - - - 219, 26 - - - Starte Validierung für Profil - 1132, 17 @@ -1717,11 +1723,11 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabellenlayoutZurücksetzenToolStripMenuItem + + ToolStripSeparator4 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tsmiMarkedFilesFinish @@ -1729,10 +1735,22 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - GroupToolStripMenuItem + + ToolStripSeparator3 - + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabellenlayoutZurücksetzenToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + LayoutSpeichernToolStripMenuItem + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index acc145b..cf418cf 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -7,6 +7,7 @@ Imports DevExpress.XtraGrid Imports DevExpress.XtraNavBar Imports DevExpress.XtraGrid.Columns Imports DevExpress.XtraCharts +Imports DevExpress.XtraGrid.Views.Base Public Class frmMain 'Private _windreamPM As ClassPMWindream @@ -228,7 +229,7 @@ Public Class frmMain End Try End Function Private Function GetXML_LayoutName() - Dim Filename As String = String.Format("GridView_Docs_UserLayout_{0}.xml", GRID_LOAD_TYPE) + Dim Filename As String = String.Format("GridViewOverview_UserLayout_{0}.xml", GRID_LOAD_TYPE) Return System.IO.Path.Combine(Application.UserAppDataPath(), Filename) End Function @@ -251,8 +252,8 @@ Public Class frmMain End If Try - Dim xml As String = GetXML_LayoutName() - GridView_Docs.RestoreLayoutFromXml(xml, OptionsLayoutBase.FullLayout) + Dim oXml As String = GetXML_LayoutName() + GridView_Docs.RestoreLayoutFromXml(oXml, OptionsLayoutBase.FullLayout) Catch ex As Exception LOGGER.Error(ex) LOGGER.Info("Error while restoring layout: " & ex.Message) @@ -752,7 +753,7 @@ Public Class frmMain GridView_Docs.GroupedColumns(I).Tag = GridView_Docs.Columns.Item("PROFILE_ID") Next - GridView_Docs.OptionsBehavior.AutoExpandAllGroups = True + 'GridView_Docs.OptionsBehavior.AutoExpandAllGroups = False GridView_Docs.OptionsView.ShowGroupedColumns = False Catch ex As Exception LOGGER.Error(ex) @@ -850,7 +851,6 @@ Public Class frmMain SaveGridLayout() Load_Profile_items() Decide_Load() - RestoreLayout() End Sub Private Sub ToolStripButton2_Click_2(sender As Object, e As EventArgs) @@ -940,6 +940,7 @@ Public Class frmMain End Sub Private Sub Item_Scope() Try + 'GridView_Docs.EndSelection() CURRENT_JUMP_DOC_GUID = 0 Dim hitInfo As GridHitInfo = GridView_Docs.CalcHitInfo(GridCursorLocation) Dim groupRowText @@ -964,6 +965,7 @@ Public Class frmMain If GRID_LOAD_TYPE = "OVERVIEW" Then Try groupRowText = LTrim(RTrim(groupRowText.ToString.Replace("PROFILE_GROUP_TEXT: ", ""))) + groupRowText = LTrim(RTrim(groupRowText.ToString.Replace("GROUP_TEXT: ", ""))) Catch ex As Exception groupRowText = LTrim(RTrim(groupRowText.ToString.Replace("GROUP_TEXT: ", ""))) End Try @@ -1236,7 +1238,7 @@ Public Class frmMain RestoreLayout() Try - GridView_Docs.OptionsBehavior.AutoExpandAllGroups = True + GridView_Docs.OptionsBehavior.AutoExpandAllGroups = False GridView_Docs.OptionsView.ShowGroupedColumns = False GridView_Docs.OptionsView.ShowGroupPanel = False Dim oindex As Integer = 0 @@ -1267,7 +1269,9 @@ Public Class frmMain For index = 0 To GridView_Docs.GroupCount - 1 Dim v = GridView_Docs.GroupedColumns(index).ToString LOGGER.Debug($"Addig tag [{GridView_Docs.Columns.Item("PROFILE_ID")}] for group...", False) + Dim sd = GridView_Docs.GroupedColumns(index).GetTextCaption GridView_Docs.GroupedColumns(index).Tag = GridView_Docs.Columns.Item("PROFILE_ID") + Next GridView_Docs.Columns.Item("PROFILE_ID").Visible = False @@ -1372,7 +1376,7 @@ Public Class frmMain End Sub Private Sub TabellenlayoutZurücksetzenToolStripMenuItem_Click_1(sender As Object, e As EventArgs) Handles TabellenlayoutZurücksetzenToolStripMenuItem.Click - Reset_GridLayout + Reset_GridLayout() End Sub Sub Reset_GridLayout() @@ -1436,14 +1440,14 @@ Public Class frmMain Dim item As GridGroupSummaryItem = CType(view.GroupSummary(Tag), GridGroupSummaryItem) ' Dim value As Object = view.GetGroupSummaryValue(e.RowHandle, item) - If info.Column.FieldName = "PROFILE_GROUP_TEXT" Then + If info.Column.FieldName = "GROUP_TEXT" Then info.GroupText = info.GroupValueText Dim _color As String = "Grey" For Each row As DataRow In CURR_DT_VWPM_PROFILE_ACTIVE.Rows - If row.Item("PROFILE_GROUP_TEXT") = info.GroupValueText Then - _color = row.Item("PROFILE_GROUP_COLOR") + If row.Item("GROUP_TEXT") = info.GroupValueText Then + _color = row.Item("GROUP_COLOR") End If Next @@ -1469,7 +1473,6 @@ Public Class frmMain Dim view As GridView = sender Dim hi As GridHitInfo = view.CalcHitInfo(e.Location) Dim groupRowButtonClicked = (hi.HitTest = GridHitTest.RowGroupButton) - GridCursorLocation = e.Location ' wenn in eine Group Row Doppelt geklickt wurde.. If hi.InGroupRow And Not groupRowButtonClicked Then @@ -1477,8 +1480,8 @@ Public Class frmMain DXMouseEventArgs.GetMouseArgs(e).Handled = True GridViewItem_Clicked = "GROUP" - 'Dim info = hi.Column.FieldName - 'Dim info1 = hi.ToString + Dim info = hi.Column.FieldName + Dim info1 = hi.ToString Dim msg = "" ElseIf hi.InDataRow Then GridViewItem_Clicked = "ROW" @@ -1487,23 +1490,17 @@ Public Class frmMain End If End Sub - Private Sub GroupToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GroupToolStripMenuItem.Click - If GridView_Docs.OptionsView.ShowGroupedColumns = True Then - GridView_Docs.OptionsView.ShowGroupedColumns = False - Else - GridView_Docs.OptionsView.ShowGroupedColumns = True - End If + Private Sub GridView_Docs_ColumnWidthChanged(sender As Object, e As Views.Base.ColumnEventArgs) Handles GridView_Docs.ColumnWidthChanged + SaveGridLayout() End Sub - Private Sub GridView_Docs_MouseUp(sender As Object, e As MouseEventArgs) Handles GridView_Docs.MouseUp - + Private Sub LayoutSpeichernToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LayoutSpeichernToolStripMenuItem.Click + SaveGridLayout() End Sub - Private Sub GridControl_Docs_DoubleClick(sender As Object, e As EventArgs) Handles GridControl_Docs.DoubleClick - + Private Sub GridView_Docs_GroupRowExpandCollapse(sender As Object, e As RowEventArgs) Handles GridView_Docs.GroupRowExpanded, GridView_Docs.GroupRowCollapsed + 'GridView_Docs.EndSelection() + SaveGridLayout() End Sub - Private Sub GridView_Docs_ValidateRow(sender As Object, e As Views.Base.ValidateRowEventArgs) Handles GridView_Docs.ValidateRow - - End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmMassValidator.vb b/app/DD_PM_WINDREAM/frmMassValidator.vb index f14c4d6..664104c 100644 --- a/app/DD_PM_WINDREAM/frmMassValidator.vb +++ b/app/DD_PM_WINDREAM/frmMassValidator.vb @@ -1676,7 +1676,6 @@ Public Class frmMassValidator Private Sub frmMassValidator_Shown(sender As Object, e As EventArgs) Handles Me.Shown FORM_Shown = True - Me.BringToFront() End Sub Private Sub frmMassValidator_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing diff --git a/app/Setup/Product.wxs b/app/Setup/Product.wxs index 870226b..66bbe4c 100644 --- a/app/Setup/Product.wxs +++ b/app/Setup/Product.wxs @@ -109,8 +109,12 @@ - - + + + + + +