MS 2.7

2021-06-28 16:02:25 +02:00
parent e9fb65eddf
commit 3feb7ebf4d
10 changed files with 785 additions and 395 deletions
--- a/app/DD-Record-Organizer/frmDocSearchResult.Designer.vb
+++ b/app/DD-Record-Organizer/frmDocSearchResult.Designer.vb
@@ -1,6 +1,6 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
 Partial Class frmDocSearchResult
-    Inherits System.Windows.Forms.Form
+    Inherits DevExpress.XtraBars.Ribbon.RibbonForm

    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
    <System.Diagnostics.DebuggerNonUserCode()> _
@@ -23,14 +23,8 @@ Partial Class frmDocSearchResult
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
-        Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
+        Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDocSearchResult))
-        Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
-        Me.tslblDocID = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
-        Me.ToolStripLabelCaption = New System.Windows.Forms.ToolStripLabel()
-        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton()
        Me.GridControlDocSearch = New DevExpress.XtraGrid.GridControl()
        Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.docCM_Open = New System.Windows.Forms.ToolStripMenuItem()
@@ -42,72 +36,31 @@ Partial Class frmDocSearchResult
        Me.docCM_PropertiesFile = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripSeparator25 = New System.Windows.Forms.ToolStripSeparator()
        Me.GridViewDoc_Search = New DevExpress.XtraGrid.Views.Grid.GridView()
-        Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton()
-        Me.StatusStrip1.SuspendLayout()
-        Me.ToolStrip1.SuspendLayout()
+        Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
+        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
+        Me.bsiDocID = New DevExpress.XtraBars.BarStaticItem()
+        Me.bsiInfo = 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()
        CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.ContextMenuStripResultFiles.SuspendLayout()
        CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
-        'StatusStrip1
-        '
-        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblDocID})
-        Me.StatusStrip1.Location = New System.Drawing.Point(0, 623)
-        Me.StatusStrip1.Name = "StatusStrip1"
-        Me.StatusStrip1.Size = New System.Drawing.Size(1083, 22)
-        Me.StatusStrip1.TabIndex = 0
-        Me.StatusStrip1.Text = "StatusStrip1"
-        '
-        'tslblDocID
-        '
-        Me.tslblDocID.Name = "tslblDocID"
-        Me.tslblDocID.Size = New System.Drawing.Size(92, 17)
-        Me.tslblDocID.Text = "No row selected"
-        '
-        'ToolStrip1
-        '
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLabelCaption, Me.ToolStripButton1, Me.ToolStripButton2, Me.ToolStripButton3})
-        Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
-        Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Size = New System.Drawing.Size(1083, 25)
-        Me.ToolStrip1.TabIndex = 1
-        Me.ToolStrip1.Text = "ToolStrip1"
-        '
-        'ToolStripLabelCaption
-        '
-        Me.ToolStripLabelCaption.Name = "ToolStripLabelCaption"
-        Me.ToolStripLabelCaption.Size = New System.Drawing.Size(87, 22)
-        Me.ToolStripLabelCaption.Text = "ToolStripLabel1"
-        '
-        'ToolStripButton1
-        '
-        Me.ToolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
-        Me.ToolStripButton1.Image = Global.DD_Record_Organizer.My.Resources.Resources.refresh_16xLG
-        Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton1.Name = "ToolStripButton1"
-        Me.ToolStripButton1.Size = New System.Drawing.Size(95, 22)
-        Me.ToolStripButton1.Text = "Aktualisieren"
-        '
-        'ToolStripButton2
-        '
-        Me.ToolStripButton2.Image = Global.DD_Record_Organizer.My.Resources.Resources.Excel_25ixel
-        Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton2.Name = "ToolStripButton2"
-        Me.ToolStripButton2.Size = New System.Drawing.Size(120, 22)
-        Me.ToolStripButton2.Text = "Export nach Excel"
-        Me.ToolStripButton2.ToolTipText = "Export nach Excel"
-        '
        'GridControlDocSearch
        '
        Me.GridControlDocSearch.ContextMenuStrip = Me.ContextMenuStripResultFiles
        Me.GridControlDocSearch.Dock = System.Windows.Forms.DockStyle.Fill
-        GridLevelNode2.RelationName = "Level1"
-        Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode2})
-        Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 25)
+        GridLevelNode1.RelationName = "Level1"
+        Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1})
+        Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 158)
        Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search
        Me.GridControlDocSearch.Name = "GridControlDocSearch"
-        Me.GridControlDocSearch.Size = New System.Drawing.Size(1083, 598)
+        Me.GridControlDocSearch.Size = New System.Drawing.Size(1083, 463)
        Me.GridControlDocSearch.TabIndex = 8
        Me.GridControlDocSearch.TabStop = False
        Me.GridControlDocSearch.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDoc_Search})
@@ -189,44 +142,98 @@ Partial Class frmDocSearchResult
        Me.GridViewDoc_Search.OptionsView.ShowAutoFilterRow = True
        Me.GridViewDoc_Search.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[True]
        '
