RegexEditor: Improve Look and Feel

2021-04-19 14:03:33 +02:00
parent 04fd63a9c7
commit 5e45aef7ff
13 changed files with 326 additions and 87 deletions
--- a/Controls.RegexEditor/frmRegexEditor.Designer.vb
+++ b/Controls.RegexEditor/frmRegexEditor.Designer.vb
@@ -1,6 +1,6 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
 Partial Class frmRegexEditor
-    Inherits DevExpress.XtraEditors.XtraForm
+    Inherits DevExpress.XtraBars.Ribbon.RibbonForm

    'Form overrides dispose to clean up the component list.
    <System.Diagnostics.DebuggerNonUserCode()> _
@@ -19,62 +19,29 @@ Partial Class frmRegexEditor
    'Do not modify it using the code editor.
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
-        Me.btnTest = New System.Windows.Forms.Button()
-        Me.btnSave = New System.Windows.Forms.Button()
-        Me.labelResult = New System.Windows.Forms.Label()
-        Me.Label3 = New System.Windows.Forms.Label()
        Me.Label2 = New System.Windows.Forms.Label()
        Me.txtTest = New System.Windows.Forms.TextBox()
        Me.Label4 = New System.Windows.Forms.Label()
        Me.Label1 = New System.Windows.Forms.Label()
        Me.txtRegex = New System.Windows.Forms.TextBox()
+        Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
+        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem()
+        Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
+        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
+        Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
+        Me.labelResult = New DevExpress.XtraBars.BarStaticItem()
+        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
-        'btnTest
-        '
-        Me.btnTest.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnTest.Location = New System.Drawing.Point(187, 192)
-        Me.btnTest.Name = "btnTest"
-        Me.btnTest.Size = New System.Drawing.Size(112, 31)
-        Me.btnTest.TabIndex = 23
-        Me.btnTest.Text = "Test"
-        Me.btnTest.UseVisualStyleBackColor = True
-        '
-        'btnSave
-        '
-        Me.btnSave.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnSave.DialogResult = System.Windows.Forms.DialogResult.OK
-        Me.btnSave.Location = New System.Drawing.Point(305, 192)
-        Me.btnSave.Name = "btnSave"
-        Me.btnSave.Size = New System.Drawing.Size(112, 31)
-        Me.btnSave.TabIndex = 22
-        Me.btnSave.Text = "Speichern"
-        Me.btnSave.UseVisualStyleBackColor = True
-        '
-        'labelResult
-        '
-        Me.labelResult.AutoSize = True
-        Me.labelResult.Location = New System.Drawing.Point(12, 163)
-        Me.labelResult.Name = "labelResult"
-        Me.labelResult.Size = New System.Drawing.Size(284, 13)
-        Me.labelResult.TabIndex = 21
-        Me.labelResult.Text = "Klicken Sie auf Test, um die Regular Expression zu testen."
-        '
-        'Label3
-        '
-        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(12, 150)
-        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(52, 13)
-        Me.Label3.TabIndex = 20
-        Me.Label3.Text = "Ergebnis:"
-        '
        'Label2
        '
        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(12, 100)
+        Me.Label2.Location = New System.Drawing.Point(12, 151)
        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(63, 13)
+        Me.Label2.Size = New System.Drawing.Size(64, 13)
        Me.Label2.TabIndex = 19
        Me.Label2.Text = "Test String:"
        '
@@ -82,15 +49,16 @@ Partial Class frmRegexEditor
        '
        Me.txtTest.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.txtTest.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtTest.Location = New System.Drawing.Point(12, 116)
