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

Portable download url fix

Browse source
This commit is contained in:
Jaex 2015-10-29 09:57:01 +02:00
parent 41f90e017e
commit 74ed6f7bac
3 changed files with 59 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ShareX.HelpersLib/UpdateChecker/GitHubUpdateChecker.cs
View file

@ -96,7 +96,16 @@ public override void CheckUpdate()
if (asset != null && !string.IsNullOrEmpty(asset.name) && asset.name.EndsWith(extension, StringComparison.InvariantCultureIgnoreCase))
{
Filename = asset.name;
DownloadURL = asset.url;
if (IsPortable)
{
DownloadURL = asset.browser_download_url;
}
else
{
DownloadURL = asset.url;
}
RefreshStatus();
return;
}
@ -204,5 +213,6 @@ public class GitHubAsset
public int download_count { get; set; }
public string created_at { get; set; }
public string updated_at { get; set; }
public string browser_download_url { get; set; }
}
}

22
ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.Designer.cs generated
View file

@ -41,6 +41,7 @@ private void InitializeComponent()
this.cbGIFStatsMode = new System.Windows.Forms.ComboBox();
this.cbGIFDither = new System.Windows.Forms.ComboBox();
this.pbAudioCodecWarning = new System.Windows.Forms.PictureBox();
this.pbx264PresetWarning = new System.Windows.Forms.PictureBox();
this.lblCodec = new System.Windows.Forms.Label();
this.cboVideoCodec = new System.Windows.Forms.ComboBox();
this.lblx264Preset = new System.Windows.Forms.Label();
@ -89,13 +90,13 @@ private void InitializeComponent()
this.gbCodecs = new System.Windows.Forms.GroupBox();
this.btnHelp = new System.Windows.Forms.Button();
this.eiFFmpeg = new ShareX.HelpersLib.ExportImportControl();
this.pbx264PresetWarning = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.nudx264CRF)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nudXvidQscale)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tbVorbis_qscale)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tbMP3_qscale)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tbAACBitrate)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pbAudioCodecWarning)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pbx264PresetWarning)).BeginInit();
this.gbFFmpegExe.SuspendLayout();
this.gbCommandLinePreview.SuspendLayout();
this.gbCommandLineArgs.SuspendLayout();
@ -111,7 +112,6 @@ private void InitializeComponent()
this.tpMP3.SuspendLayout();
this.gbSource.SuspendLayout();
this.gbCodecs.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pbx264PresetWarning)).BeginInit();
this.SuspendLayout();
//
// lblx264CRF
@ -240,6 +240,14 @@ private void InitializeComponent()
this.pbAudioCodecWarning.TabStop = false;
this.ttHelpTip.SetToolTip(this.pbAudioCodecWarning, resources.GetString("pbAudioCodecWarning.ToolTip"));
//
// pbx264PresetWarning
//
this.pbx264PresetWarning.Image = global::ShareX.ScreenCaptureLib.Properties.Resources.exclamation_button;
resources.ApplyResources(this.pbx264PresetWarning, "pbx264PresetWarning");
this.pbx264PresetWarning.Name = "pbx264PresetWarning";
this.pbx264PresetWarning.TabStop = false;
this.ttHelpTip.SetToolTip(this.pbx264PresetWarning, resources.GetString("pbx264PresetWarning.ToolTip"));
//
// lblCodec
//
resources.ApplyResources(this.lblCodec, "lblCodec");
@ -607,14 +615,6 @@ private void InitializeComponent()
this.eiFFmpeg.ExportRequested += new ShareX.HelpersLib.ExportImportControl.ExportEventHandler(this.eiFFmpeg_ExportRequested);
this.eiFFmpeg.ImportRequested += new ShareX.HelpersLib.ExportImportControl.ImportEventHandler(this.eiFFmpeg_ImportRequested);
//
// pbx264PresetWarning
//
this.pbx264PresetWarning.Image = global::ShareX.ScreenCaptureLib.Properties.Resources.exclamation_button;
resources.ApplyResources(this.pbx264PresetWarning, "pbx264PresetWarning");
this.pbx264PresetWarning.Name = "pbx264PresetWarning";
this.pbx264PresetWarning.TabStop = false;
this.ttHelpTip.SetToolTip(this.pbx264PresetWarning, resources.GetString("pbx264PresetWarning.ToolTip"));
//
// FFmpegOptionsForm
//
resources.ApplyResources(this, "$this");
@ -641,6 +641,7 @@ private void InitializeComponent()
((System.ComponentModel.ISupportInitialize)(this.tbMP3_qscale)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tbAACBitrate)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pbAudioCodecWarning)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pbx264PresetWarning)).EndInit();
this.gbFFmpegExe.ResumeLayout(false);
this.gbFFmpegExe.PerformLayout();
this.gbCommandLinePreview.ResumeLayout(false);
@ -668,7 +669,6 @@ private void InitializeComponent()
this.gbSource.PerformLayout();
this.gbCodecs.ResumeLayout(false);
this.gbCodecs.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pbx264PresetWarning)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();