-        'ToolStripButton3
+        'RibbonControl1
        '
-        Me.ToolStripButton3.Image = Global.DD_Record_Organizer.My.Resources.Resources.delete
-        Me.ToolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton3.Name = "ToolStripButton3"
-        Me.ToolStripButton3.Size = New System.Drawing.Size(134, 22)
-        Me.ToolStripButton3.Text = "Layout zurücksetzen"
+        Me.RibbonControl1.ExpandCollapseItem.Id = 0
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.bsiDocID, Me.bsiInfo})
+        Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
+        Me.RibbonControl1.MaxItemId = 5
+        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(1083, 158)
+        Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
+        '
+        'BarButtonItem1
+        '
+        Me.BarButtonItem1.Caption = "Export Excel"
+        Me.BarButtonItem1.Id = 1
+        Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem1.Name = "BarButtonItem1"
+        '
+        'BarButtonItem2
+        '
+        Me.BarButtonItem2.Caption = "Layout zurücksetzen"
+        Me.BarButtonItem2.Id = 2
+        Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem2.Name = "BarButtonItem2"
+        '
+        'bsiDocID
+        '
+        Me.bsiDocID.Id = 3
+        Me.bsiDocID.Name = "bsiDocID"
+        '
+        'bsiInfo
+        '
+        Me.bsiInfo.Caption = "BarStaticItem1"
+        Me.bsiInfo.Id = 4
+        Me.bsiInfo.ItemAppearance.Normal.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.bsiInfo.ItemAppearance.Normal.Options.UseFont = True
+        Me.bsiInfo.Name = "bsiInfo"
+        '
+        'RibbonPage1
+        '
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1})
+        Me.RibbonPage1.Name = "RibbonPage1"
+        Me.RibbonPage1.Text = "DocResults"
+        '
+        'RibbonPageGroup1
+        '
+        Me.RibbonPageGroup1.AllowTextClipping = False
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1)
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2)
+        Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
+        Me.RibbonPageGroup1.Text = "Funktionen"
+        '
+        'RibbonStatusBar1
+        '
+        Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiDocID)
+        Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiInfo)
+        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 621)
+        Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
+        Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
+        Me.RibbonStatusBar1.Size = New System.Drawing.Size(1083, 24)
+        '
+        'RibbonPage2
+        '
+        Me.RibbonPage2.Name = "RibbonPage2"
+        Me.RibbonPage2.Text = "RibbonPage2"
        '
        'frmDocSearchResult
        '
+        Me.Appearance.Options.UseFont = True
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(1083, 645)
        Me.Controls.Add(Me.GridControlDocSearch)
-        Me.Controls.Add(Me.ToolStrip1)
-        Me.Controls.Add(Me.StatusStrip1)
+        Me.Controls.Add(Me.RibbonStatusBar1)
+        Me.Controls.Add(Me.RibbonControl1)
        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("frmDocSearchResult.IconOptions.Icon"), System.Drawing.Icon)
        Me.Name = "frmDocSearchResult"
+        Me.Ribbon = Me.RibbonControl1
+        Me.StatusBar = Me.RibbonStatusBar1
        Me.Text = "frmDocSearchResult"
-        Me.StatusStrip1.ResumeLayout(False)
-        Me.StatusStrip1.PerformLayout()
-        Me.ToolStrip1.ResumeLayout(False)
-        Me.ToolStrip1.PerformLayout()
        CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ContextMenuStripResultFiles.ResumeLayout(False)
        CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

    End Sub
-
-    Friend WithEvents StatusStrip1 As StatusStrip
-    Friend WithEvents ToolStrip1 As ToolStrip
    Friend WithEvents GridControlDocSearch As DevExpress.XtraGrid.GridControl
    Friend WithEvents GridViewDoc_Search As DevExpress.XtraGrid.Views.Grid.GridView
-    Friend WithEvents tslblDocID As ToolStripStatusLabel
-    Friend WithEvents ToolStripLabelCaption As ToolStripLabel
    Friend WithEvents ContextMenuStripResultFiles As ContextMenuStrip
    Friend WithEvents docCM_Open As ToolStripMenuItem
    Friend WithEvents OrdnerÖffnenToolStripMenuItem As ToolStripMenuItem
@@ -236,7 +243,13 @@ Partial Class frmDocSearchResult
    Friend WithEvents ToolStripSeparator22 As ToolStripSeparator
    Friend WithEvents docCM_PropertiesFile As ToolStripMenuItem
    Friend WithEvents ToolStripSeparator25 As ToolStripSeparator
-    Friend WithEvents ToolStripButton1 As ToolStripButton
-    Friend WithEvents ToolStripButton2 As ToolStripButton
-    Friend WithEvents ToolStripButton3 As ToolStripButton
+    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 bsiDocID As DevExpress.XtraBars.BarStaticItem
+    Friend WithEvents bsiInfo As DevExpress.XtraBars.BarStaticItem
 End Class