From a15acf8b42f46ffff985c33b9e04ab6bb7785f6f Mon Sep 17 00:00:00 2001 From: Jaex Date: Mon, 5 Jun 2017 16:44:46 +0300 Subject: [PATCH] On WindowsStore build only check startup when integration tab selected and status on label instead of message box --- .../Forms/ApplicationSettingsForm.Designer.cs | 9 + ShareX/Forms/ApplicationSettingsForm.cs | 60 +- ShareX/Forms/ApplicationSettingsForm.resx | 2169 ++++------------- ShareX/Forms/MainForm.Designer.cs | 12 +- ShareX/Forms/MainForm.resx | 853 ++++--- ShareX/IntegrationHelpers.cs | 6 +- 6 files changed, 999 insertions(+), 2110 deletions(-) diff --git a/ShareX/Forms/ApplicationSettingsForm.Designer.cs b/ShareX/Forms/ApplicationSettingsForm.Designer.cs index 37250aca6..f041b6ba5 100644 --- a/ShareX/Forms/ApplicationSettingsForm.Designer.cs +++ b/ShareX/Forms/ApplicationSettingsForm.Designer.cs @@ -144,6 +144,7 @@ private void InitializeComponent() this.tpAdvanced = new System.Windows.Forms.TabPage(); this.pgSettings = new System.Windows.Forms.PropertyGrid(); this.tttvMain = new ShareX.HelpersLib.TabToTreeView(); + this.lblWindowsStoreStartupStatus = new System.Windows.Forms.Label(); this.tcSettings.SuspendLayout(); this.tpGeneral.SuspendLayout(); this.tpIntegration.SuspendLayout(); @@ -394,6 +395,7 @@ private void InitializeComponent() // // gbWindows // + this.gbWindows.Controls.Add(this.lblWindowsStoreStartupStatus); this.gbWindows.Controls.Add(this.cbStartWithWindows); this.gbWindows.Controls.Add(this.cbSendToMenu); this.gbWindows.Controls.Add(this.cbShellContextMenu); @@ -1043,6 +1045,12 @@ private void InitializeComponent() this.tttvMain.Name = "tttvMain"; this.tttvMain.TreeViewFont = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(162))); this.tttvMain.TreeViewSize = 175; + this.tttvMain.TabChanged += new ShareX.HelpersLib.TabToTreeView.TabChangedEventHandler(this.tttvMain_TabChanged); + // + // lblWindowsStoreStartupStatus + // + resources.ApplyResources(this.lblWindowsStoreStartupStatus, "lblWindowsStoreStartupStatus"); + this.lblWindowsStoreStartupStatus.Name = "lblWindowsStoreStartupStatus"; // // ApplicationSettingsForm // @@ -1219,5 +1227,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox cbChromeExtensionSupport; private System.Windows.Forms.CheckBox cbFirefoxAddonSupport; private System.Windows.Forms.Button btnResetSettings; + private System.Windows.Forms.Label lblWindowsStoreStartupStatus; } } \ No newline at end of file diff --git a/ShareX/Forms/ApplicationSettingsForm.cs b/ShareX/Forms/ApplicationSettingsForm.cs index 8081f73d2..98465ff9c 100644 --- a/ShareX/Forms/ApplicationSettingsForm.cs +++ b/ShareX/Forms/ApplicationSettingsForm.cs @@ -68,6 +68,16 @@ private void SettingsForm_FormClosed(object sender, FormClosedEventArgs e) } } + private void tttvMain_TabChanged(TabPage tabPage) + { +#if WindowsStore + if (tabPage == tpIntegration) + { + CheckWindowsStoreStartup(); + } +#endif + } + private void InitializeControls() { InitializeComponent(); @@ -122,21 +132,6 @@ private void UpdateControls() // Integration #if WindowsStore cbStartWithWindows.Enabled = false; - StartupTaskState state = StartupTaskState.Error; - - TaskEx.Run(() => - { - state = IntegrationHelpers.CheckStartupWindowsStore(); - }, - () => - { - if (!IsDisposed && state != StartupTaskState.Error && state != StartupTaskState.DisabledByUser) - { - cbStartWithWindows.Checked = state == StartupTaskState.Enabled; - cbStartWithWindows.Enabled = true; - } - }); - cbShellContextMenu.Visible = false; cbSendToMenu.Visible = false; gbChrome.Visible = false; @@ -306,6 +301,41 @@ private void UpdateExportButton() btnExport.Enabled = Program.Settings.ExportSettings || Program.Settings.ExportHistory || Program.Settings.ExportLogs; } + private void CheckWindowsStoreStartup() + { + if (cbStartWithWindows.Enabled) return; + + lblWindowsStoreStartupStatus.Text = "Checking startup state..."; + lblWindowsStoreStartupStatus.Visible = true; + + StartupTaskState state = StartupTaskState.Error; + + TaskEx.Run(() => + { + state = IntegrationHelpers.CheckStartupWindowsStore(); + }, + () => + { + if (!IsDisposed) + { + if (state == StartupTaskState.Error) + { + lblWindowsStoreStartupStatus.Text = "Startup state check failed. Check debug log for more info."; + } + else if (state == StartupTaskState.DisabledByUser) + { + lblWindowsStoreStartupStatus.Text = "The startup has been disabled by the user."; + } + else + { + lblWindowsStoreStartupStatus.Visible = false; + cbStartWithWindows.Checked = state == StartupTaskState.Enabled; + cbStartWithWindows.Enabled = true; + } + } + }); + } + #region General private void cbShowTray_CheckedChanged(object sender, EventArgs e) diff --git a/ShareX/Forms/ApplicationSettingsForm.resx b/ShareX/Forms/ApplicationSettingsForm.resx index 955660e57..3b6e87c19 100644 --- a/ShareX/Forms/ApplicationSettingsForm.resx +++ b/ShareX/Forms/ApplicationSettingsForm.resx @@ -121,962 +121,11 @@ Top, Bottom, Left, Right - - cbCheckPreReleaseUpdates - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGeneral - - - 0 - - - cbTrayMiddleClickAction - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGeneral - - - 1 - - - lblTrayMiddleClickAction - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGeneral - - - 2 - - - cbTrayLeftDoubleClickAction - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGeneral - - - 3 - - - lblTrayLeftDoubleClickAction - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGeneral - - - 4 - - - cbTrayLeftClickAction - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGeneral - - - 5 - - - lblTrayLeftClickAction - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGeneral - - - 6 - - - btnEditQuickTaskMenu - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGeneral - - - 7 - - - cbShowTray - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGeneral - - - 8 - - - cbTrayIconProgressEnabled - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGeneral - - - 9 - - - btnLanguages - - - ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - tpGeneral - - - 10 - - - cbRememberMainFormPosition - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGeneral - - - 11 - - - cbSilentRun - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGeneral - - - 12 - - - cbTaskbarProgressEnabled - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGeneral - - - 13 - - - cbRememberMainFormSize - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGeneral - - - 14 - - - lblLanguage - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGeneral - - - 15 - - - - 4, 22 - - - 3, 3, 3, 3 - - - 550, 370 - - - 0 - - - General - - - tpGeneral - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcSettings - - - 0 - - - gbFirefox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpIntegration - - - 0 - - - gbSteam - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpIntegration - - - 1 - - - gbChrome - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpIntegration - - - 2 - - - gbWindows - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpIntegration - - - 3 - - - 4, 22 - - - 3, 3, 3, 3 - - - 550, 370 - - - 6 - - - Integration - - - tpIntegration - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcSettings - - - 1 - - - lblNotePersonalFolderPath - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPaths - - - 0 - - - btnOpenScreenshotsFolder - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPaths - - - 1 - - - lblPreviewPersonalFolderPath - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPaths - - - 2 - - - btnBrowsePersonalFolderPath - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPaths - - - 3 - - - lblPersonalFolderPath - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPaths - - - 4 - - - txtPersonalFolderPath - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPaths - - - 5 - - - btnBrowseCustomScreenshotsPath - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPaths - - - 6 - - - btnOpenPersonalFolderPath - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPaths - - - 7 - - - txtCustomScreenshotsPath - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPaths - - - 8 - - - cbUseCustomScreenshotsPath - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPaths - - - 9 - - - lblSaveImageSubFolderPattern - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPaths - - - 10 - - - lblSaveImageSubFolderPatternPreview - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPaths - - - 11 - - - txtSaveImageSubFolderPattern - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPaths - - - 12 - - - 4, 22 - - - 3, 3, 3, 3 - - - 550, 370 - - - 1 - - - Paths - - - tpPaths - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcSettings - - - 2 - - - btnResetSettings - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpExportImport - - - 0 - - - cbExportLogs - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpExportImport - - - 1 - - - cbExportHistory - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpExportImport - - - 2 - - - cbExportSettings - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpExportImport - - - 3 - - - pbExportImport - - - System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpExportImport - - - 4 - - - btnExport - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpExportImport - - - 5 - - - btnImport - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpExportImport - - - 6 - - - 4, 22 - - - 3, 3, 3, 3 - - - 550, 370 - - - 7 - - - Export / Import - - - tpExportImport - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcSettings - - - 3 - - - tcUpload - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpUpload - - - 0 - - - 4, 22 - - - 3, 3, 3, 3 - - - 550, 370 - - - 3 - - - Upload - - - tpUpload - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcSettings - - - 4 - - - gbHistory - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpHistory - - - 0 - - - gbRecentLinks - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpHistory - - - 1 - - - 4, 22 - - - 3, 3, 3, 3 - - - 550, 370 - - - 8 - - - History - - - tpHistory - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcSettings - - - 5 - - - cbPrintDontShowWindowsDialog - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPrint - - - 0 - - - cbDontShowPrintSettingDialog - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPrint - - - 1 - - - btnShowImagePrintSettings - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPrint - - - 2 - - - 4, 22 - - - 3, 3, 3, 3 - - - 550, 370 - - - 4 - - - Print - - - tpPrint - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcSettings - - - 6 - - - cbProxyMethod - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpProxy - - - 0 - - - lblProxyMethod - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpProxy - - - 1 - - - lblProxyHost - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpProxy - - - 2 - - - txtProxyHost - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpProxy - - - 3 - - - nudProxyPort - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpProxy - - - 4 - - - lblProxyPort - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpProxy - - - 5 - - - lblProxyPassword - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpProxy - - - 6 - - - txtProxyPassword - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpProxy - - - 7 - - - lblProxyUsername - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpProxy - - - 8 - - - txtProxyUsername - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpProxy - - - 9 - - - 4, 22 - - - 5, 5, 5, 5 - - - 550, 370 - - - 2 - - - Proxy - - - tpProxy - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcSettings - - - 7 - - - pgSettings - - - System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpAdvanced - - - 0 - - - 4, 22 - - - 3, 3, 3, 3 - - - 550, 370 - - - 5 - - - Advanced - - - tpAdvanced - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcSettings - - - 8 - - - 176, 3 - - - 558, 396 - - - 1 - - - False - - - tcSettings - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - True + 16, 328 @@ -1524,52 +573,31 @@ 15 - - cbFirefoxAddonSupport + + 4, 22 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3, 3, 3, 3 - - gbFirefox + + 550, 370 - + 0 - - btnFirefoxOpenAddonPage + + General - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tpGeneral - - gbFirefox + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + tcSettings - - 8, 216 - - - 536, 88 - - - 3 - - - Firefox addon - - - gbFirefox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpIntegration - - + 0 @@ -1626,6 +654,45 @@ 1 + + 8, 216 + + + 536, 88 + + + 3 + + + Firefox addon + + + gbFirefox + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpIntegration + + + 0 + + + True + + + 16, 24 + + + 247, 17 + + + 0 + + + While ShareX is open, show "In-App" in Steam + cbSteamShowInApp @@ -1662,81 +729,6 @@ 1 - - True - - - 16, 24 - - - 247, 17 - - - 0 - - - While ShareX is open, show "In-App" in Steam - - - cbSteamShowInApp - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbSteam - - - 0 - - - cbChromeExtensionSupport - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbChrome - - - 0 - - - btnChromeOpenExtensionPage - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbChrome - - - 1 - - - 8, 120 - - - 536, 88 - - - 1 - - - Chrome extension - - - gbChrome - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpIntegration - - - 2 - True @@ -1788,66 +780,60 @@ 1 - - cbStartWithWindows + + 8, 120 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 536, 88 - - gbWindows - - - 0 - - - cbSendToMenu - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbWindows - - + 1 - - cbShellContextMenu + + Chrome extension - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gbChrome - - gbWindows - - - 2 - - - 8, 8 - - - 536, 104 - - - 0 - - - Windows - - - gbWindows - - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tpIntegration - + + 2 + + + True + + + 13, 56 + + + 37, 13 + + 3 + + Status + + + False + + + lblWindowsStoreStartupStatus + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbWindows + + + 0 + True @@ -1876,7 +862,7 @@ gbWindows - 0 + 1 True @@ -1906,7 +892,7 @@ gbWindows - 1 + 2 True @@ -1936,7 +922,58 @@ gbWindows - 2 + 3 + + + 8, 8 + + + 536, 104 + + + 0 + + + Windows + + + gbWindows + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpIntegration + + + 3 + + + 4, 22 + + + 3, 3, 3, 3 + + + 550, 370 + + + 6 + + + Integration + + + tpIntegration + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcSettings + + + 1 True @@ -2289,6 +1326,33 @@ 12 + + 4, 22 + + + 3, 3, 3, 3 + + + 550, 370 + + + 1 + + + Paths + + + tpPaths + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcSettings + + + 2 + 16, 160 @@ -2475,149 +1539,32 @@ 6 - - tpPerformance - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcUpload - - - 0 - - - tpUploadResults - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcUpload - - - 1 - - - tpUploadRetry - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcUpload - - - 2 - - - Fill - - - 3, 3 - - - 544, 364 - - - 0 - - - tcUpload - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpUpload - - - 0 - - - lblUploadLimit - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPerformance - - - 0 - - - nudUploadLimit - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPerformance - - - 1 - - - lblUploadLimitHint - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPerformance - - - 2 - - - cbBufferSize - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPerformance - - - 3 - - - lblBufferSize - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpPerformance - - - 4 - - + 4, 22 - + 3, 3, 3, 3 - - 536, 338 + + 550, 370 - - 0 + + 7 - - tpPerformance + + Export / Import - + + tpExportImport + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tcUpload + + tcSettings - - 0 + + 3 True @@ -2754,120 +1701,33 @@ 4 - - gbClipboardFormats - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpUploadResults - - - 0 - - + 4, 22 - + 3, 3, 3, 3 - + 536, 338 - - 1 + + 0 - - Results + + tpPerformance - - tpUploadResults - - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcUpload - - 1 + + 0 Top, Bottom, Left, Right - - btnClipboardFormatEdit - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbClipboardFormats - - - 0 - - - btnClipboardFormatRemove - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbClipboardFormats - - - 1 - - - btnClipboardFormatAdd - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbClipboardFormats - - - 2 - - - lvClipboardFormats - - - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - gbClipboardFormats - - - 3 - - - 8, 8 - - - 512, 320 - - - 0 - - - Clipboard formats - these appear under Copy in the context menu in the main window - - - gbClipboardFormats - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpUploadResults - - - 0 - NoControl @@ -2952,6 +1812,18 @@ Top, Bottom, Left, Right + + Description + + + 135 + + + Format + + + 320 + 8, 48 @@ -2973,95 +1845,56 @@ 3 - - Description + + 8, 8 - - 135 + + 512, 320 - - Format - - - 320 - - - chkUseSecondaryUploaders - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpUploadRetry - - + 0 - - tlpBackupDestinations + + Clipboard formats - these appear under Copy in the context menu in the main window - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gbClipboardFormats - - tpUploadRetry + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + tpUploadResults - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="gbSecondaryImageUploaders" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="gbSecondaryFileUploaders" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="gbSecondaryTextUploaders" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,33,Percent,34,Percent,33" /><Rows Styles="Percent,100" /></TableLayoutSettings> + + 0 - - cbIfUploadFailRetryOnce - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpUploadRetry - - - 2 - - - nudRetryUpload - - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpUploadRetry - - - 3 - - + 4, 22 - + 3, 3, 3, 3 - + 536, 338 - - 2 + + 1 - - Retry + + Results - - tpUploadRetry + + tpUploadResults - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcUpload - - 2 + + 1 True @@ -3099,72 +1932,18 @@ 3 - - gbSecondaryImageUploaders + + Fill - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3, 18 - - tlpBackupDestinations + + 156, 242 - + 0 - - gbSecondaryFileUploaders - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tlpBackupDestinations - - - 1 - - - gbSecondaryTextUploaders - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tlpBackupDestinations - - - 2 - - - 3, 56 - - - 5, 5, 5, 5 - - - 1 - - - 521, 279 - - - 3 - - - tlpBackupDestinations - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpUploadRetry - - - 1 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="gbSecondaryImageUploaders" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="gbSecondaryFileUploaders" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="gbSecondaryTextUploaders" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,33,Percent,34,Percent,33" /><Rows Styles="Percent,100" /></TableLayoutSettings> - lvSecondaryImageUploaders @@ -3207,28 +1986,16 @@ 0 - + Fill - + 3, 18 - - 156, 242 + + 158, 242 - - 0 - - - lvSecondaryImageUploaders - - - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - gbSecondaryImageUploaders - - + 0 @@ -3273,28 +2040,16 @@ 1 - + Fill - + 3, 18 - - 158, 242 + + 161, 242 - - 0 - - - lvSecondaryFileUploaders - - - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - gbSecondaryFileUploaders - - + 0 @@ -3339,29 +2094,35 @@ 2 - - Fill + + 3, 56 - - 3, 18 + + 5, 5, 5, 5 - - 161, 242 + + 1 - - 0 + + 521, 279 - - lvSecondaryTextUploaders + + 3 - - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + tlpBackupDestinations - - gbSecondaryTextUploaders + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + tpUploadRetry + + + 1 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="gbSecondaryImageUploaders" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="gbSecondaryFileUploaders" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="gbSecondaryTextUploaders" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="Percent,33,Percent,34,Percent,33" /><Rows Styles="Percent,100" /></TableLayoutSettings> True @@ -3417,54 +2178,84 @@ 3 - - cbHistoryCheckURL + + 4, 22 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3, 3, 3, 3 - - gbHistory + + 536, 338 - + + 2 + + + Retry + + + tpUploadRetry + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcUpload + + + 2 + + + Fill + + + 3, 3 + + + 544, 364 + + 0 - - cbHistorySaveTasks + + tcUpload - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - gbHistory + + tpUpload - - 1 - - - 8, 8 - - - 536, 80 - - - 1 - - - History - - - gbHistory - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpHistory - - + 0 + + 4, 22 + + + 3, 3, 3, 3 + + + 550, 370 + + + 3 + + + Upload + + + tpUpload + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcSettings + + + 4 + True @@ -3519,101 +2310,29 @@ 1 - - cbRecentTasksTrayMenuMostRecentFirst + + 8, 8 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 536, 80 - - gbRecentLinks - - - 0 - - - lblRecentTasksMaxCount - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbRecentLinks - - + 1 - - nudRecentTasksMaxCount + + History - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gbHistory - - gbRecentLinks - - - 2 - - - cbRecentTasksShowInTrayMenu - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbRecentLinks - - - 3 - - - cbRecentTasksShowInMainWindow - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbRecentLinks - - - 4 - - - cbRecentTasksSave - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbRecentLinks - - - 5 - - - 8, 96 - - - 536, 176 - - - 0 - - - Recent tasks - - - gbRecentLinks - - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tpHistory - - 1 + + 0 True @@ -3777,6 +2496,57 @@ 5 + + 8, 96 + + + 536, 176 + + + 0 + + + Recent tasks + + + gbRecentLinks + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpHistory + + + 1 + + + 4, 22 + + + 3, 3, 3, 3 + + + 550, 370 + + + 8 + + + History + + + tpHistory + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcSettings + + + 5 + True @@ -3864,6 +2634,33 @@ 2 + + 4, 22 + + + 3, 3, 3, 3 + + + 550, 370 + + + 4 + + + Print + + + tpPrint + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcSettings + + + 6 + 16, 32 @@ -4122,6 +2919,33 @@ 9 + + 4, 22 + + + 5, 5, 5, 5 + + + 550, 370 + + + 2 + + + Proxy + + + tpProxy + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcSettings + + + 7 + Fill @@ -4146,6 +2970,57 @@ 0 + + 4, 22 + + + 3, 3, 3, 3 + + + 550, 370 + + + 5 + + + Advanced + + + tpAdvanced + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcSettings + + + 8 + + + 176, 3 + + + 558, 396 + + + 1 + + + False + + + tcSettings + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + Fill diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index e08393323..dae03c2ba 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -239,7 +239,7 @@ private void InitializeComponent() this.tsmiTrayExit = new System.Windows.Forms.ToolStripMenuItem(); this.timerTraySingleClick = new System.Windows.Forms.Timer(this.components); this.ttMain = new System.Windows.Forms.ToolTip(this.components); - this.newsListControl1 = new ShareX.NewsListControl(); + this.ucNews = new ShareX.NewsListControl(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); @@ -1859,10 +1859,10 @@ private void InitializeComponent() this.ttMain.InitialDelay = 200; this.ttMain.ReshowDelay = 100; // - // newsListControl1 + // ucNews // - resources.ApplyResources(this.newsListControl1, "newsListControl1"); - this.newsListControl1.Name = "newsListControl1"; + resources.ApplyResources(this.ucNews, "ucNews"); + this.ucNews.Name = "ucNews"; // // MainForm // @@ -1870,7 +1870,7 @@ private void InitializeComponent() resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; - this.Controls.Add(this.newsListControl1); + this.Controls.Add(this.ucNews); this.Controls.Add(this.flpPatreon); this.Controls.Add(this.scMain); this.Controls.Add(this.tsMain); @@ -2113,6 +2113,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem tsmiDeleteSelectedItem; private System.Windows.Forms.ToolStripMenuItem tsmiSearchImage; private ShareX.HelpersLib.ToolStripButtonExtraImage tsbNews; - private NewsListControl newsListControl1; + private NewsListControl ucNews; } } \ No newline at end of file diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index 1693ff101..8d19eb2fb 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -159,6 +159,45 @@ 0 + + Filename + + + 150 + + + Status + + + Progress + + + 125 + + + Speed + + + 75 + + + Elapsed + + + 45 + + + Remaining + + + 45 + + + URL + + + 145 + Fill @@ -255,105 +294,12 @@ 4 - - Filename - - - 150 - - - Status - - - Progress - - - 125 - - - Speed - - - 75 - - - Elapsed - - - 45 - - - Remaining - - - 45 - - - URL - - - 145 - Bottom, Right True - - pbPatreonOpen - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flpPatreon - - - 0 - - - pbPatreonHide - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flpPatreon - - - 1 - - - 613, 378 - - - 215, 45 - - - 3 - - - False - - - False - - - flpPatreon - - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - - - 567, 17 - 0, 0 @@ -369,6 +315,9 @@ 0 + + 567, 17 + Open ShareX Patreon campaign web page @@ -414,6 +363,33 @@ 1 + + 613, 378 + + + 215, 45 + + + 3 + + + False + + + False + + + flpPatreon + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + 17, 17 @@ -423,6 +399,84 @@ Left + + 191, 22 + + + Fullscreen + + + 191, 22 + + + Window + + + 191, 22 + + + Monitor + + + 191, 22 + + + Region + + + 191, 22 + + + Region (Light) + + + 191, 22 + + + Region (Transparent) + + + 191, 22 + + + Last region + + + 191, 22 + + + Screen recording + + + 191, 22 + + + Screen recording (GIF) + + + 191, 22 + + + Scrolling capture... + + + 191, 22 + + + Webpage capture... + + + 191, 22 + + + Text capture (OCR)... + + + 191, 22 + + + Auto capture... + MiddleLeft @@ -435,6 +489,36 @@ Capture + + 203, 22 + + + Upload file... + + + 203, 22 + + + Upload folder... + + + 203, 22 + + + Upload from clipboard... + + + 203, 22 + + + Upload from URL... + + + 203, 22 + + + Drag and drop upload... + MiddleLeft @@ -459,6 +543,90 @@ Workflows + + 183, 22 + + + Color picker... + + + 183, 22 + + + Screen color picker... + + + 183, 22 + + + Annotate image... + + + 183, 22 + + + Image effects... + + + 183, 22 + + + Hash check... + + + 183, 22 + + + DNS changer... + + + 183, 22 + + + QR code... + + + 183, 22 + + + Ruler... + + + 183, 22 + + + Directory indexer... + + + 183, 22 + + + Image combiner... + + + 183, 22 + + + Video thumbnailer... + + + 183, 22 + + + FTP client... + + + 183, 22 + + + Tweet message... + + + 183, 22 + + + Monitor test... + MiddleLeft @@ -498,6 +666,45 @@ After upload tasks + + 187, 22 + + + Image uploaders + + + 187, 22 + + + Text uploaders + + + 187, 22 + + + File uploaders + + + 187, 22 + + + URL shorteners + + + 187, 22 + + + URL sharing services + + + 184, 6 + + + 187, 22 + + + Destination settings... + MiddleLeft @@ -585,6 +792,42 @@ Image history... + + 172, 22 + + + Debug log... + + + 172, 22 + + + Test image upload + + + 172, 22 + + + Test text upload + + + 172, 22 + + + Test file upload + + + 172, 22 + + + Test URL shortener + + + 172, 22 + + + Test URL sharing + MiddleLeft @@ -657,285 +900,9 @@ 5 - - 191, 22 - - - Fullscreen - - - 191, 22 - - - Window - - - 191, 22 - - - Monitor - - - 191, 22 - - - Region - - - 191, 22 - - - Region (Light) - - - 191, 22 - - - Region (Transparent) - - - 191, 22 - - - Last region - - - 191, 22 - - - Screen recording - - - 191, 22 - - - Screen recording (GIF) - - - 191, 22 - - - Scrolling capture... - - - 191, 22 - - - Webpage capture... - - - 191, 22 - - - Text capture (OCR)... - - - 191, 22 - - - Auto capture... - - - 203, 22 - - - Upload file... - - - 203, 22 - - - Upload folder... - - - 203, 22 - - - Upload from clipboard... - - - 203, 22 - - - Upload from URL... - - - 203, 22 - - - Drag and drop upload... - - - 183, 22 - - - Color picker... - - - 183, 22 - - - Screen color picker... - - - 183, 22 - - - Annotate image... - - - 183, 22 - - - Image effects... - - - 183, 22 - - - Hash check... - - - 183, 22 - - - DNS changer... - - - 183, 22 - - - QR code... - - - 183, 22 - - - Ruler... - - - 183, 22 - - - Directory indexer... - - - 183, 22 - - - Image combiner... - - - 183, 22 - - - Video thumbnailer... - - - 183, 22 - - - FTP client... - - - 183, 22 - - - Tweet message... - - - 183, 22 - - - Monitor test... - - - 187, 22 - - - Image uploaders - - - 187, 22 - - - Text uploaders - - - 187, 22 - - - File uploaders - - - 187, 22 - - - URL shorteners - - - 187, 22 - - - URL sharing services - - - 184, 6 - - - 187, 22 - - - Destination settings... - - - 172, 22 - - - Debug log... - - - 172, 22 - - - Test image upload - - - 172, 22 - - - Test text upload - - - 172, 22 - - - Test file upload - - - 172, 22 - - - Test URL shortener - - - 172, 22 - - - Test URL sharing - 286, 17 - - 229, 450 - - - cmsTaskInfo - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 228, 22 @@ -948,15 +915,6 @@ Stop upload - - - - - 228, 22 - - - Open - Enter @@ -1011,14 +969,14 @@ Thumbnail file - + - + 228, 22 - - Copy + + Open Ctrl+C @@ -1164,6 +1122,15 @@ False + + + + + 228, 22 + + + Copy + Ctrl+U @@ -1272,12 +1239,6 @@ Hide columns - - 228, 22 - - - Image preview - 130, 22 @@ -1296,30 +1257,27 @@ Automatic + + 228, 22 + + + Image preview + + + 229, 450 + + + cmsTaskInfo + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 105, 17 190, 17 - - 193, 484 - - - cmsTray - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ShareX - - - 192, 22 - - - Capture - 191, 22 @@ -1398,11 +1356,11 @@ Auto capture... - + 192, 22 - - Upload + + Capture 203, 22 @@ -1434,18 +1392,18 @@ Drag and drop upload... + + 192, 22 + + + Upload + 192, 22 Workflows - - 192, 22 - - - Tools - 183, 22 @@ -1530,6 +1488,12 @@ Monitor test... + + 192, 22 + + + Tools + 189, 6 @@ -1545,12 +1509,6 @@ After upload tasks - - 192, 22 - - - Destinations - 187, 22 @@ -1590,6 +1548,12 @@ Destination settings... + + 192, 22 + + + Destinations + 192, 22 @@ -1635,12 +1599,6 @@ Image history... - - 192, 22 - - - Debug - 172, 22 @@ -1677,6 +1635,12 @@ Test URL sharing + + 192, 22 + + + Debug + 192, 22 @@ -1719,37 +1683,46 @@ Exit + + 193, 484 + + + cmsTray + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ShareX + 405, 17 - - 567, 17 - - + Fill - + 160, 0 - + 0, 0, 0, 0 - + 674, 429 - + 4 - - newsListControl1 + + ucNews - + ShareX.NewsListControl, ShareX, Version=11.8.0.0, Culture=neutral, PublicKeyToken=null - + $this - + 2 diff --git a/ShareX/IntegrationHelpers.cs b/ShareX/IntegrationHelpers.cs index c91e9b98d..ed8f96043 100644 --- a/ShareX/IntegrationHelpers.cs +++ b/ShareX/IntegrationHelpers.cs @@ -88,6 +88,8 @@ public static StartupTaskState CheckStartupWindowsStore() { try { + DebugHelper.WriteLine($"Start: {filepath} -StartupState"); + ProcessStartInfo startInfo = new ProcessStartInfo() { FileName = filepath, @@ -102,7 +104,7 @@ public static StartupTaskState CheckStartupWindowsStore() { int code = process.ExitCode; - DebugHelper.WriteLine($"CheckStartupWindowsStore: {code}"); + DebugHelper.WriteLine($"Startup check result: {code}"); if (code > -1) { @@ -112,7 +114,7 @@ public static StartupTaskState CheckStartupWindowsStore() } catch (Exception e) { - MessageBox.Show("Startup state check failed:\r\n" + e.ToString(), "ShareX"); + DebugHelper.WriteException(e, "Startup state check failed"); } }