diff --git a/EDMI_ClientSuite/App.config b/EDMI_ClientSuite/App.config index fc72f0ac..8232b6f7 100644 --- a/EDMI_ClientSuite/App.config +++ b/EDMI_ClientSuite/App.config @@ -59,4 +59,18 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/EDMI_ClientSuite/ClassInit.vb b/EDMI_ClientSuite/ClassInit.vb index 0ec64426..e955433b 100644 --- a/EDMI_ClientSuite/ClassInit.vb +++ b/EDMI_ClientSuite/ClassInit.vb @@ -1,61 +1,68 @@ Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.Logging.LogConfig Imports System.ServiceModel Imports EDMI_ClientSuite.NetworkService_DDEDM Imports System.IO + Public Class ClassInit Private _ChannelFactory As ChannelFactory(Of IEDMServiceChannel) Private _Channel As IEDMServiceChannel Private _Logger As Logger - Private _MyLogger As LogConfig + Private _LogConfig As LogConfig + + Private CurrentRetry As Integer = 0 + + Private Const MAX_RETRIES = 10 + Private Const OPEN_TIMEOUT = 10 Public Sub New() - Dim oUserAppdata = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Digital Data\EDMI_Client_Suite\Log") - - _MyLogger = New LogConfig(LogConfig.PathType.CustomPath, oUserAppdata) - _Logger = _MyLogger.GetLogger() + _LogConfig = New LogConfig(PathType.AppData) + _Logger = _LogConfig.GetLogger() MyLogger = _Logger - MyLogConfig = _MyLogger - - Try - Dim binding As New NetTcpBinding() - binding.Security.Mode = SecurityMode.Transport - binding.Security.Transport.ClientCredentialType = TcpClientCredentialType.Windows - binding.MaxReceivedMessageSize = 2147483647 - binding.MaxBufferSize = 2147483647 - binding.MaxBufferPoolSize = 2147483647 - binding.MaxConnections = 10000 - binding.ReaderQuotas.MaxArrayLength = 2147483647 - binding.ReaderQuotas.MaxStringContentLength = 2147483647 - 'binding.TransferMode = TransferMode.Streamed - - Dim endpointAddress = New EndpointAddress(My.Settings.EDM_NetworkService_Adress) - _ChannelFactory = New ChannelFactory(Of IEDMServiceChannel)(binding, endpointAddress) - Connect2NetService() - Catch ex As Exception - _Logger.Error(ex) - End Try + MyLogConfig = _LogConfig + _ChannelFactory = ConfigureChannelFactory() + _Logger.Debug("Service channelfactory created") + + Connect() End Sub - Private Sub Connect2NetService() + + Public Function ConfigureChannelFactory() + Dim oBinding As New NetTcpBinding() + oBinding.Security.Mode = SecurityMode.Transport + oBinding.Security.Transport.ClientCredentialType = TcpClientCredentialType.Windows + oBinding.MaxReceivedMessageSize = 2147483647 + oBinding.MaxBufferSize = 2147483647 + oBinding.MaxBufferPoolSize = 2147483647 + oBinding.MaxConnections = 10000 + oBinding.ReaderQuotas.MaxArrayLength = 2147483647 + oBinding.ReaderQuotas.MaxStringContentLength = 2147483647 + 'oBinding.OpenTimeout = New TimeSpan(0, 0, OPEN_TIMEOUT) + Dim oEndpointAddress = New EndpointAddress(My.Settings.EDM_NetworkService_Adress) + + Return New ChannelFactory(Of IEDMServiceChannel)(oBinding, oEndpointAddress) + End Function + + Private Sub Connect() Try - _Channel = Nothing _Channel = _ChannelFactory.CreateChannel() - _Logger.Info("Successfully connected to EDM_Network Service") + _Logger.Debug("Service channel created") + _Logger.Debug("Opening service channel") AddHandler _Channel.Faulted, AddressOf Reconnect - _Channel.Open() + _Logger.Debug("Service channel opened") + _Logger.Info("Connection to service established!") Catch ex As Exception _Logger.Error(ex) + Throw ex End Try - - End Sub - Private Sub Reconnect() + Private Sub Reconnect(sender As Object, e As EventArgs) + _Logger.Warn("Could not connect to service. Retrying.") _Channel.Abort() - Connect2NetService() + Connect() End Sub - End Class diff --git a/EDMI_ClientSuite/ClassLayout.vb b/EDMI_ClientSuite/ClassLayout.vb new file mode 100644 index 00000000..ae2f22e4 --- /dev/null +++ b/EDMI_ClientSuite/ClassLayout.vb @@ -0,0 +1,27 @@ +Imports System.IO +Imports DevExpress.Utils.Serializing + +Public Class ClassLayout + Public Const LAYOUT_FOLDER = "Layout" + + Public Enum LayoutName + LayoutMain + End Enum + + Public Enum LayoutComponent + DockManager + DocumentManager + End Enum + + Public Shared Function GetLayoutPath(LayoutName As LayoutName, Component As LayoutComponent) As String + Dim oFileName As String = $"{LayoutName.ToString}-{Component.ToString}.xml" + Return IO.Path.Combine(GetAppDataFolder(), LAYOUT_FOLDER, oFileName) + End Function + + Private Shared Function GetAppDataFolder() As String + Dim oLocalAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + Dim oProduct = My.Application.Info.ProductName + Dim oCompany = My.Application.Info.CompanyName + Return Path.Combine(oLocalAppData, oCompany, oProduct) + End Function +End Class diff --git a/EDMI_ClientSuite/EDMI_ClientSuite.vbproj b/EDMI_ClientSuite/EDMI_ClientSuite.vbproj index bc9cc36e..4de0c886 100644 --- a/EDMI_ClientSuite/EDMI_ClientSuite.vbproj +++ b/EDMI_ClientSuite/EDMI_ClientSuite.vbproj @@ -69,14 +69,77 @@ + + + + + ..\packages\FirebirdSql.Data.FirebirdClient.6.0.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll + + + ..\packages\FirebirdSql.EntityFrameworkCore.Firebird.6.4.0\lib\netstandard2.0\FirebirdSql.EntityFrameworkCore.Firebird.dll + + + + ..\packages\Microsoft.EntityFrameworkCore.2.0.3\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll + + + ..\packages\Microsoft.EntityFrameworkCore.Relational.2.0.3\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Relational.dll + + + ..\packages\Microsoft.Extensions.Caching.Abstractions.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll + + + ..\packages\Microsoft.Extensions.Caching.Memory.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll + + + ..\packages\Microsoft.Extensions.Configuration.Abstractions.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll + + + ..\packages\Microsoft.Extensions.DependencyInjection.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.dll + + + ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + + ..\packages\Microsoft.Extensions.Logging.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Logging.dll + + + ..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + + + ..\packages\Microsoft.Extensions.Options.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Options.dll + + + ..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll + False ..\Modules.Logging\bin\Debug\NLog.dll + + ..\packages\Remotion.Linq.2.1.1\lib\net45\Remotion.Linq.dll + + + ..\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll + + + ..\packages\System.ComponentModel.Annotations.4.4.0\lib\net461\System.ComponentModel.Annotations.dll + + + + + ..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll + + + ..\packages\System.Interactive.Async.3.1.1\lib\net46\System.Interactive.Async.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + @@ -101,6 +164,7 @@ + True True @@ -112,16 +176,22 @@ Form + + frmDashboard.vb + + + Form + frmFileTest.vb Form - - frmMain2.vb + + frmMain.vb - + Form @@ -157,11 +227,14 @@ DockManagerTest.vb + + frmDashboard.vb + frmFileTest.vb - - frmMain2.vb + + frmMain.vb frmSplash.vb @@ -219,6 +292,7 @@ + @@ -265,6 +339,10 @@ {5b1171dc-fffe-4813-a20d-786aae47b320} EDMIFileOps + + {991d0231-4623-496d-8bd0-9ca906029cbc} + Filesystem + {903b2d7d-3b80-4be9-8713-7447b704e1b0} Logging diff --git a/EDMI_ClientSuite/My Project/Application.Designer.vb b/EDMI_ClientSuite/My Project/Application.Designer.vb index de923179..55d6a2a9 100644 --- a/EDMI_ClientSuite/My Project/Application.Designer.vb +++ b/EDMI_ClientSuite/My Project/Application.Designer.vb @@ -24,7 +24,7 @@ Namespace My _ Public Sub New() MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows) - Me.IsSingleInstance = false + Me.IsSingleInstance = true Me.EnableVisualStyles = true Me.SaveMySettingsOnExit = true Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses @@ -32,7 +32,7 @@ Namespace My _ Protected Overrides Sub OnCreateMainForm() - Me.MainForm = Global.EDMI_ClientSuite.frmMain2 + Me.MainForm = Global.EDMI_ClientSuite.frmMain End Sub End Class End Namespace diff --git a/EDMI_ClientSuite/My Project/Application.myapp b/EDMI_ClientSuite/My Project/Application.myapp index 0627499d..5eb49b3b 100644 --- a/EDMI_ClientSuite/My Project/Application.myapp +++ b/EDMI_ClientSuite/My Project/Application.myapp @@ -1,8 +1,8 @@  true - frmMain2 - false + frmMain + true 0 true 0 diff --git a/EDMI_ClientSuite/My Project/AssemblyInfo.vb b/EDMI_ClientSuite/My Project/AssemblyInfo.vb index c4280086..62b1fa6b 100644 --- a/EDMI_ClientSuite/My Project/AssemblyInfo.vb +++ b/EDMI_ClientSuite/My Project/AssemblyInfo.vb @@ -8,9 +8,9 @@ Imports System.Runtime.InteropServices ' Werte der Assemblyattribute überprüfen - + - + diff --git a/EDMI_ClientSuite/My Project/licenses.licx b/EDMI_ClientSuite/My Project/licenses.licx index a98038f0..3b5bc02f 100644 --- a/EDMI_ClientSuite/My Project/licenses.licx +++ b/EDMI_ClientSuite/My Project/licenses.licx @@ -1,4 +1,5 @@ -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/EDMI_ClientSuite/frmDashboard.Designer.vb b/EDMI_ClientSuite/frmDashboard.Designer.vb new file mode 100644 index 00000000..12189a97 --- /dev/null +++ b/EDMI_ClientSuite/frmDashboard.Designer.vb @@ -0,0 +1,37 @@ + _ +Partial Class frmDashboard + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.SuspendLayout() + ' + 'frmDashboard + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Name = "frmDashboard" + Me.Text = "Dashboard" + Me.ResumeLayout(False) + + End Sub +End Class diff --git a/EDMI_ClientSuite/frmDashboard.resx b/EDMI_ClientSuite/frmDashboard.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/EDMI_ClientSuite/frmDashboard.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/EDMI_ClientSuite/frmDashboard.vb b/EDMI_ClientSuite/frmDashboard.vb new file mode 100644 index 00000000..32034675 --- /dev/null +++ b/EDMI_ClientSuite/frmDashboard.vb @@ -0,0 +1,4 @@ +Imports System.ComponentModel + +Public Class frmDashboard +End Class \ No newline at end of file diff --git a/EDMI_ClientSuite/frmFileTest.Designer.vb b/EDMI_ClientSuite/frmFileTest.Designer.vb index 416fbc87..ac37c75f 100644 --- a/EDMI_ClientSuite/frmFileTest.Designer.vb +++ b/EDMI_ClientSuite/frmFileTest.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmFileTest Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class frmFileTest 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Me.Button1 = New System.Windows.Forms.Button() Me.ListBox1 = New System.Windows.Forms.ListBox() diff --git a/EDMI_ClientSuite/frmFileTest.vb b/EDMI_ClientSuite/frmFileTest.vb index 1c2db56c..a8130db6 100644 --- a/EDMI_ClientSuite/frmFileTest.vb +++ b/EDMI_ClientSuite/frmFileTest.vb @@ -33,6 +33,5 @@ Public Class frmFileTest MsgBox(oFileID) ListBox1.Items.Add(oFileID) - End Sub End Class \ No newline at end of file diff --git a/EDMI_ClientSuite/frmMain2.Designer.vb b/EDMI_ClientSuite/frmMain.Designer.vb similarity index 51% rename from EDMI_ClientSuite/frmMain2.Designer.vb rename to EDMI_ClientSuite/frmMain.Designer.vb index 22b08d9d..065aca4c 100644 --- a/EDMI_ClientSuite/frmMain2.Designer.vb +++ b/EDMI_ClientSuite/frmMain.Designer.vb @@ -1,9 +1,9 @@ - _ -Partial Class frmMain2 + +Partial Class frmMain Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Form overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) If disposing AndAlso components IsNot Nothing Then components.Dispose() @@ -17,10 +17,10 @@ Partial Class frmMain2 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - _ + Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain2)) + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain)) Me.RibbonControl = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.MainMenu = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components) Me.BarButtonExit = New DevExpress.XtraBars.BarButtonItem() @@ -35,30 +35,43 @@ Partial Class frmMain2 Me.RibbonPageView = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() - Me.DockManagerMain = New DevExpress.XtraBars.Docking.DockManager(Me.components) - Me.DockPanel1 = New DevExpress.XtraBars.Docking.DockPanel() - Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer() - Me.DockPanel2 = New DevExpress.XtraBars.Docking.DockPanel() - Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer() - Me.DocumentManager1 = New DevExpress.XtraBars.Docking2010.DocumentManager(Me.components) + Me.DocumentManager = New DevExpress.XtraBars.Docking2010.DocumentManager(Me.components) Me.TabbedView1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView(Me.components) + Me.DockManager = New DevExpress.XtraBars.Docking.DockManager(Me.components) + Me.DockPanelGlobix = New DevExpress.XtraBars.Docking.DockPanel() + Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer() + Me.Label1 = New System.Windows.Forms.Label() + Me.DockPanelProcessManager = New DevExpress.XtraBars.Docking.DockPanel() + Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer() + Me.panelContainer1 = New DevExpress.XtraBars.Docking.DockPanel() + Me.SkinDropDownButtonItem1 = New DevExpress.XtraBars.SkinDropDownButtonItem() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.BarButtonDashboard = New DevExpress.XtraBars.BarButtonItem() + Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MainMenu, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.DockManagerMain, System.ComponentModel.ISupportInitialize).BeginInit() - Me.DockPanel1.SuspendLayout() - Me.DockPanel2.SuspendLayout() - CType(Me.DocumentManager1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DocumentManager, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TabbedView1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DockManager, System.ComponentModel.ISupportInitialize).BeginInit() + Me.DockPanelGlobix.SuspendLayout() + Me.DockPanel1_Container.SuspendLayout() + Me.DockPanelProcessManager.SuspendLayout() + Me.DockPanel2_Container.SuspendLayout() + Me.panelContainer1.SuspendLayout() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl ' 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.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.RibbonControl.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl.MaxItemId = 10 + Me.RibbonControl.MaxItemId = 12 Me.RibbonControl.Name = "RibbonControl" + Me.RibbonControl.PageHeaderItemLinks.Add(Me.SkinDropDownButtonItem1) Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPageView}) Me.RibbonControl.Size = New System.Drawing.Size(1139, 146) Me.RibbonControl.StatusBar = Me.RibbonStatusBar @@ -120,13 +133,13 @@ Partial Class frmMain2 ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3}) Me.RibbonPage1.Name = "RibbonPage1" - Me.RibbonPage1.Text = "RibbonPage1" + Me.RibbonPage1.Text = "Start" ' 'RibbonPageGroup1 ' - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonDashboard) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "RibbonPageGroup1" ' @@ -152,83 +165,149 @@ Partial Class frmMain2 Me.RibbonStatusBar.Ribbon = Me.RibbonControl Me.RibbonStatusBar.Size = New System.Drawing.Size(1139, 21) ' - 'DockManagerMain + 'DocumentManager ' - Me.DockManagerMain.Form = Me - Me.DockManagerMain.HiddenPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.DockPanel1}) - Me.DockManagerMain.RootPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.DockPanel2}) - Me.DockManagerMain.TopZIndexControls.AddRange(New String() {"DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.StatusBar", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl"}) + Me.DocumentManager.MdiParent = Me + Me.DocumentManager.MenuManager = Me.RibbonControl + Me.DocumentManager.View = Me.TabbedView1 + Me.DocumentManager.ViewCollection.AddRange(New DevExpress.XtraBars.Docking2010.Views.BaseView() {Me.TabbedView1}) ' - 'DockPanel1 + 'TabbedView1 ' - Me.DockPanel1.Controls.Add(Me.DockPanel1_Container) - Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right - Me.DockPanel1.FloatVertical = True - Me.DockPanel1.ID = New System.Guid("be5e4321-16c2-4610-a05f-45ccfd108268") - Me.DockPanel1.ImageOptions.Image = CType(resources.GetObject("DockPanel1.ImageOptions.Image"), System.Drawing.Image) - Me.DockPanel1.Location = New System.Drawing.Point(939, 146) - Me.DockPanel1.Name = "DockPanel1" - Me.DockPanel1.OriginalSize = New System.Drawing.Size(200, 200) - Me.DockPanel1.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Right - Me.DockPanel1.SavedIndex = 0 - Me.DockPanel1.SavedSizeFactor = 1.0R - Me.DockPanel1.Size = New System.Drawing.Size(200, 410) - Me.DockPanel1.Text = "DockPanel1" - Me.DockPanel1.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden + Me.TabbedView1.EnableFreeLayoutMode = DevExpress.Utils.DefaultBoolean.[True] + ' + 'DockManager + ' + Me.DockManager.Form = Me + Me.DockManager.RootPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.panelContainer1}) + Me.DockManager.TopZIndexControls.AddRange(New String() {"DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.StatusBar", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl"}) + ' + 'DockPanelGlobix + ' + Me.DockPanelGlobix.Controls.Add(Me.DockPanel1_Container) + Me.DockPanelGlobix.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill + Me.DockPanelGlobix.ID = New System.Guid("804984d7-b275-4115-ab10-a8322f0a8a7e") + Me.DockPanelGlobix.Location = New System.Drawing.Point(0, 0) + Me.DockPanelGlobix.Name = "DockPanelGlobix" + Me.DockPanelGlobix.Options.ShowCloseButton = False + Me.DockPanelGlobix.OriginalSize = New System.Drawing.Size(200, 200) + Me.DockPanelGlobix.SavedSizeFactor = 0R + Me.DockPanelGlobix.Size = New System.Drawing.Size(346, 205) + Me.DockPanelGlobix.Text = "GLOBIX" ' 'DockPanel1_Container ' + Me.DockPanel1_Container.Controls.Add(Me.Label1) Me.DockPanel1_Container.Location = New System.Drawing.Point(5, 38) Me.DockPanel1_Container.Name = "DockPanel1_Container" - Me.DockPanel1_Container.Size = New System.Drawing.Size(191, 368) + Me.DockPanel1_Container.Size = New System.Drawing.Size(337, 162) Me.DockPanel1_Container.TabIndex = 0 ' - 'DockPanel2 + 'Label1 ' - Me.DockPanel2.Controls.Add(Me.DockPanel2_Container) - Me.DockPanel2.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom - Me.DockPanel2.ID = New System.Guid("a9e840fa-a0c7-409e-8726-498d466363f8") - Me.DockPanel2.Location = New System.Drawing.Point(0, 356) - Me.DockPanel2.Name = "DockPanel2" - Me.DockPanel2.OriginalSize = New System.Drawing.Size(200, 200) - Me.DockPanel2.SavedSizeFactor = 0R - Me.DockPanel2.Size = New System.Drawing.Size(1139, 200) - Me.DockPanel2.Text = "Log" + Me.Label1.Dock = System.Windows.Forms.DockStyle.Fill + Me.Label1.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.Location = New System.Drawing.Point(0, 0) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(337, 162) + Me.Label1.TabIndex = 0 + Me.Label1.Text = "DROP FILES HERE" + Me.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + ' + 'DockPanelProcessManager + ' + Me.DockPanelProcessManager.Controls.Add(Me.DockPanel2_Container) + Me.DockPanelProcessManager.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill + Me.DockPanelProcessManager.ID = New System.Guid("a84f02de-66af-4674-9260-85bec9f0825b") + Me.DockPanelProcessManager.Location = New System.Drawing.Point(0, 205) + Me.DockPanelProcessManager.Name = "DockPanelProcessManager" + Me.DockPanelProcessManager.Options.ShowCloseButton = False + Me.DockPanelProcessManager.OriginalSize = New System.Drawing.Size(346, 200) + Me.DockPanelProcessManager.SavedSizeFactor = 0R + Me.DockPanelProcessManager.Size = New System.Drawing.Size(346, 205) + Me.DockPanelProcessManager.Text = "Process Manager" ' 'DockPanel2_Container ' - Me.DockPanel2_Container.Location = New System.Drawing.Point(4, 39) + Me.DockPanel2_Container.Controls.Add(Me.GridControl1) + Me.DockPanel2_Container.Location = New System.Drawing.Point(5, 38) Me.DockPanel2_Container.Name = "DockPanel2_Container" - Me.DockPanel2_Container.Size = New System.Drawing.Size(1131, 157) + Me.DockPanel2_Container.Size = New System.Drawing.Size(337, 163) Me.DockPanel2_Container.TabIndex = 0 ' - 'DocumentManager1 + 'panelContainer1 ' - Me.DocumentManager1.MdiParent = Me - Me.DocumentManager1.MenuManager = Me.RibbonControl - Me.DocumentManager1.View = Me.TabbedView1 - Me.DocumentManager1.ViewCollection.AddRange(New DevExpress.XtraBars.Docking2010.Views.BaseView() {Me.TabbedView1}) + Me.panelContainer1.Controls.Add(Me.DockPanelGlobix) + Me.panelContainer1.Controls.Add(Me.DockPanelProcessManager) + Me.panelContainer1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right + Me.panelContainer1.ID = New System.Guid("a0849884-28cd-486b-bc02-0c28fd88a006") + Me.panelContainer1.Location = New System.Drawing.Point(793, 146) + Me.panelContainer1.Name = "panelContainer1" + Me.panelContainer1.OriginalSize = New System.Drawing.Size(346, 200) + Me.panelContainer1.SavedSizeFactor = 0R + Me.panelContainer1.Size = New System.Drawing.Size(346, 410) + Me.panelContainer1.Text = "panelContainer1" ' - 'frmMain2 + 'SkinDropDownButtonItem1 + ' + Me.SkinDropDownButtonItem1.Id = 10 + Me.SkinDropDownButtonItem1.Name = "SkinDropDownButtonItem1" + ' + 'GridControl1 + ' + Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridControl1.Location = New System.Drawing.Point(0, 0) + Me.GridControl1.MainView = Me.GridView1 + Me.GridControl1.MenuManager = Me.RibbonControl + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.Size = New System.Drawing.Size(337, 163) + Me.GridControl1.TabIndex = 0 + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'GridView1 + ' + Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.Name = "GridView1" + ' + 'BarButtonDashboard + ' + Me.BarButtonDashboard.Caption = "Dashboard" + Me.BarButtonDashboard.Id = 11 + Me.BarButtonDashboard.ImageOptions.Image = CType(resources.GetObject("BarButtonDashboard.ImageOptions.Image"), System.Drawing.Image) + Me.BarButtonDashboard.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonDashboard.ImageOptions.LargeImage"), System.Drawing.Image) + Me.BarButtonDashboard.Name = "BarButtonDashboard" + ' + 'RibbonPageGroup3 + ' + Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup3.Name = "RibbonPageGroup3" + Me.RibbonPageGroup3.Text = "RibbonPageGroup3" + ' + 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1139, 577) - Me.Controls.Add(Me.DockPanel2) + Me.Controls.Add(Me.panelContainer1) Me.Controls.Add(Me.RibbonStatusBar) Me.Controls.Add(Me.RibbonControl) Me.IsMdiContainer = True - Me.Name = "frmMain2" + Me.Name = "frmMain" Me.Ribbon = Me.RibbonControl Me.StatusBar = Me.RibbonStatusBar Me.Text = "EDMI" CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.MainMenu, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.DockManagerMain, System.ComponentModel.ISupportInitialize).EndInit() - Me.DockPanel1.ResumeLayout(False) - Me.DockPanel2.ResumeLayout(False) - CType(Me.DocumentManager1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DocumentManager, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TabbedView1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DockManager, System.ComponentModel.ISupportInitialize).EndInit() + Me.DockPanelGlobix.ResumeLayout(False) + Me.DockPanel1_Container.ResumeLayout(False) + Me.DockPanelProcessManager.ResumeLayout(False) + Me.DockPanel2_Container.ResumeLayout(False) + Me.panelContainer1.ResumeLayout(False) + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -245,15 +324,22 @@ Partial Class frmMain2 Friend WithEvents LabelCurrentMachine As DevExpress.XtraBars.BarStaticItem Friend WithEvents LabelCurrentVersion As DevExpress.XtraBars.BarStaticItem Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents DockPanel1 As DevExpress.XtraBars.Docking.DockPanel - Friend WithEvents DockPanel1_Container As DevExpress.XtraBars.Docking.ControlContainer - Friend WithEvents DockManagerMain As DevExpress.XtraBars.Docking.DockManager - Friend WithEvents DocumentManager1 As DevExpress.XtraBars.Docking2010.DocumentManager Friend WithEvents BarButtonDock1 As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageView As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents DockPanel2 As DevExpress.XtraBars.Docking.DockPanel - Friend WithEvents DockPanel2_Container As DevExpress.XtraBars.Docking.ControlContainer Friend WithEvents NativeMdiView1 As DevExpress.XtraBars.Docking2010.Views.NativeMdi.NativeMdiView + Friend WithEvents DocumentManager As DevExpress.XtraBars.Docking2010.DocumentManager Friend WithEvents TabbedView1 As DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView + Friend WithEvents DockManager As DevExpress.XtraBars.Docking.DockManager + Friend WithEvents DockPanelGlobix As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents DockPanel1_Container As DevExpress.XtraBars.Docking.ControlContainer + Friend WithEvents Label1 As Label + Friend WithEvents DockPanelProcessManager As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents DockPanel2_Container As DevExpress.XtraBars.Docking.ControlContainer + Friend WithEvents panelContainer1 As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents SkinDropDownButtonItem1 As DevExpress.XtraBars.SkinDropDownButtonItem + Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents BarButtonDashboard As DevExpress.XtraBars.BarButtonItem + Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup End Class diff --git a/EDMI_ClientSuite/frmMain2.resx b/EDMI_ClientSuite/frmMain.resx similarity index 79% rename from EDMI_ClientSuite/frmMain2.resx rename to EDMI_ClientSuite/frmMain.resx index d43f5b5d..bdb371c5 100644 --- a/EDMI_ClientSuite/frmMain2.resx +++ b/EDMI_ClientSuite/frmMain.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 128, 18 + 174, 17 @@ -338,48 +338,80 @@ 8Ky/HUvEvynFkqiPC+j6AAAAAElFTkSuQmCC - - 238, 18 - - + - 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 - - 393, 18 + + + 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 + Z3JnQxwAAAAASUVORK5CYII= + + + + 17, 17 + + + 284, 17 \ No newline at end of file diff --git a/EDMI_ClientSuite/frmMain.vb b/EDMI_ClientSuite/frmMain.vb new file mode 100644 index 00000000..a468d583 --- /dev/null +++ b/EDMI_ClientSuite/frmMain.vb @@ -0,0 +1,74 @@ +Imports DevExpress.XtraBars.Docking2010.Views +Imports DevExpress.XtraBars.Docking2010 +Imports DevExpress.XtraBars.Docking2010.Views.Widget +Imports System.ComponentModel +Imports EDMI_ClientSuite.ClassLayout +Imports System.IO + +Public Class frmMain + Public Sub New() + InitializeComponent() + + Dim oForm As New frmSplash() + oForm.ShowDialog() + End Sub + + Private Sub FrmMain_Load(sender As Object, e As EventArgs) Handles Me.Load + LabelCurrentUser.Caption = Environment.UserName + LabelCurrentMachine.Caption = Environment.MachineName + LabelCurrentVersion.Caption = My.Application.Info.Version.ToString + + Dim oDashboard = New frmDashboard() + oDashboard.MdiParent = DocumentManager.MdiParent + oDashboard.Show() + + LoadLayout() + End Sub + + Private Sub FrmMain_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing + SaveLayout() + End Sub + + Private Sub LoadLayout() + Dim oLayoutPathForDockManager As String = GetLayoutPath(LayoutName.LayoutMain, LayoutComponent.DockManager) + Dim oLayoutPathForDocumentManager As String = GetLayoutPath(LayoutName.LayoutMain, LayoutComponent.DocumentManager) + + If IO.File.Exists(oLayoutPathForDockManager) Then + DockManager.RestoreLayoutFromXml(oLayoutPathForDockManager) + End If + + If IO.File.Exists(oLayoutPathForDocumentManager) Then + DocumentManager.View.RestoreLayoutFromXml(oLayoutPathForDocumentManager) + End If + End Sub + Private Sub SaveLayout() + Dim oLayoutPathForDockManager As String = GetLayoutPath(LayoutName.LayoutMain, LayoutComponent.DockManager) + Dim oLayoutPathForDocumentManager As String = GetLayoutPath(LayoutName.LayoutMain, LayoutComponent.DocumentManager) + Dim oDirectory As String = Path.GetDirectoryName(oLayoutPathForDockManager) + + If Not Directory.Exists(oDirectory) Then + Directory.CreateDirectory(oDirectory) + End If + + DockManager.SaveLayoutToXml(oLayoutPathForDockManager) + DocumentManager.View.SaveLayoutToXml(oLayoutPathForDocumentManager) + End Sub + + Private Sub BarButtonUserSettings_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonUserSettings.ItemClick + Dim frm As New frmUserBasics() + frm.MdiParent = DocumentManager.MdiParent + frm.Show() + End Sub + + Private Sub BarButtonDashboard_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonDashboard.ItemClick + Dim frm As New frmDashboard() + frm.MdiParent = DocumentManager.MdiParent + frm.Show() + End Sub + + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + Dim frm As New frmFileTest(MyLogConfig) + frm.MdiParent = DocumentManager.MdiParent + frm.Show() + End Sub +End Class \ No newline at end of file diff --git a/EDMI_ClientSuite/frmMain2.vb b/EDMI_ClientSuite/frmMain2.vb deleted file mode 100644 index c38eea24..00000000 --- a/EDMI_ClientSuite/frmMain2.vb +++ /dev/null @@ -1,30 +0,0 @@ -Imports DevExpress.XtraBars.Docking2010.Views -Imports DevExpress.XtraBars.Docking2010 -Imports DevExpress.XtraBars.Docking2010.Views.Widget - -Public Class frmMain2 - Public Sub New() - InitializeComponent() - - Dim oForm As New frmSplash() - oForm.ShowDialog() - End Sub - - Private Sub BarButtonUserSettings_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonUserSettings.ItemClick - Dim frm As New frmUserBasics() - 'frm.MdiParent = DocumentManager1.MdiParent - frm.Show() - End Sub - - Private Sub frmMain2_Load(sender As Object, e As EventArgs) Handles Me.Load - LabelCurrentUser.Caption = Environment.UserName - LabelCurrentMachine.Caption = Environment.MachineName - LabelCurrentVersion.Caption = My.Application.Info.Version.ToString - End Sub - - Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick - Dim frm As New frmFileTest(MyLogConfig) - frm.MdiParent = DocumentManager1.MdiParent - frm.Show() - End Sub -End Class \ No newline at end of file diff --git a/EDMI_ClientSuite/frmSplash.designer.vb b/EDMI_ClientSuite/frmSplash.designer.vb index e059b8af..a968c346 100644 --- a/EDMI_ClientSuite/frmSplash.designer.vb +++ b/EDMI_ClientSuite/frmSplash.designer.vb @@ -13,8 +13,8 @@ Partial Class frmSplash MyBase.Dispose(disposing) End Try End Sub - Friend WithEvents Version As System.Windows.Forms.Label - Friend WithEvents Copyright As System.Windows.Forms.Label + Friend WithEvents lblVersion As System.Windows.Forms.Label + Friend WithEvents lblCopyright As System.Windows.Forms.Label 'Wird vom Windows Form-Designer benötigt. Private components As System.ComponentModel.IContainer @@ -24,40 +24,40 @@ Partial Class frmSplash 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() - Me.Version = New System.Windows.Forms.Label() - Me.Copyright = New System.Windows.Forms.Label() + Me.lblVersion = New System.Windows.Forms.Label() + Me.lblCopyright = New System.Windows.Forms.Label() Me.lblStatus = New System.Windows.Forms.Label() Me.pbStatus = New System.Windows.Forms.ProgressBar() Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel() Me.PictureBox1 = New System.Windows.Forms.PictureBox() - Me.Label1 = New System.Windows.Forms.Label() + Me.lblProductName = New System.Windows.Forms.Label() Me.TableLayoutPanel1.SuspendLayout() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'Version + 'lblVersion ' - Me.Version.BackColor = System.Drawing.Color.Transparent - Me.Version.Dock = System.Windows.Forms.DockStyle.Fill - Me.Version.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Version.Location = New System.Drawing.Point(3, 0) - Me.Version.Name = "Version" - Me.Version.Size = New System.Drawing.Size(290, 21) - Me.Version.TabIndex = 1 - Me.Version.Text = "Version {0}.{1:00}" - Me.Version.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.lblVersion.BackColor = System.Drawing.Color.Transparent + Me.lblVersion.Dock = System.Windows.Forms.DockStyle.Fill + Me.lblVersion.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblVersion.Location = New System.Drawing.Point(3, 0) + Me.lblVersion.Name = "lblVersion" + Me.lblVersion.Size = New System.Drawing.Size(290, 21) + Me.lblVersion.TabIndex = 1 + Me.lblVersion.Text = "Version {0}.{1:00}" + Me.lblVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' - 'Copyright + 'lblCopyright ' - Me.Copyright.BackColor = System.Drawing.Color.Transparent - Me.Copyright.Dock = System.Windows.Forms.DockStyle.Fill - Me.Copyright.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Copyright.Location = New System.Drawing.Point(3, 21) - Me.Copyright.Name = "Copyright" - Me.Copyright.Size = New System.Drawing.Size(290, 21) - Me.Copyright.TabIndex = 2 - Me.Copyright.Text = "Copyright" - Me.Copyright.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.lblCopyright.BackColor = System.Drawing.Color.Transparent + Me.lblCopyright.Dock = System.Windows.Forms.DockStyle.Fill + Me.lblCopyright.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblCopyright.Location = New System.Drawing.Point(3, 21) + Me.lblCopyright.Name = "lblCopyright" + Me.lblCopyright.Size = New System.Drawing.Size(290, 21) + Me.lblCopyright.TabIndex = 2 + Me.lblCopyright.Text = "Copyright" + Me.lblCopyright.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' 'lblStatus ' @@ -84,8 +84,8 @@ Partial Class frmSplash ' Me.TableLayoutPanel1.ColumnCount = 1 Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle()) - Me.TableLayoutPanel1.Controls.Add(Me.Copyright, 0, 1) - Me.TableLayoutPanel1.Controls.Add(Me.Version, 0, 0) + Me.TableLayoutPanel1.Controls.Add(Me.lblCopyright, 0, 1) + Me.TableLayoutPanel1.Controls.Add(Me.lblVersion, 0, 0) Me.TableLayoutPanel1.Location = New System.Drawing.Point(313, 188) Me.TableLayoutPanel1.Name = "TableLayoutPanel1" Me.TableLayoutPanel1.RowCount = 2 @@ -105,15 +105,15 @@ Partial Class frmSplash Me.PictureBox1.TabIndex = 3 Me.PictureBox1.TabStop = False ' - 'Label1 + 'lblProductName ' - Me.Label1.AutoSize = True - Me.Label1.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(316, 156) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(48, 17) - Me.Label1.TabIndex = 4 - Me.Label1.Text = "Label1" + Me.lblProductName.AutoSize = True + Me.lblProductName.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblProductName.Location = New System.Drawing.Point(316, 156) + Me.lblProductName.Name = "lblProductName" + Me.lblProductName.Size = New System.Drawing.Size(48, 17) + Me.lblProductName.TabIndex = 4 + Me.lblProductName.Text = "Label1" ' 'frmSplash ' @@ -122,7 +122,7 @@ Partial Class frmSplash Me.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.ClientSize = New System.Drawing.Size(621, 419) Me.ControlBox = False - Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.lblProductName) Me.Controls.Add(Me.TableLayoutPanel1) Me.Controls.Add(Me.lblStatus) Me.Controls.Add(Me.pbStatus) @@ -146,5 +146,5 @@ Partial Class frmSplash Friend WithEvents pbStatus As System.Windows.Forms.ProgressBar Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox - Friend WithEvents Label1 As Label + Friend WithEvents lblProductName As Label End Class diff --git a/EDMI_ClientSuite/frmSplash.vb b/EDMI_ClientSuite/frmSplash.vb index add1e19a..ea1d28ca 100644 --- a/EDMI_ClientSuite/frmSplash.vb +++ b/EDMI_ClientSuite/frmSplash.vb @@ -4,61 +4,17 @@ Imports System.Threading Imports System.Globalization Public NotInheritable Class frmSplash - - 'TODO: Dieses Formular kann einfach als Begrüßungsbildschirm für die Anwendung festgelegt werden, indem Sie zur Registerkarte "Anwendung" - ' des Projekt-Designers wechseln (Menü "Projekt", Option "Eigenschaften"). - Private InitSteps As Integer = 4 + Private InitSteps As Integer = 2 Private bw As New BackgroundWorker() Private Sub frmSplash_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load - 'Richten Sie den Dialogtext zur Laufzeit gemäß den Assemblyinformationen der Anwendung ein. + lblProductName.Text = My.Application.Info.ProductName + lblCopyright.Text = My.Application.Info.Copyright + lblVersion.Text = String.Format("Version {0}", My.Application.Info.Version.ToString) - 'TODO: Die Assemblyinformationen der Anwendung im Bereich "Anwendung" des Dialogfelds für die - ' Projekteigenschaften (im Menü "Projekt") anpassen. - - 'Anwendungstitel - 'If My.Application.Info.Title <> "" Then - ' ApplicationTitle.Text = My.Application.Info.Title - 'Else - ' 'Wenn der Anwendungstitel fehlt, Anwendungsnamen ohne Erweiterung verwenden - ' ApplicationTitle.Text = System.IO.Path.GetFileNameWithoutExtension(My.Application.Info.AssemblyName) - 'End If - - 'Verwenden Sie zum Formatieren der Versionsinformationen den Text, der zur Entwurfszeit in der Versionskontrolle festgelegt wurde, als - ' Formatierungszeichenfolge. Dies ermöglicht ggf. eine effektive Lokalisierung. - ' Build- und Revisionsinformationen können durch Verwendung des folgenden Codes und durch Ändern - ' des Entwurfszeittexts der Versionskontrolle in "Version {0}.{1:00}.{2}.{3}" oder einen ähnlichen Text eingeschlossen werden. Weitere Informationen erhalten Sie unter - ' String.Format() in der Hilfe. - ' - ' Version.Text = System.String.Format(Version.Text, My.Application.Info.Version.Major, My.Application.Info.Version.Minor, My.Application.Info.Version.Build, My.Application.Info.Version.Revision) - Label1.Text = My.Application.Info.ProductName - Version.Text = String.Format("Version {0}", My.Application.Info.Version.ToString) - - 'Copyrightinformationen - Copyright.Text = My.Application.Info.Copyright Me.BringToFront() - Dim p As Process - Dim RunCount = 0 - For Each p In Process.GetProcesses - If p.ProcessName.Contains("lobal_Indexe") Then - RunCount += 1 - End If - Next - 'If RunCount = 2 Then - ' MsgBox("Application already running. " & "GLOBIX will be closed!", MsgBoxStyle.Exclamation) - ' My.Settings.AppTerminate = True - ' My.Settings.Save() - ' Me.Close() - 'Else - ' InitProgram() - 'End If - InitProgram() - - - - End Sub Private Sub InitProgram() @@ -74,29 +30,15 @@ Public NotInheritable Class frmSplash Return _step * (100 / InitSteps) End Function - _ + Private Sub bw_DoWork(sender As Object, e As System.ComponentModel.DoWorkEventArgs) - - - bw.ReportProgress(CalcProgress(1), "Initialize Logging") + bw.ReportProgress(CalcProgress(1), "Connecting to service..") Dim Init = New ClassInit() System.Threading.Thread.Sleep(600) bw.ReportProgress(CalcProgress(2), "Initialize User Settings") ' Init.InitUserConfig() System.Threading.Thread.Sleep(600) - - bw.ReportProgress(CalcProgress(3), "Initialize Database") - 'If Init.InitDatabase() = True Then - ' System.Threading.Thread.Sleep(600) - ' bw.ReportProgress(CalcProgress(4), "Initialize UserConfiguration") - ' Init.InitBasics() - ' Init.InitUserLogin() - - - 'End If - - End Sub Private Sub bw_ProgressChanged(sender As Object, e As System.ComponentModel.ProgressChangedEventArgs) @@ -115,13 +57,4 @@ Public NotInheritable Class frmSplash ' Wenn kein Fehler, Splashscreen schließen Me.Close() End Sub - - Public Sub New() - - ' Dieser Aufruf ist für den Designer erforderlich. - InitializeComponent() - - ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - - End Sub End Class diff --git a/EDMI_ClientSuite/packages.config b/EDMI_ClientSuite/packages.config new file mode 100644 index 00000000..bf44e291 --- /dev/null +++ b/EDMI_ClientSuite/packages.config @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file