From 41d849557e9c031abb0da67138668813f4fb1f5b Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 27 Feb 2019 15:16:10 +0100 Subject: [PATCH] Fix Crash on ContextMenu open via FilterRow --- app/DD_PM_WINDREAM/frmMain.Designer.vb | 10 +- app/DD_PM_WINDREAM/frmMain.resx | 407 ++++++++++++------------- app/DD_PM_WINDREAM/frmMain.vb | 46 +-- 3 files changed, 218 insertions(+), 245 deletions(-) diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index 9adb037..0c0c35d 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -158,6 +158,7 @@ Partial Class frmMain 'ChartTopLeft ' resources.ApplyResources(Me.ChartTopLeft, "ChartTopLeft") + Me.ChartTopLeft.Legend.Name = "Default Legend" Me.ChartTopLeft.Name = "ChartTopLeft" Me.ChartTopLeft.SeriesSerializable = New DevExpress.XtraCharts.Series(-1) {} ' @@ -171,6 +172,7 @@ Partial Class frmMain 'ChartTopRight ' resources.ApplyResources(Me.ChartTopRight, "ChartTopRight") + Me.ChartTopRight.Legend.Name = "Default Legend" Me.ChartTopRight.Name = "ChartTopRight" Me.ChartTopRight.SeriesSerializable = New DevExpress.XtraCharts.Series(-1) {} ' @@ -199,6 +201,7 @@ Partial Class frmMain 'ChartBottomLeft ' resources.ApplyResources(Me.ChartBottomLeft, "ChartBottomLeft") + Me.ChartBottomLeft.Legend.Name = "Default Legend" Me.ChartBottomLeft.Name = "ChartBottomLeft" Me.ChartBottomLeft.SeriesSerializable = New DevExpress.XtraCharts.Series(-1) {} ' @@ -212,6 +215,7 @@ Partial Class frmMain 'ChartBottomRight ' resources.ApplyResources(Me.ChartBottomRight, "ChartBottomRight") + Me.ChartBottomRight.Legend.Name = "Default Legend" Me.ChartBottomRight.Name = "ChartBottomRight" Me.ChartBottomRight.SeriesSerializable = New DevExpress.XtraCharts.Series(-1) {} ' @@ -523,6 +527,7 @@ Partial Class frmMain 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" ' 'cmsNavPane @@ -543,20 +548,23 @@ Partial Class frmMain resources.ApplyResources(Me.NavBarGroupMore, "NavBarGroupMore") Me.NavBarGroupMore.Expanded = True Me.NavBarGroupMore.GroupStyle = DevExpress.XtraNavBar.NavBarGroupStyle.LargeIconsText + Me.NavBarGroupMore.ImageOptions.LargeImage = CType(resources.GetObject("NavBarGroupMore.ImageOptions.LargeImage"), System.Drawing.Image) Me.NavBarGroupMore.ItemLinks.AddRange(New DevExpress.XtraNavBar.NavBarItemLink() {New DevExpress.XtraNavBar.NavBarItemLink(Me.NavBarItemOverview), New DevExpress.XtraNavBar.NavBarItemLink(Me.NavBarItemDashboard)}) Me.NavBarGroupMore.Name = "NavBarGroupMore" ' 'NavBarItemOverview ' - Me.NavBarItemOverview.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.[False] Me.NavBarItemOverview.Appearance.Image = CType(resources.GetObject("NavBarItemOverview.Appearance.Image"), System.Drawing.Image) Me.NavBarItemOverview.Appearance.Options.UseImage = True resources.ApplyResources(Me.NavBarItemOverview, "NavBarItemOverview") + Me.NavBarItemOverview.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.[False] + Me.NavBarItemOverview.ImageOptions.LargeImage = CType(resources.GetObject("NavBarItemOverview.ImageOptions.LargeImage"), System.Drawing.Image) Me.NavBarItemOverview.Name = "NavBarItemOverview" ' 'NavBarItemDashboard ' resources.ApplyResources(Me.NavBarItemDashboard, "NavBarItemDashboard") + Me.NavBarItemDashboard.ImageOptions.LargeImage = CType(resources.GetObject("NavBarItemDashboard.ImageOptions.LargeImage"), System.Drawing.Image) Me.NavBarItemDashboard.Name = "NavBarItemDashboard" ' 'NotifyIcon1 diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 9d24f22..1fa809d 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -151,7 +151,7 @@ ChartTopLeft - DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v18.1.UI, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a SplitContainerTop.Panel1 @@ -214,7 +214,7 @@ ChartTopRight - DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v18.1.UI, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a SplitContainerTop.Panel2 @@ -316,7 +316,7 @@ ChartBottomLeft - DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v18.1.UI, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a SplitContainerBottom.Panel1 @@ -379,7 +379,7 @@ ChartBottomRight - DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v18.1.UI, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a SplitContainerBottom.Panel2 @@ -488,7 +488,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAawBAwGsAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAbQBAwG0AQMBEAEAARABAAT/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 - - - 4 - Segoe UI, 9pt, style=Bold, Italic @@ -628,35 +604,35 @@ Aktualisieren - - 1015, 17 - - - Tahoma, 9pt + + 0, 0 - - 0, 498 + + 1023, 27 - - 1023, 29 + + 2 - - 3 + + ToolStrip1 - - StatusStrip1 + + ToolStrip1 - - StatusStrip1 + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Panel1 - - $this + + 4 - - 3 + + 1015, 17 + + + Tahoma, 9pt 150, 24 @@ -703,11 +679,162 @@ 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 + + + $this + + + 3 + + + Top, Left, Right + 1047, 95 - - Top, Left, Right + + 1201, 95 + + + 87, 22 + + + von {0} Dateien + + + Die Gesamtanzahl der Elemente. + + + Fill + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 + v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg + UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA + Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu + lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= + + + + True + + + 24, 22 + + + Erste verschieben + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f + Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ + 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC + + + + True + + + 24, 22 + + + Vorherige verschieben + + + 6, 25 + + + Position + + + False + + + 50, 23 + + + 0 + + + Aktuelle Position + + + 6, 25 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI + N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f + oAc0QjgAAAAASUVORK5CYII= + + + + True + + + 24, 22 + + + Nächste verschieben + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B + twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA + kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG + WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 + 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + + True + + + 24, 22 + + + Letzte verschieben + + + 6, 25 + + + 0, 0 + + + 778, 25 + + + 9 + + + BindingNavigator1 BindingNavigator1 @@ -806,7 +933,7 @@ GridControl_Docs - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a Panel1 @@ -847,7 +974,7 @@ Profilübersicht - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAFNhbGU76FnfrwAACeVJREFUWEfF @@ -899,6 +1026,12 @@ 301, 95 + + 219, 26 + + + Starte Validierung für Profil + 220, 30 @@ -914,7 +1047,7 @@ Weitere Ansichten - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAXdEVYdFRpdGxlAFByb2R1Y3Q7UHJvZHVjdHM7c0vM @@ -990,7 +1123,7 @@ Gesamtübersicht - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAZdEVYdFRpdGxlAFVubWVyZ2VDZWxscztNZXJnZTuJ @@ -1028,7 +1161,7 @@ Dashboard - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhck9mUGllO7hVPVUAAAf4SURB @@ -1088,7 +1221,7 @@ NavBarControl1 - DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a Panel1 @@ -1123,154 +1256,6 @@ 2 - - 1047, 95 - - - 1201, 95 - - - 87, 22 - - - von {0} Dateien - - - Die Gesamtanzahl der Elemente. - - - Fill - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 - wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 - v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg - UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA - Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu - lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= - - - - True - - - 24, 22 - - - Erste verschieben - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w - 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f - Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ - 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC - - - - True - - - 24, 22 - - - Vorherige verschieben - - - 6, 25 - - - Position - - - False - - - 50, 23 - - - 0 - - - Aktuelle Position - - - 6, 25 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 - n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI - N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f - oAc0QjgAAAAASUVORK5CYII= - - - - True - - - 24, 22 - - - Nächste verschieben - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// - h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B - twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA - kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG - WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 - 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== - - - - True - - - 24, 22 - - - Letzte verschieben - - - 6, 25 - - - 0, 0 - - - 778, 25 - - - 9 - - - BindingNavigator1 - - - BindingNavigator1 - - - System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlNavigator - - - 0 - - - 219, 26 - - - Starte Validierung für Profil - 1132, 17 @@ -2354,13 +2339,13 @@ GridView_Docs - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a NavBarGroupProfiles - DevExpress.XtraNavBar.NavBarGroup, DevExpress.XtraNavBar.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraNavBar.NavBarGroup, DevExpress.XtraNavBar.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a tsmiValidationProfil @@ -2372,19 +2357,19 @@ NavBarGroupMore - DevExpress.XtraNavBar.NavBarGroup, DevExpress.XtraNavBar.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraNavBar.NavBarGroup, DevExpress.XtraNavBar.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a NavBarItemOverview - DevExpress.XtraNavBar.NavBarItem, DevExpress.XtraNavBar.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraNavBar.NavBarItem, DevExpress.XtraNavBar.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a NavBarItemDashboard - DevExpress.XtraNavBar.NavBarItem, DevExpress.XtraNavBar.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraNavBar.NavBarItem, DevExpress.XtraNavBar.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a NotifyIcon1 diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 2a8ee12..b7220de 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -960,13 +960,14 @@ Public Class frmMain End Function Private Sub tsmiMarkedFilesFinish_Click(sender As Object, e As EventArgs) Handles tsmiMarkedFilesFinish.Click Try - Dim selectedRows As Integer() = GridView_Docs.GetSelectedRows() - Dim hitInfo As GridHitInfo = GridView_Docs.CalcHitInfo(GridCursorLocation) - Dim workedFiles As Integer = 0 + Dim oSelectedRows As Integer() = GridView_Docs.GetSelectedRows() + Dim oHitInfo As GridHitInfo = GridView_Docs.CalcHitInfo(GridCursorLocation) + Dim oSelectedRowHandle As Integer = oHitInfo.RowHandle + Dim oWorkedFiles As Integer = 0 - Dim profileId = 0 + Dim oProfileId = 0 - If selectedRows.Count = 0 Then + If oSelectedRows.Count = 0 Then If USER_LANGUAGE = "de-DE" Then MsgBox("Bitte selektieren Sie einige 1 oder mehr Dokumente", MsgBoxStyle.Exclamation, "Massenabschluss") Else @@ -976,32 +977,11 @@ Public Class frmMain Exit Sub End If - If GridView_Docs.IsGroupRow(hitInfo.RowHandle) Then - Dim groupRowHandle = hitInfo.RowHandle - - Dim childRows As Integer = GridView_Docs.GetChildRowCount(groupRowHandle) - - If childRows > 0 Then - Dim childRowHandle = GridView_Docs.GetChildRowHandle(groupRowHandle, 0) - - profileId = GridView_Docs.GetRowCellValue(childRowHandle, "PROFILE_ID") - Else - MsgBox("This profile has no documents!") - End If - Else - If hitInfo.RowHandle >= 0 Then - profileId = GridView_Docs.GetRowCellValue(hitInfo.RowHandle, "PROFILE_ID") - Else - Dim parentRowHandle = GridView_Docs.GetParentRowHandle(hitInfo.RowHandle) - Dim dataRowHandle = GridView_Docs.GetDataRowHandleByGroupRowHandle(parentRowHandle) - - profileId = GridView_Docs.GetRowCellValue(dataRowHandle, "PROFILE_ID") - End If - End If + oProfileId = GridView_Docs.GetRowCellValue(oSelectedRows.First(), "PROFILE_ID") If Init_windream() Then - CURRENT_ProfilGUID = profileId + CURRENT_ProfilGUID = oProfileId CURRENT_DT_FINAL_INDEXING = ClassDatabase.Return_Datatable(String.Format("select * from TBPM_PROFILE_FINAL_INDEXING where PROFIL_ID = {0}", CURRENT_ProfilGUID)) CURRENT_DT_PROFILE = ClassDatabase.Return_Datatable(String.Format("select * from TBPM_PROFILE where GUID = {0}", CURRENT_ProfilGUID)) CURRENT_PROFILE_VEKTOR_LOG = CURRENT_DT_PROFILE.Rows(0).Item("PM_VEKTOR_INDEX") @@ -1015,16 +995,16 @@ Public Class frmMain dt.Columns.Add("DOC_GUID") dt.Columns.Add("FULL_PATH") - For Each rowhandle As Integer In selectedRows + For Each oRowHandle As Integer In oSelectedRows Dim R As DataRow = dt.NewRow - Dim DOC_ID = GridView_Docs.GetRowCellValue(rowhandle, "DOC_ID") + Dim DOC_ID = GridView_Docs.GetRowCellValue(oRowHandle, "DOC_ID") CURRENT_DOC_ID = DOC_ID - Dim DOC_PATH = GridView_Docs.GetRowCellValue(rowhandle, "FULL_FILE_PATH") + Dim DOC_PATH = GridView_Docs.GetRowCellValue(oRowHandle, "FULL_FILE_PATH") CURRENT_DOC_PATH = DOC_PATH - CURRENT_DOC_GUID = GridView_Docs.GetRowCellValue(rowhandle, "GUID") + CURRENT_DOC_GUID = GridView_Docs.GetRowCellValue(oRowHandle, "GUID") R("DOC_ID") = CURRENT_DOC_ID R("FULL_PATH") = CURRENT_DOC_PATH - R("DOC_GUID") = GridView_Docs.GetRowCellValue(rowhandle, "GUID") + R("DOC_GUID") = GridView_Docs.GetRowCellValue(oRowHandle, "GUID") dt.Rows.Add(R) Next