diff --git a/app/DD_PM_WINDREAM/ClassParamRefresh.vb b/app/DD_PM_WINDREAM/ClassParamRefresh.vb index 1820e59..e5b5116 100644 --- a/app/DD_PM_WINDREAM/ClassParamRefresh.vb +++ b/app/DD_PM_WINDREAM/ClassParamRefresh.vb @@ -39,6 +39,8 @@ LOGCONFIG.Debug = True ElseIf oMode = "PM.IDBWITHWMFS" Then IDB_USES_WMFILESTORE = True + ElseIf oMode = "PM.NO_BASICCONF" Then + BASIC_CONF_VISIBLE = False ElseIf oMode.StartsWith("PM.IDB_CONID!") Then Dim CON_ID = oMode.Replace("PM.IDB_CONID!", "") Dim oConString = ClassDatabase.Get_ConnectionString(CON_ID) @@ -59,6 +61,8 @@ ElseIf oMode.StartsWith("PM.COLORSCHEME") Then Dim oColorScheme = oMode.Replace("PM.COLORSCHEME=", "") RIBBON_COLOR_SCHEME = oColorScheme.ToUpper + ElseIf oMode.StartsWith("PM.NO_DETAIL_PROFILES") Then + NO_DETAIL_PROFILES = True Else LOGGER.Info($"Wrong oMode: {oMode}") End If diff --git a/app/DD_PM_WINDREAM/ModuleMySettings.vb b/app/DD_PM_WINDREAM/ModuleMySettings.vb index cb5845b..caa22be 100644 --- a/app/DD_PM_WINDREAM/ModuleMySettings.vb +++ b/app/DD_PM_WINDREAM/ModuleMySettings.vb @@ -5,9 +5,11 @@ Public CONNECTION_STRING_IDB As String = "" Public IDB_ACTIVE As Boolean = False Public IDB_USES_WMFILESTORE As Boolean = False + Public BASIC_CONF_VISIBLE As Boolean = True Public IDB_DOC_DATA_SQL As String Public IDB_DT_DOC_DATA As DataTable Public TEST_MODE As String = False + Public NO_DETAIL_PROFILES As Boolean = False ' Debug Settings Public LOG_ERRORS_ONLY As Boolean = True diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index 5a1a8b6..c197d11 100644 --- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb +++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index b018b74..dfb9981 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -104,7 +104,7 @@ Partial Class frmMain Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroupBasicConf = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.ApplicationMenu1 = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components) @@ -703,13 +703,13 @@ Partial Class frmMain ' resources.ApplyResources(Me.bbtnitmGhostMode, "bbtnitmGhostMode") Me.bbtnitmGhostMode.Id = 19 - Me.bbtnitmGhostMode.ImageOptions.Image = CType(resources.GetObject("BarButtonItem2.ImageOptions.Image"), System.Drawing.Image) - Me.bbtnitmGhostMode.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.LargeImage"), System.Drawing.Image) + Me.bbtnitmGhostMode.ImageOptions.Image = CType(resources.GetObject("bbtnitmGhostMode.ImageOptions.Image"), System.Drawing.Image) + Me.bbtnitmGhostMode.ImageOptions.LargeImage = CType(resources.GetObject("bbtnitmGhostMode.ImageOptions.LargeImage"), System.Drawing.Image) Me.bbtnitmGhostMode.Name = "bbtnitmGhostMode" ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroup4}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroupBasicConf}) Me.RibbonPage1.Name = "RibbonPage1" resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") ' @@ -737,12 +737,12 @@ Partial Class frmMain Me.RibbonPageGroup3.Name = "RibbonPageGroup3" resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3") ' - 'RibbonPageGroup4 + 'RibbonPageGroupBasicConf ' - Me.RibbonPageGroup4.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far - Me.RibbonPageGroup4.ItemLinks.Add(Me.bbtniGrundeinstellung) - Me.RibbonPageGroup4.Name = "RibbonPageGroup4" - resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4") + Me.RibbonPageGroupBasicConf.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far + Me.RibbonPageGroupBasicConf.ItemLinks.Add(Me.bbtniGrundeinstellung) + Me.RibbonPageGroupBasicConf.Name = "RibbonPageGroupBasicConf" + resources.ApplyResources(Me.RibbonPageGroupBasicConf, "RibbonPageGroupBasicConf") ' 'RibbonStatusBar1 ' @@ -1463,7 +1463,7 @@ Partial Class frmMain Friend WithEvents bbiKonfiguration As DevExpress.XtraBars.BarButtonItem Friend WithEvents bbtniGrundeinstellung As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroupBasicConf As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents bbtnitemInfo As DevExpress.XtraBars.BarButtonItem Friend WithEvents ApplicationMenu1 As DevExpress.XtraBars.Ribbon.ApplicationMenu Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 92768e6..e21a1e9 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAZQBBgGUAQYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAZwBBgGcAQYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -178,114 +178,10 @@ 597, 17 - - 138, 95 - - - GridControl_Docs - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel1 - - - 0 - - - BindingNavigator1 - - - System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 1 - - - NavBarControl1 - - - DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel1 - - - 2 - - - - Fill - - - - Tahoma, 9pt - - - 0, 146 - - - 1347, 360 - - - - 4 - - - Panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - 1347, 56 - - 270, 230 - - - ContextMenuGrid - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Fill - - - 233, 27 - - - 1114, 333 - - - 8 - - - False - - - GridControl_Docs - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel1 - - - 0 - + 269, 26 @@ -314,6 +210,7 @@ Metadaten Datei anzeigen + False @@ -369,17 +266,54 @@ 266, 6 + + 200, 22 + + + Datei als Link versenden + 269, 26 Aktionen - - 204, 26 + + 270, 230 - - Datei als Link versenden + + ContextMenuGrid + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + Fill + + + 233, 27 + + + 1114, 333 + + + 8 + + + False + + + GridControl_Docs + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Panel1 + + + 0 138, 95 @@ -455,6 +389,9 @@ False + + Segoe UI, 9pt + 50, 23 @@ -584,6 +521,12 @@ 17, 95 + + 219, 26 + + + Starte Validierung für Profil + 220, 30 @@ -737,11 +680,32 @@ 2 - - 219, 26 + + Fill - - Starte Validierung für Profil + + Tahoma, 9pt + + + 0, 146 + + + 1347, 360 + + + 4 + + + Panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 908, 17 @@ -749,6 +713,27 @@ 640, 95 + + 234, 22 + + + Popup Erinnerung inaktivieren + + + 231, 6 + + + 234, 22 + + + Bring to Front + + + 234, 22 + + + Out of Range - PM fixieren + 235, 76 @@ -930,27 +915,6 @@ True - - 234, 22 - - - Popup Erinnerung inaktivieren - - - 231, 6 - - - 234, 22 - - - Bring to Front - - - 234, 22 - - - Out of Range - PM fixieren - 1023, 17 @@ -1321,7 +1285,7 @@ Ghost Mode (Beta) - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABB0RVh0VGl0 bGUATWFzaztSb2xlO7qx7LMAAANOSURBVDhPTZN5UIxhHMffELWiVKtr7bbtJDWOypVyHyOaiHJPJhMa @@ -1341,7 +1305,7 @@ jwdXucuNidhYj6IIKazgQrGnsFEehAcE4P4CACn8IorHn6UAAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABB0RVh0VGl0 bGUATWFzaztSb2xlO7qx7LMAAAp6SURBVFhHpZcJNNZZH8dTDZkZ1ZiUMj32pWUmtNhSdrIlxZRB1qwR @@ -1404,7 +1368,7 @@ Verwaltung - + Grundeinstellungen @@ -2170,10 +2134,10 @@ DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup4 + + RibbonPageGroupBasicConf - + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -2796,9 +2760,6 @@ &Ansicht - - &Hintergrund - &Seiten Layout @@ -2811,6 +2772,9 @@ Bars + + &Hintergrund + PDF Dokument diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 0a93ccd..1b45a97 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -231,7 +231,11 @@ Public Class frmMain bsiGeneralInfo.Caption = "IDB active" End If - + If BASIC_CONF_VISIBLE = False Then + RibbonPageGroupBasicConf.Visible = False + Else + RibbonPageGroupBasicConf.Visible = True + End If LOGGER.Debug("MainForm initialized!") End If formopenClose = False @@ -458,42 +462,48 @@ Public Class frmMain Throw New Exception("Could not load Profiles. Datatable is empty") Exit Sub End If - Dim oCountItems As Integer = 0 - For Each oProfileRow As DataRow In CURR_DT_VWPM_PROFILE_ACTIVE.Rows - If CInt(oProfileRow.Item("FILE_COUNT")) > 0 And (oProfileRow.Item("DISPLAY_MODE") = "Overview and Detail" Or oProfileRow.Item("DISPLAY_MODE") = "Detail") Then + If NO_DETAIL_PROFILES = False Then + NavBarControl1.Visible = True + Dim oCountItems As Integer = 0 + For Each oProfileRow As DataRow In CURR_DT_VWPM_PROFILE_ACTIVE.Rows + If CInt(oProfileRow.Item("FILE_COUNT")) > 0 And (oProfileRow.Item("DISPLAY_MODE") = "Overview and Detail" Or oProfileRow.Item("DISPLAY_MODE") = "Detail") Then - oCountItems += 1 - Dim item1 As NavBarItem = NavBarControl1.Items.Add() - item1.Caption = oProfileRow.Item("TITLE") - item1.Hint = oProfileRow.Item("TITLE") - item1.Appearance.TextOptions.WordWrap = WordWrap.Wrap - item1.Tag = "itmProfile#" & oProfileRow.Item("GUID").ToString + oCountItems += 1 + Dim item1 As NavBarItem = NavBarControl1.Items.Add() + item1.Caption = oProfileRow.Item("TITLE") + item1.Hint = oProfileRow.Item("TITLE") + item1.Appearance.TextOptions.WordWrap = WordWrap.Wrap + item1.Tag = "itmProfile#" & oProfileRow.Item("GUID").ToString - Dim _image As Image = Nothing - _image = DevExpress.Images.ImageResourceCache.Default.GetImage("images/business%20objects/bofileattachment_16x16.png") - item1.LargeImage = _image - item1.SmallImage = _image + Dim _image As Image = Nothing + _image = DevExpress.Images.ImageResourceCache.Default.GetImage("images/business%20objects/bofileattachment_16x16.png") + item1.LargeImage = _image + item1.SmallImage = _image - NavBarControl1.Groups(1).ItemLinks.Add(item1) + NavBarControl1.Groups(1).ItemLinks.Add(item1) - AddHandler NavBarControl1.LinkClicked, AddressOf navBar_LinkClicked + AddHandler NavBarControl1.LinkClicked, AddressOf navBar_LinkClicked + End If + Next + If oCountItems > 0 Then + If NavBarControl1.Groups(1).Visible = False Then + NavBarControl1.Groups(1).Visible = True + End If + Else + If NavBarControl1.Groups(1).Visible = True Then + NavBarControl1.Groups(1).Visible = False + End If End If - Next - If oCountItems > 0 Then - If NavBarControl1.Groups(1).Visible = False Then - NavBarControl1.Groups(1).Visible = True + + If Not IsNothing(CurrNavBarGroup) Then + CurrNavBarGroup.Expanded = profileGroupOpen + Else + NavBarControl1.Groups(1).Expanded = True End If Else - If NavBarControl1.Groups(1).Visible = True Then - NavBarControl1.Groups(1).Visible = False - End If + NavBarControl1.Visible = False End If - If Not IsNothing(CurrNavBarGroup) Then - CurrNavBarGroup.Expanded = profileGroupOpen - Else - NavBarControl1.Groups(1).Expanded = True - End If Catch ex As Exception