From d5e7ed90be3390a08fbc72ba98af076a3397df7a Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 11 Aug 2023 13:41:24 +0200 Subject: [PATCH] 11-08-23 --- Connectors.Form/frmMain.Designer.vb | 15 +++++++++++++-- Connectors.Form/frmMain.resx | 19 +++++++++++++++++++ Connectors.Form/frmMain.vb | 12 ++++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/Connectors.Form/frmMain.Designer.vb b/Connectors.Form/frmMain.Designer.vb index c661166..6ecdf15 100644 --- a/Connectors.Form/frmMain.Designer.vb +++ b/Connectors.Form/frmMain.Designer.vb @@ -39,6 +39,7 @@ Me.TrayMenu = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.btnToggleWindow = New System.Windows.Forms.ToolStripMenuItem() Me.btnExit = New System.Windows.Forms.ToolStripMenuItem() + Me.btnForceSync = New DevExpress.XtraBars.BarButtonItem() CType(Me.ListBoxControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.TrayMenu.SuspendLayout() @@ -56,9 +57,9 @@ ' 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.btnSyncStart, Me.btnStopSync, Me.BarButtonItem1}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnSyncStart, Me.btnStopSync, Me.BarButtonItem1, Me.btnForceSync}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 4 + 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] @@ -101,6 +102,7 @@ ' Me.RibbonPageGroup1.ItemLinks.Add(Me.btnSyncStart) Me.RibbonPageGroup1.ItemLinks.Add(Me.btnStopSync) + Me.RibbonPageGroup1.ItemLinks.Add(Me.btnForceSync) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "RibbonPageGroup1" ' @@ -139,6 +141,14 @@ Me.btnExit.Size = New System.Drawing.Size(184, 22) Me.btnExit.Text = "Beenden" ' + 'btnForceSync + ' + Me.btnForceSync.Caption = "Sync Auslösen" + Me.btnForceSync.Enabled = False + Me.btnForceSync.Id = 4 + Me.btnForceSync.ImageOptions.SvgImage = CType(resources.GetObject("btnForceSync.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.btnForceSync.Name = "btnForceSync" + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -171,6 +181,7 @@ Friend WithEvents TrayMenu As ContextMenuStrip Friend WithEvents btnToggleWindow As ToolStripMenuItem Friend WithEvents btnExit As ToolStripMenuItem + Friend WithEvents btnForceSync As DevExpress.XtraBars.BarButtonItem #End Region diff --git a/Connectors.Form/frmMain.resx b/Connectors.Form/frmMain.resx index 2bdfd35..f549a1e 100644 --- a/Connectors.Form/frmMain.resx +++ b/Connectors.Form/frmMain.resx @@ -171,6 +171,25 @@ MC40QzIuMSwyNS4zLDIuMiwyNS4zLDIuMiwyNS4yeiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgPC9nPg0K ICA8cGF0aCBkPSJNMzEuMywxNEg5LjZMNCwyNmgyMS44YzAuNSwwLDEuMS0wLjMsMS4zLTAuN0wzMiwx NC43QzMyLjEsMTQuMywzMS44LDE0LDMxLjMsMTR6IiBjbGFzcz0iWWVsbG93IiAvPg0KPC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJkCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAzMiAzMiI+DQogIDxz + dHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQo8L3N0eWxlPg0KICA8ZyBp + ZD0iTGF5ZXJfMSI+DQogICAgPHBhdGggZD0iTTIzLjcsMTQuNGMwLjUsMC4zLDAuNSwwLjgsMCwxLjFs + LTExLjgsNy4zdjIuNmMwLDAuNiwwLjQsMC44LDAuOSwwLjVsMTYuOC0xMC40YzAuNS0wLjMsMC41LTAu + OCwwLTEuMSAgIEwxMi44LDQuMWMtMC41LTAuMy0wLjktMC4xLTAuOSwwLjV2Mi42TDIzLjcsMTQuNHoi + IGNsYXNzPSJCbHVlIiAvPg0KICAgIDxwYXRoIGQ9Ik0xOS43LDE1LjVjMC41LTAuMywwLjUtMC44LDAt + MS4xTDIuOSw0LjFDMi40LDMuOCwyLDQsMiw0LjZ2MjAuNmMwLDAuNiwwLjQsMC44LDAuOSwwLjVMMTku + NywxNS41eiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCiAgPGcgaWQ9IkxheWVyXzIiIC8+DQo8L3N2 + Zz4L diff --git a/Connectors.Form/frmMain.vb b/Connectors.Form/frmMain.vb index 9dfc0d0..9c1ee55 100644 --- a/Connectors.Form/frmMain.vb +++ b/Connectors.Form/frmMain.vb @@ -43,8 +43,12 @@ Partial Public Class frmMain Exit Sub End If + btnForceSync.Enabled = True + If ConfigManager.Config.Autostart And Sync.TestConfigIsComplete() Then + btnForceSync.Enabled = False Await Sync.Run() + btnForceSync.Enabled = True End If If ConfigManager.Config.TimerIntervalMin > 0 Then @@ -115,7 +119,9 @@ Partial Public Class frmMain End Sub Private Async Function Timer_Elapsed(sender As Object, e As System.EventArgs) As Threading.Tasks.Task Handles SyncTimer.Tick + btnForceSync.Enabled = False Await Sync.Run() + btnForceSync.Enabled = True End Function Private Sub AddInfoEntry(pMessage As String, ParamArray pArgs As Object()) @@ -171,4 +177,10 @@ Partial Public Class frmMain WindowState = FormWindowState.Normal End If End Sub + + Private Async Sub btnForceSync_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnForceSync.ItemClick + btnForceSync.Enabled = False + Await Sync.Run() + btnForceSync.Enabled = True + End Sub End Class