diff --git a/Config/ConfigManager.vb b/Config/ConfigManager.vb index a1b894fb..e32f5059 100644 --- a/Config/ConfigManager.vb +++ b/Config/ConfigManager.vb @@ -2,6 +2,7 @@ Imports System.Xml.Serialization Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Filesystem +Imports System.Xml Public Class ConfigManager(Of T) Private Const USER_CONFIG_NAME As String = "UserConfig.xml" @@ -14,11 +15,15 @@ Public Class ConfigManager(Of T) Private ReadOnly _ComputerPath As String Private _CurrentDataPath As String - Private ReadOnly _Schema As T + ''' + ''' The blueprint class from which the default config is created + ''' + Private ReadOnly _Blueprint As T Private ReadOnly _Serializer As XmlSerializer Public ReadOnly Property Config As T + ''' ''' Creates a new instance of the ConfigManager ''' @@ -42,8 +47,8 @@ Public Class ConfigManager(Of T) _UserPath = Path.Combine(UserConfigPath, USER_CONFIG_NAME) _ComputerPath = Path.Combine(ComputerConfigPath, COMPUTER_CONFIG_NAME) - _Schema = Activator.CreateInstance(Of T) - _Serializer = New XmlSerializer(_Schema.GetType) + _Blueprint = Activator.CreateInstance(Of T) + _Serializer = New XmlSerializer(_Blueprint.GetType) If Not Directory.Exists(UserConfigPath) Then Throw New DirectoryNotFoundException($"Path {UserConfigPath} does not exist!") @@ -91,7 +96,7 @@ Public Class ConfigManager(Of T) Else _Logger.Debug("Creating default config in UserPath: {0}", _UserPath) _CurrentDataPath = _UserPath - oConfig = Activator.CreateInstance(_Schema.GetType) + oConfig = Activator.CreateInstance(_Blueprint.GetType) WriteToFile(_Config, _UserPath) End If diff --git a/DDMonorepo.sln b/DDMonorepo.sln index 31b83654..5de0393a 100644 --- a/DDMonorepo.sln +++ b/DDMonorepo.sln @@ -57,7 +57,7 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DD_CommunicationService", " EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GUI_EDMI", "GUI_EDMI\GUI_EDMI.vbproj", "{88EDAD5B-1B98-43E4-B068-1251E7AF01A0}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMI_ClientSuite", "EDMI_ClientSuite\EDMI_ClientSuite.vbproj", "{406C95F4-9FEA-45B6-8385-1768CDBBF1A7}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ClientSuite", "EDMI_ClientSuite\ClientSuite.vbproj", "{406C95F4-9FEA-45B6-8385-1768CDBBF1A7}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEDMService", "SERVICES\DDEDM_NetworkService\DDEDMService.vbproj", "{A8C3F298-76AB-4359-AB3C-986E313B4336}" EndProject diff --git a/EDMI_ClientSuite/App.config b/EDMI_ClientSuite/App.config index 28991ba1..c6126768 100644 --- a/EDMI_ClientSuite/App.config +++ b/EDMI_ClientSuite/App.config @@ -2,11 +2,13 @@ -
+
+
-
+
+
@@ -19,7 +21,7 @@ - + @@ -27,11 +29,16 @@ - + net.tcp://172.24.12.67:9000/DigitalData/Services/Main - + + + + net.tcp://172.24.12.67:9000/DigitalData/Services/Main + + Skin/Office 2016 Colorful @@ -78,10 +85,15 @@ - + - + + + + + + \ No newline at end of file diff --git a/EDMI_ClientSuite/ApplicationEvents.vb b/EDMI_ClientSuite/ApplicationEvents.vb index 6e4808af..505e4b67 100644 --- a/EDMI_ClientSuite/ApplicationEvents.vb +++ b/EDMI_ClientSuite/ApplicationEvents.vb @@ -20,11 +20,11 @@ Namespace My ConfigManager = oConfigManager _Logger = LogConfig.GetLogger() - _Logger.Info("Starting Client Suite..") + _Logger.Debug("Starting Client Suite..") End Sub Public Sub App_Shutdown(sender As Object, e As EventArgs) Handles Me.Shutdown - _Logger.Info("Shutting down Client Suite..") + _Logger.Debug("Shutting down Client Suite..") End Sub End Class End Namespace diff --git a/EDMI_ClientSuite/ClassService.vb b/EDMI_ClientSuite/ClassService.vb index a3c002c6..479ac410 100644 --- a/EDMI_ClientSuite/ClassService.vb +++ b/EDMI_ClientSuite/ClassService.vb @@ -1,7 +1,7 @@ Imports System.ServiceModel Imports System.ServiceModel.Channels Imports DigitalData.Modules.Logging -Imports EDMI_ClientSuite.NetworkService_DDEDM +Imports DigitalData.Modules.EDMIFileOps.EDMIServiceReference Public Class ClassService Private ReadOnly _LogConfig As LogConfig diff --git a/EDMI_ClientSuite/ClassTimer.vb b/EDMI_ClientSuite/ClassTimer.vb new file mode 100644 index 00000000..ec024c02 --- /dev/null +++ b/EDMI_ClientSuite/ClassTimer.vb @@ -0,0 +1,37 @@ +Imports System.Threading +Imports System.Timers +Imports DigitalData.Modules.EDMIFileOps.EDMIServiceReference +Imports DigitalData.Modules.Logging + +Public Class ClassTimer + Private _Callback As TimerCallback + Private _LogConfig As LogConfig + Private _Logger As Logger + Private _Timer As Timers.Timer + Private _Channel As IEDMServiceChannel + + Private Const TIMER_START_TIME = 1000 + Private Const TIMER_INTERVAL = 5000 + + Public Sub Callback(sender As Object, e As ElapsedEventArgs) + _Logger.Info("Checking if Service is up...") + + ' Connect to service and send hearbeat request + + My.Application.Service.Online = True + My.Application.Service.LastChecked = DateTime.Now + End Sub + + Public Sub New(LogConfig As LogConfig) + _LogConfig = LogConfig + _Logger = LogConfig.GetLogger() + + _Channel = My.ChannelFactory.CreateChannel() + _Channel.Open() + + _Timer = New Timers.Timer(TIMER_INTERVAL) + _Timer.SynchronizingObject = My.MainForm + AddHandler _Timer.Elapsed, AddressOf Callback + _Timer.Enabled = True + End Sub +End Class diff --git a/EDMI_ClientSuite/EDMI_ClientSuite.vbproj b/EDMI_ClientSuite/ClientSuite.vbproj similarity index 86% rename from EDMI_ClientSuite/EDMI_ClientSuite.vbproj rename to EDMI_ClientSuite/ClientSuite.vbproj index 8f5b80da..04da0669 100644 --- a/EDMI_ClientSuite/EDMI_ClientSuite.vbproj +++ b/EDMI_ClientSuite/ClientSuite.vbproj @@ -6,9 +6,9 @@ AnyCPU {406C95F4-9FEA-45B6-8385-1768CDBBF1A7} WinExe - EDMI_ClientSuite.My.MyApplication - EDMI_ClientSuite - EDMI_ClientSuite + DigitalData.GUIs.ClientSuite.My.MyApplication + DigitalData.GUIs.ClientSuite + ClientSuite 512 WindowsForms v4.6.1 @@ -36,7 +36,7 @@ true true bin\Debug\ - EDMI_ClientSuite.xml + ClientSuite.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -46,7 +46,7 @@ true true bin\Release\ - EDMI_ClientSuite.xml + ClientSuite.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -119,12 +119,8 @@ + - - True - True - Reference.svcmap - DockManagerTest.vb @@ -211,6 +207,7 @@ True + True @@ -282,35 +279,6 @@ - - Designer - - - - Designer - - - Designer - - - Reference.svcmap - - - Reference.svcmap - - - Reference.svcmap - - - Reference.svcmap - - - - Designer - - - Designer - MyApplicationCodeGenerator @@ -321,7 +289,9 @@ My Settings.Designer.vb - + + Designer + @@ -335,21 +305,6 @@ - - - - - - - - - - - - WCF Proxy Generator - Reference.vb - - False @@ -394,5 +349,8 @@ Logging + + + \ No newline at end of file diff --git a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/DigitalData.Modules.Filesystem.xsd b/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/DigitalData.Modules.Filesystem.xsd deleted file mode 100644 index 46469df3..00000000 --- a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/DigitalData.Modules.Filesystem.xsd +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/DigitalData.Services.EDMService.wsdl b/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/DigitalData.Services.EDMService.wsdl deleted file mode 100644 index 2fd4ed52..00000000 --- a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/DigitalData.Services.EDMService.wsdl +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/DigitalData.Services.EDMService.xsd b/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/DigitalData.Services.EDMService.xsd deleted file mode 100644 index dcec368e..00000000 --- a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/DigitalData.Services.EDMService.xsd +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/DigitalData.Services.EDMService1.xsd b/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/DigitalData.Services.EDMService1.xsd deleted file mode 100644 index 4fce5c2f..00000000 --- a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/DigitalData.Services.EDMService1.xsd +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/EDMI_ClientSuite.NetworkService_DDEDM.ContainerResult.datasource b/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/EDMI_ClientSuite.NetworkService_DDEDM.ContainerResult.datasource deleted file mode 100644 index e187b1c4..00000000 --- a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/EDMI_ClientSuite.NetworkService_DDEDM.ContainerResult.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - EDMI_ClientSuite.NetworkService_DDEDM.ContainerResult, Connected Services.NetworkService_DDEDM.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/EDMI_ClientSuite.NetworkService_DDEDM.NonQueryResult.datasource b/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/EDMI_ClientSuite.NetworkService_DDEDM.NonQueryResult.datasource deleted file mode 100644 index dda8c325..00000000 --- a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/EDMI_ClientSuite.NetworkService_DDEDM.NonQueryResult.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - EDMI_ClientSuite.NetworkService_DDEDM.NonQueryResult, Connected Services.NetworkService_DDEDM.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/EDMI_ClientSuite.NetworkService_DDEDM.ScalarResult.datasource b/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/EDMI_ClientSuite.NetworkService_DDEDM.ScalarResult.datasource deleted file mode 100644 index dd44709e..00000000 --- a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/EDMI_ClientSuite.NetworkService_DDEDM.ScalarResult.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - EDMI_ClientSuite.NetworkService_DDEDM.ScalarResult, Connected Services.NetworkService_DDEDM.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/EDMI_ClientSuite.NetworkService_DDEDM.TableResult.datasource b/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/EDMI_ClientSuite.NetworkService_DDEDM.TableResult.datasource deleted file mode 100644 index f645aaa5..00000000 --- a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/EDMI_ClientSuite.NetworkService_DDEDM.TableResult.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - EDMI_ClientSuite.NetworkService_DDEDM.TableResult, Connected Services.NetworkService_DDEDM.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/Reference.svcmap b/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/Reference.svcmap deleted file mode 100644 index 46ef9665..00000000 --- a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/Reference.svcmap +++ /dev/null @@ -1,37 +0,0 @@ - - - - false - true - true - - false - false - false - - - true - Auto - true - true - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/Reference.vb b/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/Reference.vb deleted file mode 100644 index 2354b9f6..00000000 --- a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/Reference.vb +++ /dev/null @@ -1,588 +0,0 @@ -'------------------------------------------------------------------------------ -' -' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.42000 -' -' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -' der Code erneut generiert wird. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - -Imports System -Imports System.Runtime.Serialization - -Namespace NetworkService_DDEDM - - _ - Partial Public Class TableResult - Inherits Object - Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged - - _ - Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject - - _ - Private ErrorMessageField As String - - _ - Private OKField As Boolean - - _ - Private TableField As System.Data.DataTable - - _ - Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData - Get - Return Me.extensionDataField - End Get - Set - Me.extensionDataField = value - End Set - End Property - - _ - Public Property ErrorMessage() As String - Get - Return Me.ErrorMessageField - End Get - Set - If (Object.ReferenceEquals(Me.ErrorMessageField, value) <> true) Then - Me.ErrorMessageField = value - Me.RaisePropertyChanged("ErrorMessage") - End If - End Set - End Property - - _ - Public Property OK() As Boolean - Get - Return Me.OKField - End Get - Set - If (Me.OKField.Equals(value) <> true) Then - Me.OKField = value - Me.RaisePropertyChanged("OK") - End If - End Set - End Property - - _ - Public Property Table() As System.Data.DataTable - Get - Return Me.TableField - End Get - Set - If (Object.ReferenceEquals(Me.TableField, value) <> true) Then - Me.TableField = value - Me.RaisePropertyChanged("Table") - End If - End Set - End Property - - Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged - - Protected Sub RaisePropertyChanged(ByVal propertyName As String) - Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent - If (Not (propertyChanged) Is Nothing) Then - propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName)) - End If - End Sub - End Class - - _ - Partial Public Class ScalarResult - Inherits Object - Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged - - _ - Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject - - _ - Private ErrorMessageField As String - - _ - Private OKField As Boolean - - _ - Private ScalarField As Object - - _ - Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData - Get - Return Me.extensionDataField - End Get - Set - Me.extensionDataField = value - End Set - End Property - - _ - Public Property ErrorMessage() As String - Get - Return Me.ErrorMessageField - End Get - Set - If (Object.ReferenceEquals(Me.ErrorMessageField, value) <> true) Then - Me.ErrorMessageField = value - Me.RaisePropertyChanged("ErrorMessage") - End If - End Set - End Property - - _ - Public Property OK() As Boolean - Get - Return Me.OKField - End Get - Set - If (Me.OKField.Equals(value) <> true) Then - Me.OKField = value - Me.RaisePropertyChanged("OK") - End If - End Set - End Property - - _ - Public Property Scalar() As Object - Get - Return Me.ScalarField - End Get - Set - If (Object.ReferenceEquals(Me.ScalarField, value) <> true) Then - Me.ScalarField = value - Me.RaisePropertyChanged("Scalar") - End If - End Set - End Property - - Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged - - Protected Sub RaisePropertyChanged(ByVal propertyName As String) - Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent - If (Not (propertyChanged) Is Nothing) Then - propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName)) - End If - End Sub - End Class - - _ - Partial Public Class NonQueryResult - Inherits Object - Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged - - _ - Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject - - _ - Private ErrorMessageField As String - - _ - Private OKField As Boolean - - _ - Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData - Get - Return Me.extensionDataField - End Get - Set - Me.extensionDataField = value - End Set - End Property - - _ - Public Property ErrorMessage() As String - Get - Return Me.ErrorMessageField - End Get - Set - If (Object.ReferenceEquals(Me.ErrorMessageField, value) <> true) Then - Me.ErrorMessageField = value - Me.RaisePropertyChanged("ErrorMessage") - End If - End Set - End Property - - _ - Public Property OK() As Boolean - Get - Return Me.OKField - End Get - Set - If (Me.OKField.Equals(value) <> true) Then - Me.OKField = value - Me.RaisePropertyChanged("OK") - End If - End Set - End Property - - Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged - - Protected Sub RaisePropertyChanged(ByVal propertyName As String) - Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent - If (Not (propertyChanged) Is Nothing) Then - propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName)) - End If - End Sub - End Class - - _ - Partial Public Class ContainerResult - Inherits Object - Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged - - _ - Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject - - Private ContainerField As NetworkService_DDEDM.FileContainerInner - - Private ErrorMessageField As String - - Private OKField As Boolean - - _ - Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData - Get - Return Me.extensionDataField - End Get - Set - Me.extensionDataField = value - End Set - End Property - - _ - Public Property Container() As NetworkService_DDEDM.FileContainerInner - Get - Return Me.ContainerField - End Get - Set - If (Object.ReferenceEquals(Me.ContainerField, value) <> true) Then - Me.ContainerField = value - Me.RaisePropertyChanged("Container") - End If - End Set - End Property - - _ - Public Property ErrorMessage() As String - Get - Return Me.ErrorMessageField - End Get - Set - If (Object.ReferenceEquals(Me.ErrorMessageField, value) <> true) Then - Me.ErrorMessageField = value - Me.RaisePropertyChanged("ErrorMessage") - End If - End Set - End Property - - _ - Public Property OK() As Boolean - Get - Return Me.OKField - End Get - Set - If (Me.OKField.Equals(value) <> true) Then - Me.OKField = value - Me.RaisePropertyChanged("OK") - End If - End Set - End Property - - Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged - - Protected Sub RaisePropertyChanged(ByVal propertyName As String) - Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent - If (Not (propertyChanged) Is Nothing) Then - propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName)) - End If - End Sub - End Class - - _ - Partial Public Class FileContainerInner - Inherits Object - Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged - - _ - Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject - - Private ContentsField() As Byte - - Private CreatedAtField As Date - - Private ExtensionField As String - - Private FileIdField As String - - Private UpdatedAtField As Date - - _ - Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData - Get - Return Me.extensionDataField - End Get - Set - Me.extensionDataField = value - End Set - End Property - - _ - Public Property Contents() As Byte() - Get - Return Me.ContentsField - End Get - Set - If (Object.ReferenceEquals(Me.ContentsField, value) <> true) Then - Me.ContentsField = value - Me.RaisePropertyChanged("Contents") - End If - End Set - End Property - - _ - Public Property CreatedAt() As Date - Get - Return Me.CreatedAtField - End Get - Set - If (Me.CreatedAtField.Equals(value) <> true) Then - Me.CreatedAtField = value - Me.RaisePropertyChanged("CreatedAt") - End If - End Set - End Property - - _ - Public Property Extension() As String - Get - Return Me.ExtensionField - End Get - Set - If (Object.ReferenceEquals(Me.ExtensionField, value) <> true) Then - Me.ExtensionField = value - Me.RaisePropertyChanged("Extension") - End If - End Set - End Property - - _ - Public Property FileId() As String - Get - Return Me.FileIdField - End Get - Set - If (Object.ReferenceEquals(Me.FileIdField, value) <> true) Then - Me.FileIdField = value - Me.RaisePropertyChanged("FileId") - End If - End Set - End Property - - _ - Public Property UpdatedAt() As Date - Get - Return Me.UpdatedAtField - End Get - Set - If (Me.UpdatedAtField.Equals(value) <> true) Then - Me.UpdatedAtField = value - Me.RaisePropertyChanged("UpdatedAt") - End If - End Set - End Property - - Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged - - Protected Sub RaisePropertyChanged(ByVal propertyName As String) - Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent - If (Not (propertyChanged) Is Nothing) Then - propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName)) - End If - End Sub - End Class - - _ - Public Interface IEDMService - - _ - Function CreateDatabaseRequest(ByVal Name As String, ByVal Debug As Boolean) As String - - _ - Function CreateDatabaseRequestAsync(ByVal Name As String, ByVal Debug As Boolean) As System.Threading.Tasks.Task(Of String) - - _ - Sub CloseDatabaseRequest() - - _ - Function CloseDatabaseRequestAsync() As System.Threading.Tasks.Task - - _ - Function ReturnDatatable(ByVal SQL As String) As NetworkService_DDEDM.TableResult - - _ - Function ReturnDatatableAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of NetworkService_DDEDM.TableResult) - - _ - Function ReturnScalar(ByVal SQL As String) As NetworkService_DDEDM.ScalarResult - - _ - Function ReturnScalarAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of NetworkService_DDEDM.ScalarResult) - - _ - Function ExecuteNonQuery(ByVal SQL As String) As NetworkService_DDEDM.NonQueryResult - - _ - Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of NetworkService_DDEDM.NonQueryResult) - - _ - Function CreateFile(ByVal Contents() As Byte, ByVal Extension As String) As String - - _ - Function CreateFileAsync(ByVal Contents() As Byte, ByVal Extension As String) As System.Threading.Tasks.Task(Of String) - - _ - Function UpdateFile(ByVal ContainerId As String, ByVal Contents() As Byte) As String - - _ - Function UpdateFileAsync(ByVal ContainerId As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of String) - - _ - Function GetFile(ByVal ContainerId As String) As NetworkService_DDEDM.ContainerResult - - _ - Function GetFileAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of NetworkService_DDEDM.ContainerResult) - - _ - Function DeleteFile(ByVal ContainerId As String) As Boolean - - _ - Function DeleteFileAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of Boolean) - End Interface - - _ - Public Interface IEDMServiceChannel - Inherits NetworkService_DDEDM.IEDMService, System.ServiceModel.IClientChannel - End Interface - - _ - Partial Public Class EDMServiceClient - Inherits System.ServiceModel.ClientBase(Of NetworkService_DDEDM.IEDMService) - Implements NetworkService_DDEDM.IEDMService - - Public Sub New() - MyBase.New - End Sub - - Public Sub New(ByVal endpointConfigurationName As String) - MyBase.New(endpointConfigurationName) - End Sub - - Public Sub New(ByVal endpointConfigurationName As String, ByVal remoteAddress As String) - MyBase.New(endpointConfigurationName, remoteAddress) - End Sub - - Public Sub New(ByVal endpointConfigurationName As String, ByVal remoteAddress As System.ServiceModel.EndpointAddress) - MyBase.New(endpointConfigurationName, remoteAddress) - End Sub - - Public Sub New(ByVal binding As System.ServiceModel.Channels.Binding, ByVal remoteAddress As System.ServiceModel.EndpointAddress) - MyBase.New(binding, remoteAddress) - End Sub - - Public Function CreateDatabaseRequest(ByVal Name As String, ByVal Debug As Boolean) As String Implements NetworkService_DDEDM.IEDMService.CreateDatabaseRequest - Return MyBase.Channel.CreateDatabaseRequest(Name, Debug) - End Function - - Public Function CreateDatabaseRequestAsync(ByVal Name As String, ByVal Debug As Boolean) As System.Threading.Tasks.Task(Of String) Implements NetworkService_DDEDM.IEDMService.CreateDatabaseRequestAsync - Return MyBase.Channel.CreateDatabaseRequestAsync(Name, Debug) - End Function - - Public Sub CloseDatabaseRequest() Implements NetworkService_DDEDM.IEDMService.CloseDatabaseRequest - MyBase.Channel.CloseDatabaseRequest - End Sub - - Public Function CloseDatabaseRequestAsync() As System.Threading.Tasks.Task Implements NetworkService_DDEDM.IEDMService.CloseDatabaseRequestAsync - Return MyBase.Channel.CloseDatabaseRequestAsync - End Function - - Public Function ReturnDatatable(ByVal SQL As String) As NetworkService_DDEDM.TableResult Implements NetworkService_DDEDM.IEDMService.ReturnDatatable - Return MyBase.Channel.ReturnDatatable(SQL) - End Function - - Public Function ReturnDatatableAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of NetworkService_DDEDM.TableResult) Implements NetworkService_DDEDM.IEDMService.ReturnDatatableAsync - Return MyBase.Channel.ReturnDatatableAsync(SQL) - End Function - - Public Function ReturnScalar(ByVal SQL As String) As NetworkService_DDEDM.ScalarResult Implements NetworkService_DDEDM.IEDMService.ReturnScalar - Return MyBase.Channel.ReturnScalar(SQL) - End Function - - Public Function ReturnScalarAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of NetworkService_DDEDM.ScalarResult) Implements NetworkService_DDEDM.IEDMService.ReturnScalarAsync - Return MyBase.Channel.ReturnScalarAsync(SQL) - End Function - - Public Function ExecuteNonQuery(ByVal SQL As String) As NetworkService_DDEDM.NonQueryResult Implements NetworkService_DDEDM.IEDMService.ExecuteNonQuery - Return MyBase.Channel.ExecuteNonQuery(SQL) - End Function - - Public Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of NetworkService_DDEDM.NonQueryResult) Implements NetworkService_DDEDM.IEDMService.ExecuteNonQueryAsync - Return MyBase.Channel.ExecuteNonQueryAsync(SQL) - End Function - - Public Function CreateFile(ByVal Contents() As Byte, ByVal Extension As String) As String Implements NetworkService_DDEDM.IEDMService.CreateFile - Return MyBase.Channel.CreateFile(Contents, Extension) - End Function - - Public Function CreateFileAsync(ByVal Contents() As Byte, ByVal Extension As String) As System.Threading.Tasks.Task(Of String) Implements NetworkService_DDEDM.IEDMService.CreateFileAsync - Return MyBase.Channel.CreateFileAsync(Contents, Extension) - End Function - - Public Function UpdateFile(ByVal ContainerId As String, ByVal Contents() As Byte) As String Implements NetworkService_DDEDM.IEDMService.UpdateFile - Return MyBase.Channel.UpdateFile(ContainerId, Contents) - End Function - - Public Function UpdateFileAsync(ByVal ContainerId As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of String) Implements NetworkService_DDEDM.IEDMService.UpdateFileAsync - Return MyBase.Channel.UpdateFileAsync(ContainerId, Contents) - End Function - - Public Function GetFile(ByVal ContainerId As String) As NetworkService_DDEDM.ContainerResult Implements NetworkService_DDEDM.IEDMService.GetFile - Return MyBase.Channel.GetFile(ContainerId) - End Function - - Public Function GetFileAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of NetworkService_DDEDM.ContainerResult) Implements NetworkService_DDEDM.IEDMService.GetFileAsync - Return MyBase.Channel.GetFileAsync(ContainerId) - End Function - - Public Function DeleteFile(ByVal ContainerId As String) As Boolean Implements NetworkService_DDEDM.IEDMService.DeleteFile - Return MyBase.Channel.DeleteFile(ContainerId) - End Function - - Public Function DeleteFileAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of Boolean) Implements NetworkService_DDEDM.IEDMService.DeleteFileAsync - Return MyBase.Channel.DeleteFileAsync(ContainerId) - End Function - End Class -End Namespace diff --git a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/System.Data.xsd b/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/System.Data.xsd deleted file mode 100644 index 8c8a3c0c..00000000 --- a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/System.Data.xsd +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/configuration.svcinfo b/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/configuration.svcinfo deleted file mode 100644 index 3e545624..00000000 --- a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/configuration.svcinfo +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/configuration91.svcinfo b/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/configuration91.svcinfo deleted file mode 100644 index d39914e6..00000000 --- a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/configuration91.svcinfo +++ /dev/null @@ -1,210 +0,0 @@ - - - - - - - tcpBinding - - - - - - - - - - - - - - - False - - - Buffered - - - OleTransactions - - - StrongWildcard - - - 0 - - - - - - 65536 - - - 0 - - - - - - False - - - System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - System.ServiceModel.Configuration.StandardBindingOptionalReliableSessionElement - - - True - - - 00:10:00 - - - False - - - System.ServiceModel.Configuration.NetTcpSecurityElement - - - Transport - - - System.ServiceModel.Configuration.TcpTransportSecurityElement - - - Windows - - - EncryptAndSign - - - System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement - - - Never - - - TransportSelected - - - (Sammlung) - - - Tls, Tls11, Tls12 - - - System.ServiceModel.Configuration.MessageSecurityOverTcpElement - - - Windows - - - Default - - - - - - - - - net.tcp://localhost:9000/DigitalData/Services/Main - - - - - - netTcpBinding - - - tcpBinding - - - NetworkService_DDEDM.IEDMService - - - System.ServiceModel.Configuration.AddressHeaderCollectionElement - - - <Header /> - - - System.ServiceModel.Configuration.IdentityElement - - - System.ServiceModel.Configuration.UserPrincipalNameElement - - - - - - System.ServiceModel.Configuration.ServicePrincipalNameElement - - - - - - System.ServiceModel.Configuration.DnsElement - - - localhost - - - System.ServiceModel.Configuration.RsaElement - - - - - - System.ServiceModel.Configuration.CertificateElement - - - - - - System.ServiceModel.Configuration.CertificateReferenceElement - - - My - - - LocalMachine - - - FindBySubjectDistinguishedName - - - - - - False - - - tcpBinding - - - - - - - - - - - \ No newline at end of file diff --git a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/service.wsdl b/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/service.wsdl deleted file mode 100644 index 520b3f35..00000000 --- a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/service.wsdl +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - EncryptAndSign - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - net.tcp://localhost:9000/DigitalData/Services/Main - - localhost - - - - - \ No newline at end of file diff --git a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/service.xsd b/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/service.xsd deleted file mode 100644 index b4d5ff0f..00000000 --- a/EDMI_ClientSuite/Connected Services/NetworkService_DDEDM/service.xsd +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/EDMI_ClientSuite/EntityDesigner/ClassControlBuilder.vb b/EDMI_ClientSuite/EntityDesigner/ClassControlBuilder.vb index faf70aea..1998a7d6 100644 --- a/EDMI_ClientSuite/EntityDesigner/ClassControlBuilder.vb +++ b/EDMI_ClientSuite/EntityDesigner/ClassControlBuilder.vb @@ -1,5 +1,5 @@ Imports DigitalData.Controls.LookupGrid -Imports EDMI_ClientSuite.ClassControlUtils +Imports DigitalData.GUIs.ClientSuite.ClassControlUtils Public Class ClassControlBuilder #Region "State" diff --git a/EDMI_ClientSuite/EntityDesigner/ControlProperties/BaseClasses/ClassBaseProperties.vb b/EDMI_ClientSuite/EntityDesigner/ControlProperties/BaseClasses/ClassBaseProperties.vb index 7f2ec34f..ba7e6905 100644 --- a/EDMI_ClientSuite/EntityDesigner/ControlProperties/BaseClasses/ClassBaseProperties.vb +++ b/EDMI_ClientSuite/EntityDesigner/ControlProperties/BaseClasses/ClassBaseProperties.vb @@ -1,6 +1,6 @@ Imports System.ComponentModel -Imports EDMI_ClientSuite.ClassControlLocalization -Imports EDMI_ClientSuite.ClassControlUtils +Imports DigitalData.GUIs.ClientSuite.ClassControlLocalization +Imports DigitalData.GUIs.ClientSuite.ClassControlUtils Namespace ControlProperties Public MustInherit Class ClassBaseProperties diff --git a/EDMI_ClientSuite/EntityDesigner/ControlProperties/BaseClasses/ClassInputProperties.vb b/EDMI_ClientSuite/EntityDesigner/ControlProperties/BaseClasses/ClassInputProperties.vb index b82463e5..8e9f2623 100644 --- a/EDMI_ClientSuite/EntityDesigner/ControlProperties/BaseClasses/ClassInputProperties.vb +++ b/EDMI_ClientSuite/EntityDesigner/ControlProperties/BaseClasses/ClassInputProperties.vb @@ -1,4 +1,4 @@ -Imports EDMI_ClientSuite.ClassControlLocalization +Imports DigitalData.GUIs.ClientSuite.ClassControlLocalization Namespace ControlProperties Public MustInherit Class ClassInputProperties diff --git a/EDMI_ClientSuite/EntityDesigner/ControlProperties/BaseClasses/ClassMultiInputProperties.vb b/EDMI_ClientSuite/EntityDesigner/ControlProperties/BaseClasses/ClassMultiInputProperties.vb index faa2cc44..93dafd11 100644 --- a/EDMI_ClientSuite/EntityDesigner/ControlProperties/BaseClasses/ClassMultiInputProperties.vb +++ b/EDMI_ClientSuite/EntityDesigner/ControlProperties/BaseClasses/ClassMultiInputProperties.vb @@ -1,12 +1,6 @@ -Imports System.ComponentModel -Imports System.Drawing.Design -Imports DevExpress.XtraEditors.Repository -Imports EDMI_ClientSuite.ClassControlLocalization +Imports DigitalData.GUIs.ClientSuite.ClassControlLocalization Namespace ControlProperties - - - Public Class ClassMultiInputProperties Inherits ClassInputProperties @@ -23,5 +17,4 @@ Namespace ControlProperties End Set End Property End Class - End Namespace diff --git a/EDMI_ClientSuite/EntityDesigner/ControlProperties/Controls/ClassLabelProperties.vb b/EDMI_ClientSuite/EntityDesigner/ControlProperties/Controls/ClassLabelProperties.vb index 392b8e99..ffff5f5f 100644 --- a/EDMI_ClientSuite/EntityDesigner/ControlProperties/Controls/ClassLabelProperties.vb +++ b/EDMI_ClientSuite/EntityDesigner/ControlProperties/Controls/ClassLabelProperties.vb @@ -1,5 +1,5 @@ Imports System.ComponentModel -Imports EDMI_ClientSuite.ClassControlLocalization +Imports DigitalData.GUIs.ClientSuite.ClassControlLocalization Namespace ControlProperties Public Class ClassLabelProperties diff --git a/EDMI_ClientSuite/EntityDesigner/ControlProperties/Controls/ClassTextboxProperties.vb b/EDMI_ClientSuite/EntityDesigner/ControlProperties/Controls/ClassTextboxProperties.vb index dd58222b..6a126901 100644 --- a/EDMI_ClientSuite/EntityDesigner/ControlProperties/Controls/ClassTextboxProperties.vb +++ b/EDMI_ClientSuite/EntityDesigner/ControlProperties/Controls/ClassTextboxProperties.vb @@ -1,5 +1,5 @@ Imports System.ComponentModel -Imports EDMI_ClientSuite.ClassControlLocalization +Imports DigitalData.GUIs.ClientSuite.ClassControlLocalization Namespace ControlProperties Public Class ClassTextboxProperties diff --git a/EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.Designer.vb b/EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.Designer.vb index 4885b865..9b1d1aa7 100644 --- a/EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.Designer.vb +++ b/EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.Designer.vb @@ -23,7 +23,7 @@ Partial Class frmEntityDesigner Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Me.PanelMain = New EDMI_ClientSuite.ControlSnapPanel(Me.components) + Me.PanelMain = New ClientSuite.ControlSnapPanel(Me.components) Me.TabControlMain = New DevExpress.XtraTab.XtraTabControl() Me.TabPageControls = New DevExpress.XtraTab.XtraTabPage() Me.btnCombobox = New System.Windows.Forms.Button() diff --git a/EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.vb b/EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.vb index 34ed1fc6..3510d287 100644 --- a/EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.vb +++ b/EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.vb @@ -1,8 +1,8 @@ Imports System.ComponentModel Imports DevExpress.XtraEditors.Repository Imports DevExpress.XtraVerticalGrid -Imports EDMI_ClientSuite.ClassControlUtils -Imports EDMI_ClientSuite.ControlProperties +Imports DigitalData.GUIs.ClientSuite.ClassControlUtils +Imports DigitalData.GUIs.ClientSuite.ControlProperties Public Class frmEntityDesigner Private _IsMouseDown As Boolean = False diff --git a/EDMI_ClientSuite/My Project/Application.Designer.vb b/EDMI_ClientSuite/My Project/Application.Designer.vb index 55d6a2a9..5c8d1e2a 100644 --- a/EDMI_ClientSuite/My Project/Application.Designer.vb +++ b/EDMI_ClientSuite/My Project/Application.Designer.vb @@ -32,7 +32,7 @@ Namespace My _ Protected Overrides Sub OnCreateMainForm() - Me.MainForm = Global.EDMI_ClientSuite.frmMain + Me.MainForm = Global.DigitalData.GUIs.ClientSuite.frmMain End Sub End Class End Namespace diff --git a/EDMI_ClientSuite/My Project/Resources.Designer.vb b/EDMI_ClientSuite/My Project/Resources.Designer.vb index 108e91fc..12f93519 100644 --- a/EDMI_ClientSuite/My Project/Resources.Designer.vb +++ b/EDMI_ClientSuite/My Project/Resources.Designer.vb @@ -39,7 +39,7 @@ Namespace My.Resources Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EDMI_ClientSuite.Resources", GetType(Resources).Assembly) + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.GUIs.ClientSuite.Resources", GetType(Resources).Assembly) resourceMan = temp End If Return resourceMan diff --git a/EDMI_ClientSuite/My Project/Settings.Designer.vb b/EDMI_ClientSuite/My Project/Settings.Designer.vb index cf0fa946..cfc02179 100644 --- a/EDMI_ClientSuite/My Project/Settings.Designer.vb +++ b/EDMI_ClientSuite/My Project/Settings.Designer.vb @@ -85,9 +85,9 @@ Namespace My Friend Module MySettingsProperty _ - Friend ReadOnly Property Settings() As Global.EDMI_ClientSuite.My.MySettings + Friend ReadOnly Property Settings() As Global.DigitalData.GUIs.ClientSuite.My.MySettings Get - Return Global.EDMI_ClientSuite.My.MySettings.Default + Return Global.DigitalData.GUIs.ClientSuite.My.MySettings.Default End Get End Property End Module diff --git a/EDMI_ClientSuite/MyApplication.vb b/EDMI_ClientSuite/MyApplication.vb index a6e04ea8..1669412c 100644 --- a/EDMI_ClientSuite/MyApplication.vb +++ b/EDMI_ClientSuite/MyApplication.vb @@ -2,7 +2,7 @@ Imports System.Threading Imports DigitalData.Modules.Config Imports DigitalData.Modules.Logging -Imports EDMI_ClientSuite.NetworkService_DDEDM +Imports DigitalData.Modules.EDMIFileOps.EDMIServiceReference Namespace My ''' @@ -24,12 +24,13 @@ Namespace My End Module ''' - ''' Extends the My.Application Namespace + ''' Extends the My.Application Namespace to hold Application State ''' Example: My.Application.User ''' Partial Class MyApplication ' User Config Public User As New UserState() + Public Service As New ServiceState() End Class End Namespace diff --git a/EDMI_ClientSuite/State/ServiceState.vb b/EDMI_ClientSuite/State/ServiceState.vb new file mode 100644 index 00000000..2cba01a4 --- /dev/null +++ b/EDMI_ClientSuite/State/ServiceState.vb @@ -0,0 +1,9 @@ +Public Class ServiceState + Public Online As Boolean + Public LastChecked As DateTime + + Public Sub New() + Online = True + LastChecked = DateTime.Now + End Sub +End Class diff --git a/EDMI_ClientSuite/Strings/ControlProperties.Designer.vb b/EDMI_ClientSuite/Strings/ControlProperties.Designer.vb index b6dd43c0..61587f26 100644 --- a/EDMI_ClientSuite/Strings/ControlProperties.Designer.vb +++ b/EDMI_ClientSuite/Strings/ControlProperties.Designer.vb @@ -43,7 +43,7 @@ Namespace My.Resources Public Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EDMI_ClientSuite.ControlProperties", GetType(ControlProperties).Assembly) + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.GUIs.ClientSuite.ControlProperties", GetType(ControlProperties).Assembly) resourceMan = temp End If Return resourceMan diff --git a/EDMI_ClientSuite/frmMain.Designer.vb b/EDMI_ClientSuite/frmMain.Designer.vb index f8156f5d..bc74496a 100644 --- a/EDMI_ClientSuite/frmMain.Designer.vb +++ b/EDMI_ClientSuite/frmMain.Designer.vb @@ -59,7 +59,7 @@ 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.ProcessManagerWidget = New EDMI_ClientSuite.ProcessManagerWidget() + Me.ProcessManagerWidget = New ClientSuite.ProcessManagerWidget() CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MainMenu, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DocumentManager, System.ComponentModel.ISupportInitialize).BeginInit() diff --git a/EDMI_ClientSuite/frmMain.vb b/EDMI_ClientSuite/frmMain.vb index 6d4c6b23..0d160e77 100644 --- a/EDMI_ClientSuite/frmMain.vb +++ b/EDMI_ClientSuite/frmMain.vb @@ -1,15 +1,13 @@ -Imports DevExpress.XtraBars.Docking2010.Views -Imports DevExpress.XtraBars.Docking2010 -Imports DevExpress.XtraBars.Docking2010.Views.Widget +Imports DevExpress.XtraBars.Docking2010 Imports System.ComponentModel -Imports EDMI_ClientSuite.ClassLayout +Imports DigitalData.GUIs.ClientSuite.ClassLayout Imports System.IO Imports DigitalData.Modules.Logging -Imports DigitalData.Modules.Logging.LogConfig Imports DigitalData.Modules.License Public Class frmMain Private _Logger As Logger + Private _Timer As ClassTimer Public Sub New() ' Dieser Aufruf ist für den Designer erforderlich. @@ -18,6 +16,9 @@ Public Class frmMain ' Assign My.MainForm before everything else My.MainForm = Me + ' Initialize Main Timer + _Timer = New ClassTimer(My.LogConfig) + ' Show splashscreen frmSplash.ShowDialog() End Sub @@ -44,8 +45,8 @@ Public Class frmMain ProcessManagerWidget.DataSource = oDataTable AddHandler ProcessManagerWidget.RowDoubleClicked, Sub(RowView As DataRowView) - MsgBox($"Clicked on Document {RowView.Row.Item("DocName")}") - End Sub + MsgBox($"Clicked on Document {RowView.Row.Item("DocName")}") + End Sub LoadLayout() diff --git a/EDMI_ClientSuite/frmSplash.designer.vb b/EDMI_ClientSuite/frmSplash.designer.vb index a968c346..09ee2189 100644 --- a/EDMI_ClientSuite/frmSplash.designer.vb +++ b/EDMI_ClientSuite/frmSplash.designer.vb @@ -97,7 +97,7 @@ Partial Class frmSplash ' 'PictureBox1 ' - Me.PictureBox1.Image = Global.EDMI_ClientSuite.My.Resources.Resources.iconfinder_Gowalla_324477 + Me.PictureBox1.Image = Global.DigitalData.GUIs.ClientSuite.My.Resources.Resources.iconfinder_Gowalla_324477 Me.PictureBox1.Location = New System.Drawing.Point(0, -1) Me.PictureBox1.Name = "PictureBox1" Me.PictureBox1.Size = New System.Drawing.Size(520, 374) diff --git a/EDMI_ClientSuite/frmSplash.vb b/EDMI_ClientSuite/frmSplash.vb index 4a4a0e5b..ff5677bb 100644 --- a/EDMI_ClientSuite/frmSplash.vb +++ b/EDMI_ClientSuite/frmSplash.vb @@ -2,8 +2,7 @@ Imports System.ServiceModel Imports System.Threading Imports DigitalData.Modules.Logging -Imports DigitalData.Modules.Logging.LogConfig -Imports EDMI_ClientSuite.NetworkService_DDEDM +Imports DigitalData.Modules.EDMIFileOps.EDMIServiceReference Public NotInheritable Class frmSplash Private _Worker As New BackgroundWorker()