diff --git a/app/DD_Clipboard_Searcher/App.config b/app/DD_Clipboard_Searcher/App.config index d952adc..7ed8972 100644 --- a/app/DD_Clipboard_Searcher/App.config +++ b/app/DD_Clipboard_Searcher/App.config @@ -11,6 +11,9 @@ + + False + diff --git a/app/DD_Clipboard_Searcher/ClassConfig.vb b/app/DD_Clipboard_Searcher/ClassConfig.vb index 2cfc302..5dae166 100644 --- a/app/DD_Clipboard_Searcher/ClassConfig.vb +++ b/app/DD_Clipboard_Searcher/ClassConfig.vb @@ -17,4 +17,8 @@ Public Class ClassConfig Public Property ResultDocWindowLocation As Point = New Size(0, 0) Public Property ResultDataWindowSize As Size = New Size(1024, 786) Public Property ResultDataWindowLocation As Point = New Size(0, 0) + + Public Property ConnectionStringAppServer As String = "" + + Public Property AppServerConfig As String = "" End Class diff --git a/app/DD_Clipboard_Searcher/ClassInit.vb b/app/DD_Clipboard_Searcher/ClassInit.vb index 2095de5..0e5c333 100644 --- a/app/DD_Clipboard_Searcher/ClassInit.vb +++ b/app/DD_Clipboard_Searcher/ClassInit.vb @@ -3,6 +3,7 @@ Imports DD_LIB_Standards Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Config Imports DigitalData.Modules.Database +Imports DigitalData.Modules.EDMI.API Public Class ClassInit Public _lizenzManager As clsLicenseManager @@ -11,6 +12,21 @@ Public Class ClassInit Public Sub InitLogger() LogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, Application.CompanyName, Application.ProductName) Logger = LogConfig.GetLogger() + Try + Dim directory As New IO.DirectoryInfo(LogConfig.LogDirectory) + + For Each file As IO.FileInfo In directory.GetFiles + If (Now - file.CreationTime).Days > 29 Then + file.Delete() + Else + Exit For + End If + + + Next + Catch ex As Exception + + End Try End Sub Public Function InitDatabase() Dim dbResult As Boolean @@ -55,7 +71,15 @@ Public Class ClassInit End Function Public Function InitBasics() - ConfigManager = New ConfigManager(Of ClassConfig)(LogConfig, Application.UserAppDataPath, Application.CommonAppDataPath) + Dim UserAppDataPath = Application.UserAppDataPath + Dim CommonAppDataPath = Application.CommonAppDataPath + Dim StartupPath = Application.StartupPath + If My.Settings.UseAppConfigConString = True Then + ' UserAppDataPath = StartupPath + CommonAppDataPath = StartupPath + End If + + ConfigManager = New ConfigManager(Of ClassConfig)(LogConfig, UserAppDataPath, CommonAppDataPath, StartupPath) With ConfigManager.Config MyConnectionString = DecryptConnectionString(.ConnectionString) @@ -65,6 +89,32 @@ Public Class ClassInit LogConfig.Debug = Not .LogErrorsOnly End With + If ConfigManager.Config.ConnectionStringAppServer <> String.Empty Then + Logger.Debug("ConnectionStringAppServer will be used") + CONNECTION_STRING_APP_SERVER = DecryptConnectionString(ConfigManager.Config.ConnectionStringAppServer) + End If + + If ConfigManager.Config.AppServerConfig <> String.Empty Then + Try + Dim oSplit() = ConfigManager.Config.AppServerConfig.ToString.Split(";") + Dim oAppServer = oSplit(0) + Dim oAppServerPort = 9000 + If oSplit.Length = 2 Then + oAppServerPort = oSplit(1) + End If + _Client = New Client(LogConfig, oAppServer, oAppServerPort) + If Not IsNothing(_Client) Then + If _Client.Connect() Then + APPSERVER_ACTIVE = True + End If + End If + + + + Catch ex As Exception + Logger.Warn($"Could not initialize the AppServer: {ex.Message}") + End Try + End If Return True End Function @@ -113,8 +163,10 @@ Public Class ClassInit USER_IN_MODULE = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS") USER_IS_ADMIN = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN") - - + ADDITIONAL_TITLE = DT_CHECKUSER_MODULE.Rows(0).Item("ADDITIONAL_TITLE") + If ADDITIONAL_TITLE = String.Empty Then + ADDITIONAL_TITLE = My.Application.Info.ProductName + End If USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN") USERCOUNT_LOGGED_IN += 1 Return True diff --git a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj index 75f2a88..77a2a59 100644 --- a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj +++ b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj @@ -96,6 +96,9 @@ False ..\..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll + + ..\..\..\DDMonorepo\Modules.EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll + ..\..\..\DDMonorepo\Modules.Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll @@ -378,6 +381,7 @@ + diff --git a/app/DD_Clipboard_Searcher/My Project/Resources.Designer.vb b/app/DD_Clipboard_Searcher/My Project/Resources.Designer.vb index c48c346..0d368ac 100644 --- a/app/DD_Clipboard_Searcher/My Project/Resources.Designer.vb +++ b/app/DD_Clipboard_Searcher/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ @@ -420,6 +420,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property server_Local_16xLG() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("server_Local_16xLG", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/app/DD_Clipboard_Searcher/My Project/Resources.resx b/app/DD_Clipboard_Searcher/My Project/Resources.resx index df622dc..4a7d75f 100644 --- a/app/DD_Clipboard_Searcher/My Project/Resources.resx +++ b/app/DD_Clipboard_Searcher/My Project/Resources.resx @@ -136,6 +136,9 @@ ..\Resources\ReduceSize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\StatusAnnotations_Stop_16xLG.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 @@ -148,9 +151,6 @@ ..\Resources\GoToDefinition_5575.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\sql.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\ppt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -160,6 +160,9 @@ ..\Resources\ID_SITE_PUBLISH_ALL.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\PrepareProcess.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 @@ -172,9 +175,6 @@ ..\Resources\refresh_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Annotation_New.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\control_start_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -199,11 +199,11 @@ ..\Resources\rar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\tiff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Annotation_New.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\StatusAnnotations_Stop_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\sql.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Symbols_Stop_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -211,6 +211,9 @@ ..\Resources\PreviewTab.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\OpenFile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\mp4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -223,8 +226,8 @@ ..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\OpenFile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\tiff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\StatusAnnotations_Information_16xMD_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -256,7 +259,7 @@ ..\Resources\ID_FILE_PAGE_SETUP.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\PrepareProcess.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\server_Local_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/My Project/Settings.Designer.vb b/app/DD_Clipboard_Searcher/My Project/Settings.Designer.vb index 9cee8a2..c473a47 100644 --- a/app/DD_Clipboard_Searcher/My Project/Settings.Designer.vb +++ b/app/DD_Clipboard_Searcher/My Project/Settings.Designer.vb @@ -73,6 +73,15 @@ Namespace My Return CType(Me("UserConfig_Prefix"),String) End Get End Property + + _ + Public ReadOnly Property UseAppConfigConString() As Boolean + Get + Return CType(Me("UseAppConfigConString"),Boolean) + End Get + End Property End Class End Namespace diff --git a/app/DD_Clipboard_Searcher/My Project/Settings.settings b/app/DD_Clipboard_Searcher/My Project/Settings.settings index 8293f9f..ac75691 100644 --- a/app/DD_Clipboard_Searcher/My Project/Settings.settings +++ b/app/DD_Clipboard_Searcher/My Project/Settings.settings @@ -13,5 +13,8 @@ + + False + \ No newline at end of file diff --git a/app/DD_Clipboard_Searcher/Resources/server_Local_16xLG.png b/app/DD_Clipboard_Searcher/Resources/server_Local_16xLG.png new file mode 100644 index 0000000..a4e65c3 Binary files /dev/null and b/app/DD_Clipboard_Searcher/Resources/server_Local_16xLG.png differ diff --git a/app/DD_Clipboard_Searcher/frmStart.Designer.vb b/app/DD_Clipboard_Searcher/frmStart.Designer.vb index 5892073..295ac28 100644 --- a/app/DD_Clipboard_Searcher/frmStart.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmStart.Designer.vb @@ -28,27 +28,28 @@ Partial Class frmStart Me.cmstrpNotifyIcon = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.AblaufAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.BisherigenAblaufAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.tsmiChangeState = New System.Windows.Forms.ToolStripMenuItem() - Me.ClientÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ClientBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() - Me.labelUser = New System.Windows.Forms.ToolStripStatusLabel() Me.labelVersion = New System.Windows.Forms.ToolStripStatusLabel() Me.lblrefresh = New System.Windows.Forms.ToolStripStatusLabel() Me.TimerClose = New System.Windows.Forms.Timer(Me.components) Me.ContextMenuStripForm = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.MinimierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Label1 = New System.Windows.Forms.Label() Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.Label2 = New System.Windows.Forms.Label() Me.labelHotkey = New System.Windows.Forms.Label() - Me.btnUserConfig = New System.Windows.Forms.Button() - Me.btnAdminConfig = New System.Windows.Forms.Button() Me.ImageList1 = New System.Windows.Forms.ImageList(Me.components) Me.TimerRefresh = New System.Windows.Forms.Timer(Me.components) Me.GroupBox2 = New System.Windows.Forms.GroupBox() Me.labelStatus = New System.Windows.Forms.Label() Me.labelRefresh = New System.Windows.Forms.Label() + Me.MinimierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.btnAdminConfig = New System.Windows.Forms.Button() + Me.btnUserConfig = New System.Windows.Forms.Button() + Me.labelUser = New System.Windows.Forms.ToolStripStatusLabel() + Me.tslblAppServer = New System.Windows.Forms.ToolStripStatusLabel() + Me.tsmiChangeState = New System.Windows.Forms.ToolStripMenuItem() + Me.ClientÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ClientBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cmstrpNotifyIcon.SuspendLayout() Me.StatusStrip1.SuspendLayout() Me.ContextMenuStripForm.SuspendLayout() @@ -70,7 +71,7 @@ Partial Class frmStart ' Me.cmstrpNotifyIcon.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AblaufAnzeigenToolStripMenuItem, Me.tsmiChangeState, Me.ClientÖffnenToolStripMenuItem, Me.ClientBeendenToolStripMenuItem}) Me.cmstrpNotifyIcon.Name = "cmstrpNotifyIcon" - Me.cmstrpNotifyIcon.Size = New System.Drawing.Size(220, 114) + Me.cmstrpNotifyIcon.Size = New System.Drawing.Size(220, 92) ' 'AblaufAnzeigenToolStripMenuItem ' @@ -85,31 +86,9 @@ Partial Class frmStart Me.BisherigenAblaufAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(217, 22) Me.BisherigenAblaufAnzeigenToolStripMenuItem.Text = "Bisherigen Ablauf anzeigen" ' - 'tsmiChangeState - ' - Me.tsmiChangeState.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.StatusAnnotations_Stop_16xLG - Me.tsmiChangeState.Name = "tsmiChangeState" - Me.tsmiChangeState.Size = New System.Drawing.Size(219, 22) - Me.tsmiChangeState.Tag = "stop" - Me.tsmiChangeState.Text = "Clipboard Watcher stoppen" - ' - 'ClientÖffnenToolStripMenuItem - ' - Me.ClientÖffnenToolStripMenuItem.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.door_open - Me.ClientÖffnenToolStripMenuItem.Name = "ClientÖffnenToolStripMenuItem" - Me.ClientÖffnenToolStripMenuItem.Size = New System.Drawing.Size(219, 22) - Me.ClientÖffnenToolStripMenuItem.Text = "Client öffnen" - ' - 'ClientBeendenToolStripMenuItem - ' - Me.ClientBeendenToolStripMenuItem.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.cancel - Me.ClientBeendenToolStripMenuItem.Name = "ClientBeendenToolStripMenuItem" - Me.ClientBeendenToolStripMenuItem.Size = New System.Drawing.Size(219, 22) - Me.ClientBeendenToolStripMenuItem.Text = "Client beenden" - ' 'StatusStrip1 ' - Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.labelUser, Me.labelVersion, Me.lblrefresh}) + Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.labelUser, Me.labelVersion, Me.lblrefresh, Me.tslblAppServer}) Me.StatusStrip1.Location = New System.Drawing.Point(0, 232) Me.StatusStrip1.Name = "StatusStrip1" Me.StatusStrip1.Size = New System.Drawing.Size(345, 22) @@ -117,13 +96,6 @@ Partial Class frmStart Me.StatusStrip1.TabIndex = 3 Me.StatusStrip1.Text = "StatusStrip1" ' - 'labelUser - ' - Me.labelUser.Image = CType(resources.GetObject("labelUser.Image"), System.Drawing.Image) - Me.labelUser.Name = "labelUser" - Me.labelUser.Size = New System.Drawing.Size(37, 17) - Me.labelUser.Text = "{0}" - ' 'labelVersion ' Me.labelVersion.Name = "labelVersion" @@ -146,13 +118,6 @@ Partial Class frmStart Me.ContextMenuStripForm.Name = "ContextMenuStripForm" Me.ContextMenuStripForm.Size = New System.Drawing.Size(136, 26) ' - 'MinimierenToolStripMenuItem - ' - Me.MinimierenToolStripMenuItem.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.ReduceSize - Me.MinimierenToolStripMenuItem.Name = "MinimierenToolStripMenuItem" - Me.MinimierenToolStripMenuItem.Size = New System.Drawing.Size(135, 22) - Me.MinimierenToolStripMenuItem.Text = "Minimieren" - ' 'Label1 ' Me.Label1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ @@ -202,28 +167,6 @@ Partial Class frmStart Me.labelHotkey.Text = "{0}" Me.labelHotkey.TextAlign = System.Drawing.ContentAlignment.MiddleCenter ' - 'btnUserConfig - ' - Me.btnUserConfig.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.user_16xLG - Me.btnUserConfig.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnUserConfig.Location = New System.Drawing.Point(15, 12) - Me.btnUserConfig.Name = "btnUserConfig" - Me.btnUserConfig.Size = New System.Drawing.Size(151, 32) - Me.btnUserConfig.TabIndex = 13 - Me.btnUserConfig.Text = "Grundeinstellungen" - Me.btnUserConfig.UseVisualStyleBackColor = True - ' - 'btnAdminConfig - ' - Me.btnAdminConfig.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.Editdatasetwithdesigner_8449 - Me.btnAdminConfig.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnAdminConfig.Location = New System.Drawing.Point(182, 12) - Me.btnAdminConfig.Name = "btnAdminConfig" - Me.btnAdminConfig.Size = New System.Drawing.Size(151, 32) - Me.btnAdminConfig.TabIndex = 13 - Me.btnAdminConfig.Text = "Administration" - Me.btnAdminConfig.UseVisualStyleBackColor = True - ' 'ImageList1 ' Me.ImageList1.ImageStream = CType(resources.GetObject("ImageList1.ImageStream"), System.Windows.Forms.ImageListStreamer) @@ -269,6 +212,71 @@ Partial Class frmStart Me.labelRefresh.TabIndex = 0 Me.labelRefresh.Text = "Aktualisierung erfolgreich." ' + 'MinimierenToolStripMenuItem + ' + Me.MinimierenToolStripMenuItem.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.ReduceSize + Me.MinimierenToolStripMenuItem.Name = "MinimierenToolStripMenuItem" + Me.MinimierenToolStripMenuItem.Size = New System.Drawing.Size(135, 22) + Me.MinimierenToolStripMenuItem.Text = "Minimieren" + ' + 'btnAdminConfig + ' + Me.btnAdminConfig.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.Editdatasetwithdesigner_8449 + Me.btnAdminConfig.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnAdminConfig.Location = New System.Drawing.Point(182, 12) + Me.btnAdminConfig.Name = "btnAdminConfig" + Me.btnAdminConfig.Size = New System.Drawing.Size(151, 32) + Me.btnAdminConfig.TabIndex = 13 + Me.btnAdminConfig.Text = "Administration" + Me.btnAdminConfig.UseVisualStyleBackColor = True + ' + 'btnUserConfig + ' + Me.btnUserConfig.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.user_16xLG + Me.btnUserConfig.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnUserConfig.Location = New System.Drawing.Point(15, 12) + Me.btnUserConfig.Name = "btnUserConfig" + Me.btnUserConfig.Size = New System.Drawing.Size(151, 32) + Me.btnUserConfig.TabIndex = 13 + Me.btnUserConfig.Text = "Grundeinstellungen" + Me.btnUserConfig.UseVisualStyleBackColor = True + ' + 'labelUser + ' + Me.labelUser.Image = CType(resources.GetObject("labelUser.Image"), System.Drawing.Image) + Me.labelUser.Name = "labelUser" + Me.labelUser.Size = New System.Drawing.Size(37, 17) + Me.labelUser.Text = "{0}" + ' + 'tslblAppServer + ' + Me.tslblAppServer.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.server_Local_16xLG + Me.tslblAppServer.Name = "tslblAppServer" + Me.tslblAppServer.Size = New System.Drawing.Size(111, 17) + Me.tslblAppServer.Text = "AppServer active" + ' + 'tsmiChangeState + ' + Me.tsmiChangeState.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.StatusAnnotations_Stop_16xLG + Me.tsmiChangeState.Name = "tsmiChangeState" + Me.tsmiChangeState.Size = New System.Drawing.Size(219, 22) + Me.tsmiChangeState.Tag = "stop" + Me.tsmiChangeState.Text = "Clipboard Watcher stoppen" + ' + 'ClientÖffnenToolStripMenuItem + ' + Me.ClientÖffnenToolStripMenuItem.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.door_open + Me.ClientÖffnenToolStripMenuItem.Name = "ClientÖffnenToolStripMenuItem" + Me.ClientÖffnenToolStripMenuItem.Size = New System.Drawing.Size(219, 22) + Me.ClientÖffnenToolStripMenuItem.Text = "Client öffnen" + ' + 'ClientBeendenToolStripMenuItem + ' + Me.ClientBeendenToolStripMenuItem.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.cancel + Me.ClientBeendenToolStripMenuItem.Name = "ClientBeendenToolStripMenuItem" + Me.ClientBeendenToolStripMenuItem.Size = New System.Drawing.Size(219, 22) + Me.ClientBeendenToolStripMenuItem.Text = "Client beenden" + ' 'frmStart ' Me.Appearance.Options.UseFont = True @@ -283,11 +291,11 @@ Partial Class frmStart Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.StatusStrip1) 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.IconOptions.Icon = CType(resources.GetObject("frmStart.IconOptions.Icon"), System.Drawing.Icon) Me.KeyPreview = True Me.MaximizeBox = False Me.MaximumSize = New System.Drawing.Size(361, 293) - Me.MinimumSize = New System.Drawing.Size(361, 293) + Me.MinimumSize = New System.Drawing.Size(347, 286) Me.Name = "frmStart" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Clipboard Watcher" @@ -327,4 +335,5 @@ Partial Class frmStart Friend WithEvents GroupBox2 As GroupBox Friend WithEvents labelRefresh As Label Friend WithEvents labelStatus As Label + Friend WithEvents tslblAppServer As ToolStripStatusLabel End Class diff --git a/app/DD_Clipboard_Searcher/frmStart.resx b/app/DD_Clipboard_Searcher/frmStart.resx index 7d9864e..7487f11 100644 --- a/app/DD_Clipboard_Searcher/frmStart.resx +++ b/app/DD_Clipboard_Searcher/frmStart.resx @@ -4663,7 +4663,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABU - CwAAAk1TRnQBSQFMAgEBBQEAATgBAAE4AQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CwAAAk1TRnQBSQFMAgEBBQEAAUgBAAFIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -4717,7 +4717,7 @@ 817, 17 - + AAABAAEAAAAAAAEAIAAoIAQAFgAAACgAAAAAAQAAAAIAAAEAIAAAAAAAACAEABMLAAATCwAAAAAAAAAA AAAxJKX/MSSl/zEkpf8xJKX/MSSl/zEkpf8xJKX/MSSl/zEkpf8xJKX/MSSl/zEkpf8xJKX/MSSl/zEk diff --git a/app/DD_Clipboard_Searcher/frmStart.vb b/app/DD_Clipboard_Searcher/frmStart.vb index 92bc5fc..db954a2 100644 --- a/app/DD_Clipboard_Searcher/frmStart.vb +++ b/app/DD_Clipboard_Searcher/frmStart.vb @@ -57,7 +57,11 @@ Public Class frmStart ElseIf HotkeyFunctionKey = HOTKEY_SHIFT Then Hotkey.AddHotKey(oKeyCode, ClassHotkey.ModfierKey.MOD_SHIFT, ClassConstants.HOTKEY_TRIGGER_WATCHER) End If - + If APPSERVER_ACTIVE = True Then + tslblAppServer.Visible = True + Else + tslblAppServer.Visible = False + End If End If RefreshUI() diff --git a/app/DD_Clipboard_Searcher/modCurrent.vb b/app/DD_Clipboard_Searcher/modCurrent.vb index 1e8106a..afcd303 100644 --- a/app/DD_Clipboard_Searcher/modCurrent.vb +++ b/app/DD_Clipboard_Searcher/modCurrent.vb @@ -2,6 +2,7 @@ Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging Imports DigitalData.Modules.ZooFlow.Params +Imports DigitalData.Modules.EDMI.API Module modCurrent Public LogConfig As LogConfig @@ -13,6 +14,7 @@ Module modCurrent Public ConfigManager As ConfigManager(Of ClassConfig) Public MyConnectionString As String = "" + Public CONNECTION_STRING_APP_SERVER As String = "" Public HotkeyFunctionKey As String = ClassConstants.HOTKEY_CTRL Public HotkeySearchKey As String = "d" Public LogErrorsOnly As Boolean = True @@ -31,7 +33,7 @@ Module modCurrent Public USER_DATE_FORMAT As String Public USER_EXISTS = False Public USER_IN_MODULE = False - + Public ADDITIONAL_TITLE As String = "CW" Public USERCOUNT_LOGGED_IN As Integer Public LICENSE_COUNT As Integer @@ -76,5 +78,7 @@ Module modCurrent Public CurrSearchOpen As Boolean = False Public CurrMatchTreeView As New TreeView + Public _Client As Client + Public APPSERVER_ACTIVE As Boolean = False End Module diff --git a/app/DD_Clipboard_Watcher.sln b/app/DD_Clipboard_Watcher.sln index 422af92..fccd3c9 100644 --- a/app/DD_Clipboard_Watcher.sln +++ b/app/DD_Clipboard_Watcher.sln @@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.29728.190 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DD_Clipboard_Watcher", "DD_Clipboard_Searcher\DD_Clipboard_Watcher.vbproj", "{09BC9934-1A38-4752-8873-639B42779CDB}" EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupWix", "SetupWix\SetupWix.wixproj", "{15FC07B7-9FF7-4F14-9BAB-05674E20D839}" -EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupVS19", "SetupVS19\SetupVS19.wixproj", "{9A7C1386-F66E-49DD-994C-F5935A0D196F}" EndProject Global @@ -29,16 +27,6 @@ Global {09BC9934-1A38-4752-8873-639B42779CDB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {09BC9934-1A38-4752-8873-639B42779CDB}.Release|Mixed Platforms.Build.0 = Release|Any CPU {09BC9934-1A38-4752-8873-639B42779CDB}.Release|x86.ActiveCfg = Release|Any CPU - {15FC07B7-9FF7-4F14-9BAB-05674E20D839}.Debug|Any CPU.ActiveCfg = Debug|x86 - {15FC07B7-9FF7-4F14-9BAB-05674E20D839}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {15FC07B7-9FF7-4F14-9BAB-05674E20D839}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {15FC07B7-9FF7-4F14-9BAB-05674E20D839}.Debug|x86.ActiveCfg = Debug|x86 - {15FC07B7-9FF7-4F14-9BAB-05674E20D839}.Debug|x86.Build.0 = Debug|x86 - {15FC07B7-9FF7-4F14-9BAB-05674E20D839}.Release|Any CPU.ActiveCfg = Release|x86 - {15FC07B7-9FF7-4F14-9BAB-05674E20D839}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {15FC07B7-9FF7-4F14-9BAB-05674E20D839}.Release|Mixed Platforms.Build.0 = Release|x86 - {15FC07B7-9FF7-4F14-9BAB-05674E20D839}.Release|x86.ActiveCfg = Release|x86 - {15FC07B7-9FF7-4F14-9BAB-05674E20D839}.Release|x86.Build.0 = Release|x86 {9A7C1386-F66E-49DD-994C-F5935A0D196F}.Debug|Any CPU.ActiveCfg = Debug|x86 {9A7C1386-F66E-49DD-994C-F5935A0D196F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 {9A7C1386-F66E-49DD-994C-F5935A0D196F}.Debug|Mixed Platforms.Build.0 = Debug|x86