diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index e153c69..1398815 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -238,6 +238,16 @@ Public Class frmConstructor_Main End If End Sub + Private Sub AddRibbonCloseHandler(controls As Control.ControlCollection) + For Each c As Control In controls + AddHandler c.MouseClick, Sub() + MAIN_FORM.CloseRibbon() + End Sub + If c.Controls.Count > 0 Then + AddRibbonCloseHandler(c.Controls) + End If + Next + End Sub Private Sub frmForm_Constructor_Main_Load(sender As Object, e As EventArgs) Handles Me.Load Dim sw As New Stopwatch @@ -252,6 +262,8 @@ Public Class frmConstructor_Main CONSTRUCTORID = CURRENT_CONSTRUCTOR_ID Me.Cursor = Cursors.WaitCursor + AddRibbonCloseHandler(Controls) + Init_Grid_Control() 'Catch ex As Exception ' ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) diff --git a/app/DD-Record-Organizer/frmMain.vb b/app/DD-Record-Organizer/frmMain.vb index 31c671c..b472787 100644 --- a/app/DD-Record-Organizer/frmMain.vb +++ b/app/DD-Record-Organizer/frmMain.vb @@ -17,6 +17,14 @@ Public Class frmMain Public Shared TIMER_SCAN As New System.Windows.Forms.Timer Public TIMER_INACTIVITY As ClassInactivity + Public Sub OpenRibbon() + ribbonMain.Minimized = False + End Sub + + Public Sub CloseRibbon() + ribbonMain.Minimized = True + End Sub + Private Shared Sub Scan_TickHandler(sender As Object, e As EventArgs) Try If ClassFolderWatcher.NEW_FILES = False Then Exit Sub @@ -286,54 +294,6 @@ Public Class frmMain Catch ex As Exception MsgBox("Unexpected Error in Load QuickStart-Items:" & vbNewLine & ex.Message) End Try - - 'Dim SQL As String = "SELECT * FROM TBPMO_MENU_FORM" - 'Dim dtRootMenu As DataTable = ClassDatabase.Return_Datatable(SQL) - 'ss() - 'pageForms.Groups.Clear() - - 'If dtRootMenu.Rows.Count <> 0 Then - - ' For Each row As DataRow In dtRootMenu.Rows - - ' Dim MenuID As Integer = row.Item("GUID") - ' Dim groupTitle As String = row.Item("MENU_ENTRY") - ' Dim group As New RibbonPageGroup(groupTitle) - ' Dim dtSubMenu As DataTable - ' Dim image As Bitmap = LoadImage(row.Item("ICON_PATH")) - - ' group.Glyph = image - ' group.AllowTextClipping = False - - ' SQL = "SELECT * FROM TBPMO_MENU_FORM_ENTRIES WHERE MENU_FORM_ID = " & MenuID - ' dtSubMenu = ClassDatabase.Return_Datatable(SQL) - - ' If dtSubMenu.Rows.Count <> 0 Then - - ' For Each subRow As DataRow In dtSubMenu.Rows - - ' Dim itemTitle As String = subRow.Item("MENU_ENTRY") - ' Dim tag As String = subRow.Item("FORM_ID") - ' Dim item As New BarButtonItem(ribbonMain.Manager, itemTitle) - - ' Dim subimage As Bitmap = LoadImage(subRow.Item("ICON_PATH")) - - ' item.RibbonStyle = RibbonItemStyles.SmallWithText - ' item.Tag = tag - ' item.Glyph = subimage - - ' AddHandler item.ItemClick, AddressOf BarButtonItemClick - - ' group.ItemLinks.Add(item) - - ' Next - - ' pageForms.Groups.Add(group) - ' End If - - ' Next - - 'End If End Sub Public Sub LoadQuickStartItems() Try