Improve frmMain

2021-01-11 14:27:03 +01:00 · 2021-01-11 14:27:03 +01:00 · 0014948bf5
commit 0014948bf5
parent 2b7bee6b04
5 changed files with 79 additions and 21 deletions
--- a/app/DD_Clipboard_Searcher/frmClientLogin.designer.vb
+++ b/app/DD_Clipboard_Searcher/frmClientLogin.designer.vb
@ -1,6 +1,6 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
 Partial Class frmClientLogin
-    Inherits System.Windows.Forms.Form
+    Inherits DevExpress.XtraEditors.XtraForm

    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
    <System.Diagnostics.DebuggerNonUserCode()> _
--- a/app/DD_Clipboard_Searcher/frmClientLogin.resx
+++ b/app/DD_Clipboard_Searcher/frmClientLogin.resx
@ -208,15 +208,15 @@
  </data>
  <data name="btnLogin.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGdSURBVFhH7ZM9boQwEIU5Qo6QI+QM9Ehp6VLQc4vt6ZFS
-        UuYG9FS5AkWShsKJxE9JeNYMMcYQbFixivKkT9r1zLw3XhZvr7quu2+a5rltWzHQEwJnqFHbdVTX9YMW
-        rCPQQ+3HCrdDAILyPO/DMOx935fgM854iav8EvSzyyAO1uEl0Etjxwk3g7l6cx3U0INeGjtOZGwMVuE+
-        GjtON7PAaY/g9D/hKa8hGe6G7OxlMnOB7OzFBupzBpfLZRaCM72Pa2RnLzbQjYG6hCkccJ3sljX8ax+H
-        xhce0DGZAwQvhQOep5i5hBB3/HqtEUWRMeA3eJ7i5uLwqqrkTYIgGIfxGWeooSeO44n5FlYXGN7VJxTL
-        spwE66CGHiyi972/fUjUM5XVBYbCK4rqzdI07YuikOAzn6MHvUmSjGfAeQE8exRwK27OsmwcYHCmmmEx
-        /r4F9qHYH/ECLpiCluAZip1KNbXBFLQEz1DkVLaG3O8CRU7FRVOYCdXQFoqciot60Kf4kujnq2Yu+l/g
-        ZhdY4u8uYAuN75fJfAs07ijP+wYj01KCKhcnhQAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAAZ1JREFUWEftkz1uhDAQhTlCjpAj5Az0SGnpUtBzi+3pkVJS5gb0VLkCRZKGwonE
+        T0l41gwxxhBsWLGK8qRP2vXMvDdeFm+vuq67b5rmuW1bMdATAmeoUdt1VNf1gxasI9BD7ccKt0MAgvI8
+        78Mw7H3fl+AzzniJq/wS9LPLIA7W4SXQS2PHCTeDuXpzHdTQg14aO05kbAxW4T4aO043s8Bpj+D0P+Ep
+        ryEZ7obs7GUyc4Hs7MUG6nMGl8tlFoIzvY9rZGcvNtCNgbqEKRxwneyWNfxrH4fGFx7QMZkDBC+FA56n
+        mLmEEHf8eq0RRZEx4Dd4nuLm4vCqquRNgiAYh/EZZ6ihJ47jifkWVhcY3tUnFMuynATroIYeLKL3vb99
+        SNQzldUFhsIriurN0jTti6KQ4DOfowe9SZKMZ8B5ATx7FHArbs6ybBxgcKaaYTH+vgX2odgf8QIumIKW
+        4BmKnUo1tcEUtATPUORUtobc7wJFTsVFU5gJ1dAWipyKi3rQp/iS6OerZi76X+BmF1ji7y5gC43vl8l8
+        CzTuKM/7BiPTUoIqFyeFAAAAAElFTkSuQmCC
 </value>
  </data>
  <data name="btnLogin.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
--- a/app/DD_Clipboard_Searcher/frmConfig_Basic.Designer.vb
+++ b/app/DD_Clipboard_Searcher/frmConfig_Basic.Designer.vb
@ -1,6 +1,6 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
 Partial Class frmConfig_Basic
-    Inherits System.Windows.Forms.Form
+    Inherits DevExpress.XtraEditors.XtraForm

    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
    <System.Diagnostics.DebuggerNonUserCode()> _
