diff --git a/3rdparty/lib/Commandline/CommandLine.dll b/3rdparty/lib/Commandline/CommandLine.dll new file mode 100644 index 0000000..d5497ef Binary files /dev/null and b/3rdparty/lib/Commandline/CommandLine.dll differ diff --git a/app/DD-Record-Organiser/ApplicationEvents.vb b/app/DD-Record-Organiser/ApplicationEvents.vb index 37d74c5..ac89f5a 100644 --- a/app/DD-Record-Organiser/ApplicationEvents.vb +++ b/app/DD-Record-Organiser/ApplicationEvents.vb @@ -8,9 +8,9 @@ ' StartupNextInstance: Wird beim Starten einer Einzelinstanzanwendung ausgelöst, wenn diese bereits aktiv ist. ' NetworkAvailabilityChanged: Wird beim Herstellen oder Trennen der Netzwerkverbindung ausgelöst. Partial Friend Class MyApplication - - - + Private Sub MyApplication_StartupNextInstance(sender As Object, e As ApplicationServices.StartupNextInstanceEventArgs) Handles Me.StartupNextInstance + ClassJumpRecord.ParseArgs() + End Sub End Class End Namespace \ No newline at end of file diff --git a/app/DD-Record-Organiser/ClassJumpRecord.vb b/app/DD-Record-Organiser/ClassJumpRecord.vb new file mode 100644 index 0000000..b29d180 --- /dev/null +++ b/app/DD-Record-Organiser/ClassJumpRecord.vb @@ -0,0 +1,62 @@ +Imports CommandLine +Imports CommandLine.Text +Imports System.Text.RegularExpressions + +Public Class ClassJumpRecord + Private Shared ProtocolRegex As New Regex("pmo://(?\d+)-(?\d+)") + 'Aufruf: PMO.exe --data pmo://10-60 + + Class Options + <[Option]("d", "data")> + Public Property data As String + End Class + + Public Shared Sub ParseArgs() + Try + Dim args() As String = Environment.GetCommandLineArgs() + Dim options As New Options() + Dim constructorId As Integer + Dim recordId As Integer + + If args.Length <> 3 Then + Exit Sub + End If + + If (Parser.Default.ParseArguments(args, options)) Then + Dim data As String = options.data + Dim match = ProtocolRegex.Match(data) + + If Not match.Success Then + Exit Sub + End If + + constructorId = match.Groups("constructorId").Value + recordId = match.Groups("recordId").Value + + JumpToRecord(constructorId, recordId) + Else + Exit Sub + End If + Catch ex As Exception + MsgBox("Error in ParseArgs:" & vbNewLine & ex.Message) + Exit Sub + End Try + End Sub + + Private Shared Sub JumpToRecord(constructorId As Integer, recordId As Integer) + Try + Dim constructorIdExists As Boolean = ClassDatabase.Execute_Scalar(String.Format("SELECT CONSTRUCT_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0}", constructorId)) + Dim recordIdExists As Boolean = ClassDatabase.Execute_Scalar(String.Format("SELECT GUID FROM TBPMO_RECORD WHERE GUID = {0}", recordId)) + + If constructorIdExists = False Or recordIdExists = False Then + MsgBox("Das angegebene Formular konnte nicht geöffnet werden. Grund: Die ConstructorID oder die RecordID wurde nicht gefunden." & vbNewLine & "constructorId: " & constructorId & ", recordId: " & recordId, MsgBoxStyle.Exclamation, "URL Handler") + Exit Sub + End If + + OpenFormConstructor(constructorId, recordId) + Catch ex As Exception + MsgBox("Error in JumpToRecord:" & vbNewLine & ex.Message) + Exit Sub + End Try + End Sub +End Class diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj index a1216d5..b97f866 100644 --- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj +++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj @@ -78,6 +78,9 @@ ..\..\3rdparty\lib\Windream\AxInterop.OBJECTLISTCONTROLLib.dll True + + ..\..\3rdparty\lib\Commandline\CommandLine.dll + False True @@ -245,6 +248,7 @@ + frmAbout.vb diff --git a/app/DD-Record-Organiser/ModuleHelperMethods.vb b/app/DD-Record-Organiser/ModuleHelperMethods.vb index 39f3acf..6bc034e 100644 --- a/app/DD-Record-Organiser/ModuleHelperMethods.vb +++ b/app/DD-Record-Organiser/ModuleHelperMethods.vb @@ -211,23 +211,8 @@ frm3.Show() End Sub - Public Sub OpenFormConstructor(id As Integer) - CURRENT_CONSTRUCTOR_ID = id - Dim frm As New frmForm_Constructor() - Dim activeChild As Form = MAIN_FORM.ActiveMdiChild - If activeChild IsNot Nothing Then - activeChild.WindowState = FormWindowState.Normal - End If - - frm.MdiParent = MAIN_FORM - frm.Show() - ' frm = frmForm_Constructor.Instance() - - End Sub - - ' TODO: NUR FÜR WINDREAM CON!!! - Public Sub OpenFormConstructorDemo(id As Integer) + Public Sub OpenFormConstructor(id As Integer, Optional recordId As Integer = -1) Try CURRENT_CONSTRUCTOR_ID = id Dim frm As New frmForm_Constructor_Main_2() @@ -238,6 +223,11 @@ activeChild.WindowState = FormWindowState.Normal End If + If recordId <> -1 Then + ' Wenn JUMP_RECORD_ID gesetzt wurde, wird zu diesem Record gesprungen + JUMP_RECORD_ID = recordId + End If + frm.MdiParent = MAIN_FORM frm.Show() Catch ex As Exception @@ -245,7 +235,6 @@ MsgBox("Fehler beim Laden des Formulars, bitte erneut versuchen") End Try End Sub - ' TODO: NUR FÜR WINDREAM CON!!! Public Sub OpenTaskmanagement() Dim frm As New frmTaskmanagement diff --git a/app/DD-Record-Organiser/My Project/AssemblyInfo.vb b/app/DD-Record-Organiser/My Project/AssemblyInfo.vb index d8f6a6c..18566a4 100644 --- a/app/DD-Record-Organiser/My Project/AssemblyInfo.vb +++ b/app/DD-Record-Organiser/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/DD-Record-Organiser/frmCustomAppointment.vb b/app/DD-Record-Organiser/frmCustomAppointment.vb index 39f72b4..c4d3a38 100644 --- a/app/DD-Record-Organiser/frmCustomAppointment.vb +++ b/app/DD-Record-Organiser/frmCustomAppointment.vb @@ -100,7 +100,7 @@ Partial Public Class frmCustomAppointment ' TODO: FormId und ConstructId herausfinden - OpenFormConstructorDemo(constructId) + OpenFormConstructor(constructId) Me.Close() End If End Sub diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb index a117c98..8e4f7b9 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb @@ -23,9 +23,9 @@ Partial Class frmForm_Constructor_Main_2 _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim GridLevelNode4 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() - Dim GridLevelNode5 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() - Dim GridLevelNode6 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() + Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() + Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() + Dim GridLevelNode3 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmForm_Constructor_Main_2)) Me.grvwGrid = New DevExpress.XtraGrid.Views.Grid.GridView() Me.GridControlMain = New DevExpress.XtraGrid.GridControl() @@ -175,6 +175,7 @@ Partial Class frmForm_Constructor_Main_2 ' Me.grvwGrid.Appearance.EvenRow.BackColor = System.Drawing.Color.Aqua Me.grvwGrid.Appearance.EvenRow.Options.UseBackColor = True + Me.grvwGrid.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.None Me.grvwGrid.GridControl = Me.GridControlMain Me.grvwGrid.GroupPanelText = "Ziehen Sie Spaltenüberschriften in diesen Bereich um nach diesen gruppieren zu la" & _ "ssen" @@ -186,6 +187,8 @@ Partial Class frmForm_Constructor_Main_2 Me.grvwGrid.OptionsBehavior.Editable = False Me.grvwGrid.OptionsBehavior.ReadOnly = True Me.grvwGrid.OptionsSelection.EnableAppearanceFocusedCell = False + Me.grvwGrid.OptionsSelection.EnableAppearanceFocusedRow = False + Me.grvwGrid.OptionsSelection.EnableAppearanceHideSelection = False Me.grvwGrid.OptionsView.ColumnAutoWidth = False Me.grvwGrid.OptionsView.EnableAppearanceEvenRow = True Me.grvwGrid.OptionsView.EnableAppearanceOddRow = True @@ -197,16 +200,16 @@ Partial Class frmForm_Constructor_Main_2 Me.GridControlMain.ContextMenuStrip = Me.ContextMenuGrid Me.GridControlMain.Dock = System.Windows.Forms.DockStyle.Fill Me.GridControlMain.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - GridLevelNode4.LevelTemplate = Me.grvwGrid - GridLevelNode4.RelationName = "Level1" - GridLevelNode5.LevelTemplate = Me.grvwCarousel - GridLevelNode5.RelationName = "Level2" - GridLevelNode6.RelationName = "Level3" - Me.GridControlMain.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode4, GridLevelNode5, GridLevelNode6}) + GridLevelNode1.LevelTemplate = Me.grvwGrid + GridLevelNode1.RelationName = "Level1" + GridLevelNode2.LevelTemplate = Me.grvwCarousel + GridLevelNode2.RelationName = "Level2" + GridLevelNode3.RelationName = "Level3" + Me.GridControlMain.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1, GridLevelNode2, GridLevelNode3}) Me.GridControlMain.Location = New System.Drawing.Point(0, 0) Me.GridControlMain.MainView = Me.grvwTiles Me.GridControlMain.Name = "GridControlMain" - Me.GridControlMain.Size = New System.Drawing.Size(788, 270) + Me.GridControlMain.Size = New System.Drawing.Size(795, 270) Me.GridControlMain.TabIndex = 0 Me.GridControlMain.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwCarousel, Me.grvwTiles, Me.grvwGrid}) ' @@ -461,7 +464,7 @@ Partial Class frmForm_Constructor_Main_2 Me.SplitContainerBottom.Panel1.Text = "Panel1" Me.SplitContainerBottom.Panel2.Controls.Add(Me.Panel2) Me.SplitContainerBottom.Panel2.Text = "Panel2" - Me.SplitContainerBottom.Size = New System.Drawing.Size(1083, 365) + Me.SplitContainerBottom.Size = New System.Drawing.Size(1083, 372) Me.SplitContainerBottom.SplitterPosition = 576 Me.SplitContainerBottom.TabIndex = 0 Me.SplitContainerBottom.Text = "SplitContainerControl1" @@ -477,7 +480,7 @@ Partial Class frmForm_Constructor_Main_2 Me.TCDetails.Location = New System.Drawing.Point(0, 25) Me.TCDetails.Name = "TCDetails" Me.TCDetails.SelectedTabPage = Me.TabDetails - Me.TCDetails.Size = New System.Drawing.Size(1071, 340) + Me.TCDetails.Size = New System.Drawing.Size(1078, 347) Me.TCDetails.TabIndex = 1 Me.TCDetails.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabDetails, Me.TabWindream, Me.TabFollowUp, Me.TabPos}) ' @@ -486,7 +489,7 @@ Partial Class frmForm_Constructor_Main_2 Me.TabDetails.Controls.Add(Me.pnlDetails) Me.TabDetails.Image = Global.DD_Record_Organiser.My.Resources.Resources.grid_Data_16xMD Me.TabDetails.Name = "TabDetails" - Me.TabDetails.Size = New System.Drawing.Size(1069, 312) + Me.TabDetails.Size = New System.Drawing.Size(1072, 316) Me.TabDetails.Text = "Detailansicht" ' 'pnlDetails @@ -495,7 +498,7 @@ Partial Class frmForm_Constructor_Main_2 Me.pnlDetails.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlDetails.Location = New System.Drawing.Point(0, 0) Me.pnlDetails.Name = "pnlDetails" - Me.pnlDetails.Size = New System.Drawing.Size(1069, 312) + Me.pnlDetails.Size = New System.Drawing.Size(1072, 316) Me.pnlDetails.TabIndex = 0 ' 'TabWindream @@ -504,7 +507,7 @@ Partial Class frmForm_Constructor_Main_2 Me.TabWindream.Controls.Add(Me.ToolStripDokumente) Me.TabWindream.Image = Global.DD_Record_Organiser.My.Resources.Resources.Files_7954 Me.TabWindream.Name = "TabWindream" - Me.TabWindream.Size = New System.Drawing.Size(1069, 312) + Me.TabWindream.Size = New System.Drawing.Size(1072, 316) Me.TabWindream.Text = "windream-Dateien" ' 'AxObjectListControl @@ -515,7 +518,7 @@ Partial Class frmForm_Constructor_Main_2 Me.AxObjectListControl.Location = New System.Drawing.Point(0, 25) Me.AxObjectListControl.Name = "AxObjectListControl" Me.AxObjectListControl.OcxState = CType(resources.GetObject("AxObjectListControl.OcxState"), System.Windows.Forms.AxHost.State) - Me.AxObjectListControl.Size = New System.Drawing.Size(1069, 287) + Me.AxObjectListControl.Size = New System.Drawing.Size(1072, 291) Me.AxObjectListControl.TabIndex = 6 Me.AxObjectListControl.TabStop = False ' @@ -525,7 +528,7 @@ Partial Class frmForm_Constructor_Main_2 Me.ToolStripDokumente.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblWindreamView, Me.ToolStripDropDownButton2}) Me.ToolStripDokumente.Location = New System.Drawing.Point(0, 0) Me.ToolStripDokumente.Name = "ToolStripDokumente" - Me.ToolStripDokumente.Size = New System.Drawing.Size(1069, 25) + Me.ToolStripDokumente.Size = New System.Drawing.Size(1072, 25) Me.ToolStripDokumente.TabIndex = 2 Me.ToolStripDokumente.Text = "ToolStrip2" ' @@ -559,7 +562,7 @@ Partial Class frmForm_Constructor_Main_2 Me.TabFollowUp.Controls.Add(Me.Label5) Me.TabFollowUp.Image = Global.DD_Record_Organiser.My.Resources.Resources.Task_16xMD Me.TabFollowUp.Name = "TabFollowUp" - Me.TabFollowUp.Size = New System.Drawing.Size(1069, 312) + Me.TabFollowUp.Size = New System.Drawing.Size(1072, 316) Me.TabFollowUp.Text = "Wiedervorlage" ' 'ListViewFollowUps @@ -738,7 +741,7 @@ Partial Class frmForm_Constructor_Main_2 Me.TabPos.Image = CType(resources.GetObject("TabPos.Image"), System.Drawing.Image) Me.TabPos.Name = "TabPos" Me.TabPos.PageVisible = False - Me.TabPos.Size = New System.Drawing.Size(1069, 312) + Me.TabPos.Size = New System.Drawing.Size(1072, 316) Me.TabPos.Text = "Positionen" ' 'Panel1 @@ -747,7 +750,7 @@ Partial Class frmForm_Constructor_Main_2 Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel1.Location = New System.Drawing.Point(0, 25) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1069, 287) + Me.Panel1.Size = New System.Drawing.Size(1072, 291) Me.Panel1.TabIndex = 2 ' 'GridControlPos @@ -756,7 +759,7 @@ Partial Class frmForm_Constructor_Main_2 Me.GridControlPos.Location = New System.Drawing.Point(0, 0) Me.GridControlPos.MainView = Me.grvwGridPos Me.GridControlPos.Name = "GridControlPos" - Me.GridControlPos.Size = New System.Drawing.Size(1069, 287) + Me.GridControlPos.Size = New System.Drawing.Size(1072, 291) Me.GridControlPos.TabIndex = 0 Me.GridControlPos.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwGridPos}) ' @@ -783,7 +786,7 @@ Partial Class frmForm_Constructor_Main_2 Me.BindingNavigatorPOS.MovePreviousItem = Me.BindingNavigatorMovePreviousItem Me.BindingNavigatorPOS.Name = "BindingNavigatorPOS" Me.BindingNavigatorPOS.PositionItem = Me.BindingNavigatorPositionItem - Me.BindingNavigatorPOS.Size = New System.Drawing.Size(1069, 25) + Me.BindingNavigatorPOS.Size = New System.Drawing.Size(1072, 25) Me.BindingNavigatorPOS.TabIndex = 1 Me.BindingNavigatorPOS.Text = "BindingNavigator1" ' @@ -878,7 +881,7 @@ Partial Class frmForm_Constructor_Main_2 Me.ToolStripEdit.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsButtonAdd, Me.tsButtonSave, Me.tsButtonDelete, Me.tsButtonEditMode, Me.ToolStripDropDownButton1, Me.tsButtonShowTaskOverview, Me.tsButtonShowWorkflowTasks}) Me.ToolStripEdit.Location = New System.Drawing.Point(0, 0) Me.ToolStripEdit.Name = "ToolStripEdit" - Me.ToolStripEdit.Size = New System.Drawing.Size(1071, 25) + Me.ToolStripEdit.Size = New System.Drawing.Size(1078, 25) Me.ToolStripEdit.TabIndex = 0 Me.ToolStripEdit.Text = "ToolStrip1" ' diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.resx b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.resx index c29eb22..340772b 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.resx +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.resx @@ -154,23 +154,6 @@ 17, 93 - - 1157, 15 - - - 124, 93 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASdEVYdFRpdGxlAExpc3Q7QnVsbGV0O1FzfzkAAABa - SURBVDhPY/j//z9FGEPAxsaGEYhBNF4MUw/TVADED0A0kkHMQMyCBbOCaHQDQJr/g2gkA0B8nBimDqYY - wwXEYqyCpGCsgqRgMEGxF6CaQYEzGogjMRD/MwAARTWKOO3Nn7MAAAAASUVORK5CYII= - - - - 773, 15 - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w @@ -262,6 +245,17 @@ 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASdEVYdFRpdGxlAExpc3Q7QnVsbGV0O1FzfzkAAABa + SURBVDhPY/j//z9FGEPAxsaGEYhBNF4MUw/TVADED0A0kkHMQMyCBbOCaHQDQJr/g2gkA0B8nBimDqYY + wwXEYqyCpGCsgqRgMEGxF6CaQYEzGogjMRD/MwAARTWKOO3Nn7MAAAAASUVORK5CYII= + + + + 773, 15 + 162, 11 diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb index c739359..8968e2f 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb @@ -612,11 +612,11 @@ Public Class frmForm_Constructor_Main_2 If GRID_TYPE = GridType.Grid Then If IsTopFirstRow Then IsTopFirstRow = False - grvwGrid.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus - grvwGrid.OptionsBehavior.Editable = Not IsTopFirstRow - grvwGrid.OptionsSelection.EnableAppearanceFocusedCell = Not IsTopFirstRow - grvwGrid.OptionsSelection.EnableAppearanceFocusedRow = Not IsTopFirstRow - grvwGrid.OptionsSelection.EnableAppearanceHideSelection = Not IsTopFirstRow + 'grvwGrid.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus + 'grvwGrid.OptionsBehavior.Editable = Not IsTopFirstRow + 'grvwGrid.OptionsSelection.EnableAppearanceFocusedCell = Not IsTopFirstRow + 'grvwGrid.OptionsSelection.EnableAppearanceFocusedRow = Not IsTopFirstRow + 'grvwGrid.OptionsSelection.EnableAppearanceHideSelection = Not IsTopFirstRow End If ElseIf GRID_TYPE = GridType.Carousel Then If IsTopFirstRow Then diff --git a/app/DD-Record-Organiser/frmMain.Designer.vb b/app/DD-Record-Organiser/frmMain.Designer.vb index 845b0b0..c3221e0 100644 --- a/app/DD-Record-Organiser/frmMain.Designer.vb +++ b/app/DD-Record-Organiser/frmMain.Designer.vb @@ -58,7 +58,6 @@ Partial Class frmMain Me.pageHome = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.groupQuickAccess = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.groupQuickAccessDemo = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.pageForms = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.pageAdmin = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroupProgram = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -341,7 +340,7 @@ Partial Class frmMain ' 'pageHome ' - Me.pageHome.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.groupQuickAccess, Me.groupQuickAccessDemo}) + Me.pageHome.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.groupQuickAccess}) Me.pageHome.Image = Global.DD_Record_Organiser.My.Resources.Resources.HomeHS Me.pageHome.Name = "pageHome" Me.pageHome.Text = "Home" @@ -354,17 +353,10 @@ Partial Class frmMain Me.RibbonPageGroup2.ShowCaptionButton = False Me.RibbonPageGroup2.Text = "Kalender" ' - 'groupQuickAccess - ' - Me.groupQuickAccess.AllowTextClipping = False - Me.groupQuickAccess.Name = "groupQuickAccess" - Me.groupQuickAccess.Text = "Schnellstart" - Me.groupQuickAccess.Visible = False - ' 'groupQuickAccessDemo ' - Me.groupQuickAccessDemo.Name = "groupQuickAccessDemo" - Me.groupQuickAccessDemo.Text = "Schnellstart " + Me.groupQuickAccess.Name = "groupQuickAccessDemo" + Me.groupQuickAccess.Text = "Schnellstart " ' 'pageForms ' @@ -514,14 +506,13 @@ Partial Class frmMain Friend WithEvents BarButtonItem12 As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroupTask As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents pageHome As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents groupQuickAccess As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonItem13 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem14 As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonItem15 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem16 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem17 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents groupQuickAccessDemo As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents groupQuickAccess As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents TimerClose3Minutes As System.Windows.Forms.Timer End Class diff --git a/app/DD-Record-Organiser/frmMain.vb b/app/DD-Record-Organiser/frmMain.vb index 3c5b82e..4b723ba 100644 --- a/app/DD-Record-Organiser/frmMain.vb +++ b/app/DD-Record-Organiser/frmMain.vb @@ -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 @@ -146,6 +150,37 @@ 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 @@ -169,47 +204,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!!! - - Do While 0 < groupQuickAccessDemo.ItemLinks.Count - groupQuickAccessDemo.ItemLinks.Remove(groupQuickAccessDemo.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 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 +220,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) diff --git a/app/SetupWiX/Product.wxs b/app/SetupWiX/Product.wxs index 1faa834..e14377e 100644 --- a/app/SetupWiX/Product.wxs +++ b/app/SetupWiX/Product.wxs @@ -1,7 +1,7 @@ - + @@ -82,6 +82,10 @@ + + + + @@ -137,6 +141,9 @@ + + + @@ -156,6 +163,7 @@ +