Update Report, Fix Paths issues, Small Tweaks, Work on Exports

2021-12-23 15:58:45 +01:00
parent 79cfec3173
commit 4859406fe3
22 changed files with 495 additions and 243 deletions
--- a/MultiTool.Form/frmExportMain.Designer.vb
+++ b/MultiTool.Form/frmExportMain.Designer.vb
@@ -28,9 +28,14 @@ Partial Class frmExportMain
        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
        Me.txtResults = New DevExpress.XtraBars.BarStaticItem()
        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnOpenInputDirectory = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnOpenOutputDirectory = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
        Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage()
+        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
        Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.GridControlDocuments = New DevExpress.XtraGrid.GridControl()
@@ -76,10 +81,6 @@ Partial Class frmExportMain
        Me.colName2 = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.colId2 = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.MultiTool.Form.frmWaitForm), True, True)
-        Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage()
-        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.btnOpenInputDirectory = New DevExpress.XtraBars.BarButtonItem()
-        Me.btnOpenOutputDirectory = New DevExpress.XtraBars.BarButtonItem()
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridControlDocuments, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridViewDocuments, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -118,13 +119,16 @@ Partial Class frmExportMain
        'RibbonControl1
        '
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.txtResults, Me.BarButtonItem2, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.txtResults, Me.BarButtonItem2, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.BarButtonItem3})
        Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl1.MaxItemId = 8
+        Me.RibbonControl1.MaxItemId = 9
        Me.RibbonControl1.Name = "RibbonControl1"
        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3})
+        Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
+        Me.RibbonControl1.ShowToolbarCustomizeItem = False
        Me.RibbonControl1.Size = New System.Drawing.Size(1107, 158)
        Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
+        Me.RibbonControl1.Toolbar.ShowCustomizeItem = False
        '
        'BarButtonItem1
        '
@@ -137,7 +141,9 @@ Partial Class frmExportMain
        '
        Me.txtResults.Caption = "Keine Ergebnisse"
        Me.txtResults.Id = 4
+        Me.txtResults.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.insertpagenumber
        Me.txtResults.Name = "txtResults"
+        Me.txtResults.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
        '
        'BarButtonItem2
        '
@@ -146,17 +152,38 @@ Partial Class frmExportMain
        Me.BarButtonItem2.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_send5
        Me.BarButtonItem2.Name = "BarButtonItem2"
        '
+        'btnOpenInputDirectory
+        '
+        Me.btnOpenInputDirectory.Caption = "Eingangsverzeichnis öffnen"
+        Me.btnOpenInputDirectory.Id = 6
+        Me.btnOpenInputDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open27
+        Me.btnOpenInputDirectory.Name = "btnOpenInputDirectory"
+        '
+        'btnOpenOutputDirectory
+        '
+        Me.btnOpenOutputDirectory.Caption = "Ausgangsverzeichnis öffnen"
+        Me.btnOpenOutputDirectory.Id = 7
+        Me.btnOpenOutputDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.up1
+        Me.btnOpenOutputDirectory.Name = "btnOpenOutputDirectory"
+        '
+        'BarButtonItem3
+        '
+        Me.BarButtonItem3.Caption = "Vorlagenverzeichnis öffnen"
+        Me.BarButtonItem3.Id = 8
+        Me.BarButtonItem3.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open3
+        Me.BarButtonItem3.Name = "BarButtonItem3"
+        '
        'RibbonPage1
        '
        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2})
        Me.RibbonPage1.Name = "RibbonPage1"
-        Me.RibbonPage1.Text = "RibbonPage1"
+        Me.RibbonPage1.Text = "Start"
        '
        'RibbonPageGroup1
        '
        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1)
        Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
-        Me.RibbonPageGroup1.Text = "Start"
+        Me.RibbonPageGroup1.Text = "Suche"
        '
        'RibbonPageGroup2
        '
@@ -165,6 +192,20 @@ Partial Class frmExportMain
        Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
        Me.RibbonPageGroup2.Text = "Export"
        '
+        'RibbonPage3
+        '
+        Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3})
+        Me.RibbonPage3.Name = "RibbonPage3"
+        Me.RibbonPage3.Text = "Erweitert"
+        '
+        'RibbonPageGroup3
+        '
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.btnOpenInputDirectory)
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.btnOpenOutputDirectory)
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem3)
+        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
+        Me.RibbonPageGroup3.Text = "Verzeichnisse"
+        '
        'RibbonStatusBar1
        '
        Me.RibbonStatusBar1.ItemLinks.Add(Me.txtResults)
@@ -607,31 +648,6 @@ Partial Class frmExportMain
        '
        Me.SplashScreenManager.ClosingDelay = 500
        '
-        'RibbonPage3
-        '
-        Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3})
-        Me.RibbonPage3.Name = "RibbonPage3"
-        Me.RibbonPage3.Text = "RibbonPage3"
-        '
-        'RibbonPageGroup3
-        '
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.btnOpenInputDirectory)
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.btnOpenOutputDirectory)
-        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
-        Me.RibbonPageGroup3.Text = "RibbonPageGroup3"
-        '
-        'btnOpenInputDirectory
-        '
-        Me.btnOpenInputDirectory.Caption = "BarButtonItem3"
-        Me.btnOpenInputDirectory.Id = 6
-        Me.btnOpenInputDirectory.Name = "btnOpenInputDirectory"
-        '
-        'btnOpenOutputDirectory
-        '
-        Me.btnOpenOutputDirectory.Caption = "BarButtonItem4"
-        Me.btnOpenOutputDirectory.Id = 7
-        Me.btnOpenOutputDirectory.Name = "btnOpenOutputDirectory"
-        '
        'frmExportMain
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -640,6 +656,7 @@ Partial Class frmExportMain
        Me.Controls.Add(Me.SplitContainerControl1)
        Me.Controls.Add(Me.RibbonStatusBar1)
        Me.Controls.Add(Me.RibbonControl1)
+        Me.IconOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.squarified1
        Me.KeyPreview = True
        Me.Name = "frmExportMain"
        Me.Ribbon = Me.RibbonControl1
@@ -740,4 +757,5 @@ Partial Class frmExportMain
    Friend WithEvents btnOpenOutputDirectory As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage
    Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
 End Class