From 1b9e14c2a649c4f5954b341a6f74a803cc788fea Mon Sep 17 00:00:00 2001 From: Jaex Date: Mon, 28 Sep 2015 08:42:56 +0300 Subject: [PATCH] Beta build --- ShareX.HelpersLib/Links.cs | 1 + .../Forms/ScrollingCaptureForm.cs | 2 +- ShareX/Forms/MainForm.Designer.cs | 16 ++-- ShareX/Forms/MainForm.cs | 4 + ShareX/Forms/MainForm.resx | 82 +++++++++---------- ShareX/Program.cs | 2 +- 6 files changed, 56 insertions(+), 51 deletions(-) diff --git a/ShareX.HelpersLib/Links.cs b/ShareX.HelpersLib/Links.cs index e61848edc..2367bc72a 100644 --- a/ShareX.HelpersLib/Links.cs +++ b/ShareX.HelpersLib/Links.cs @@ -33,6 +33,7 @@ public static class Links public const string URL_CALLBACK = URL_WEBSITE + "/callback/"; public const string URL_CHANGELOG = URL_PROJECT + "/wiki/Changelog"; public const string URL_DONATE = "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=PCNWK2G6ZYJ2E"; + public const string URL_STEAM_DONATE = "http://store.steampowered.com/dlc/400040/"; public const string URL_BERK = "https://github.com/Jaex"; public const string URL_MIKE = "https://github.com/McoreD"; public const string URL_STEAM = "http://store.steampowered.com/app/400040/"; diff --git a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs index 05b9d35c4..75914b64f 100644 --- a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs +++ b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs @@ -743,7 +743,7 @@ private void GuessCombineAdjustments() } } - private int CalculateVerticalOffset(Image img1, Image img2, int ignoreRightOffset = 50, int matchCount = 50) + private int CalculateVerticalOffset(Image img1, Image img2, int ignoreRightOffset = 50) { int lastMatchCount = 0; int lastMatchOffset = 0; diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index bd5fdf116..9d35805ae 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -177,6 +177,7 @@ private void InitializeComponent() this.tsmiTrayLastRegion = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayScreenRecordingFFmpeg = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayScreenRecordingGIF = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiTrayScrollingCapture = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayWebpageCapture = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayAutoCapture = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayUpload = new System.Windows.Forms.ToolStripMenuItem(); @@ -228,7 +229,6 @@ 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.tsmiTrayScrollingCapture = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); @@ -1383,6 +1383,13 @@ private void InitializeComponent() resources.ApplyResources(this.tsmiTrayScreenRecordingGIF, "tsmiTrayScreenRecordingGIF"); this.tsmiTrayScreenRecordingGIF.Click += new System.EventHandler(this.tsmiScreenRecordingGIF_Click); // + // tsmiTrayScrollingCapture + // + this.tsmiTrayScrollingCapture.Image = global::ShareX.Properties.Resources.ui_scroll_pane_image; + this.tsmiTrayScrollingCapture.Name = "tsmiTrayScrollingCapture"; + resources.ApplyResources(this.tsmiTrayScrollingCapture, "tsmiTrayScrollingCapture"); + this.tsmiTrayScrollingCapture.Click += new System.EventHandler(this.tsmiScrollingCapture_Click); + // // tsmiTrayWebpageCapture // this.tsmiTrayWebpageCapture.Image = global::ShareX.Properties.Resources.document_globe; @@ -1748,13 +1755,6 @@ private void InitializeComponent() // this.timerTraySingleClick.Tick += new System.EventHandler(this.timerTraySingleClick_Tick); // - // tsmiTrayScrollingCapture - // - this.tsmiTrayScrollingCapture.Image = global::ShareX.Properties.Resources.ui_scroll_pane_image; - this.tsmiTrayScrollingCapture.Name = "tsmiTrayScrollingCapture"; - resources.ApplyResources(this.tsmiTrayScrollingCapture, "tsmiTrayScrollingCapture"); - this.tsmiTrayScrollingCapture.Click += new System.EventHandler(this.tsmiScrollingCapture_Click); - // // MainForm // this.AllowDrop = true; diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 0ef3a25b9..795509c80 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -1206,7 +1206,11 @@ private void tsbAbout_Click(object sender, EventArgs e) private void tsbDonate_Click(object sender, EventArgs e) { +#if STEAM + URLHelpers.OpenURL(Links.URL_STEAM_DONATE); +#else URLHelpers.OpenURL(Links.URL_DONATE); +#endif } private void lblDragAndDropTip_MouseUp(object sender, MouseEventArgs e) diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index 2bfd27098..c7c246150 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -325,97 +325,97 @@ Left - 220, 22 + 230, 22 Fullscreen - 220, 22 + 230, 22 Window - 220, 22 + 230, 22 Monitor - 220, 22 + 230, 22 Region - 220, 22 + 230, 22 - Region (Windows & controls) + Region (Windows && controls) - 220, 22 + 230, 22 Region (Annotate) - 220, 22 + 230, 22 Region (Light) - 220, 22 + 230, 22 Region (Transparent) - 220, 22 + 230, 22 Polygon - 220, 22 + 230, 22 Freehand - 220, 22 + 230, 22 Last region - 220, 22 + 230, 22 Screen recording - 220, 22 + 230, 22 Screen recording (GIF) - 220, 22 + 230, 22 Scrolling capture... - 220, 22 + 230, 22 Webpage capture... - 220, 22 + 230, 22 Auto capture... @@ -1138,97 +1138,97 @@ 190, 17 - 220, 22 + 230, 22 Fullscreen - 220, 22 + 230, 22 Window - 220, 22 + 230, 22 Monitor - 220, 22 + 230, 22 Region - 220, 22 + 230, 22 - Region (Windows & controls) + Region (Windows && controls) - 220, 22 + 230, 22 Region (Annotate) - 220, 22 + 230, 22 Region (Light) - 220, 22 + 230, 22 Region (Transparent) - 220, 22 + 230, 22 Polygon - 220, 22 + 230, 22 Freehand - 220, 22 + 230, 22 Last region - 220, 22 + 230, 22 Screen recording - 220, 22 + 230, 22 Screen recording (GIF) - 220, 22 + 230, 22 Scrolling capture... - 220, 22 + 230, 22 Webpage capture... - 220, 22 + 230, 22 Auto capture... @@ -2385,6 +2385,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsmiTrayScrollingCapture + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + tsmiTrayWebpageCapture @@ -2691,16 +2697,10 @@ System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsmiTrayScrollingCapture - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - MainForm - ShareX.HotkeyForm, ShareX, Version=10.2.5.0, Culture=neutral, PublicKeyToken=null + ShareX.HotkeyForm, ShareX, Version=10.2.6.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/ShareX/Program.cs b/ShareX/Program.cs index a4fed551e..70f148110 100644 --- a/ShareX/Program.cs +++ b/ShareX/Program.cs @@ -54,7 +54,7 @@ public static ShareXBuild Build } } - public static bool IsBeta { get; } = false; + public static bool IsBeta { get; } = true; public static string Title {