Merge branch 'master' of http://scmadmin@172.24.11.74:90/scm/git/record_organizer
This commit is contained in:
@@ -24,6 +24,10 @@ Public Class frmMain
|
||||
LabelMachine.Caption = My.Computer.Name
|
||||
|
||||
Load_Connection_Dep_Data()
|
||||
|
||||
'Wenn Argumente übergeben wurden, wird Formular geladen und zu record gesprungen
|
||||
ClassJumpRecord.ParseArgs()
|
||||
|
||||
Catch ex As Exception
|
||||
MsgBox("Error in Load Form:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
|
||||
End Try
|
||||
@@ -106,6 +110,8 @@ Public Class frmMain
|
||||
Dim SQL As String = "SELECT * FROM TBPMO_MENU_FORM"
|
||||
Dim dtRootMenu As DataTable = ClassDatabase.Return_Datatable(SQL)
|
||||
|
||||
pageForms.Groups.Clear()
|
||||
|
||||
If dtRootMenu.Rows.Count <> 0 Then
|
||||
|
||||
For Each row As DataRow In dtRootMenu.Rows
|
||||
@@ -155,6 +161,41 @@ Public Class frmMain
|
||||
Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL2)
|
||||
Dim image2 As Bitmap = LoadNoImage()
|
||||
|
||||
'Do While 0 < groupQuickAccess.ItemLinks.Count
|
||||
' groupQuickAccess.ItemLinks.Remove(groupQuickAccess.ItemLinks(0))
|
||||
'Loop
|
||||
|
||||
'If dt.Rows.Count <> 0 Then
|
||||
|
||||
' For Each row As DataRow In dt.Rows
|
||||
' If Not IsDBNull(row.Item("MENU_IMG")) Then
|
||||
' Dim bimg() As Byte = row.Item("MENU_IMG")
|
||||
' Dim bitmap As Bitmap = ByteArrayToBitmap(bimg)
|
||||
' image2 = bitmap
|
||||
' End If
|
||||
|
||||
' Dim title As String = row.Item("FORM_TITLE")
|
||||
' Dim index As Integer = row.Item("SEQUENCE_MENU")
|
||||
' Dim tag As Integer = row.Item("GUID")
|
||||
' Dim item As New BarButtonItem(ribbonMain.Manager, title)
|
||||
' item.RibbonStyle = RibbonItemStyles.Large
|
||||
' item.Caption = title
|
||||
' item.Tag = tag
|
||||
' item.Glyph = image2
|
||||
|
||||
' AddHandler item.ItemClick, AddressOf ToolbarButtonItemClick
|
||||
|
||||
' groupQuickAccess.ItemLinks.Add(item)
|
||||
|
||||
' Next
|
||||
|
||||
'End If
|
||||
|
||||
|
||||
Do While 0 < groupQuickAccess.ItemLinks.Count
|
||||
groupQuickAccess.ItemLinks.Remove(groupQuickAccess.ItemLinks(0))
|
||||
Loop
|
||||
|
||||
If dt.Rows.Count <> 0 Then
|
||||
|
||||
For Each row As DataRow In dt.Rows
|
||||
@@ -174,42 +215,14 @@ Public Class frmMain
|
||||
item.Glyph = image2
|
||||
|
||||
AddHandler item.ItemClick, AddressOf ToolbarButtonItemClick
|
||||
|
||||
groupQuickAccess.ItemLinks.Add(item)
|
||||
|
||||
Next
|
||||
|
||||
End If
|
||||
|
||||
' TODO: NUR FÜR WINDREAM CON!!!
|
||||
If dt.Rows.Count <> 0 Then
|
||||
|
||||
For Each row As DataRow In dt.Rows
|
||||
If Not IsDBNull(row.Item("MENU_IMG")) Then
|
||||
Dim bimg() As Byte = row.Item("MENU_IMG")
|
||||
Dim bitmap As Bitmap = ByteArrayToBitmap(bimg)
|
||||
image2 = bitmap
|
||||
End If
|
||||
|
||||
Dim title As String = row.Item("FORM_TITLE")
|
||||
Dim index As Integer = row.Item("SEQUENCE_MENU")
|
||||
Dim tag As Integer = row.Item("GUID")
|
||||
Dim item As New BarButtonItem(ribbonMain.Manager, title)
|
||||
item.RibbonStyle = RibbonItemStyles.Large
|
||||
item.Caption = title
|
||||
item.Tag = tag
|
||||
item.Glyph = image2
|
||||
|
||||
AddHandler item.ItemClick, AddressOf ToolbarButtonItemClickDemo
|
||||
groupQuickAccessDemo.ItemLinks.Add(item)
|
||||
|
||||
Next
|
||||
|
||||
End If
|
||||
' TODO: NUR FÜR WINDREAM CON!!!
|
||||
End Sub
|
||||
|
||||
|
||||
|
||||
Private Sub BarButtonItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs)
|
||||
Dim formId As Integer = Integer.Parse(e.Item.Tag)
|
||||
|
||||
@@ -218,16 +231,6 @@ Public Class frmMain
|
||||
Cursor = Cursors.Default
|
||||
End Sub
|
||||
|
||||
' TODO: NUR FÜR WINDREAM CON!!!
|
||||
Private Sub ToolbarButtonItemClickDemo(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs)
|
||||
Dim formId As Integer = Integer.Parse(e.Item.Tag)
|
||||
|
||||
Cursor = Cursors.WaitCursor
|
||||
OpenFormConstructorDemo(formId)
|
||||
Cursor = Cursors.Default
|
||||
End Sub
|
||||
' TODO: NUR FÜR WINDREAM CON!!!
|
||||
|
||||
Private Sub ToolbarButtonItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs)
|
||||
Dim formId As Integer = Integer.Parse(e.Item.Tag)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user