--- a/app/DD_Clipboard_Searcher/frmMain.Designer.vb
+++ b/app/DD_Clipboard_Searcher/frmMain.Designer.vb
@ -62,6 +62,7 @@ Partial Class frmMain
        '
        'RibbonControl1
        '
+        Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.lblUser, Me.lblVersion, Me.lblApplicationServer, Me.bbtniKonfig, Me.bbtnitemAdmin, Me.lblRefresh})
        Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
@ -69,12 +70,13 @@ Partial Class frmMain
        Me.RibbonControl1.Name = "RibbonControl1"
        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
        Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
-        Me.RibbonControl1.Size = New System.Drawing.Size(492, 157)
+        Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide
+        Me.RibbonControl1.Size = New System.Drawing.Size(478, 66)
        Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
        '
        'lblUser
        '
-        Me.lblUser.Caption = "BarStaticItem1"
+        Me.lblUser.Caption = "lblUser"
        Me.lblUser.Id = 1
        Me.lblUser.ImageOptions.SvgImage = CType(resources.GetObject("lblUser.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.lblUser.Name = "lblUser"
@ -82,8 +84,9 @@ Partial Class frmMain
        '
        'lblVersion
        '
-        Me.lblVersion.Caption = "BarStaticItem1"
+        Me.lblVersion.Caption = "lblVersion"
        Me.lblVersion.Id = 2
+        Me.lblVersion.ImageOptions.SvgImage = CType(resources.GetObject("lblVersion.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.lblVersion.Name = "lblVersion"
        '
        'lblApplicationServer
@ -110,8 +113,9 @@ Partial Class frmMain
        '
        'lblRefresh
        '
-        Me.lblRefresh.Caption = "BarStaticItem1"
+        Me.lblRefresh.Caption = "lblRefresh"
        Me.lblRefresh.Id = 6
+        Me.lblRefresh.ImageOptions.SvgImage = CType(resources.GetObject("lblRefresh.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.lblRefresh.Name = "lblRefresh"
        '
        'RibbonPage1
@ -133,10 +137,10 @@ Partial Class frmMain
        Me.RibbonStatusBar1.ItemLinks.Add(Me.lblVersion)
        Me.RibbonStatusBar1.ItemLinks.Add(Me.lblApplicationServer)
        Me.RibbonStatusBar1.ItemLinks.Add(Me.lblRefresh)
-        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 289)
+        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 207)
        Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
        Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
-        Me.RibbonStatusBar1.Size = New System.Drawing.Size(492, 22)
+        Me.RibbonStatusBar1.Size = New System.Drawing.Size(478, 22)
        '
        'RibbonPage2
        '
@ -148,7 +152,7 @@ Partial Class frmMain
        Me.GroupBox2.Controls.Add(Me.labelStatus)
        Me.GroupBox2.Controls.Add(Me.labelRefresh)
        Me.GroupBox2.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.GroupBox2.Location = New System.Drawing.Point(209, 163)
+        Me.GroupBox2.Location = New System.Drawing.Point(209, 72)
        Me.GroupBox2.Name = "GroupBox2"
        Me.GroupBox2.Size = New System.Drawing.Size(256, 119)
        Me.GroupBox2.TabIndex = 16
@ -179,7 +183,7 @@ Partial Class frmMain
        Me.GroupBox1.Controls.Add(Me.Label2)
        Me.GroupBox1.Controls.Add(Me.labelHotkey)
        Me.GroupBox1.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.GroupBox1.Location = New System.Drawing.Point(12, 163)
+        Me.GroupBox1.Location = New System.Drawing.Point(12, 72)
        Me.GroupBox1.Name = "GroupBox1"
        Me.GroupBox1.Size = New System.Drawing.Size(191, 59)
        Me.GroupBox1.TabIndex = 15
@ -294,7 +298,7 @@ Partial Class frmMain
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(492, 311)
+        Me.ClientSize = New System.Drawing.Size(478, 229)
        Me.ContextMenuStrip = Me.ContextMenuStripForm
        Me.Controls.Add(Me.GroupBox2)
        Me.Controls.Add(Me.GroupBox1)
@ -303,6 +307,8 @@ Partial Class frmMain
        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
        Me.IconOptions.Icon = CType(resources.GetObject("frmMain.IconOptions.Icon"), System.Drawing.Icon)
        Me.MaximizeBox = False
+        Me.MaximumSize = New System.Drawing.Size(480, 230)
+        Me.MinimumSize = New System.Drawing.Size(480, 230)
        Me.Name = "frmMain"
        Me.Ribbon = Me.RibbonControl1
        Me.StatusBar = Me.RibbonStatusBar1
--- a/app/DD_Clipboard_Searcher/frmMain.resx
+++ b/app/DD_Clipboard_Searcher/frmMain.resx
@ -139,6 +139,32 @@
        ICAgIDxwYXRoIGQ9Ik0yMCwxOGMtMC44LDEuNS0yLjEsNC00LDRjLTEuOSwwLTMuMi0yLjUtNC00Yy0y
        LjMsMy41LTgsMS04LDguNVYzMGgyNHYtMy41QzI4LDE5LjEsMjIuMywyMS40LDIwLDE4eiIgY2xhc3M9
        IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
+</value>
+  </data>
+  <data name="lblVersion.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAADsEAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
+        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD
+        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk
+        aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp
+        c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41
+        O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7
+        ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp
+        c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnPg0KICAgIDxnIGNsYXNzPSJz
+        dDEiPg0KICAgICAgPHJlY3QgeD0iMiIgeT0iMTIiIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgcng9IjAi
+        IHJ5PSIwIiBjbGFzcz0iWWVsbG93IiAvPg0KICAgIDwvZz4NCiAgICA8cG9seWdvbiBwb2ludHM9IjIy
+        LDExLjQgMjIsMzAgMzAsMjIgMzAsMy40ICAiIGNsYXNzPSJZZWxsb3ciIC8+DQogICAgPGcgY2xhc3M9
+        InN0MCI+DQogICAgICA8cGF0aCBkPSJNOS45LDEwSDJsOC04aDcuOUw5LjksMTB6IE0yMC43LDJsLTgs
+        OGg3LjlsOC04SDIwLjd6IiBjbGFzcz0iWWVsbG93IiAvPg0KICAgIDwvZz4NCiAgPC9nPg0KPC9zdmc+
+        Cw==
 </value>
  </data>
  <data name="lblApplicationServer.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -214,6 +240,32 @@
        Nyw2LjcsMy45LDYsMy43LDUuN3ogTTkuMyw5LjljLTAuNSwwLjktMS4yLDIuNS0yLjMsMi41Yy0xLjEs
        MC0xLjgtMS42LTIuMy0yLjYgIEMzLjQsMTIuMSwwLDEwLjUsMCwxNS4xVjE2aDE0di0wLjlDMTQsMTAu
        NSwxMC43LDEyLDkuMyw5Ljl6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L
+</value>
+  </data>
+  <data name="lblRefresh.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFAEAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
+        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD
+        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk
+        aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp
+        c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41
+        O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7
+        ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp
+        c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJBdWRpdF94NUZfQ2hh
+        bmdlSGlzdG9yeSI+DQogICAgPHBvbHlnb24gcG9pbnRzPSIxNiwxNiAxNiwxMCAxNCwxMCAxNCwxOCAy
+        MiwxOCAyMiwxNiAgIiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBhdGggZD0iTTE2LDJDMTEuNiwyLDcu
+        Nyw0LDUuMiw3LjJMMiw0djEwaDAuMmg0SDEybC00LTRjMS44LTIuNCw0LjctNCw4LTRjNS41LDAsMTAs
+        NC41LDEwLDEwYzAsNS41LTQuNSwxMC0xMCwxMCAgIGMtNC44LDAtOC45LTMuNC05LjgtOGgtNGMxLDYu
+        OCw2LjgsMTIsMTMuOCwxMmM3LjcsMCwxNC02LjMsMTQtMTRTMjMuNywyLDE2LDJ6IiBjbGFzcz0iQmx1
+        ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
 </value>
  </data>
  <metadata name="NotifyIconMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@ -4751,7 +4803,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABU
-        CwAAAk1TRnQBSQFMAgEBBQEAAYgBAAGIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CwAAAk1TRnQBSQFMAgEBBQEAAZgBAAGYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA