diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index 4172110..87c1e5c 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -91,17 +91,17 @@ Partial Class frmMain Me.barItemGridFontSize = New DevExpress.XtraBars.BarEditItem() Me.cmbGridFontSize = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem() - Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupBasicConf = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup7 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageTabelle = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup6 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPage4 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageAktionen = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup8 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RepositoryItemTrackBar1 = New DevExpress.XtraEditors.Repository.RepositoryItemTrackBar() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() @@ -377,7 +377,7 @@ Partial Class frmMain resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") Me.RibbonControl1.MaxItemId = 43 Me.RibbonControl1.Name = "RibbonControl1" - Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3, Me.RibbonPage4}) + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPageTabelle, Me.RibbonPageAktionen}) Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemProgressBar1, Me.RepositoryItemTrackBar1, Me.cmbGridFontSize}) Me.RibbonControl1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2013 Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -725,11 +725,11 @@ Partial Class frmMain Me.BarButtonItem8.Id = 42 Me.BarButtonItem8.Name = "BarButtonItem8" ' - 'RibbonPage1 + 'RibbonPageStart ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroupBasicConf, Me.RibbonPageGroup7, Me.RibbonPageGroup4}) - Me.RibbonPage1.Name = "RibbonPage1" - resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") + Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroupBasicConf, Me.RibbonPageGroup7, Me.RibbonPageGroup4}) + Me.RibbonPageStart.Name = "RibbonPageStart" + resources.ApplyResources(Me.RibbonPageStart, "RibbonPageStart") ' 'RibbonPageGroup1 ' @@ -779,11 +779,11 @@ Partial Class frmMain resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4") Me.RibbonPageGroup4.Visible = False ' - 'RibbonPage3 + 'RibbonPageTabelle ' - Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup6, Me.RibbonPageGroup5}) - Me.RibbonPage3.Name = "RibbonPage3" - resources.ApplyResources(Me.RibbonPage3, "RibbonPage3") + Me.RibbonPageTabelle.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup6, Me.RibbonPageGroup5}) + Me.RibbonPageTabelle.Name = "RibbonPageTabelle" + resources.ApplyResources(Me.RibbonPageTabelle, "RibbonPageTabelle") ' 'RibbonPageGroup6 ' @@ -803,11 +803,11 @@ Partial Class frmMain Me.RibbonPageGroup5.Name = "RibbonPageGroup5" resources.ApplyResources(Me.RibbonPageGroup5, "RibbonPageGroup5") ' - 'RibbonPage4 + 'RibbonPageAktionen ' - Me.RibbonPage4.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup8}) - Me.RibbonPage4.Name = "RibbonPage4" - resources.ApplyResources(Me.RibbonPage4, "RibbonPage4") + Me.RibbonPageAktionen.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup8}) + Me.RibbonPageAktionen.Name = "RibbonPageAktionen" + resources.ApplyResources(Me.RibbonPageAktionen, "RibbonPageAktionen") ' 'RibbonPageGroup8 ' @@ -1507,7 +1507,7 @@ Partial Class frmMain Friend WithEvents PopupErinnerungInaktivierenToolStripMenuItem As ToolStripMenuItem Friend WithEvents AnzeigenToolStripMenuItem As ToolStripMenuItem Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl - Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageStart As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar @@ -1621,7 +1621,7 @@ Partial Class frmMain Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarCheckItemAutofilter As DevExpress.XtraBars.BarCheckItem Friend WithEvents BarCheckItem2 As DevExpress.XtraBars.BarCheckItem - Friend WithEvents RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageTabelle As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup6 As DevExpress.XtraBars.Ribbon.RibbonPageGroup @@ -1632,7 +1632,7 @@ Partial Class frmMain Friend WithEvents RibbonPageGroup7 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonItemWFGroup As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItemFileLink As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPage4 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageAktionen As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup8 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonItemMassValidation As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarCheckItemShowSearch As DevExpress.XtraBars.BarCheckItem diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index fe703c3..fb4bfb6 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAaQBCAGkAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAawBCAGsAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1741,7 +1741,7 @@ Funktionen/App Start - + Start @@ -1750,10 +1750,10 @@ Workflow Tabelle - + Tabelle - + Aktionen @@ -2417,10 +2417,10 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPage1 + + RibbonPageStart - + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -2459,10 +2459,10 @@ DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPage3 + + RibbonPageTabelle - + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -2477,10 +2477,10 @@ DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPage4 + + RibbonPageAktionen - + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 85b4830..471e4ff 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -2874,7 +2874,7 @@ Public Class frmMain Private Sub RibbonControl1_SelectedPageChanged(sender As Object, e As EventArgs) Handles RibbonControl1.SelectedPageChanged Dim ribbon As RibbonControl = TryCast(sender, RibbonControl) Timer_Inactivity_Reset_Disable("RibbonControl1_SelectedPageChanged") - If ribbon.SelectedPage Is RibbonPage4 Then + If ribbon.SelectedPage Is RibbonPageAktionen Then Select Case GridViewItem_Clicked Case "GROUP" BarButtonItemMassValidation.Visibility = DevExpress.XtraBars.BarItemVisibility.Always @@ -2903,4 +2903,18 @@ Public Class frmMain Private Sub GridViewWFItems_SelectionChanged(sender As Object, e As DevExpress.Data.SelectionChangedEventArgs) Handles GridViewWFItems.SelectionChanged Timer_Inactivity_Reset_Disable("GridViewWFItems_SelectionChanged") End Sub + + Private Sub GridViewWFItems_Click(sender As Object, e As MouseEventArgs) Handles GridViewWFItems.Click + Try + If e.Button = Windows.Forms.MouseButtons.Right Then + RibbonControl1.SelectedPage = RibbonPageTabelle + Else + RibbonControl1.SelectedPage = RibbonPageStart + End If + Catch ex As Exception + LOGGER.Error(ex) + End Try + + + End Sub End Class \ No newline at end of file