From 6ff99a185a88b6090359f04caee3c5ea6c368971 Mon Sep 17 00:00:00 2001 From: Jaex Date: Thu, 1 Oct 2015 18:28:16 +0300 Subject: [PATCH] Added Steam button to main window --- .../Forms/ScrollingCaptureForm.nl-NL.resx | 3 + ShareX/ApplicationConfig.cs | 1 + ShareX/Forms/MainForm.Designer.cs | 32 ++++++-- ShareX/Forms/MainForm.cs | 15 ++++ ShareX/Forms/MainForm.nl-NL.resx | 6 ++ ShareX/Forms/MainForm.resx | 82 +++++++++++++++++-- 6 files changed, 125 insertions(+), 14 deletions(-) diff --git a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.nl-NL.resx b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.nl-NL.resx index c1cbff3ef..06885ed1c 100644 --- a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.nl-NL.resx +++ b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.nl-NL.resx @@ -213,4 +213,7 @@ Start regio opname automatisch voor het openen van dit scherm + + Gelieve op te merken dat desondanks het feit dat ShareX probeert een accurate opname inclusief scrollen te maken, het nog steeds kan gebeuren dat niet alles correct opgenomen wordt. De voornaamste reden hiervoor is bewegende elementen op het scherm (zoals een geanimeerde gif, of een menu dat niet meescrollt), die ervoor zorgen dat niet alles meegenomen wordt tijdens het combineren. + \ No newline at end of file diff --git a/ShareX/ApplicationConfig.cs b/ShareX/ApplicationConfig.cs index fa2d037f2..b90e3f911 100644 --- a/ShareX/ApplicationConfig.cs +++ b/ShareX/ApplicationConfig.cs @@ -43,6 +43,7 @@ public class ApplicationConfig : SettingsBase public int NameParserAutoIncrementNumber = 0; public RecentItem[] RecentLinks = null; public bool DisableHotkeys = false; + public bool ShowSteamButtons = true; public ApplicationConfig() { diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index 32cf7d6e7..fa042e36a 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -200,6 +200,7 @@ private void InitializeComponent() this.tsmiTrayRuler = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayAutomate = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayIndexFolder = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiTrayImageCombiner = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayVideoThumbnailer = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayFTPClient = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayTweetMessage = new System.Windows.Forms.ToolStripMenuItem(); @@ -230,7 +231,8 @@ private void InitializeComponent() this.tsmiTrayShow = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayExit = new System.Windows.Forms.ToolStripMenuItem(); this.timerTraySingleClick = new System.Windows.Forms.Timer(this.components); - this.tsmiTrayImageCombiner = new System.Windows.Forms.ToolStripMenuItem(); + this.btnOpenSteam = new ShareX.HelpersLib.GreenlightButton(); + this.btnHideSteam = new ShareX.HelpersLib.GreenlightButton(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); @@ -1567,6 +1569,13 @@ private void InitializeComponent() resources.ApplyResources(this.tsmiTrayIndexFolder, "tsmiTrayIndexFolder"); this.tsmiTrayIndexFolder.Click += new System.EventHandler(this.tsmiIndexFolder_Click); // + // tsmiTrayImageCombiner + // + this.tsmiTrayImageCombiner.Image = global::ShareX.Properties.Resources.document_break; + this.tsmiTrayImageCombiner.Name = "tsmiTrayImageCombiner"; + resources.ApplyResources(this.tsmiTrayImageCombiner, "tsmiTrayImageCombiner"); + this.tsmiTrayImageCombiner.Click += new System.EventHandler(this.tsmiImageCombiner_Click); + // // tsmiTrayVideoThumbnailer // this.tsmiTrayVideoThumbnailer.Image = global::ShareX.Properties.Resources.images_stack; @@ -1766,12 +1775,19 @@ private void InitializeComponent() // this.timerTraySingleClick.Tick += new System.EventHandler(this.timerTraySingleClick_Tick); // - // tsmiTrayImageCombiner + // btnOpenSteam // - this.tsmiTrayImageCombiner.Image = global::ShareX.Properties.Resources.document_break; - this.tsmiTrayImageCombiner.Name = "tsmiTrayImageCombiner"; - resources.ApplyResources(this.tsmiTrayImageCombiner, "tsmiTrayImageCombiner"); - this.tsmiTrayImageCombiner.Click += new System.EventHandler(this.tsmiImageCombiner_Click); + resources.ApplyResources(this.btnOpenSteam, "btnOpenSteam"); + this.btnOpenSteam.ForeColor = System.Drawing.Color.White; + this.btnOpenSteam.Name = "btnOpenSteam"; + this.btnOpenSteam.MouseClick += new System.Windows.Forms.MouseEventHandler(this.btnOpenSteam_MouseClick); + // + // btnHideSteam + // + resources.ApplyResources(this.btnHideSteam, "btnHideSteam"); + this.btnHideSteam.ForeColor = System.Drawing.Color.White; + this.btnHideSteam.Name = "btnHideSteam"; + this.btnHideSteam.MouseClick += new System.Windows.Forms.MouseEventHandler(this.btnHideSteam_MouseClick); // // MainForm // @@ -1779,6 +1795,8 @@ private void InitializeComponent() resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.White; + this.Controls.Add(this.btnHideSteam); + this.Controls.Add(this.btnOpenSteam); this.Controls.Add(this.scMain); this.Controls.Add(this.tsMain); this.DoubleBuffered = true; @@ -2007,5 +2025,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem tsmiTrayScrollingCapture; private System.Windows.Forms.ToolStripMenuItem tsmiImageCombiner; private System.Windows.Forms.ToolStripMenuItem tsmiTrayImageCombiner; + private HelpersLib.GreenlightButton btnOpenSteam; + private HelpersLib.GreenlightButton btnHideSteam; } } \ No newline at end of file diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 110692299..de04645a7 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -588,6 +588,10 @@ private void LoadSettings() UpdateToggleHotkeyButton(); TaskbarManager.Enabled = Program.Settings.TaskbarProgressEnabled; + +#if !STEAM + btnOpenSteam.Visible = btnHideSteam.Visible = Program.Settings.ShowSteamButtons; +#endif } private void RegisterMenuClosing() @@ -1295,6 +1299,17 @@ private void lvUploads_KeyDown(object sender, KeyEventArgs e) e.Handled = true; } + private void btnOpenSteam_MouseClick(object sender, MouseEventArgs e) + { + URLHelpers.OpenURL(Links.URL_STEAM); + } + + private void btnHideSteam_MouseClick(object sender, MouseEventArgs e) + { + Program.Settings.ShowSteamButtons = false; + btnOpenSteam.Visible = btnHideSteam.Visible = false; + } + #region Tray events private void timerTraySingleClick_Tick(object sender, EventArgs e) diff --git a/ShareX/Forms/MainForm.nl-NL.resx b/ShareX/Forms/MainForm.nl-NL.resx index 5dfeac903..e42bc708e 100644 --- a/ShareX/Forms/MainForm.nl-NL.resx +++ b/ShareX/Forms/MainForm.nl-NL.resx @@ -648,4 +648,10 @@ Scrollopname... + + Verberg + + + ShareX is nu beschikbaar op Steam! + \ No newline at end of file diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index 74e9364ce..899970f55 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -313,7 +313,7 @@ $this - 2 + 4 17, 17 @@ -841,7 +841,7 @@ $this - 3 + 5 286, 17 @@ -1545,6 +1545,72 @@ 405, 17 + + Bottom, Right + + + Arial, 12pt + + + 482, 360 + + + 280, 40 + + + 0 + + + ShareX is now released on Steam! + + + False + + + btnOpenSteam + + + ShareX.HelpersLib.GreenlightButton, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 3 + + + Bottom, Right + + + Arial, 12pt + + + 764, 360 + + + 64, 40 + + + 1 + + + Hide + + + False + + + btnHideSteam + + + ShareX.HelpersLib.GreenlightButton, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 2 + True @@ -2535,6 +2601,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsmiTrayImageCombiner + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + tsmiTrayVideoThumbnailer @@ -2715,12 +2787,6 @@ System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsmiTrayImageCombiner - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - MainForm