Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/ClipboardWatcher

app/DD_Clipboard_Searcher/frmStart.Designer.vb

@@ -33,8 +33,8 @@ Partial Class frmStart
         Me.ClientBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
         Me.labelUser = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.lblrefresh = 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()
@@ -47,8 +47,8 @@ Partial Class frmStart
         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.labelRefresh = New System.Windows.Forms.Label()
         Me.labelStatus = New System.Windows.Forms.Label()
+        Me.labelRefresh = New System.Windows.Forms.Label()
         Me.cmstrpNotifyIcon.SuspendLayout()
         Me.StatusStrip1.SuspendLayout()
         Me.ContextMenuStripForm.SuspendLayout()
@@ -70,13 +70,13 @@ 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(250, 92)
+        Me.cmstrpNotifyIcon.Size = New System.Drawing.Size(220, 114)
         '
         'AblaufAnzeigenToolStripMenuItem
         '
         Me.AblaufAnzeigenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BisherigenAblaufAnzeigenToolStripMenuItem})
         Me.AblaufAnzeigenToolStripMenuItem.Name = "AblaufAnzeigenToolStripMenuItem"
-        Me.AblaufAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(249, 22)
+        Me.AblaufAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(219, 22)
         Me.AblaufAnzeigenToolStripMenuItem.Text = "Funktionen"
         '
         'BisherigenAblaufAnzeigenToolStripMenuItem
@@ -89,22 +89,22 @@ Partial Class frmStart
         '
         Me.tsmiChangeState.Image = Global.DD_Clipboard_Watcher.My.Resources.Resources.StatusAnnotations_Stop_16xLG
         Me.tsmiChangeState.Name = "tsmiChangeState"
-        Me.tsmiChangeState.Size = New System.Drawing.Size(249, 22)
+        Me.tsmiChangeState.Size = New System.Drawing.Size(219, 22)
         Me.tsmiChangeState.Tag = "stop"
-        Me.tsmiChangeState.Text = "Überwachung Clipboard stoppen"
+        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(249, 22)
+        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(249, 22)
+        Me.ClientBeendenToolStripMenuItem.Size = New System.Drawing.Size(219, 22)
         Me.ClientBeendenToolStripMenuItem.Text = "Client beenden"
         '
         'StatusStrip1
@@ -124,18 +124,18 @@ Partial Class frmStart
         Me.labelUser.Size = New System.Drawing.Size(37, 17)
         Me.labelUser.Text = "{0}"
         '
-        'lblrefresh
-        '
-        Me.lblrefresh.Name = "lblrefresh"
-        Me.lblrefresh.Size = New System.Drawing.Size(59, 17)
-        Me.lblrefresh.Text = "lblRefresh"
-        '
         'labelVersion
         '
         Me.labelVersion.Name = "labelVersion"
         Me.labelVersion.Size = New System.Drawing.Size(62, 17)
         Me.labelVersion.Text = "Version {0}"
         '
+        'lblrefresh
+        '
+        Me.lblrefresh.Name = "lblrefresh"
+        Me.lblrefresh.Size = New System.Drawing.Size(59, 17)
+        Me.lblrefresh.Text = "lblRefresh"
+        '
         'TimerClose
         '
         Me.TimerClose.Interval = 10000
@@ -250,6 +250,15 @@ Partial Class frmStart
         Me.GroupBox2.TabStop = False
         Me.GroupBox2.Text = "Informationen"
         '
+        'labelStatus
+        '
+        Me.labelStatus.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.labelStatus.Location = New System.Drawing.Point(8, 34)
+        Me.labelStatus.Name = "labelStatus"
+        Me.labelStatus.Size = New System.Drawing.Size(304, 27)
+        Me.labelStatus.TabIndex = 0
+        Me.labelStatus.Text = "Label3"
+        '
         'labelRefresh
         '
         Me.labelRefresh.AutoSize = True
@@ -260,15 +269,6 @@ Partial Class frmStart
         Me.labelRefresh.TabIndex = 0
         Me.labelRefresh.Text = "Aktualisierung erfolgreich."
         '
-        'labelStatus
-        '
-        Me.labelStatus.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.labelStatus.Location = New System.Drawing.Point(8, 34)
-        Me.labelStatus.Name = "labelStatus"
-        Me.labelStatus.Size = New System.Drawing.Size(304, 27)
-        Me.labelStatus.TabIndex = 0
-        Me.labelStatus.Text = "Label3"
-        '
         'frmStart
         '
         Me.Appearance.Options.UseFont = True

app/DD_Clipboard_Searcher/frmStart.resx

@@ -4663,7 +4663,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABU
-        CwAAAk1TRnQBSQFMAgEBBQEAATABAAEwAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CwAAAk1TRnQBSQFMAgEBBQEAATgBAAE4AQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

app/DD_Clipboard_Searcher/frmStart.vb

@@ -350,13 +350,13 @@ Public Class frmStart
         If tsmiChangeState.Tag = "stop" Then
             tsmiChangeState.Tag = "start"
             tsmiChangeState.Image = My.Resources.control_start_blue
-            tsmiChangeState.Text = "Überwachung Clipboard starten"
+            tsmiChangeState.Text = "Clipboard Watcher starten"
             MONITORING_ACTIVE = False
-            NotifyIconMain.ShowBalloonTip(30000, "Clipboard Watcher", "Clipboard-Watcher wurde inaktiviert!", ToolTipIcon.Info)
+            NotifyIconMain.ShowBalloonTip(30000, "Clipboard Watcher", "Clipboard-Watcher wurde deaktiviert!", ToolTipIcon.Info)
         Else
             tsmiChangeState.Image = My.Resources.StatusAnnotations_Stop_16xLG
             tsmiChangeState.Tag = "stop"
-            tsmiChangeState.Text = "Überwachung Clipboard stoppen"
+            tsmiChangeState.Text = "Clipboard Watcher stoppen"
             MONITORING_ACTIVE = True
             NotifyIconMain.ShowBalloonTip(30000, "Clipboard Watcher", "Clipboard-Watcher wurde wieder aktiviert!", ToolTipIcon.Info)
         End If