diff --git a/EDMI_ClientSuite/ApplicationEvents.vb b/EDMI_ClientSuite/ApplicationEvents.vb index 6740854b..7feea862 100644 --- a/EDMI_ClientSuite/ApplicationEvents.vb +++ b/EDMI_ClientSuite/ApplicationEvents.vb @@ -1,4 +1,7 @@ -Namespace My +Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.Logging.LogConfig + +Namespace My ' Für MyApplication sind folgende Ereignisse verfügbar: ' Startup: Wird beim Starten der Anwendung noch vor dem Erstellen des Startformulars ausgelöst. ' Shutdown: Wird nach dem Schließen aller Anwendungsformulare ausgelöst. Dieses Ereignis wird nicht ausgelöst, wenn die Anwendung mit einem Fehler beendet wird. @@ -6,8 +9,18 @@ ' StartupNextInstance: Wird beim Starten einer Einzelinstanzanwendung ausgelöst, wenn die Anwendung bereits aktiv ist. ' NetworkAvailabilityChanged: Wird beim Herstellen oder Trennen der Netzwerkverbindung ausgelöst. Partial Friend Class MyApplication - Public Sub App_Shutdown(sender As Object, e As EventArgs) Handles Me.Shutdown + Private _Logger As Logger + Public Sub App_Startup() Handles Me.Startup + Dim oLogConfig As New LogConfig(PathType.AppData) + LogConfig = oLogConfig + + _Logger = LogConfig.GetLogger() + _Logger.Info("Starting Client Suite..") + End Sub + + Public Sub App_Shutdown(sender As Object, e As EventArgs) Handles Me.Shutdown + _Logger.Info("Shutting down Client Suite..") End Sub End Class End Namespace diff --git a/EDMI_ClientSuite/ClassConstants.vb b/EDMI_ClientSuite/ClassConstants.vb new file mode 100644 index 00000000..1f4d0d34 --- /dev/null +++ b/EDMI_ClientSuite/ClassConstants.vb @@ -0,0 +1,9 @@ +Public Class ClassConstants + Public Const SERVICE_MAX_MESSAGE_SIZE = 2147483647 + Public Const SERVICE_MAX_BUFFER_SIZE = 2147483647 + Public Const SERVICE_MAX_ARRAY_LENGTH = 2147483647 + Public Const SERVICE_MAX_STRING_LENGTH = 2147483647 + Public Const SERVICE_MAX_CONNECTIONS = 10000 + + Public Const FOLDER_NAME_LAYOUT = "Layout" +End Class diff --git a/EDMI_ClientSuite/ClassInit.vb b/EDMI_ClientSuite/ClassInit.vb index 0a34ee9a..544c27cc 100644 --- a/EDMI_ClientSuite/ClassInit.vb +++ b/EDMI_ClientSuite/ClassInit.vb @@ -5,11 +5,6 @@ Imports EDMI_ClientSuite.NetworkService_DDEDM Public Class ClassInit Private Const OPEN_TIMEOUT_SECONDS = 3 - Private Const MAX_MESSAGE_SIZE = 2147483647 - Private Const MAX_BUFFER_SIZE = 2147483647 - Private Const MAX_ARRAY_LENGTH = 2147483647 - Private Const MAX_STRING_LENGTH = 2147483647 - Private Const MAX_CONNECTIONS = 10000 Public Enum ConnectionTestResult Successful @@ -69,12 +64,12 @@ Public Class ClassInit Dim oBinding As New NetTcpBinding() oBinding.Security.Mode = SecurityMode.Transport oBinding.Security.Transport.ClientCredentialType = TcpClientCredentialType.Windows - oBinding.MaxReceivedMessageSize = MAX_MESSAGE_SIZE - oBinding.MaxBufferSize = MAX_BUFFER_SIZE - oBinding.MaxBufferPoolSize = MAX_BUFFER_SIZE - oBinding.MaxConnections = MAX_CONNECTIONS - oBinding.ReaderQuotas.MaxArrayLength = MAX_ARRAY_LENGTH - oBinding.ReaderQuotas.MaxStringContentLength = MAX_STRING_LENGTH + oBinding.MaxReceivedMessageSize = ClassConstants.SERVICE_MAX_MESSAGE_SIZE + oBinding.MaxBufferSize = ClassConstants.SERVICE_MAX_BUFFER_SIZE + oBinding.MaxBufferPoolSize = ClassConstants.SERVICE_MAX_BUFFER_SIZE + oBinding.MaxConnections = ClassConstants.SERVICE_MAX_CONNECTIONS + oBinding.ReaderQuotas.MaxArrayLength = ClassConstants.SERVICE_MAX_ARRAY_LENGTH + oBinding.ReaderQuotas.MaxStringContentLength = ClassConstants.SERVICE_MAX_STRING_LENGTH oBinding.OpenTimeout = New TimeSpan(0, 0, OPEN_TIMEOUT_SECONDS) Return oBinding diff --git a/EDMI_ClientSuite/ClassLayout.vb b/EDMI_ClientSuite/ClassLayout.vb index ae2f22e4..0b9e8e26 100644 --- a/EDMI_ClientSuite/ClassLayout.vb +++ b/EDMI_ClientSuite/ClassLayout.vb @@ -1,9 +1,6 @@ Imports System.IO -Imports DevExpress.Utils.Serializing Public Class ClassLayout - Public Const LAYOUT_FOLDER = "Layout" - Public Enum LayoutName LayoutMain End Enum @@ -15,7 +12,7 @@ Public Class ClassLayout 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) + Return IO.Path.Combine(GetAppDataFolder(), ClassConstants.FOLDER_NAME_LAYOUT, oFileName) End Function Private Shared Function GetAppDataFolder() As String diff --git a/EDMI_ClientSuite/EDMI_ClientSuite.vbproj b/EDMI_ClientSuite/EDMI_ClientSuite.vbproj index ccaaac56..600387f7 100644 --- a/EDMI_ClientSuite/EDMI_ClientSuite.vbproj +++ b/EDMI_ClientSuite/EDMI_ClientSuite.vbproj @@ -168,6 +168,7 @@ + @@ -228,10 +229,10 @@ Form - - frmServiceConfig.vb + + frmConfigService.vb - + Form @@ -240,10 +241,10 @@ Form - - frmUserBasics.vb + + frmConfigUser.vb - + Form @@ -304,14 +305,14 @@ frmMain.vb - - frmServiceConfig.vb + + frmConfigService.vb frmSplash.vb - - frmUserBasics.vb + + frmConfigUser.vb diff --git a/EDMI_ClientSuite/My Project/Resources.Designer.vb b/EDMI_ClientSuite/My Project/Resources.Designer.vb index 7f496587..108e91fc 100644 --- a/EDMI_ClientSuite/My Project/Resources.Designer.vb +++ b/EDMI_ClientSuite/My Project/Resources.Designer.vb @@ -60,26 +60,6 @@ Namespace My.Resources End Set End Property - ''' - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - ''' - Friend ReadOnly Property email_go() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("email_go", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - ''' - ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. - ''' - Friend ReadOnly Property folder_go() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("folder_go", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/EDMI_ClientSuite/My Project/Resources.resx b/EDMI_ClientSuite/My Project/Resources.resx index ae2292dd..f9ad61a5 100644 --- a/EDMI_ClientSuite/My Project/Resources.resx +++ b/EDMI_ClientSuite/My Project/Resources.resx @@ -121,13 +121,7 @@ ..\Resources\iconfinder_Gowalla_324477.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\email_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\user_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\folder_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - \ No newline at end of file diff --git a/EDMI_ClientSuite/My Project/licenses.licx b/EDMI_ClientSuite/My Project/licenses.licx index d96f8e6c..ccd2d2a4 100644 --- a/EDMI_ClientSuite/My Project/licenses.licx +++ b/EDMI_ClientSuite/My Project/licenses.licx @@ -1,7 +1,8 @@ DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.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.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.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.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.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 diff --git a/EDMI_ClientSuite/MyApplication.vb b/EDMI_ClientSuite/MyApplication.vb index 23a4744a..ec5661ae 100644 --- a/EDMI_ClientSuite/MyApplication.vb +++ b/EDMI_ClientSuite/MyApplication.vb @@ -4,12 +4,6 @@ Imports DigitalData.Modules.Logging Imports EDMI_ClientSuite.NetworkService_DDEDM Namespace My - - Public Class ModuleLicense - - End Class - - ''' ''' Extends the My Namespace ''' Example: My.LogConfig diff --git a/EDMI_ClientSuite/frmServiceConfig.Designer.vb b/EDMI_ClientSuite/frmConfigService.Designer.vb similarity index 99% rename from EDMI_ClientSuite/frmServiceConfig.Designer.vb rename to EDMI_ClientSuite/frmConfigService.Designer.vb index c4b3a8e4..907c4d8f 100644 --- a/EDMI_ClientSuite/frmServiceConfig.Designer.vb +++ b/EDMI_ClientSuite/frmConfigService.Designer.vb @@ -1,5 +1,5 @@  _ -Partial Class frmServiceConfig +Partial Class frmConfigService Inherits DevExpress.XtraEditors.XtraForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. diff --git a/EDMI_ClientSuite/frmServiceConfig.resx b/EDMI_ClientSuite/frmConfigService.resx similarity index 100% rename from EDMI_ClientSuite/frmServiceConfig.resx rename to EDMI_ClientSuite/frmConfigService.resx diff --git a/EDMI_ClientSuite/frmServiceConfig.vb b/EDMI_ClientSuite/frmConfigService.vb similarity index 97% rename from EDMI_ClientSuite/frmServiceConfig.vb rename to EDMI_ClientSuite/frmConfigService.vb index 9345ce5c..791f99f7 100644 --- a/EDMI_ClientSuite/frmServiceConfig.vb +++ b/EDMI_ClientSuite/frmConfigService.vb @@ -1,6 +1,6 @@ Imports EDMI_ClientSuite.ClassInit -Public Class frmServiceConfig +Public Class frmConfigService Private _Init As ClassInit Private Sub frmServiceConfig_Load(sender As Object, e As EventArgs) Handles Me.Load diff --git a/EDMI_ClientSuite/frmUserBasics.Designer.vb b/EDMI_ClientSuite/frmConfigUser.Designer.vb similarity index 51% rename from EDMI_ClientSuite/frmUserBasics.Designer.vb rename to EDMI_ClientSuite/frmConfigUser.Designer.vb index b75661ca..a2dcc3e0 100644 --- a/EDMI_ClientSuite/frmUserBasics.Designer.vb +++ b/EDMI_ClientSuite/frmConfigUser.Designer.vb @@ -1,5 +1,5 @@  _ -Partial Class frmUserBasics +Partial Class frmConfigUser Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -22,57 +22,59 @@ Partial Class frmUserBasics 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmUserBasics)) - Me.TabControl1 = New System.Windows.Forms.TabControl() - Me.TabPage1 = New System.Windows.Forms.TabPage() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConfigUser)) + Me.TabPageSupport = New DevExpress.XtraTab.XtraTabPage() + Me.btnAppFolder = New DevExpress.XtraEditors.SimpleButton() + Me.btnLogFolder = New DevExpress.XtraEditors.SimpleButton() Me.Button4 = New System.Windows.Forms.Button() - Me.btnApplicationFolder = New System.Windows.Forms.Button() - Me.chkLogErrorsOnly = New System.Windows.Forms.CheckBox() Me.LinkLabel1 = New System.Windows.Forms.LinkLabel() - Me.Button1 = New System.Windows.Forms.Button() - Me.TabPage2 = New System.Windows.Forms.TabPage() + Me.chkLogErrorsOnly = New System.Windows.Forms.CheckBox() + Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() + Me.TabPageMain = New DevExpress.XtraTab.XtraTabPage() + Me.Label1 = New System.Windows.Forms.Label() Me.Button3 = New System.Windows.Forms.Button() Me.cmbLanguage = New System.Windows.Forms.ComboBox() - Me.Label1 = New System.Windows.Forms.Label() - Me.TabControl1.SuspendLayout() - Me.TabPage1.SuspendLayout() + Me.TabPageSupport.SuspendLayout() + CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabControl1.SuspendLayout() + Me.TabPageMain.SuspendLayout() Me.SuspendLayout() ' - 'TabControl1 + 'TabPageSupport ' - Me.TabControl1.Controls.Add(Me.TabPage1) - Me.TabControl1.Controls.Add(Me.TabPage2) - Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.TabControl1.Location = New System.Drawing.Point(0, 0) - Me.TabControl1.Name = "TabControl1" - Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(800, 450) - Me.TabControl1.TabIndex = 0 + Me.TabPageSupport.Controls.Add(Me.btnAppFolder) + Me.TabPageSupport.Controls.Add(Me.btnLogFolder) + Me.TabPageSupport.Controls.Add(Me.Button4) + Me.TabPageSupport.Controls.Add(Me.LinkLabel1) + Me.TabPageSupport.Controls.Add(Me.chkLogErrorsOnly) + Me.TabPageSupport.ImageOptions.Image = CType(resources.GetObject("TabPageSupport.ImageOptions.Image"), System.Drawing.Image) + Me.TabPageSupport.Name = "TabPageSupport" + Me.TabPageSupport.Size = New System.Drawing.Size(703, 448) + Me.TabPageSupport.Text = "Support" ' - 'TabPage1 + 'btnAppFolder ' - Me.TabPage1.Controls.Add(Me.Label1) - Me.TabPage1.Controls.Add(Me.Button3) - Me.TabPage1.Controls.Add(Me.cmbLanguage) - Me.TabPage1.Controls.Add(Me.Button4) - Me.TabPage1.Controls.Add(Me.btnApplicationFolder) - Me.TabPage1.Controls.Add(Me.chkLogErrorsOnly) - Me.TabPage1.Controls.Add(Me.LinkLabel1) - Me.TabPage1.Controls.Add(Me.Button1) - Me.TabPage1.Location = New System.Drawing.Point(4, 22) - Me.TabPage1.Name = "TabPage1" - Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(792, 424) - Me.TabPage1.TabIndex = 0 - Me.TabPage1.Text = "Logging und Support" - Me.TabPage1.UseVisualStyleBackColor = True + Me.btnAppFolder.ImageOptions.Image = CType(resources.GetObject("SimpleButton1.ImageOptions.Image"), System.Drawing.Image) + Me.btnAppFolder.Location = New System.Drawing.Point(349, 58) + Me.btnAppFolder.Name = "btnAppFolder" + Me.btnAppFolder.Size = New System.Drawing.Size(164, 36) + Me.btnAppFolder.TabIndex = 21 + Me.btnAppFolder.Text = "AppData Ordner öffnen" + ' + 'btnLogFolder + ' + Me.btnLogFolder.ImageOptions.Image = CType(resources.GetObject("btnLogFolder.ImageOptions.Image"), System.Drawing.Image) + Me.btnLogFolder.Location = New System.Drawing.Point(349, 18) + Me.btnLogFolder.Name = "btnLogFolder" + Me.btnLogFolder.Size = New System.Drawing.Size(164, 34) + Me.btnLogFolder.TabIndex = 20 + Me.btnLogFolder.Text = "Log Ordner öffnen" ' 'Button4 ' - Me.Button4.Image = Global.EDMI_ClientSuite.My.Resources.Resources.email_go Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button4.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Button4.Location = New System.Drawing.Point(8, 6) + Me.Button4.Location = New System.Drawing.Point(15, 14) Me.Button4.Name = "Button4" Me.Button4.Size = New System.Drawing.Size(133, 23) Me.Button4.TabIndex = 19 @@ -80,72 +82,67 @@ Partial Class frmUserBasics Me.Button4.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button4.UseVisualStyleBackColor = True ' - 'btnApplicationFolder - ' - Me.btnApplicationFolder.Image = Global.EDMI_ClientSuite.My.Resources.Resources.folder_go - Me.btnApplicationFolder.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnApplicationFolder.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnApplicationFolder.Location = New System.Drawing.Point(265, 35) - Me.btnApplicationFolder.Name = "btnApplicationFolder" - Me.btnApplicationFolder.Size = New System.Drawing.Size(144, 23) - Me.btnApplicationFolder.TabIndex = 16 - Me.btnApplicationFolder.Text = "Open AppFolder User" - Me.btnApplicationFolder.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnApplicationFolder.UseVisualStyleBackColor = True - ' - 'chkLogErrorsOnly - ' - Me.chkLogErrorsOnly.AutoSize = True - Me.chkLogErrorsOnly.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.chkLogErrorsOnly.Location = New System.Drawing.Point(147, 10) - Me.chkLogErrorsOnly.Name = "chkLogErrorsOnly" - Me.chkLogErrorsOnly.Size = New System.Drawing.Size(100, 17) - Me.chkLogErrorsOnly.TabIndex = 18 - Me.chkLogErrorsOnly.Text = "Log Errors Only" - Me.chkLogErrorsOnly.UseVisualStyleBackColor = True - ' 'LinkLabel1 ' Me.LinkLabel1.AutoSize = True Me.LinkLabel1.Font = New System.Drawing.Font("Segoe UI", 9.75!) Me.LinkLabel1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.LinkLabel1.Location = New System.Drawing.Point(5, 79) + Me.LinkLabel1.Location = New System.Drawing.Point(12, 87) Me.LinkLabel1.Name = "LinkLabel1" Me.LinkLabel1.Size = New System.Drawing.Size(200, 17) Me.LinkLabel1.TabIndex = 15 Me.LinkLabel1.TabStop = True Me.LinkLabel1.Text = "Link zu Support-Tool Digital Data" ' - 'Button1 + 'chkLogErrorsOnly ' - Me.Button1.Image = Global.EDMI_ClientSuite.My.Resources.Resources.folder_go - Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Button1.Location = New System.Drawing.Point(8, 35) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(133, 23) - Me.Button1.TabIndex = 17 - Me.Button1.Text = "Open Log-Folder" - Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button1.UseVisualStyleBackColor = True + Me.chkLogErrorsOnly.AutoSize = True + Me.chkLogErrorsOnly.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.chkLogErrorsOnly.Location = New System.Drawing.Point(154, 18) + Me.chkLogErrorsOnly.Name = "chkLogErrorsOnly" + Me.chkLogErrorsOnly.Size = New System.Drawing.Size(100, 17) + Me.chkLogErrorsOnly.TabIndex = 18 + Me.chkLogErrorsOnly.Text = "Log Errors Only" + Me.chkLogErrorsOnly.UseVisualStyleBackColor = True ' - 'TabPage2 + 'XtraTabControl1 ' - Me.TabPage2.Location = New System.Drawing.Point(4, 22) - Me.TabPage2.Name = "TabPage2" - Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(792, 424) - Me.TabPage2.TabIndex = 1 - Me.TabPage2.Text = "TabPage2" - Me.TabPage2.UseVisualStyleBackColor = True + Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.XtraTabControl1.HeaderLocation = DevExpress.XtraTab.TabHeaderLocation.Left + Me.XtraTabControl1.HeaderOrientation = DevExpress.XtraTab.TabOrientation.Horizontal + Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0) + Me.XtraTabControl1.Name = "XtraTabControl1" + Me.XtraTabControl1.SelectedTabPage = Me.TabPageSupport + Me.XtraTabControl1.Size = New System.Drawing.Size(800, 450) + Me.XtraTabControl1.TabIndex = 51 + Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabPageMain, Me.TabPageSupport}) + ' + 'TabPageMain + ' + Me.TabPageMain.Controls.Add(Me.Label1) + Me.TabPageMain.Controls.Add(Me.Button3) + Me.TabPageMain.Controls.Add(Me.cmbLanguage) + Me.TabPageMain.ImageOptions.Image = CType(resources.GetObject("TabPageMain.ImageOptions.Image"), System.Drawing.Image) + Me.TabPageMain.Name = "TabPageMain" + Me.TabPageMain.Size = New System.Drawing.Size(703, 448) + Me.TabPageMain.Text = "Allgemein" + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(15, 21) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(91, 13) + Me.Label1.TabIndex = 53 + Me.Label1.Text = "Aktuelle Sprache:" ' 'Button3 ' Me.Button3.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Button3.Location = New System.Drawing.Point(148, 139) + Me.Button3.Location = New System.Drawing.Point(158, 35) Me.Button3.Name = "Button3" Me.Button3.Size = New System.Drawing.Size(134, 23) - Me.Button3.TabIndex = 49 + Me.Button3.TabIndex = 52 Me.Button3.Text = "Sprache jetzt wechseln" Me.Button3.UseVisualStyleBackColor = True ' @@ -153,46 +150,40 @@ Partial Class frmUserBasics ' Me.cmbLanguage.FormattingEnabled = True Me.cmbLanguage.Items.AddRange(New Object() {"de-DE", "en-US"}) - Me.cmbLanguage.Location = New System.Drawing.Point(8, 141) + Me.cmbLanguage.Location = New System.Drawing.Point(18, 37) Me.cmbLanguage.Name = "cmbLanguage" Me.cmbLanguage.Size = New System.Drawing.Size(134, 21) - Me.cmbLanguage.TabIndex = 48 + Me.cmbLanguage.TabIndex = 51 ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(5, 125) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(91, 13) - Me.Label1.TabIndex = 50 - Me.Label1.Text = "Aktuelle Sprache:" - ' - 'frmUserBasics + 'frmConfigUser ' 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.Controls.Add(Me.TabControl1) + Me.Controls.Add(Me.XtraTabControl1) Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) - Me.Name = "frmUserBasics" + Me.Name = "frmConfigUser" Me.Text = "Grundeinstellungen User" - Me.TabControl1.ResumeLayout(False) - Me.TabPage1.ResumeLayout(False) - Me.TabPage1.PerformLayout() + Me.TabPageSupport.ResumeLayout(False) + Me.TabPageSupport.PerformLayout() + CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabControl1.ResumeLayout(False) + Me.TabPageMain.ResumeLayout(False) + Me.TabPageMain.PerformLayout() Me.ResumeLayout(False) End Sub - Friend WithEvents TabControl1 As TabControl - Friend WithEvents TabPage1 As TabPage - Friend WithEvents TabPage2 As TabPage + Friend WithEvents TabPageSupport As DevExpress.XtraTab.XtraTabPage Friend WithEvents Button4 As Button - Friend WithEvents chkLogErrorsOnly As CheckBox - Friend WithEvents Button1 As Button - Friend WithEvents btnApplicationFolder As Button Friend WithEvents LinkLabel1 As LinkLabel + Friend WithEvents chkLogErrorsOnly As CheckBox + Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl + Friend WithEvents TabPageMain As DevExpress.XtraTab.XtraTabPage Friend WithEvents Label1 As Label Friend WithEvents Button3 As Button Friend WithEvents cmbLanguage As ComboBox + Friend WithEvents btnLogFolder As DevExpress.XtraEditors.SimpleButton + Friend WithEvents btnAppFolder As DevExpress.XtraEditors.SimpleButton End Class diff --git a/EDMI_ClientSuite/frmUserBasics.resx b/EDMI_ClientSuite/frmConfigUser.resx similarity index 97% rename from EDMI_ClientSuite/frmUserBasics.resx rename to EDMI_ClientSuite/frmConfigUser.resx index cc0c9c2e..3ee5ee40 100644 --- a/EDMI_ClientSuite/frmUserBasics.resx +++ b/EDMI_ClientSuite/frmConfigUser.resx @@ -118,6 +118,51 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAArdEVYdFRpdGxlAE9wZW47Rm9sZGVyO0JhcnM7Umli + Ym9uO1N0YW5kYXJkO0xvYWTxw8RjAAAAb0lEQVQ4T6XQ0Q2AIAwEUBbsMs7Q0ZzHFeqVRIJ6VQof7+fC + XUiLmS2hYQYNM4qqChjhOS31fICVL8JKvb+BSBueHUB3cQCGB+oxmWjgVjj2TcAC8hzwx1+Fl34gXYb2 + g6ky1BtMl1295AoajrNyArCYwjN4ThJYAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAArdEVYdFRpdGxlAE9wZW47Rm9sZGVyO0JhcnM7Umli + Ym9uO1N0YW5kYXJkO0xvYWTxw8RjAAAAb0lEQVQ4T6XQ0Q2AIAwEUBbsMs7Q0ZzHFeqVRIJ6VQof7+fC + XUiLmS2hYQYNM4qqChjhOS31fICVL8JKvb+BSBueHUB3cQCGB+oxmWjgVjj2TcAC8hzwx1+Fl34gXYb2 + g6ky1BtMl1295AoajrNyArCYwjN4ThJYAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAARdEVYdFRpdGxlAEJ1ZztSZXBvcnQ7sbAXPQAAAc5J + REFUWEfFljFOw0AQRVMgEkHDPbgGbaDhBtyAO9AAHUhUuQOUtHRAuhRwBehAAiGBZP63ZqPZ3W/s2MYp + nmK/nT8zcRIpo6Io1oqUQyLl89FeHTvgyt3zms7XRKg5RErVwLEJHkDhHK/vAc987RI1h0ipGjiOAQem + CxCe+dolag6RUjVwzEHVAo/ORag5REoLlU2F/whngk+Q9gpnkQ9IyeIQFH7tC/iPIIVnaa9wFvmAlMQF + p3Y/Bqfg27yCZ2dgbJmpedzqOVKSEDQOwW3i/oK1zCxd2j8gJQLR9j3AXnKWlCw2+liiHE7ULClDAGyA + V6AaN4FZ9lhtAWKhA6AarwJ7yBkkEyju87NPKX9RnuiGBUngP4iWSBeICsFL4trwBqI35mdWLRC+uT/O + dSF6un5m1QK8Ju/OtYVPIPQrnZ9ZuYDdL5xry8J61S8QYLG9zkKoAzPfM0VKwgA4sSZdYA85g0jJAOjz + J1l+qdWsTLDQAqpRF+QSmWCRC5F9cJ24JtwAZr3L5mWCRS5Qbg22wJ25JrB2GzDrn2Y2LxMWygK4ngD+ + 26n7R3QOJnX9ApnwgYqzXXABnsCXwetLwLMoY7nmCwyNlEMi5XAUo19RwjicG819swAAAABJRU5ErkJg + gg== + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEhvbWU7HnRkOAAAATpJREFUWEft + ks0NwjAMRkHMxQhw7wIMwAhVJ+BH4oSEgBlgAObhwhUR7KqunMRO2zSUSw9Pbb7a+R4SE2PMX6lfiqKI + YVohfQuSQmAGnIED0FmirwCWXwFT0Vmij4BbLkos8rvhUE7ECmjlRC3xCwGpfAecnKyUgNJXSgGtHH8t + fvMklvltziUgs+7sIhAq5zNBCTjzO1sLSOVbQPrHByXg3ZpvI9ClnFAl4GnNNgnElBOiBGDthgT6lBON + EppAinIiKCEJpCwnVAlJ4MKGkL7lhCSxlwRWwIcNpSgnUILufQOZJICgxAbAQX4BQZc0oe0egQzPmgAf + drMyfz7WQXDG2al3+dkT4NCwlEulHJxx9xAt9wJkFBgFQgJtcPcQLfcCpLpI/BbLKBAjkBy3B/GCoRHD + IRHD4TCTL7ccmUyvvNxMAAAAAElFTkSuQmCC + + AAABAAoAMDAQAAEABABoBgAApgAAACAgEAABAAQA6AIAAA4HAAAQEBAAAQAEACgBAAD2CQAAMDAAAAEA diff --git a/EDMI_ClientSuite/frmConfigUser.vb b/EDMI_ClientSuite/frmConfigUser.vb new file mode 100644 index 00000000..33b04302 --- /dev/null +++ b/EDMI_ClientSuite/frmConfigUser.vb @@ -0,0 +1,24 @@ +Imports System.IO +Imports DigitalData.Modules.Logging +Public Class frmConfigUser + Private _Logger As Logger + + Private Sub LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked + ' Specify that the link was visited. + Me.LinkLabel1.LinkVisited = True + ' Navigate to a URL. + System.Diagnostics.Process.Start("http://www.didalog.de/Support") + End Sub + + Private Sub frmUserBasics_Load(sender As Object, e As EventArgs) Handles Me.Load + _Logger = My.LogConfig.GetLogger() + End Sub + + Private Sub btnLogFolder_Click(sender As Object, e As EventArgs) Handles btnLogFolder.Click + Process.Start(My.LogConfig.LogDirectory) + End Sub + + Private Sub btnAppFolder_Click(sender As Object, e As EventArgs) Handles btnAppFolder.Click + Process.Start(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)) + End Sub +End Class \ No newline at end of file diff --git a/EDMI_ClientSuite/frmMain.vb b/EDMI_ClientSuite/frmMain.vb index ec4f7169..7237e462 100644 --- a/EDMI_ClientSuite/frmMain.vb +++ b/EDMI_ClientSuite/frmMain.vb @@ -14,15 +14,6 @@ Public Class frmMain ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() - ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - - ' Initialize Logger - Dim oLogConfig As New LogConfig(PathType.AppData) - _Logger = oLogConfig.GetLogger() - - ' This sets the LogConfig object that is used in the WHOLE application!! - My.LogConfig = oLogConfig - ' Show splashscreen frmSplash.ShowDialog() End Sub @@ -86,7 +77,7 @@ Public Class frmMain End Sub Private Sub BarButtonUserSettings_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonUserSettings.ItemClick - Dim frm As New frmUserBasics() + Dim frm As New frmConfigUser() frm.MdiParent = DocumentManager.MdiParent frm.Show() End Sub @@ -111,7 +102,7 @@ Public Class frmMain End Sub Private Sub BarButtonConnectionSettings_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonConnectionSettings.ItemClick - Dim frm As New frmServiceConfig() + Dim frm As New frmConfigService() frm.MdiParent = DocumentManager.MdiParent frm.Show() End Sub diff --git a/EDMI_ClientSuite/frmSplash.vb b/EDMI_ClientSuite/frmSplash.vb index fb9db005..678e65b8 100644 --- a/EDMI_ClientSuite/frmSplash.vb +++ b/EDMI_ClientSuite/frmSplash.vb @@ -29,7 +29,7 @@ Public NotInheritable Class frmSplash Dim oConnectionURLExists = oInit.TestConnectionURLExists If Not oConnectionURLExists Then - Dim oResult = frmServiceConfig.ShowDialog() + Dim oResult = frmConfigService.ShowDialog() If oResult = DialogResult.Cancel Then MsgBox("Es wurde keine Dienst Verbindungsurl hinterlegt. Die Anwendung wird beendet.") diff --git a/EDMI_ClientSuite/frmUserBasics.vb b/EDMI_ClientSuite/frmUserBasics.vb deleted file mode 100644 index bbcfe1a8..00000000 --- a/EDMI_ClientSuite/frmUserBasics.vb +++ /dev/null @@ -1,27 +0,0 @@ -Imports System.IO -Imports DigitalData.Modules.Logging -Public Class frmUserBasics - Private _Logger As Logger - Private _MyLogger As LogConfig - Private Sub LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked - ' Specify that the link was visited. - Me.LinkLabel1.LinkVisited = True - ' Navigate to a URL. - System.Diagnostics.Process.Start("http://www.didalog.de/Support") - End Sub - - Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click - - End Sub - - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click - Process.Start(_MyLogger.LogDirectory) - End Sub - - Private Sub frmUserBasics_Load(sender As Object, e As EventArgs) Handles Me.Load - 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() - End Sub -End Class \ No newline at end of file