From 286b61e68797c6a5fa58fa1958a0ce8553efd862 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 25 Mar 2021 13:59:59 +0100 Subject: [PATCH] use AlertControl for search popup, show clipboard contents in popup, --- app/DD_Clipboard_Searcher/ClassInit.vb | 4 +- app/DD_Clipboard_Searcher/ClassLicense.vb | 2 +- .../frmAdministration.Designer.vb | 68 +++++++++---------- app/DD_Clipboard_Searcher/frmConfig_Basic.vb | 4 +- app/DD_Clipboard_Searcher/frmLicense.vb | 3 +- app/DD_Clipboard_Searcher/frmMain.Designer.vb | 20 +++++- app/DD_Clipboard_Searcher/frmMain.resx | 7 +- app/DD_Clipboard_Searcher/frmMain.vb | 59 ++++++++++++---- app/DD_Clipboard_Searcher/modCurrent.vb | 4 +- 9 files changed, 112 insertions(+), 59 deletions(-) diff --git a/app/DD_Clipboard_Searcher/ClassInit.vb b/app/DD_Clipboard_Searcher/ClassInit.vb index 6382e6a..1270d30 100644 --- a/app/DD_Clipboard_Searcher/ClassInit.vb +++ b/app/DD_Clipboard_Searcher/ClassInit.vb @@ -322,7 +322,7 @@ Public Class ClassInit Logger.Info(" - User: " & USER_USERNAME & " not related to module!", False) Dim msg = String.Format("Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systemadministrator in Verbindung!") - If USER_LANGUAGE <> "de-DE" Then + If USER_LANGUAGE <> LANGUAGE_GERMAN Then msg = String.Format("You are not authorized for using this module." & vbNewLine & "Please contact the admin.") End If MsgBox(msg, MsgBoxStyle.Exclamation, "Attention:") @@ -361,7 +361,7 @@ Public Class ClassInit If LICENSE_COUNT < USERCOUNT_LOGGED_IN And LICENSE_EXPIRED = False Then Dim msg = String.Format("Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!") - If USER_LANGUAGE <> "de-DE" Then + If USER_LANGUAGE <> LANGUAGE_GERMAN Then msg = String.Format("The number of logged Users (" & USERCOUNT_LOGGED_IN.ToString & ") exceeds the number of licenses." & vbNewLine & "Number of licenses: " & LICENSE_COUNT.ToString & vbNewLine & "Please contact Your admin!") End If diff --git a/app/DD_Clipboard_Searcher/ClassLicense.vb b/app/DD_Clipboard_Searcher/ClassLicense.vb index 3cf21a1..22d2638 100644 --- a/app/DD_Clipboard_Searcher/ClassLicense.vb +++ b/app/DD_Clipboard_Searcher/ClassLicense.vb @@ -34,7 +34,7 @@ Public Class ClassLicense LICENSE_COUNT = split(0) Try Dim cultureInfo As System.Globalization.CultureInfo - cultureInfo = New System.Globalization.CultureInfo("de-DE") + cultureInfo = New System.Globalization.CultureInfo(LANGUAGE_GERMAN) cultureInfo.DateTimeFormat.ShortDatePattern = "dd.MM.yyyy" Try Dim oLicDate As Date = Convert.ToDateTime(split(1), cultureInfo) diff --git a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb index 530d17a..a5378c4 100644 --- a/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmAdministration.Designer.vb @@ -1215,7 +1215,7 @@ Partial Class frmAdministration 'CheckEdit3 ' Me.CheckEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "ACTIVE", True)) - Me.CheckEdit3.Location = New System.Drawing.Point(-8, 12) + Me.CheckEdit3.Location = New System.Drawing.Point(12, 12) Me.CheckEdit3.Name = "CheckEdit3" Me.CheckEdit3.Properties.Caption = "Suche Aktiv" Me.CheckEdit3.Size = New System.Drawing.Size(286, 18) @@ -1225,7 +1225,7 @@ Partial Class frmAdministration 'TextEdit17 ' Me.TextEdit17.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "ADDED_WHO", True)) - Me.TextEdit17.Location = New System.Drawing.Point(0, 218) + Me.TextEdit17.Location = New System.Drawing.Point(20, 218) Me.TextEdit17.Name = "TextEdit17" Me.TextEdit17.Properties.ReadOnly = True Me.TextEdit17.Size = New System.Drawing.Size(125, 20) @@ -1235,7 +1235,7 @@ Partial Class frmAdministration 'TextEdit15 ' Me.TextEdit15.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "ADDED_WHEN", True)) - Me.TextEdit15.Location = New System.Drawing.Point(145, 218) + Me.TextEdit15.Location = New System.Drawing.Point(165, 218) Me.TextEdit15.Name = "TextEdit15" Me.TextEdit15.Properties.ReadOnly = True Me.TextEdit15.Size = New System.Drawing.Size(125, 20) @@ -1245,7 +1245,7 @@ Partial Class frmAdministration 'TextEdit18 ' Me.TextEdit18.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "CHANGED_WHEN", True)) - Me.TextEdit18.Location = New System.Drawing.Point(145, 274) + Me.TextEdit18.Location = New System.Drawing.Point(165, 274) Me.TextEdit18.Name = "TextEdit18" Me.TextEdit18.Properties.ReadOnly = True Me.TextEdit18.Size = New System.Drawing.Size(125, 20) @@ -1255,7 +1255,7 @@ Partial Class frmAdministration 'CHANGED_WHOTextBox2 ' Me.CHANGED_WHOTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "CHANGED_WHO", True)) - Me.CHANGED_WHOTextBox2.Location = New System.Drawing.Point(0, 274) + Me.CHANGED_WHOTextBox2.Location = New System.Drawing.Point(20, 274) Me.CHANGED_WHOTextBox2.Name = "CHANGED_WHOTextBox2" Me.CHANGED_WHOTextBox2.Properties.ReadOnly = True Me.CHANGED_WHOTextBox2.Size = New System.Drawing.Size(125, 20) @@ -1266,7 +1266,7 @@ Partial Class frmAdministration ' Me.txtDocSearchName.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "TAB_TITLE", True)) Me.txtDocSearchName.EditValue = "" - Me.txtDocSearchName.Location = New System.Drawing.Point(128, 82) + Me.txtDocSearchName.Location = New System.Drawing.Point(148, 82) Me.txtDocSearchName.Name = "txtDocSearchName" Me.txtDocSearchName.Size = New System.Drawing.Size(142, 20) Me.txtDocSearchName.StyleController = Me.LayoutControlDocs @@ -1275,7 +1275,7 @@ Partial Class frmAdministration 'LookUpEdit1 ' Me.LookUpEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "CONN_ID", True)) - Me.LookUpEdit1.Location = New System.Drawing.Point(128, 162) + Me.LookUpEdit1.Location = New System.Drawing.Point(148, 162) Me.LookUpEdit1.Name = "LookUpEdit1" Me.LookUpEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.LookUpEdit1.Properties.Columns.AddRange(New DevExpress.XtraEditors.Controls.LookUpColumnInfo() {New DevExpress.XtraEditors.Controls.LookUpColumnInfo("BEZEICHNUNG", "Verbindung", 80, DevExpress.Utils.FormatType.None, "", True, DevExpress.Utils.HorzAlignment.Near, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.[Default])}) @@ -1297,29 +1297,29 @@ Partial Class frmAdministration 'MemoEdit5 ' Me.MemoEdit5.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "SQL_COMMAND", True)) - Me.MemoEdit5.Location = New System.Drawing.Point(282, 54) + Me.MemoEdit5.Location = New System.Drawing.Point(302, 54) Me.MemoEdit5.Name = "MemoEdit5" Me.MemoEdit5.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MemoEdit5.Properties.Appearance.Options.UseFont = True - Me.MemoEdit5.Size = New System.Drawing.Size(620, 154) + Me.MemoEdit5.Size = New System.Drawing.Size(620, 248) Me.MemoEdit5.StyleController = Me.LayoutControlDocs Me.MemoEdit5.TabIndex = 12 ' 'MemoEdit6 ' Me.MemoEdit6.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "COUNT_COMMAND", True)) - Me.MemoEdit6.Location = New System.Drawing.Point(282, 291) + Me.MemoEdit6.Location = New System.Drawing.Point(302, 385) Me.MemoEdit6.Name = "MemoEdit6" Me.MemoEdit6.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MemoEdit6.Properties.Appearance.Options.UseFont = True - Me.MemoEdit6.Size = New System.Drawing.Size(620, 227) + Me.MemoEdit6.Size = New System.Drawing.Size(620, 133) Me.MemoEdit6.StyleController = Me.LayoutControlDocs Me.MemoEdit6.TabIndex = 13 ' 'txtDOC_GUID ' Me.txtDOC_GUID.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DOC_SEARCHBindingSource, "GUID", True)) - Me.txtDOC_GUID.Location = New System.Drawing.Point(128, 42) + Me.txtDOC_GUID.Location = New System.Drawing.Point(148, 42) Me.txtDOC_GUID.Name = "txtDOC_GUID" Me.txtDOC_GUID.Properties.ReadOnly = True Me.txtDOC_GUID.Size = New System.Drawing.Size(142, 20) @@ -1329,7 +1329,7 @@ Partial Class frmAdministration 'TextEdit19 ' Me.TextEdit19.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROF_DOC_SEARCHBindingSource, "TAB_INDEX", True)) - Me.TextEdit19.Location = New System.Drawing.Point(128, 122) + Me.TextEdit19.Location = New System.Drawing.Point(148, 122) Me.TextEdit19.Name = "TextEdit19" Me.TextEdit19.Properties.AutoHeight = False Me.TextEdit19.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) @@ -1351,7 +1351,7 @@ Partial Class frmAdministration ' 'ComboBoxEdit3 ' - Me.ComboBoxEdit3.Location = New System.Drawing.Point(410, 12) + Me.ComboBoxEdit3.Location = New System.Drawing.Point(430, 12) Me.ComboBoxEdit3.MenuManager = Me.RibbonControl2 Me.ComboBoxEdit3.Name = "ComboBoxEdit3" Me.ComboBoxEdit3.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) @@ -1361,7 +1361,7 @@ Partial Class frmAdministration ' 'SimpleButton2 ' - Me.SimpleButton2.Location = New System.Drawing.Point(843, 12) + Me.SimpleButton2.Location = New System.Drawing.Point(863, 12) Me.SimpleButton2.Name = "SimpleButton2" Me.SimpleButton2.Size = New System.Drawing.Size(59, 22) Me.SimpleButton2.StyleController = Me.LayoutControlDocs @@ -1370,7 +1370,7 @@ Partial Class frmAdministration ' 'ComboBoxEdit4 ' - Me.ComboBoxEdit4.Location = New System.Drawing.Point(410, 249) + Me.ComboBoxEdit4.Location = New System.Drawing.Point(430, 343) Me.ComboBoxEdit4.MenuManager = Me.RibbonControl2 Me.ComboBoxEdit4.Name = "ComboBoxEdit4" Me.ComboBoxEdit4.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) @@ -1380,7 +1380,7 @@ Partial Class frmAdministration ' 'SimpleButton3 ' - Me.SimpleButton3.Location = New System.Drawing.Point(843, 249) + Me.SimpleButton3.Location = New System.Drawing.Point(863, 343) Me.SimpleButton3.Name = "SimpleButton3" Me.SimpleButton3.Size = New System.Drawing.Size(59, 22) Me.SimpleButton3.StyleController = Me.LayoutControlDocs @@ -1477,9 +1477,9 @@ Partial Class frmAdministration ' Me.LayoutControlItem33.Control = Me.MemoEdit6 Me.LayoutControlItem33.CustomizationFormText = "SQL für Ergebnis Zählung:" - Me.LayoutControlItem33.Location = New System.Drawing.Point(290, 263) + Me.LayoutControlItem33.Location = New System.Drawing.Point(290, 357) Me.LayoutControlItem33.Name = "LayoutControlItem33" - Me.LayoutControlItem33.Size = New System.Drawing.Size(624, 247) + Me.LayoutControlItem33.Size = New System.Drawing.Size(624, 153) Me.LayoutControlItem33.Text = "SQL für Ergebnis Zählung:" Me.LayoutControlItem33.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem33.TextSize = New System.Drawing.Size(125, 13) @@ -1490,7 +1490,7 @@ Partial Class frmAdministration Me.LayoutControlItem32.CustomizationFormText = "SQL für Suche:" Me.LayoutControlItem32.Location = New System.Drawing.Point(290, 26) Me.LayoutControlItem32.Name = "LayoutControlItem32" - Me.LayoutControlItem32.Size = New System.Drawing.Size(624, 174) + Me.LayoutControlItem32.Size = New System.Drawing.Size(624, 268) Me.LayoutControlItem32.Text = "SQL für Suche:" Me.LayoutControlItem32.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem32.TextSize = New System.Drawing.Size(125, 13) @@ -1550,7 +1550,7 @@ Partial Class frmAdministration 'LayoutControlItem39 ' Me.LayoutControlItem39.Control = Me.ComboBoxEdit4 - Me.LayoutControlItem39.Location = New System.Drawing.Point(290, 237) + Me.LayoutControlItem39.Location = New System.Drawing.Point(290, 331) Me.LayoutControlItem39.Name = "LayoutControlItem39" Me.LayoutControlItem39.Size = New System.Drawing.Size(561, 26) Me.LayoutControlItem39.Text = "Platzhalter" @@ -1559,7 +1559,7 @@ Partial Class frmAdministration 'LayoutControlItem40 ' Me.LayoutControlItem40.Control = Me.SimpleButton3 - Me.LayoutControlItem40.Location = New System.Drawing.Point(851, 237) + Me.LayoutControlItem40.Location = New System.Drawing.Point(851, 331) Me.LayoutControlItem40.Name = "LayoutControlItem40" Me.LayoutControlItem40.Size = New System.Drawing.Size(63, 26) Me.LayoutControlItem40.TextSize = New System.Drawing.Size(0, 0) @@ -1569,7 +1569,7 @@ Partial Class frmAdministration ' Me.SimpleLabelItem1.AllowHotTrack = False Me.SimpleLabelItem1.ImageOptions.SvgImage = CType(resources.GetObject("SimpleLabelItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.SimpleLabelItem1.Location = New System.Drawing.Point(290, 200) + Me.SimpleLabelItem1.Location = New System.Drawing.Point(290, 294) Me.SimpleLabelItem1.Name = "SimpleLabelItem1" Me.SimpleLabelItem1.Size = New System.Drawing.Size(624, 36) Me.SimpleLabelItem1.Text = "Die folgenden Spalten müssen existieren: DocId (Eindeutige Id), Name (Dateiname) " & @@ -1580,7 +1580,7 @@ Partial Class frmAdministration 'SimpleSeparator2 ' Me.SimpleSeparator2.AllowHotTrack = False - Me.SimpleSeparator2.Location = New System.Drawing.Point(290, 236) + Me.SimpleSeparator2.Location = New System.Drawing.Point(290, 330) Me.SimpleSeparator2.Name = "SimpleSeparator2" Me.SimpleSeparator2.Size = New System.Drawing.Size(624, 1) ' @@ -1748,19 +1748,19 @@ Partial Class frmAdministration Me.MemoEdit3.Name = "MemoEdit3" Me.MemoEdit3.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MemoEdit3.Properties.Appearance.Options.UseFont = True - Me.MemoEdit3.Size = New System.Drawing.Size(523, 220) + Me.MemoEdit3.Size = New System.Drawing.Size(523, 248) Me.MemoEdit3.StyleController = Me.LayoutControlData Me.MemoEdit3.TabIndex = 12 ' 'MemoEdit4 ' Me.MemoEdit4.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBCW_PROF_DATA_SEARCHBindingSource, "COUNT_COMMAND", True)) - Me.MemoEdit4.Location = New System.Drawing.Point(379, 320) + Me.MemoEdit4.Location = New System.Drawing.Point(379, 348) Me.MemoEdit4.MenuManager = Me.RibbonControl2 Me.MemoEdit4.Name = "MemoEdit4" Me.MemoEdit4.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MemoEdit4.Properties.Appearance.Options.UseFont = True - Me.MemoEdit4.Size = New System.Drawing.Size(523, 215) + Me.MemoEdit4.Size = New System.Drawing.Size(523, 187) Me.MemoEdit4.StyleController = Me.LayoutControlData Me.MemoEdit4.TabIndex = 13 ' @@ -1815,7 +1815,7 @@ Partial Class frmAdministration ' 'ComboBoxEdit6 ' - Me.ComboBoxEdit6.Location = New System.Drawing.Point(507, 278) + Me.ComboBoxEdit6.Location = New System.Drawing.Point(507, 306) Me.ComboBoxEdit6.MenuManager = Me.RibbonControl2 Me.ComboBoxEdit6.Name = "ComboBoxEdit6" Me.ComboBoxEdit6.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) @@ -1825,7 +1825,7 @@ Partial Class frmAdministration ' 'SimpleButton5 ' - Me.SimpleButton5.Location = New System.Drawing.Point(848, 278) + Me.SimpleButton5.Location = New System.Drawing.Point(848, 306) Me.SimpleButton5.Name = "SimpleButton5" Me.SimpleButton5.Size = New System.Drawing.Size(54, 22) Me.SimpleButton5.StyleController = Me.LayoutControlData @@ -1933,7 +1933,7 @@ Partial Class frmAdministration Me.LayoutControlItem21.Control = Me.MemoEdit3 Me.LayoutControlItem21.Location = New System.Drawing.Point(367, 26) Me.LayoutControlItem21.Name = "LayoutControlItem21" - Me.LayoutControlItem21.Size = New System.Drawing.Size(527, 240) + Me.LayoutControlItem21.Size = New System.Drawing.Size(527, 268) Me.LayoutControlItem21.Text = "SQL für Suche:" Me.LayoutControlItem21.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem21.TextSize = New System.Drawing.Size(125, 13) @@ -1941,9 +1941,9 @@ Partial Class frmAdministration 'LayoutControlItem22 ' Me.LayoutControlItem22.Control = Me.MemoEdit4 - Me.LayoutControlItem22.Location = New System.Drawing.Point(367, 292) + Me.LayoutControlItem22.Location = New System.Drawing.Point(367, 320) Me.LayoutControlItem22.Name = "LayoutControlItem22" - Me.LayoutControlItem22.Size = New System.Drawing.Size(527, 235) + Me.LayoutControlItem22.Size = New System.Drawing.Size(527, 207) Me.LayoutControlItem22.Text = "SQL für Ergebnis Zählung:" Me.LayoutControlItem22.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem22.TextSize = New System.Drawing.Size(125, 13) @@ -1987,7 +1987,7 @@ Partial Class frmAdministration 'LayoutControlItem43 ' Me.LayoutControlItem43.Control = Me.ComboBoxEdit6 - Me.LayoutControlItem43.Location = New System.Drawing.Point(367, 266) + Me.LayoutControlItem43.Location = New System.Drawing.Point(367, 294) Me.LayoutControlItem43.Name = "LayoutControlItem43" Me.LayoutControlItem43.Size = New System.Drawing.Size(469, 26) Me.LayoutControlItem43.Text = "Platzhalter" @@ -1996,7 +1996,7 @@ Partial Class frmAdministration 'LayoutControlItem44 ' Me.LayoutControlItem44.Control = Me.SimpleButton5 - Me.LayoutControlItem44.Location = New System.Drawing.Point(836, 266) + Me.LayoutControlItem44.Location = New System.Drawing.Point(836, 294) Me.LayoutControlItem44.Name = "LayoutControlItem44" Me.LayoutControlItem44.Size = New System.Drawing.Size(58, 26) Me.LayoutControlItem44.TextSize = New System.Drawing.Size(0, 0) diff --git a/app/DD_Clipboard_Searcher/frmConfig_Basic.vb b/app/DD_Clipboard_Searcher/frmConfig_Basic.vb index 890cab3..47443f2 100644 --- a/app/DD_Clipboard_Searcher/frmConfig_Basic.vb +++ b/app/DD_Clipboard_Searcher/frmConfig_Basic.vb @@ -22,7 +22,7 @@ Public Class frmConfig_Basic 'DialogResult = Windows.Forms.DialogResult.OK Dim result As MsgBoxResult Dim msg = "Die Verbindung wurde erfolgreich aufgebaut!" & vbNewLine & "Möchten Sie diese Verbindung nun in der Anwendung speichern?" - If USER_LANGUAGE <> "de-DE" Then + If USER_LANGUAGE <> LANGUAGE_GERMAN Then msg = "Connection was successfully opened!" & vbNewLine & "Would You like to save it?" End If result = MessageBox.Show(msg, "Database-Connection", MessageBoxButtons.YesNo, MessageBoxIcon.Question) @@ -196,7 +196,7 @@ Public Class frmConfig_Basic End If Dim msg = "Die Änderung des Hotkeys war erfolgreich." & vbNewLine & "Da es sich um einen global Hotkey handelt muss die Anwendung neugestartet werden!" - If USER_LANGUAGE <> "de-DE" Then + If USER_LANGUAGE <> LANGUAGE_GERMAN Then msg = "The change of your desired hotkey was successfull." & vbNewLine & "For using it the application must be restarted now!" End If MsgBox(msg, MsgBoxStyle.Information) diff --git a/app/DD_Clipboard_Searcher/frmLicense.vb b/app/DD_Clipboard_Searcher/frmLicense.vb index 5b12606..be08e9a 100644 --- a/app/DD_Clipboard_Searcher/frmLicense.vb +++ b/app/DD_Clipboard_Searcher/frmLicense.vb @@ -3,6 +3,7 @@ Imports DD_LIB_Standards Public Class frmLicense Dim CLIENT_ID As Integer Public _lizenzManager As clsLicenseManager + Private Sub btnPW_check_Click(sender As System.Object, e As System.EventArgs) Handles btnPW_check.Click OpenLicenseManager() End Sub @@ -79,7 +80,7 @@ Public Class frmLicense If Neu = True Then If CInt(LICENSE_COUNT) > 0 Then Dim msg As String = "Die Lizenz wurde aktualisiert!" & vbNewLine & Now - If USER_LANGUAGE <> "de-DE" Then + If USER_LANGUAGE <> LANGUAGE_GERMAN Then msg = "The license was renewed!" & vbNewLine & Now End If MsgBox(msg, MsgBoxStyle.Information, "License renewed:") diff --git a/app/DD_Clipboard_Searcher/frmMain.Designer.vb b/app/DD_Clipboard_Searcher/frmMain.Designer.vb index df13746..8253d6c 100644 --- a/app/DD_Clipboard_Searcher/frmMain.Designer.vb +++ b/app/DD_Clipboard_Searcher/frmMain.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmMain Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class frmMain 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain)) @@ -53,6 +53,7 @@ Partial Class frmMain Me.ContextMenuStripForm = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.MinimierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ImageList1 = New System.Windows.Forms.ImageList(Me.components) + Me.AlertControl1 = New DevExpress.XtraBars.Alerter.AlertControl(Me.components) CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox2.SuspendLayout() Me.GroupBox1.SuspendLayout() @@ -298,6 +299,18 @@ Partial Class frmMain Me.ImageList1.Images.SetKeyName(3, "WindowsForm_817.ico") Me.ImageList1.Images.SetKeyName(4, "process_16xMD.png") ' + 'AlertControl1 + ' + Me.AlertControl1.AllowHotTrack = False + Me.AlertControl1.AppearanceCaption.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.AlertControl1.AppearanceCaption.Options.UseFont = True + Me.AlertControl1.AppearanceText.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.AlertControl1.AppearanceText.Options.UseFont = True + Me.AlertControl1.AutoFormDelay = 2500 + Me.AlertControl1.AutoHeight = True + Me.AlertControl1.FormShowingEffect = DevExpress.XtraBars.Alerter.AlertFormShowingEffect.SlideHorizontal + Me.AlertControl1.ShowPinButton = False + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -357,4 +370,5 @@ Partial Class frmMain Friend WithEvents ContextMenuStripForm As ContextMenuStrip Friend WithEvents MinimierenToolStripMenuItem As ToolStripMenuItem Friend WithEvents ImageList1 As ImageList + Friend WithEvents AlertControl1 As DevExpress.XtraBars.Alerter.AlertControl End Class diff --git a/app/DD_Clipboard_Searcher/frmMain.resx b/app/DD_Clipboard_Searcher/frmMain.resx index 35ad437..0ab327f 100644 --- a/app/DD_Clipboard_Searcher/frmMain.resx +++ b/app/DD_Clipboard_Searcher/frmMain.resx @@ -4796,14 +4796,14 @@ 511, 17 - 817, 17 + 815, 17 AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABU - CwAAAk1TRnQBSQFMAgEBBQEAAaABAAGgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CwAAAk1TRnQBSQFMAgEBBQEAAdgBAAHYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -4854,6 +4854,9 @@ Af8BnwL/AQABBwGAAQAE/wHAB/8BwQP/Cw== + + 690, 17 + AAABAAEAAAAAAAEAIAAoIAQAFgAAACgAAAAAAQAAAAIAAAEAIAAAAAAAACAEABMLAAATCwAAAAAAAAAA diff --git a/app/DD_Clipboard_Searcher/frmMain.vb b/app/DD_Clipboard_Searcher/frmMain.vb index a59bca2..f6c96ad 100644 --- a/app/DD_Clipboard_Searcher/frmMain.vb +++ b/app/DD_Clipboard_Searcher/frmMain.vb @@ -6,6 +6,8 @@ Imports DD_Clipboard_Watcher.ClassWindowAPI Imports DigitalData.Modules.ZooFlow Imports DigitalData.Modules.Windows Imports DigitalData.GUIs.ClipboardWatcher +Imports DevExpress.XtraBars.ToastNotifications + Public Class frmMain Private WithEvents _Hotkey As New ClassHotkey(Me) Private WithEvents _Watcher As ClassClipboardWatcher = ClassClipboardWatcher.Singleton @@ -235,10 +237,28 @@ Public Class frmMain Logger.Info("ReceiveHotKey - No profiles matched the Clipboard-Content!") Logger.Info("NOMATCH_INFO = {0}", NOMATCH_INFO) If NOMATCH_INFO = False Then - NotifyIconMain.BalloonTipTitle = "Clipboard Watcher" - NotifyIconMain.BalloonTipText = "Es wurden keine passenden Profile gefunden." - NotifyIconMain.BalloonTipIcon = ToolTipIcon.Warning - NotifyIconMain.ShowBalloonTip(2500) + Dim oMessageTitle As String + Dim oMessageText As String + + If USER_LANGUAGE <> LANGUAGE_GERMAN Then + oMessageTitle = "Clipboard Watcher" + oMessageText = $"No matching profile were found for the term '{CURRENT_CLIPBOARD_CONTENTS}'!" + Else + oMessageTitle = "Clipboard Watcher" + oMessageText = $"Es wurden keine passenden Profile gefunden für die Suche nach '{CURRENT_CLIPBOARD_CONTENTS}'!" + End If + + If NOTIFY_MODE.ToUpper = "MSGBOX" Then + MsgBox(oMessageText, MsgBoxStyle.Exclamation, oMessageTitle) + Else + 'NotifyIconMain.BalloonTipTitle = oMessageTitle + 'NotifyIconMain.BalloonTipText = oMessageText + 'NotifyIconMain.BalloonTipIcon = ToolTipIcon.Warning + 'NotifyIconMain.ShowBalloonTip(2500) + + AlertControl1.AutoFormDelay = 2500 + AlertControl1.Show(Me, oMessageTitle, oMessageText) + End If Else Logger.Info("Popup will not be shown. NOMATCH_INFO Is True.") End If @@ -247,14 +267,31 @@ Public Class frmMain Logger.Info("ReceiveHotKey - No documents or data found for Clipboard-Content!") Logger.Info("NOMATCH_INFO = {0}", NOMATCH_INFO) If NOMATCH_INFO = False Then - NotifyIconMain.BalloonTipTitle = "Clipboard Watcher" - NotifyIconMain.BalloonTipText = "Es wurden weder Dokumente noch Daten gefunden!" - NotifyIconMain.BalloonTipIcon = ToolTipIcon.Warning - NotifyIconMain.ShowBalloonTip(2500) + Dim oMessageTitle As String + Dim oMessageText As String + + If USER_LANGUAGE <> LANGUAGE_GERMAN Then + oMessageTitle = "Clipboard Watcher" + oMessageText = $"No documents or records were found for the term '{CURRENT_CLIPBOARD_CONTENTS}'!" + Else + oMessageTitle = "Clipboard Watcher" + oMessageText = $"Es wurden weder Dokumente noch Daten gefunden für die Suche nach '{CURRENT_CLIPBOARD_CONTENTS}'!" + End If + + If NOTIFY_MODE.ToUpper = "MSGBOX" Then + MsgBox(oMessageText, MsgBoxStyle.Exclamation, oMessageTitle) + Else + 'NotifyIconMain.BalloonTipTitle = oMessageTitle + 'NotifyIconMain.BalloonTipText = oMessageText + 'NotifyIconMain.BalloonTipIcon = ToolTipIcon.Warning + 'NotifyIconMain.ShowBalloonTip(2500) + + AlertControl1.AutoFormDelay = 2500 + AlertControl1.Show(Me, oMessageTitle, oMessageText) + End If Else Logger.Info("Popup will not be shown. NOMATCH_INFO Is True.") End If - Else OpenMatchForm() End If @@ -372,14 +409,10 @@ Public Class frmMain Private Sub MinimierenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MinimierenToolStripMenuItem.Click Hide() End Sub - Private Sub ClientÖffnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ClientÖffnenToolStripMenuItem.Click OpenClose() End Sub - - - Private Sub ClientBeendenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ClientBeendenToolStripMenuItem.Click Shut_Down() End Sub diff --git a/app/DD_Clipboard_Searcher/modCurrent.vb b/app/DD_Clipboard_Searcher/modCurrent.vb index c452d61..b0fd36f 100644 --- a/app/DD_Clipboard_Searcher/modCurrent.vb +++ b/app/DD_Clipboard_Searcher/modCurrent.vb @@ -11,6 +11,8 @@ Module modCurrent Public DatabaseAppServ As MSSQLServer Public Automation As ClassAutomation + Public Const LANGUAGE_GERMAN As String = "de-DE" + Public ConfigManager As ConfigManager(Of ClassConfig) @@ -31,7 +33,7 @@ Module modCurrent Public USER_SURNAME Public USER_SHORTNAME Public USER_EMAIL - Public USER_LANGUAGE As String = "de-DE" + Public USER_LANGUAGE As String = LANGUAGE_GERMAN Public USER_DATE_FORMAT As String Public USER_EXISTS = False Public USER_IN_MODULE = False