75
ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.resx
View file

@ -163,9 +163,8 @@
<value>17, 17</value>
</metadata>
<data name="nudx264CRF.ToolTip" xml:space="preserve">
<value>Constant Rate Factor (CRF): The range of the quantizer scale is 0-51: where 0 is lossless, 23 is default, and 51 is worst possible.
A lower value is a higher quality and a subjectively sane range is 18-28.
Consider 18 to be visually lossless or nearly so: it should look the same or nearly the same as the input but it isn't technically lossless.</value>
<value>Constant Rate Factor (CRF): The value can be between 0-51, where 0 is lossless, 30 is default, and 51 is the worst possible.
A higher value means bad quality, but a low file size.</value>
</data>
<data name="&gt;&gt;nudx264CRF.Name" xml:space="preserve">
<value>nudx264CRF</value>
@ -218,7 +217,7 @@ Consider 18 to be visually lossless or nearly so: it should look the same or nea
<data name="cbx264Preset.ToolTip" xml:space="preserve">
<value>Faster preset = Faster encoding but higher file size.
Slower preset = Slower encoding but lower file size.
For real time encoding like screen recording preset must be fast as possible.</value>
For real time encoding (e.g. screen recording), the preset must be as fast as possible.</value>
</data>
<data name="&gt;&gt;cbx264Preset.Name" xml:space="preserve">
<value>cbx264Preset</value>
@ -391,6 +390,40 @@ For real time encoding like screen recording preset must be fast as possible.</v
<data name="&gt;&gt;pbAudioCodecWarning.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="pbx264PresetWarning.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="pbx264PresetWarning.Location" type="System.Drawing.Point, System.Drawing">
<value>272, 38</value>
</data>
<data name="pbx264PresetWarning.Size" type="System.Drawing.Size, System.Drawing">
<value>16, 16</value>
</data>
<data name="pbx264PresetWarning.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
<value>AutoSize</value>
</data>
<data name="pbx264PresetWarning.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="pbx264PresetWarning.ToolTip" xml:space="preserve">
<value>For real time encoding like screen recording it is recommended to select fast as possible preset.
Otherwise it can't keep up with recording and a lot of frame drops will happen.</value>
</data>
<data name="pbx264PresetWarning.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;pbx264PresetWarning.Name" xml:space="preserve">
<value>pbx264PresetWarning</value>
</data>
<data name="&gt;&gt;pbx264PresetWarning.Type" xml:space="preserve">
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pbx264PresetWarning.Parent" xml:space="preserve">
<value>tpX264</value>
</data>
<data name="&gt;&gt;pbx264PresetWarning.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="lblCodec.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -859,40 +892,6 @@ For real time encoding like screen recording preset must be fast as possible.</v
<data name="&gt;&gt;tbUserArgs.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="pbx264PresetWarning.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="pbx264PresetWarning.Location" type="System.Drawing.Point, System.Drawing">
<value>272, 38</value>
</data>
<data name="pbx264PresetWarning.Size" type="System.Drawing.Size, System.Drawing">
<value>16, 16</value>
</data>
<data name="pbx264PresetWarning.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
<value>AutoSize</value>
</data>
<data name="pbx264PresetWarning.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="pbx264PresetWarning.ToolTip" xml:space="preserve">
<value>For real time encoding like screen recording it is recommended to select fast as possible preset.
Otherwise it can't keep up with recording and alot of frame drops will happen.</value>
</data>
<data name="pbx264PresetWarning.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;pbx264PresetWarning.Name" xml:space="preserve">
<value>pbx264PresetWarning</value>
</data>
<data name="&gt;&gt;pbx264PresetWarning.Type" xml:space="preserve">
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pbx264PresetWarning.Parent" xml:space="preserve">
<value>tpX264</value>
</data>
<data name="&gt;&gt;pbx264PresetWarning.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="tpX264.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
</data>