MS 2.7

app/DD-Record-Organizer/frmGlobalSearch.vb

@@ -5,7 +5,7 @@ Imports DevExpress.XtraGrid.Views.Grid
 Imports System.Runtime.InteropServices
 
 Public Class frmGlobalSearch
-    Inherits Form
+    Inherits DevExpress.XtraBars.Ribbon.RibbonForm
     <DllImport("Shell32", CharSet:=CharSet.Auto, SetLastError:=True)>
     Public Shared Function ShellExecuteEx(ByRef lpExecInfo As SHELLEXECUTEINFO) As Boolean
     End Function
@@ -32,6 +32,7 @@ Public Class frmGlobalSearch
     Public Const SW_SHOW As Short = 5
     Private _Helper As ClassHelper
     Dim sel_Records, sel_FT As String
+    Private SelectedGrid As DevExpress.XtraGrid.GridControl
     Private Sub tsbtnRefresh_Click(sender As Object, e As EventArgs) Handles tsbtnRefresh.Click
         Refresh_Search()
     End Sub
@@ -145,25 +146,25 @@ Public Class frmGlobalSearch
         End If
     End Function
 
-    Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
-        Export_Excel(GridControlRecords)
-    End Sub
 
-    Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click
-        Export_Excel(GridControlFiles)
-    End Sub
+
+
 
     Private Sub ExportExcelToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExportExcelToolStripMenuItem.Click
-        Export_Excel(GridControlRecords)
+        Export_Excel()
     End Sub
-    Sub Export_Excel(Grid As DevExpress.XtraGrid.GridControl)
+    Sub Export_Excel()
+        If IsNothing(SelectedGrid) Then
+            MsgBox("Please choose a grid!", MsgBoxStyle.Exclamation)
+            Exit Sub
+        End If
         Dim saveFileDialog1 As New SaveFileDialog
         saveFileDialog1.Filter = "Excel File|*.xlsx"
         saveFileDialog1.Title = "Export to Excel:"
         saveFileDialog1.ShowDialog()
         If saveFileDialog1.FileName <> "" Then
             Cursor = Cursors.WaitCursor
-            Grid.MainView.ExportToXlsx(saveFileDialog1.FileName)
+            SelectedGrid.MainView.ExportToXlsx(saveFileDialog1.FileName)
             Dim result As MsgBoxResult
             Dim msg = String.Format("Datei wurde erstellt! Wollen Sie diese nun öffnen?")
 
@@ -203,9 +204,6 @@ Public Class frmGlobalSearch
         End If
     End Sub
 
-    Private Sub tsbtnviewDetail_Click(sender As Object, e As EventArgs) Handles tsbtnviewDetail.Click
-        Show_Detail_Record()
-    End Sub
 
     Private Sub GridControlFiles_DoubleClick(sender As Object, e As EventArgs) Handles GridControlFiles.DoubleClick
         File_open()
@@ -346,6 +344,22 @@ Public Class frmGlobalSearch
         End Try
     End Sub
 
+    Private Sub GridControlRecords_Click(sender As Object, e As EventArgs) Handles GridControlRecords.Click
+        SelectedGrid = sender
+    End Sub
+
+    Private Sub GridControlFiles_Click(sender As Object, e As EventArgs) Handles GridControlFiles.Click
+        SelectedGrid = sender
+    End Sub
+
+    Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
+        Export_Excel()
+    End Sub
+
+    Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
+        Show_Detail_Record()
+    End Sub
+
     Sub File_open()
         Me.Cursor = Cursors.WaitCursor