CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-30 20:20:34 +12:00
Code Issues Packages Projects Releases Wiki Activity

Beta build

Browse source
This commit is contained in:
Jaex 2015-09-28 08:42:56 +03:00
parent 2652fefa49
commit 1b9e14c2a6
6 changed files with 56 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ShareX.HelpersLib/Links.cs
View file

@ -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/";

2
ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs
View file

@ -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;

16
ShareX/Forms/MainForm.Designer.cs generated
View file

@ -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;

4
ShareX/Forms/MainForm.cs
View file

@ -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)

82
ShareX/Forms/MainForm.resx
View file

@ -325,97 +325,97 @@
<value>Left</value>
</data>
<data name="tsmiFullscreen.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiFullscreen.Text" xml:space="preserve">
<value>Fullscreen</value>
</data>
<data name="tsmiWindow.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiWindow.Text" xml:space="preserve">
<value>Window</value>
</data>
<data name="tsmiMonitor.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiMonitor.Text" xml:space="preserve">
<value>Monitor</value>
</data>
<data name="tsmiRectangle.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiRectangle.Text" xml:space="preserve">
<value>Region</value>
</data>
<data name="tsmiWindowRectangle.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiWindowRectangle.Text" xml:space="preserve">
<value>Region (Windows &amp; controls)</value>
<value>Region (Windows &amp;&amp; controls)</value>
</data>
<data name="tsmiRectangleAnnotate.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiRectangleAnnotate.Text" xml:space="preserve">
<value>Region (Annotate)</value>
</data>
<data name="tsmiRectangleLight.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiRectangleLight.Text" xml:space="preserve">
<value>Region (Light)</value>
</data>
<data name="tsmiRectangleTransparent.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiRectangleTransparent.Text" xml:space="preserve">
<value>Region (Transparent)</value>
</data>
<data name="tsmiPolygon.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiPolygon.Text" xml:space="preserve">
<value>Polygon</value>
</data>
<data name="tsmiFreeHand.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiFreeHand.Text" xml:space="preserve">
<value>Freehand</value>
</data>
<data name="tsmiLastRegion.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiLastRegion.Text" xml:space="preserve">
<value>Last region</value>
</data>
<data name="tsmiScreenRecordingFFmpeg.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiScreenRecordingFFmpeg.Text" xml:space="preserve">
<value>Screen recording</value>
</data>
<data name="tsmiScreenRecordingGIF.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiScreenRecordingGIF.Text" xml:space="preserve">
<value>Screen recording (GIF)</value>
</data>
<data name="tsmiScrollingCapture.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiScrollingCapture.Text" xml:space="preserve">
<value>Scrolling capture...</value>
</data>
<data name="tsmiWebpageCapture.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiWebpageCapture.Text" xml:space="preserve">
<value>Webpage capture...</value>
</data>
<data name="tsmiAutoCapture.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiAutoCapture.Text" xml:space="preserve">
<value>Auto capture...</value>
@ -1138,97 +1138,97 @@
<value>190, 17</value>
</metadata>
<data name="tsmiTrayFullscreen.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiTrayFullscreen.Text" xml:space="preserve">
<value>Fullscreen</value>
</data>
<data name="tsmiTrayWindow.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiTrayWindow.Text" xml:space="preserve">
<value>Window</value>
</data>
<data name="tsmiTrayMonitor.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiTrayMonitor.Text" xml:space="preserve">
<value>Monitor</value>
</data>
<data name="tsmiTrayRectangle.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiTrayRectangle.Text" xml:space="preserve">
<value>Region</value>
</data>
<data name="tsmiTrayWindowRectangle.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiTrayWindowRectangle.Text" xml:space="preserve">
<value>Region (Windows &amp; controls)</value>
<value>Region (Windows &amp;&amp; controls)</value>
</data>
<data name="tsmiTrayRectangleAnnotate.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiTrayRectangleAnnotate.Text" xml:space="preserve">
<value>Region (Annotate)</value>
</data>
<data name="tsmiTrayRectangleLight.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiTrayRectangleLight.Text" xml:space="preserve">
<value>Region (Light)</value>
</data>
<data name="tsmiTrayRectangleTransparent.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiTrayRectangleTransparent.Text" xml:space="preserve">
<value>Region (Transparent)</value>
</data>
<data name="tsmiTrayPolygon.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiTrayPolygon.Text" xml:space="preserve">
<value>Polygon</value>
</data>
<data name="tsmiTrayFreeHand.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiTrayFreeHand.Text" xml:space="preserve">
<value>Freehand</value>
</data>
<data name="tsmiTrayLastRegion.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiTrayLastRegion.Text" xml:space="preserve">
<value>Last region</value>
</data>
<data name="tsmiTrayScreenRecordingFFmpeg.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiTrayScreenRecordingFFmpeg.Text" xml:space="preserve">
<value>Screen recording</value>
</data>
<data name="tsmiTrayScreenRecordingGIF.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiTrayScreenRecordingGIF.Text" xml:space="preserve">
<value>Screen recording (GIF)</value>
</data>
<data name="tsmiTrayScrollingCapture.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiTrayScrollingCapture.Text" xml:space="preserve">
<value>Scrolling capture...</value>
</data>
<data name="tsmiTrayWebpageCapture.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiTrayWebpageCapture.Text" xml:space="preserve">
<value>Webpage capture...</value>
</data>
<data name="tsmiTrayAutoCapture.Size" type="System.Drawing.Size, System.Drawing">
<value>220, 22</value>
<value>230, 22</value>
</data>
<data name="tsmiTrayAutoCapture.Text" xml:space="preserve">
<value>Auto capture...</value>
@ -2385,6 +2385,12 @@
<data name="&gt;&gt;tsmiTrayScreenRecordingGIF.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiTrayScrollingCapture.Name" xml:space="preserve">
<value>tsmiTrayScrollingCapture</value>
</data>
<data name="&gt;&gt;tsmiTrayScrollingCapture.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiTrayWebpageCapture.Name" xml:space="preserve">
<value>tsmiTrayWebpageCapture</value>
</data>
@ -2691,16 +2697,10 @@
<data name="&gt;&gt;timerTraySingleClick.Type" xml:space="preserve">
<value>System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiTrayScrollingCapture.Name" xml:space="preserve">
<value>tsmiTrayScrollingCapture</value>
</data>
<data name="&gt;&gt;tsmiTrayScrollingCapture.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>MainForm</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>ShareX.HotkeyForm, ShareX, Version=10.2.5.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HotkeyForm, ShareX, Version=10.2.6.0, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

2
ShareX/Program.cs
View file

@ -54,7 +54,7 @@ public static ShareXBuild Build
}
}
public static bool IsBeta { get; } = false;
public static bool IsBeta { get; } = true;
public static string Title
{