+        Me.txtTest.Font = New System.Drawing.Font("Consolas", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtTest.Location = New System.Drawing.Point(12, 167)
+        Me.txtTest.Multiline = True
        Me.txtTest.Name = "txtTest"
-        Me.txtTest.Size = New System.Drawing.Size(405, 20)
+        Me.txtTest.Size = New System.Drawing.Size(487, 136)
        Me.txtTest.TabIndex = 18
        '
        'Label4
        '
-        Me.Label4.Location = New System.Drawing.Point(12, 48)
+        Me.Label4.Location = New System.Drawing.Point(12, 110)
        Me.Label4.Name = "Label4"
        Me.Label4.Size = New System.Drawing.Size(419, 33)
        Me.Label4.TabIndex = 17
@@ -100,9 +68,9 @@ Partial Class frmRegexEditor
        'Label1
        '
        Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(12, 9)
+        Me.Label1.Location = New System.Drawing.Point(12, 69)
        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(103, 13)
+        Me.Label1.Size = New System.Drawing.Size(108, 13)
        Me.Label1.TabIndex = 16
        Me.Label1.Text = "Regular Expression:"
        '
@@ -110,41 +78,117 @@ Partial Class frmRegexEditor
        '
        Me.txtRegex.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.txtRegex.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtRegex.Location = New System.Drawing.Point(12, 25)
+        Me.txtRegex.Font = New System.Drawing.Font("Consolas", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtRegex.Location = New System.Drawing.Point(12, 85)
        Me.txtRegex.Name = "txtRegex"
-        Me.txtRegex.Size = New System.Drawing.Size(405, 20)
+        Me.txtRegex.Size = New System.Drawing.Size(487, 22)
        Me.txtRegex.TabIndex = 15
        '
+        '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.BarButtonItem1, Me.BarButtonItem2, Me.BarStaticItem1, Me.labelResult})
+        Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
+        Me.RibbonControl1.MaxItemId = 6
+        Me.RibbonControl1.Name = "RibbonControl1"
+        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
+        Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
+        Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide
+        Me.RibbonControl1.ShowToolbarCustomizeItem = False
+        Me.RibbonControl1.Size = New System.Drawing.Size(511, 66)
+        Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
+        Me.RibbonControl1.Toolbar.ShowCustomizeItem = False
+        '
+        'BarButtonItem1
+        '
+        Me.BarButtonItem1.Caption = "Speichern und schließen"
+        Me.BarButtonItem1.Id = 1
+        Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.Controls.RegexEditor.My.Resources.Resources.actions_check1
+        Me.BarButtonItem1.Name = "BarButtonItem1"
+        '
+        'BarButtonItem2
+        '
+        Me.BarButtonItem2.Caption = "Regular Expression testen"
+        Me.BarButtonItem2.Id = 2
+        Me.BarButtonItem2.ImageOptions.SvgImage = Global.DigitalData.Controls.RegexEditor.My.Resources.Resources.definednameuseinformula1
+        Me.BarButtonItem2.Name = "BarButtonItem2"
+        '
+        'BarStaticItem1
+        '
+        Me.BarStaticItem1.Caption = "Ergebnis"
+        Me.BarStaticItem1.Id = 3
+        Me.BarStaticItem1.ImageOptions.SvgImage = Global.DigitalData.Controls.RegexEditor.My.Resources.Resources.about
+        Me.BarStaticItem1.Name = "BarStaticItem1"
+        Me.BarStaticItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
+        '
+        'RibbonPage1
+        '
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1})
+        Me.RibbonPage1.Name = "RibbonPage1"
+        Me.RibbonPage1.Text = "RibbonPage1"
+        '
+        'RibbonPageGroup1
+        '
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1)
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2)
+        Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
+        Me.RibbonPageGroup1.Text = "RibbonPageGroup1"
+        '
+        'RibbonStatusBar1
+        '
+        Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItem1)
+        Me.RibbonStatusBar1.ItemLinks.Add(Me.labelResult)
+        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 309)
+        Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
+        Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
+        Me.RibbonStatusBar1.Size = New System.Drawing.Size(511, 22)
+        '
+        'RibbonPage2
+        '
+        Me.RibbonPage2.Name = "RibbonPage2"
+        Me.RibbonPage2.Text = "RibbonPage2"
+        '
+        'labelResult
+        '
+        Me.labelResult.Caption = "<kein Ergebnis>"
+        Me.labelResult.Id = 5
+        Me.labelResult.Name = "labelResult"
+        '
        'frmRegexEditor
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(429, 235)
-        Me.Controls.Add(Me.btnTest)
-        Me.Controls.Add(Me.btnSave)
-        Me.Controls.Add(Me.labelResult)
-        Me.Controls.Add(Me.Label3)
+        Me.ClientSize = New System.Drawing.Size(511, 331)
        Me.Controls.Add(Me.Label2)
        Me.Controls.Add(Me.txtTest)
        Me.Controls.Add(Me.Label4)
        Me.Controls.Add(Me.Label1)
        Me.Controls.Add(Me.txtRegex)
-        Me.IconOptions.ShowIcon = False
+        Me.Controls.Add(Me.RibbonStatusBar1)
+        Me.Controls.Add(Me.RibbonControl1)
+        Me.IconOptions.SvgImage = Global.DigitalData.Controls.RegexEditor.My.Resources.Resources.definednameuseinformula2
        Me.Name = "frmRegexEditor"
+        Me.Ribbon = Me.RibbonControl1
+        Me.StatusBar = Me.RibbonStatusBar1
        Me.Text = "Regex Editor"
+        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

    End Sub
-
-    Friend WithEvents btnTest As Button
-    Friend WithEvents btnSave As Button
-    Friend WithEvents labelResult As Label
-    Friend WithEvents Label3 As Label
    Friend WithEvents Label2 As Label
    Friend WithEvents txtTest As TextBox
    Friend WithEvents Label4 As Label
    Friend WithEvents Label1 As Label
    Friend WithEvents txtRegex As TextBox
+    Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl
+    Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage
+    Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar
+    Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage
+    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem
+    Friend WithEvents labelResult As DevExpress.XtraBars.BarStaticItem
 End Class