From a68697a9e2eedb500123c233030a71f9b4a79dc2 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 4 Oct 2023 14:12:39 +0200 Subject: [PATCH] Disable export button while exporting --- MultiTool.Form/frmExportMain.Designer.vb | 18 +++++++++--------- MultiTool.Form/frmExportMain.resx | 3 --- MultiTool.Form/frmExportMain.vb | 4 +++- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/MultiTool.Form/frmExportMain.Designer.vb b/MultiTool.Form/frmExportMain.Designer.vb index 2f17e82..6b6947a 100644 --- a/MultiTool.Form/frmExportMain.Designer.vb +++ b/MultiTool.Form/frmExportMain.Designer.vb @@ -26,7 +26,7 @@ Partial Class frmExportMain Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.txtResults = New DevExpress.XtraBars.BarStaticItem() - Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.btnExport = New DevExpress.XtraBars.BarButtonItem() Me.btnOpenInputDirectory = New DevExpress.XtraBars.BarButtonItem() Me.btnOpenOutputDirectory = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() @@ -136,7 +136,7 @@ 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.BarButtonItem3, Me.BarButtonItem4}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.txtResults, Me.btnExport, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.BarButtonItem3, Me.BarButtonItem4}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) Me.RibbonControl1.MaxItemId = 10 Me.RibbonControl1.Name = "RibbonControl1" @@ -162,12 +162,12 @@ Partial Class frmExportMain Me.txtResults.Name = "txtResults" Me.txtResults.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' - 'BarButtonItem2 + 'btnExport ' - Me.BarButtonItem2.Caption = "Ausgewählte Zeilen Exportieren" - Me.BarButtonItem2.Id = 5 - Me.BarButtonItem2.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_send5 - Me.BarButtonItem2.Name = "BarButtonItem2" + Me.btnExport.Caption = "Ausgewählte Zeilen Exportieren" + Me.btnExport.Id = 5 + Me.btnExport.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_send5 + Me.btnExport.Name = "btnExport" ' 'btnOpenInputDirectory ' @@ -213,7 +213,7 @@ Partial Class frmExportMain 'RibbonPageGroup2 ' Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far - Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup2.ItemLinks.Add(Me.btnExport) Me.RibbonPageGroup2.Name = "RibbonPageGroup2" Me.RibbonPageGroup2.Text = "Export" ' @@ -856,7 +856,7 @@ Partial Class frmExportMain Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents GridColumn7 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents txtResults As DevExpress.XtraBars.BarStaticItem - Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents btnExport As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager Friend WithEvents RepositoryItemImageComboBox1 As DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox diff --git a/MultiTool.Form/frmExportMain.resx b/MultiTool.Form/frmExportMain.resx index 69735f0..2876866 100644 --- a/MultiTool.Form/frmExportMain.resx +++ b/MultiTool.Form/frmExportMain.resx @@ -120,9 +120,6 @@ 189, 17 - - 189, 17 - 87 diff --git a/MultiTool.Form/frmExportMain.vb b/MultiTool.Form/frmExportMain.vb index a3e3edd..acdba5f 100644 --- a/MultiTool.Form/frmExportMain.vb +++ b/MultiTool.Form/frmExportMain.vb @@ -224,8 +224,9 @@ Public Class frmExportMain End Try End Sub - Private Async Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + Private Async Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnExport.ItemClick Try + btnExport.Enabled = False SplashScreenManager.ShowWaitForm() Dim oExportResult = False @@ -259,6 +260,7 @@ Public Class frmExportMain Finally SplashScreenManager.CloseWaitForm() + btnExport.Enabled = True SearchDocuments() End Try