diff --git a/EDMI_ClientSuite/EDMI_ClientSuite.vbproj b/EDMI_ClientSuite/EDMI_ClientSuite.vbproj index 7370d18d..03abdef7 100644 --- a/EDMI_ClientSuite/EDMI_ClientSuite.vbproj +++ b/EDMI_ClientSuite/EDMI_ClientSuite.vbproj @@ -275,10 +275,10 @@ True ControlProperties.en.resx - - ProcessManagerOverview.vb + + ProcessManagerWidget.vb - + UserControl @@ -330,8 +330,8 @@ ControlProperties.Designer.vb My.Resources - - ProcessManagerOverview.vb + + ProcessManagerWidget.vb diff --git a/EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.vb b/EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.vb index 9e0a47ee..34ed1fc6 100644 --- a/EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.vb +++ b/EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.vb @@ -1,4 +1,5 @@ -Imports DevExpress.XtraEditors.Repository +Imports System.ComponentModel +Imports DevExpress.XtraEditors.Repository Imports DevExpress.XtraVerticalGrid Imports EDMI_ClientSuite.ClassControlUtils Imports EDMI_ClientSuite.ControlProperties @@ -254,4 +255,8 @@ Public Class frmEntityDesigner End If End Select End Sub + + Private Sub frmEntityDesigner_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing + My.MainForm.RibbonPageCategoryEntityDesigner.Visible = False + End Sub End Class \ No newline at end of file diff --git a/EDMI_ClientSuite/MyApplication.vb b/EDMI_ClientSuite/MyApplication.vb index d1dabc6e..228e18b1 100644 --- a/EDMI_ClientSuite/MyApplication.vb +++ b/EDMI_ClientSuite/MyApplication.vb @@ -13,6 +13,7 @@ Namespace My Property LogConfig As LogConfig Property ChannelFactory As ChannelFactory(Of IEDMServiceChannel) Property Channel As IEDMServiceChannel + Property MainForm As frmMain End Module ''' diff --git a/EDMI_ClientSuite/UserControls/ProcessManagerOverview.Designer.vb b/EDMI_ClientSuite/UserControls/ProcessManagerWidget.Designer.vb similarity index 98% rename from EDMI_ClientSuite/UserControls/ProcessManagerOverview.Designer.vb rename to EDMI_ClientSuite/UserControls/ProcessManagerWidget.Designer.vb index 685b7288..ba4e5736 100644 --- a/EDMI_ClientSuite/UserControls/ProcessManagerOverview.Designer.vb +++ b/EDMI_ClientSuite/UserControls/ProcessManagerWidget.Designer.vb @@ -1,5 +1,5 @@  _ -Partial Class ProcessManagerOverview +Partial Class ProcessManagerWidget Inherits System.Windows.Forms.UserControl 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. diff --git a/EDMI_ClientSuite/UserControls/ProcessManagerOverview.resx b/EDMI_ClientSuite/UserControls/ProcessManagerWidget.resx similarity index 100% rename from EDMI_ClientSuite/UserControls/ProcessManagerOverview.resx rename to EDMI_ClientSuite/UserControls/ProcessManagerWidget.resx diff --git a/EDMI_ClientSuite/UserControls/ProcessManagerOverview.vb b/EDMI_ClientSuite/UserControls/ProcessManagerWidget.vb similarity index 94% rename from EDMI_ClientSuite/UserControls/ProcessManagerOverview.vb rename to EDMI_ClientSuite/UserControls/ProcessManagerWidget.vb index 2139cd09..7a02571e 100644 --- a/EDMI_ClientSuite/UserControls/ProcessManagerOverview.vb +++ b/EDMI_ClientSuite/UserControls/ProcessManagerWidget.vb @@ -1,4 +1,4 @@ -Public Class ProcessManagerOverview +Public Class ProcessManagerWidget Public Delegate Sub RowDoubleClickedDelegate(RowView As DataRowView) Public Event RowDoubleClicked As RowDoubleClickedDelegate diff --git a/EDMI_ClientSuite/frmFileTest.vb b/EDMI_ClientSuite/frmFileTest.vb index a8130db6..0928c1c5 100644 --- a/EDMI_ClientSuite/frmFileTest.vb +++ b/EDMI_ClientSuite/frmFileTest.vb @@ -3,19 +3,17 @@ Imports DigitalData.Modules.Logging Public Class frmFileTest Private _fileOp As FileOp - Private _LogConfig As LogConfig Private _Logger As Logger - Public Sub New(LogConfig As LogConfig) + Public Sub New() InitializeComponent() - _LogConfig = LogConfig - _Logger = LogConfig.GetLogger() + _Logger = My.LogConfig.GetLogger() End Sub Private Sub frmFileTest_Load(sender As Object, e As EventArgs) Handles Me.Load Try - _fileOp = New FileOp(_LogConfig, My.Settings.EDM_NetworkService_Adress) + _fileOp = New FileOp(My.LogConfig, My.Settings.EDM_NetworkService_Adress) Catch ex As Exception _Logger.Warn($"Unexpected error in frmFileTest_Load: {ex.Message}") diff --git a/EDMI_ClientSuite/frmMain.Designer.vb b/EDMI_ClientSuite/frmMain.Designer.vb index 3e5b83fb..aa629754 100644 --- a/EDMI_ClientSuite/frmMain.Designer.vb +++ b/EDMI_ClientSuite/frmMain.Designer.vb @@ -21,6 +21,7 @@ Partial Class frmMain Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain)) + Dim PushTransition1 As DevExpress.Utils.Animation.PushTransition = New DevExpress.Utils.Animation.PushTransition() Me.RibbonControl = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.MainMenu = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components) Me.BarButtonExit = New DevExpress.XtraBars.BarButtonItem() @@ -36,6 +37,7 @@ Partial Class frmMain Me.BarButtonEntityDesigner = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonDeleteControl = New DevExpress.XtraBars.BarButtonItem() Me.LabelCurrentLanguage = New DevExpress.XtraBars.BarStaticItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPageCategoryEntityDesigner = New DevExpress.XtraBars.Ribbon.RibbonPageCategory() Me.RibbonPageControlActions = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -56,8 +58,9 @@ Partial Class frmMain Me.Label1 = New System.Windows.Forms.Label() Me.DockPanelProcessManager = New DevExpress.XtraBars.Docking.DockPanel() Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer() - Me.ProcessManagerOverview = New EDMI_ClientSuite.ProcessManagerOverview() - Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.ProcessManagerWidget = New EDMI_ClientSuite.ProcessManagerWidget() + Me.BarWorkspaceMenuItem1 = New DevExpress.XtraBars.BarWorkspaceMenuItem() + Me.WorkspaceManager1 = New DevExpress.Utils.WorkspaceManager() CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MainMenu, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DocumentManager, System.ComponentModel.ISupportInitialize).BeginInit() @@ -74,12 +77,13 @@ Partial Class frmMain ' Me.RibbonControl.ApplicationButtonDropDownControl = Me.MainMenu Me.RibbonControl.ExpandCollapseItem.Id = 0 - Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.BarButtonExit, Me.BarButtonUserSettings, Me.LabelCurrentUser, Me.LabelCurrentMachine, Me.LabelCurrentVersion, Me.BarButtonItem1, Me.BarButtonDock1, Me.SkinDropDownButtonItem1, Me.BarButtonDashboard, Me.BarButtonEntityDesigner, Me.BarButtonDeleteControl, Me.BarButtonConnectionSettings, Me.LabelCurrentLanguage, Me.BarButtonItem2}) + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.BarButtonExit, Me.BarButtonUserSettings, Me.LabelCurrentUser, Me.LabelCurrentMachine, Me.LabelCurrentVersion, Me.BarButtonItem1, Me.BarButtonDock1, Me.SkinDropDownButtonItem1, Me.BarButtonDashboard, Me.BarButtonEntityDesigner, Me.BarButtonDeleteControl, Me.BarButtonConnectionSettings, Me.LabelCurrentLanguage, Me.BarButtonItem2, Me.BarWorkspaceMenuItem1}) Me.RibbonControl.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl.MaxItemId = 17 + Me.RibbonControl.MaxItemId = 18 Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategoryEntityDesigner}) Me.RibbonControl.PageHeaderItemLinks.Add(Me.SkinDropDownButtonItem1) + Me.RibbonControl.PageHeaderItemLinks.Add(Me.BarWorkspaceMenuItem1) Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPageView, Me.RibbonPageWorkflow}) Me.RibbonControl.Size = New System.Drawing.Size(1139, 146) Me.RibbonControl.StatusBar = Me.RibbonStatusBar @@ -117,15 +121,12 @@ Partial Class frmMain ' Me.LabelCurrentUser.Caption = "Current User" Me.LabelCurrentUser.Id = 3 - Me.LabelCurrentUser.ImageOptions.Image = CType(resources.GetObject("LabelCurrentUser.ImageOptions.Image"), System.Drawing.Image) - Me.LabelCurrentUser.ImageOptions.LargeImage = CType(resources.GetObject("LabelCurrentUser.ImageOptions.LargeImage"), System.Drawing.Image) Me.LabelCurrentUser.Name = "LabelCurrentUser" ' 'LabelCurrentMachine ' Me.LabelCurrentMachine.Caption = "Current Machine" Me.LabelCurrentMachine.Id = 4 - Me.LabelCurrentMachine.ImageOptions.Image = CType(resources.GetObject("LabelCurrentMachine.ImageOptions.Image"), System.Drawing.Image) Me.LabelCurrentMachine.Name = "LabelCurrentMachine" ' 'LabelCurrentVersion @@ -133,7 +134,6 @@ Partial Class frmMain Me.LabelCurrentVersion.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right Me.LabelCurrentVersion.Caption = "Current Version" Me.LabelCurrentVersion.Id = 5 - Me.LabelCurrentVersion.ImageOptions.Image = CType(resources.GetObject("LabelCurrentVersion.ImageOptions.Image"), System.Drawing.Image) Me.LabelCurrentVersion.Name = "LabelCurrentVersion" ' 'BarButtonItem1 @@ -179,13 +179,20 @@ Partial Class frmMain ' 'LabelCurrentLanguage ' - Me.LabelCurrentLanguage.Caption = "BarStaticItem1" + Me.LabelCurrentLanguage.Caption = "CurrentLanguage" Me.LabelCurrentLanguage.Id = 15 Me.LabelCurrentLanguage.Name = "LabelCurrentLanguage" ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "License Test" + Me.BarButtonItem2.Id = 16 + Me.BarButtonItem2.Name = "BarButtonItem2" + ' 'RibbonPageCategoryEntityDesigner ' Me.RibbonPageCategoryEntityDesigner.AutoStretchPageHeaders = True + Me.RibbonPageCategoryEntityDesigner.Color = System.Drawing.Color.Red Me.RibbonPageCategoryEntityDesigner.Name = "RibbonPageCategoryEntityDesigner" Me.RibbonPageCategoryEntityDesigner.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageControlActions}) Me.RibbonPageCategoryEntityDesigner.Text = "Entitäten Designer" @@ -335,7 +342,7 @@ Partial Class frmMain ' 'DockPanel2_Container ' - Me.DockPanel2_Container.Controls.Add(Me.ProcessManagerOverview) + Me.DockPanel2_Container.Controls.Add(Me.ProcessManagerWidget) Me.DockPanel2_Container.Location = New System.Drawing.Point(5, 38) Me.DockPanel2_Container.Name = "DockPanel2_Container" Me.DockPanel2_Container.Size = New System.Drawing.Size(337, 163) @@ -343,18 +350,24 @@ Partial Class frmMain ' 'ProcessManagerOverview ' - Me.ProcessManagerOverview.DataSource = Nothing - Me.ProcessManagerOverview.Dock = System.Windows.Forms.DockStyle.Fill - Me.ProcessManagerOverview.Location = New System.Drawing.Point(0, 0) - Me.ProcessManagerOverview.Name = "ProcessManagerOverview" - Me.ProcessManagerOverview.Size = New System.Drawing.Size(337, 163) - Me.ProcessManagerOverview.TabIndex = 0 + Me.ProcessManagerWidget.DataSource = Nothing + Me.ProcessManagerWidget.Dock = System.Windows.Forms.DockStyle.Fill + Me.ProcessManagerWidget.Location = New System.Drawing.Point(0, 0) + Me.ProcessManagerWidget.Name = "ProcessManagerOverview" + Me.ProcessManagerWidget.Size = New System.Drawing.Size(337, 163) + Me.ProcessManagerWidget.TabIndex = 0 ' - 'BarButtonItem2 + 'BarWorkspaceMenuItem1 ' - Me.BarButtonItem2.Caption = "License Test" - Me.BarButtonItem2.Id = 16 - Me.BarButtonItem2.Name = "BarButtonItem2" + Me.BarWorkspaceMenuItem1.Caption = "BarWorkspaceMenuItem1" + Me.BarWorkspaceMenuItem1.Id = 17 + Me.BarWorkspaceMenuItem1.Name = "BarWorkspaceMenuItem1" + Me.BarWorkspaceMenuItem1.WorkspaceManager = Me.WorkspaceManager1 + ' + 'WorkspaceManager1 + ' + Me.WorkspaceManager1.TargetControl = Me + Me.WorkspaceManager1.TransitionType = PushTransition1 ' 'frmMain ' @@ -411,7 +424,7 @@ Partial Class frmMain Friend WithEvents SkinDropDownButtonItem1 As DevExpress.XtraBars.SkinDropDownButtonItem Friend WithEvents BarButtonDashboard As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents ProcessManagerOverview As ProcessManagerOverview + Friend WithEvents ProcessManagerWidget As ProcessManagerWidget Friend WithEvents RibbonPageWorkflow As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonEntityDesigner As DevExpress.XtraBars.BarButtonItem @@ -422,4 +435,6 @@ Partial Class frmMain Friend WithEvents BarButtonConnectionSettings As DevExpress.XtraBars.BarButtonItem Friend WithEvents LabelCurrentLanguage As DevExpress.XtraBars.BarStaticItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarWorkspaceMenuItem1 As DevExpress.XtraBars.BarWorkspaceMenuItem + Friend WithEvents WorkspaceManager1 As DevExpress.Utils.WorkspaceManager End Class diff --git a/EDMI_ClientSuite/frmMain.resx b/EDMI_ClientSuite/frmMain.resx index 9a1ff3b1..ffd1364b 100644 --- a/EDMI_ClientSuite/frmMain.resx +++ b/EDMI_ClientSuite/frmMain.resx @@ -240,94 +240,6 @@ UgOUWsM43AyRGqDEGqa++dLn1ABd1/BY5qnbDos7khqgyxoeyXhVeA3nxddw1QPX5C8cUgPk/Bu2DofU AG03YIyuMvdCa5bC0ZhwkGGbNcwKB3QmHGQK665hVjiQZcIB04pdcSBYxdQaYlaHxMF13YQDWSY8B5k1 w9YKB7TGLAeZxaH/hgNaY5aDzJoDrBUOIYTBL0gqUmOSnmecAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAydEVYdFRpdGxlAEN1c3RvbWVyO0VtcGxveWVlO1Bl - cnNvbjtDb250YWN0O1VzZXI7Q2xpZW50fhE26AAAAM1JREFUOE+l0TEOQUEUBdBfiN4ySDQqKvTfGuxF - pbEIi5DoRcIa/gqovwKRca/MvMw8/zGhODKZd98NpnDO/eX1MVtstSHs4eIdYAxJzipowQmccoY2SNYq - 6IJeDnogWatgAk3LNAXJWgVLaFomziRrFYzgAXqZd/xzJWsV0A50Ae+S3KcCPtkNwjLP2c8YzOHo8fyW - sQo6sIL4zXnmHWeS1QUD2MAd+LXX0Pd45h1nzDCbFJRwhfCbv2G2jAuqaJirigtqNcxRS8HvXPEEp3w/ - tQHvKFEAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAydEVYdFRpdGxlAEN1c3RvbWVyO0VtcGxveWVlO1Bl - cnNvbjtDb250YWN0O1VzZXI7Q2xpZW50fhE26AAAAfhJREFUWEfF1rFLVWEYx3FBFweHwGhVamnIvdUQ - CmwI+mOiIUIXwV10cQ8aGoVcbFWCiIYgAiVHsWgwSDj+fofzHN7nvV+vDt7r8Fne87zP99x7HZxomuZW - DRw8X9m5jmV5J7/kf+dY3ssLoTtJ9FLcaLiyIc0VtoXu9qKX4kbDhadCQfJSaEcreiluNFzw104x8kFo - Ryt6KW40XPguFCM/hHa0opfiRsOFv0Ix8ltoRyt6KW40XKDQZf4J7WhFL8WNhjuLQqFhfId29b0UNxru - bApFhvEd2tX3UtxouLMmFBnGd2hX30txo+HOfTkRChHP+g7t6nspbjRceCMUI6+EdrSil+JGw4VHQjHi - WdrRil6KGw1XPgoFS7tCd3vRS3Gj4cqCnAmFzc88Q3d70Utxo2HwTE6ljv8RP6M7SfRS3Gj4Enfltfgn - +SRv5Z7Q7IDopbjRcGUSzmpTcJZEL8WNhguP5bM8KM5q/uv/Ip6l563opbjB8JysyDeJ33pPpqWenZED - iTnfWZV5SbPRS3Erhu7Ilvj/vVhY2pcn4q/bluSr0Kx3eJd3XusFHspPoWW18w49q3mnd/e9FDc9nJVD - oQU3wbtno0cvsF4Mj8p69OgFRvnpw2H06AXowo2LHr3AUT08AkfRG3iBccPDccLDccLD8WkmLgAKdExB - J+0x6AAAAABJRU5ErkJggg== - - - - - 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 - MSB7/gewyEBZy6qOBQAAAABJRU5ErkJggg== - - - - - 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 - 8Ky/HUvEvynFkqiPC+j6AAAAAElFTkSuQmCC @@ -403,6 +315,9 @@ UrQgwP9Df+6iycr/ls9EijOR4kykOBMpzqPsfgDZ5w1jF/MagwAAAABJRU5ErkJggg== + + 412, 17 + 17, 17 diff --git a/EDMI_ClientSuite/frmMain.vb b/EDMI_ClientSuite/frmMain.vb index b9133050..6d4c6b23 100644 --- a/EDMI_ClientSuite/frmMain.vb +++ b/EDMI_ClientSuite/frmMain.vb @@ -15,6 +15,9 @@ Public Class frmMain ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() + ' Assign My.MainForm before everything else + My.MainForm = Me + ' Show splashscreen frmSplash.ShowDialog() End Sub @@ -39,8 +42,8 @@ Public Class frmMain oDataTable.Rows.Add(oRow) - ProcessManagerOverview.DataSource = oDataTable - AddHandler ProcessManagerOverview.RowDoubleClicked, Sub(RowView As DataRowView) + ProcessManagerWidget.DataSource = oDataTable + AddHandler ProcessManagerWidget.RowDoubleClicked, Sub(RowView As DataRowView) MsgBox($"Clicked on Document {RowView.Row.Item("DocName")}") End Sub @@ -90,7 +93,7 @@ Public Class frmMain End Sub Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick - Dim frm As New frmFileTest(My.LogConfig) + Dim frm As New frmFileTest() frm.MdiParent = DocumentManager.MdiParent frm.Show() End Sub @@ -99,6 +102,7 @@ Public Class frmMain Dim frm As New frmEntityDesigner() frm.MdiParent = DocumentManager.MdiParent frm.Show() + RibbonPageCategoryEntityDesigner.Visible = True End Sub @@ -109,30 +113,17 @@ Public Class frmMain End Sub Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick - Dim oUser1 = New LicenseModuleUser With { - .Type = UserType.PowerUser, - .Test = False, - .Count = 5, - .ValidUntil = New Date(), - .ValidUntilSpecified = True - } - + Dim oUser1 = LicenseCreator.NewUser(UserType.PowerUser, 5) + Dim oUser2 = LicenseCreator.NewUser(UserType.WriteOnly, 5, Date.Now) Dim oUsers As New List(Of LicenseModuleUser) oUsers.Add(oUser1) + oUsers.Add(oUser2) - Dim oModule = New LicenseModule() With { - .Users = oUsers.ToArray(), - .Name = "EDMI", - .ValidUntil = New Date(), - .ValidUntilSpecified = True - } - + Dim oModule = LicenseCreator.NewModule("EDMI", oUsers) Dim oModules As New List(Of LicenseModule) oModules.Add(oModule) - Dim oLicense = New LicenseSchema() With { - .Modules = oModules.ToArray - } + Dim oLicense = LicenseCreator.NewLicense(oModules) Dim oLicenseFile As New LicenseFile(My.LogConfig, "E:\") oLicenseFile.SaveFile(oLicense)