From 1cb47cc89115a3175e7fb33f0547dedbe5640781 Mon Sep 17 00:00:00 2001 From: matty <10895809+murrty@users.noreply.github.com> Date: Fri, 1 Jan 2021 18:33:29 -0600 Subject: [PATCH] Fixes FirstTime is set to false when creating the settings if portable is being used Introduced pre-release versioning which will identify the branch a thing in the settings form now anchors properly --- App.config | 23 +++-- Classes/CheckSettings.cs | 2 +- Forms/frmAbout.cs | 7 +- Forms/frmException.cs | 11 ++- Forms/frmMain.Designer.cs | 160 ++++++++++++++++---------------- Forms/frmMain.cs | 16 ++-- Forms/frmSettings.Designer.cs | 112 +++++++++++----------- Forms/frmSettings.resx | 3 - Program.cs | 12 +-- Properties/Settings.Designer.cs | 42 +++++---- Properties/Settings.settings | 15 +-- youtube-dl-gui.csproj.user | 3 +- 12 files changed, 217 insertions(+), 189 deletions(-) diff --git a/App.config b/App.config index 1551c325..f9272807 100644 --- a/App.config +++ b/App.config @@ -173,6 +173,9 @@ 0, 0 + + %(title)s-%(id)s.%(ext)s|%(uploader)s\(%(playlist_index)s) %(title)s-%(id)s.%(ext)s + @@ -309,6 +312,9 @@ True + + True + @@ -343,28 +349,31 @@ True - - True - - - 2020-11-05 - -1 + + 2.26-pre2 + - 2.26 + 2.252 1 + + 2020-12-31 + + + True + \ No newline at end of file diff --git a/Classes/CheckSettings.cs b/Classes/CheckSettings.cs index 1a7362cb..d3e41025 100644 --- a/Classes/CheckSettings.cs +++ b/Classes/CheckSettings.cs @@ -423,7 +423,7 @@ public static void SavePortableSettings() { #endregion } public static void CreatePortableSettings() { - Ini.WriteBool("FirstTime", true, "youtube-dl-gui"); + Ini.WriteBool("FirstTime", false, "youtube-dl-gui"); Ini.WriteString("downloadPath", Downloads.Default.downloadPath, "Downloads"); } } diff --git a/Forms/frmAbout.cs b/Forms/frmAbout.cs index d7920bd8..e618e273 100644 --- a/Forms/frmAbout.cs +++ b/Forms/frmAbout.cs @@ -21,7 +21,12 @@ private void LoadLanguage() { this.Text = string.Format("{0} youtube-dl-gui", lang.frmAbout); } private void frmAbout_Shown(object sender, EventArgs e) { - lbVersion.Text = "v" + Properties.Settings.Default.appVersion.ToString(); + if (Properties.Settings.Default.IsBetaVersion) { + lbVersion.Text = "v" + Properties.Settings.Default.BetaVersion; + } + else { + lbVersion.Text = "v" + Properties.Settings.Default.appVersion.ToString(); + } } private void llbCheckForUpdates_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { diff --git a/Forms/frmException.cs b/Forms/frmException.cs index ef4f086a..2997d5ed 100644 --- a/Forms/frmException.cs +++ b/Forms/frmException.cs @@ -72,9 +72,16 @@ private void frmError_Load(object sender, EventArgs e) { Exception = "An exception occured, but it didn't parse properly.\nCreate a new issue and tell me how you got here."; } - string outputBuffer = "Feel free to copy + paste this entire text wall into a new issue on Github\n\nVersion: " + Properties.Settings.Default.appVersion + "\n" + Exception; + string outputBuffer = "Feel free to copy + paste this entire text wall into a new issue on Github\n\nVersion: {0}\n" + Exception; + if (Properties.Settings.Default.IsBetaVersion) { + outputBuffer = string.Format(outputBuffer, Properties.Settings.Default.BetaVersion); + lbVersion.Text = "v" + Properties.Settings.Default.BetaVersion; + } + else { + outputBuffer = string.Format(outputBuffer, Properties.Settings.Default.appVersion.ToString()); + lbVersion.Text = "v" + Properties.Settings.Default.appVersion.ToString(); + } rtbExceptionDetails.Text = outputBuffer; - lbVersion.Text = "v" + Properties.Settings.Default.appVersion.ToString(); System.Media.SystemSounds.Hand.Play(); } diff --git a/Forms/frmMain.Designer.cs b/Forms/frmMain.Designer.cs index addb139e..ddc43c4b 100644 --- a/Forms/frmMain.Designer.cs +++ b/Forms/frmMain.Designer.cs @@ -29,6 +29,7 @@ private void InitializeComponent() { this.lbURL = new System.Windows.Forms.Label(); this.tcMain = new System.Windows.Forms.TabControl(); this.tabDownload = new System.Windows.Forms.TabPage(); + this.chkUseSelection = new System.Windows.Forms.CheckBox(); this.gbSelection = new System.Windows.Forms.GroupBox(); this.rbVideoSelectionAfterDate = new System.Windows.Forms.RadioButton(); this.rbVideoSelectionBeforeDate = new System.Windows.Forms.RadioButton(); @@ -36,11 +37,16 @@ private void InitializeComponent() { this.rbVideoSelectionPlaylistItems = new System.Windows.Forms.RadioButton(); this.rbVideoSelectionPlaylistIndex = new System.Windows.Forms.RadioButton(); this.panelDate = new System.Windows.Forms.Panel(); + this.txtVideoDate = new youtube_dl_gui.HintTextBox(); this.panelPlaylistStartEnd = new System.Windows.Forms.Panel(); + this.txtPlaylistEnd = new youtube_dl_gui.HintTextBox(); + this.txtPlaylistStart = new youtube_dl_gui.HintTextBox(); this.panelPlaylistItems = new System.Windows.Forms.Panel(); + this.txtPlaylistItems = new youtube_dl_gui.HintTextBox(); this.cbFormat = new System.Windows.Forms.ComboBox(); this.lbFormat = new System.Windows.Forms.Label(); this.lbDownloadStatus = new System.Windows.Forms.Label(); + this.sbDownload = new youtube_dl_gui.SplitButton(); this.cmDownload = new System.Windows.Forms.ContextMenu(); this.mDownloadWithAuthentication = new System.Windows.Forms.MenuItem(); this.mBatchDownloadFromFile = new System.Windows.Forms.MenuItem(); @@ -120,12 +126,6 @@ private void InitializeComponent() { this.trayIcon = new System.Windows.Forms.NotifyIcon(this.components); this.tmrConvertLabel = new System.Windows.Forms.Timer(this.components); this.tmrDownloadLabel = new System.Windows.Forms.Timer(this.components); - this.chkUseSelection = new System.Windows.Forms.CheckBox(); - this.txtVideoDate = new youtube_dl_gui.HintTextBox(); - this.txtPlaylistEnd = new youtube_dl_gui.HintTextBox(); - this.txtPlaylistStart = new youtube_dl_gui.HintTextBox(); - this.txtPlaylistItems = new youtube_dl_gui.HintTextBox(); - this.sbDownload = new youtube_dl_gui.SplitButton(); this.tcMain.SuspendLayout(); this.tabDownload.SuspendLayout(); this.gbSelection.SuspendLayout(); @@ -168,7 +168,7 @@ private void InitializeComponent() { this.tcMain.Location = new System.Drawing.Point(0, 0); this.tcMain.Name = "tcMain"; this.tcMain.SelectedIndex = 0; - this.tcMain.Size = new System.Drawing.Size(244, 375); + this.tcMain.Size = new System.Drawing.Size(244, 395); this.tcMain.TabIndex = 0; // // tabDownload @@ -190,11 +190,22 @@ private void InitializeComponent() { this.tabDownload.Location = new System.Drawing.Point(4, 22); this.tabDownload.Name = "tabDownload"; this.tabDownload.Padding = new System.Windows.Forms.Padding(3); - this.tabDownload.Size = new System.Drawing.Size(236, 349); + this.tabDownload.Size = new System.Drawing.Size(236, 369); this.tabDownload.TabIndex = 0; this.tabDownload.Text = "tabDownload"; this.tabDownload.UseVisualStyleBackColor = true; // + // chkUseSelection + // + this.chkUseSelection.Anchor = System.Windows.Forms.AnchorStyles.None; + this.chkUseSelection.AutoSize = true; + this.chkUseSelection.Location = new System.Drawing.Point(8, 170); + this.chkUseSelection.Name = "chkUseSelection"; + this.chkUseSelection.Size = new System.Drawing.Size(99, 17); + this.chkUseSelection.TabIndex = 20; + this.chkUseSelection.Text = "Video Selection"; + this.chkUseSelection.UseVisualStyleBackColor = true; + // // gbSelection // this.gbSelection.Anchor = System.Windows.Forms.AnchorStyles.None; @@ -206,7 +217,7 @@ private void InitializeComponent() { this.gbSelection.Controls.Add(this.panelDate); this.gbSelection.Controls.Add(this.panelPlaylistStartEnd); this.gbSelection.Controls.Add(this.panelPlaylistItems); - this.gbSelection.Location = new System.Drawing.Point(7, 160); + this.gbSelection.Location = new System.Drawing.Point(7, 170); this.gbSelection.Name = "gbSelection"; this.gbSelection.Size = new System.Drawing.Size(225, 106); this.gbSelection.TabIndex = 19; @@ -281,6 +292,16 @@ private void InitializeComponent() { this.panelDate.TabIndex = 18; this.panelDate.Visible = false; // + // txtVideoDate + // + this.txtVideoDate.Location = new System.Drawing.Point(3, 3); + this.txtVideoDate.MaxLength = 8; + this.txtVideoDate.Name = "txtVideoDate"; + this.txtVideoDate.Size = new System.Drawing.Size(205, 20); + this.txtVideoDate.TabIndex = 0; + this.txtVideoDate.TextHint = "Date (YYYYMMDD)"; + this.txtVideoDate.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtVideoDate_KeyPress); + // // panelPlaylistStartEnd // this.panelPlaylistStartEnd.Controls.Add(this.txtPlaylistEnd); @@ -291,6 +312,24 @@ private void InitializeComponent() { this.panelPlaylistStartEnd.TabIndex = 16; this.panelPlaylistStartEnd.Visible = false; // + // txtPlaylistEnd + // + this.txtPlaylistEnd.Location = new System.Drawing.Point(108, 3); + this.txtPlaylistEnd.Name = "txtPlaylistEnd"; + this.txtPlaylistEnd.Size = new System.Drawing.Size(100, 20); + this.txtPlaylistEnd.TabIndex = 1; + this.txtPlaylistEnd.TextHint = "End Index"; + this.txtPlaylistEnd.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtPlaylistEnd_KeyPress); + // + // txtPlaylistStart + // + this.txtPlaylistStart.Location = new System.Drawing.Point(3, 3); + this.txtPlaylistStart.Name = "txtPlaylistStart"; + this.txtPlaylistStart.Size = new System.Drawing.Size(100, 20); + this.txtPlaylistStart.TabIndex = 0; + this.txtPlaylistStart.TextHint = "Start Index"; + this.txtPlaylistStart.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtPlaylistStart_KeyPress); + // // panelPlaylistItems // this.panelPlaylistItems.Controls.Add(this.txtPlaylistItems); @@ -300,12 +339,21 @@ private void InitializeComponent() { this.panelPlaylistItems.TabIndex = 17; this.panelPlaylistItems.Visible = false; // + // txtPlaylistItems + // + this.txtPlaylistItems.Location = new System.Drawing.Point(3, 3); + this.txtPlaylistItems.Name = "txtPlaylistItems"; + this.txtPlaylistItems.Size = new System.Drawing.Size(205, 20); + this.txtPlaylistItems.TabIndex = 0; + this.txtPlaylistItems.TextHint = "Video Indexes (separated by commas)"; + this.txtPlaylistItems.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtPlaylistItems_KeyPress); + // // cbFormat // this.cbFormat.Anchor = System.Windows.Forms.AnchorStyles.None; this.cbFormat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbFormat.FormattingEnabled = true; - this.cbFormat.Location = new System.Drawing.Point(70, 133); + this.cbFormat.Location = new System.Drawing.Point(70, 143); this.cbFormat.Name = "cbFormat"; this.cbFormat.Size = new System.Drawing.Size(80, 21); this.cbFormat.TabIndex = 11; @@ -313,7 +361,7 @@ private void InitializeComponent() { // lbFormat // this.lbFormat.Anchor = System.Windows.Forms.AnchorStyles.None; - this.lbFormat.Location = new System.Drawing.Point(4, 136); + this.lbFormat.Location = new System.Drawing.Point(4, 146); this.lbFormat.Name = "lbFormat"; this.lbFormat.Size = new System.Drawing.Size(63, 13); this.lbFormat.TabIndex = 10; @@ -324,7 +372,7 @@ private void InitializeComponent() { // this.lbDownloadStatus.Anchor = System.Windows.Forms.AnchorStyles.Bottom; this.lbDownloadStatus.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbDownloadStatus.Location = new System.Drawing.Point(-1, 342); + this.lbDownloadStatus.Location = new System.Drawing.Point(-1, 362); this.lbDownloadStatus.Name = "lbDownloadStatus"; this.lbDownloadStatus.Size = new System.Drawing.Size(238, 20); this.lbDownloadStatus.TabIndex = 15; @@ -332,6 +380,19 @@ private void InitializeComponent() { this.lbDownloadStatus.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lbDownloadStatus.Visible = false; // + // sbDownload + // + this.sbDownload.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.sbDownload.DropDownContextMenu = this.cmDownload; + this.sbDownload.FlatStyle = System.Windows.Forms.FlatStyle.System; + this.sbDownload.Location = new System.Drawing.Point(77, 336); + this.sbDownload.Name = "sbDownload"; + this.sbDownload.Size = new System.Drawing.Size(83, 25); + this.sbDownload.TabIndex = 14; + this.sbDownload.Text = "sbDownload"; + this.sbDownload.UseVisualStyleBackColor = true; + this.sbDownload.Click += new System.EventHandler(this.sbDownload_Click); + // // cmDownload // this.cmDownload.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { @@ -356,7 +417,7 @@ private void InitializeComponent() { this.chkDownloadSound.AutoSize = true; this.chkDownloadSound.Checked = true; this.chkDownloadSound.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkDownloadSound.Location = new System.Drawing.Point(156, 106); + this.chkDownloadSound.Location = new System.Drawing.Point(156, 116); this.chkDownloadSound.Name = "chkDownloadSound"; this.chkDownloadSound.Size = new System.Drawing.Size(122, 17); this.chkDownloadSound.TabIndex = 9; @@ -369,7 +430,7 @@ private void InitializeComponent() { this.cbQuality.Anchor = System.Windows.Forms.AnchorStyles.None; this.cbQuality.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbQuality.FormattingEnabled = true; - this.cbQuality.Location = new System.Drawing.Point(70, 104); + this.cbQuality.Location = new System.Drawing.Point(70, 114); this.cbQuality.Name = "cbQuality"; this.cbQuality.Size = new System.Drawing.Size(80, 21); this.cbQuality.TabIndex = 8; @@ -377,7 +438,7 @@ private void InitializeComponent() { // lbQuality // this.lbQuality.Anchor = System.Windows.Forms.AnchorStyles.None; - this.lbQuality.Location = new System.Drawing.Point(4, 107); + this.lbQuality.Location = new System.Drawing.Point(4, 117); this.lbQuality.Name = "lbQuality"; this.lbQuality.Size = new System.Drawing.Size(63, 15); this.lbQuality.TabIndex = 7; @@ -388,7 +449,7 @@ private void InitializeComponent() { // this.lbCustomArguments.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.lbCustomArguments.AutoSize = true; - this.lbCustomArguments.Location = new System.Drawing.Point(15, 270); + this.lbCustomArguments.Location = new System.Drawing.Point(15, 290); this.lbCustomArguments.Name = "lbCustomArguments"; this.lbCustomArguments.Size = new System.Drawing.Size(100, 13); this.lbCustomArguments.TabIndex = 12; @@ -398,7 +459,7 @@ private void InitializeComponent() { // this.txtArgs.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txtArgs.Location = new System.Drawing.Point(22, 290); + this.txtArgs.Location = new System.Drawing.Point(22, 310); this.txtArgs.Name = "txtArgs"; this.txtArgs.ReadOnly = true; this.txtArgs.Size = new System.Drawing.Size(192, 20); @@ -411,7 +472,7 @@ private void InitializeComponent() { this.gbDownloadType.Controls.Add(this.rbCustom); this.gbDownloadType.Controls.Add(this.rbAudio); this.gbDownloadType.Controls.Add(this.rbVideo); - this.gbDownloadType.Location = new System.Drawing.Point(7, 56); + this.gbDownloadType.Location = new System.Drawing.Point(7, 66); this.gbDownloadType.Name = "gbDownloadType"; this.gbDownloadType.Size = new System.Drawing.Size(225, 40); this.gbDownloadType.TabIndex = 3; @@ -1072,72 +1133,11 @@ private void InitializeComponent() { this.tmrDownloadLabel.Interval = 5000; this.tmrDownloadLabel.Tick += new System.EventHandler(this.tmrDownloadLabel_Tick); // - // chkUseSelection - // - this.chkUseSelection.Anchor = System.Windows.Forms.AnchorStyles.None; - this.chkUseSelection.AutoSize = true; - this.chkUseSelection.Location = new System.Drawing.Point(8, 160); - this.chkUseSelection.Name = "chkUseSelection"; - this.chkUseSelection.Size = new System.Drawing.Size(99, 17); - this.chkUseSelection.TabIndex = 20; - this.chkUseSelection.Text = "Video Selection"; - this.chkUseSelection.UseVisualStyleBackColor = true; - // - // txtVideoDate - // - this.txtVideoDate.Location = new System.Drawing.Point(3, 3); - this.txtVideoDate.MaxLength = 8; - this.txtVideoDate.Name = "txtVideoDate"; - this.txtVideoDate.Size = new System.Drawing.Size(205, 20); - this.txtVideoDate.TabIndex = 0; - this.txtVideoDate.TextHint = "Date (YYYYMMDD)"; - this.txtVideoDate.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtVideoDate_KeyPress); - // - // txtPlaylistEnd - // - this.txtPlaylistEnd.Location = new System.Drawing.Point(108, 3); - this.txtPlaylistEnd.Name = "txtPlaylistEnd"; - this.txtPlaylistEnd.Size = new System.Drawing.Size(100, 20); - this.txtPlaylistEnd.TabIndex = 1; - this.txtPlaylistEnd.TextHint = "End Index"; - this.txtPlaylistEnd.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtPlaylistEnd_KeyPress); - // - // txtPlaylistStart - // - this.txtPlaylistStart.Location = new System.Drawing.Point(3, 3); - this.txtPlaylistStart.Name = "txtPlaylistStart"; - this.txtPlaylistStart.Size = new System.Drawing.Size(100, 20); - this.txtPlaylistStart.TabIndex = 0; - this.txtPlaylistStart.TextHint = "Start Index"; - this.txtPlaylistStart.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtPlaylistStart_KeyPress); - // - // txtPlaylistItems - // - this.txtPlaylistItems.Location = new System.Drawing.Point(3, 3); - this.txtPlaylistItems.Name = "txtPlaylistItems"; - this.txtPlaylistItems.Size = new System.Drawing.Size(205, 20); - this.txtPlaylistItems.TabIndex = 0; - this.txtPlaylistItems.TextHint = "Video Indexes (separated by commas)"; - this.txtPlaylistItems.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtPlaylistItems_KeyPress); - // - // sbDownload - // - this.sbDownload.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.sbDownload.DropDownContextMenu = this.cmDownload; - this.sbDownload.FlatStyle = System.Windows.Forms.FlatStyle.System; - this.sbDownload.Location = new System.Drawing.Point(77, 316); - this.sbDownload.Name = "sbDownload"; - this.sbDownload.Size = new System.Drawing.Size(83, 25); - this.sbDownload.TabIndex = 14; - this.sbDownload.Text = "sbDownload"; - this.sbDownload.UseVisualStyleBackColor = true; - this.sbDownload.Click += new System.EventHandler(this.sbDownload_Click); - // // frmMain // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(244, 375); + this.ClientSize = new System.Drawing.Size(244, 395); this.Controls.Add(this.lbDebug); this.Controls.Add(this.tcMain); this.MaximizeBox = false; diff --git a/Forms/frmMain.cs b/Forms/frmMain.cs index 8e5c0c30..53c6c337 100644 --- a/Forms/frmMain.cs +++ b/Forms/frmMain.cs @@ -1131,15 +1131,15 @@ private void btnDebugThrowException_Click(object sender, EventArgs e) { } } - private void txtPlaylistStart_KeyPress(object sender, KeyPressEventArgs e) { - if (!char.IsDigit(e.KeyChar) && e.KeyChar != (char)8) { - e.Handled = true; + private void txtPlaylistStart_KeyPress(object sender, KeyPressEventArgs e) { + if (!char.IsDigit(e.KeyChar) && e.KeyChar != (char)8) { + e.Handled = true; } } private void txtPlaylistEnd_KeyPress(object sender, KeyPressEventArgs e) { - if (!char.IsDigit(e.KeyChar) && e.KeyChar != (char)8) { - e.Handled = true; + if (!char.IsDigit(e.KeyChar) && e.KeyChar != (char)8) { + e.Handled = true; } } @@ -1149,9 +1149,9 @@ private void txtPlaylistItems_KeyPress(object sender, KeyPressEventArgs e) { } } - private void txtVideoDate_KeyPress(object sender, KeyPressEventArgs e) { - if (!char.IsDigit(e.KeyChar) && e.KeyChar != (char)8) { - e.Handled = true; + private void txtVideoDate_KeyPress(object sender, KeyPressEventArgs e) { + if (!char.IsDigit(e.KeyChar) && e.KeyChar != (char)8) { + e.Handled = true; } } diff --git a/Forms/frmSettings.Designer.cs b/Forms/frmSettings.Designer.cs index 7802b0cb..54b5ce49 100644 --- a/Forms/frmSettings.Designer.cs +++ b/Forms/frmSettings.Designer.cs @@ -86,6 +86,7 @@ private void InitializeComponent() { this.btnSettingsDownloadsBrowseSavePath = new System.Windows.Forms.Button(); this.lbSepDownloads = new System.Windows.Forms.Label(); this.lbSettingsDownloadsFileNameSchema = new System.Windows.Forms.Label(); + this.txtSettingsDownloadsFileNameSchema = new System.Windows.Forms.ComboBox(); this.tabSettingsConverter = new System.Windows.Forms.TabPage(); this.chkSettingsConverterHideFFmpegCompileInfo = new System.Windows.Forms.CheckBox(); this.chkSettingsConverterDetectOutputFileType = new System.Windows.Forms.CheckBox(); @@ -134,7 +135,6 @@ private void InitializeComponent() { this.btnSettingsCancel = new System.Windows.Forms.Button(); this.btnSettingsSave = new System.Windows.Forms.Button(); this.tipSettings = new System.Windows.Forms.ToolTip(this.components); - this.txtSettingsDownloadsFileNameSchema = new System.Windows.Forms.ComboBox(); this.tcMain.SuspendLayout(); this.tabSettingsGeneral.SuspendLayout(); this.gbSettingsGeneralCustomArguments.SuspendLayout(); @@ -206,7 +206,7 @@ private void InitializeComponent() { this.chkSettingsGeneralRotateQualityFormat.AutoSize = true; this.chkSettingsGeneralRotateQualityFormat.Location = new System.Drawing.Point(53, 221); this.chkSettingsGeneralRotateQualityFormat.Name = "chkSettingsGeneralRotateQualityFormat"; - this.chkSettingsGeneralRotateQualityFormat.Size = new System.Drawing.Size(215, 17); + this.chkSettingsGeneralRotateQualityFormat.Size = new System.Drawing.Size(214, 17); this.chkSettingsGeneralRotateQualityFormat.TabIndex = 15; this.chkSettingsGeneralRotateQualityFormat.Text = "chkSettingsGeneralRotateQualityFormat"; this.tipSettings.SetToolTip(this.chkSettingsGeneralRotateQualityFormat, "chkSettingsGeneralRotateQualityFormatHint"); @@ -219,7 +219,7 @@ private void InitializeComponent() { this.chkSettingsGeneralClearClipboardOnDownload.AutoSize = true; this.chkSettingsGeneralClearClipboardOnDownload.Location = new System.Drawing.Point(36, 198); this.chkSettingsGeneralClearClipboardOnDownload.Name = "chkSettingsGeneralClearClipboardOnDownload"; - this.chkSettingsGeneralClearClipboardOnDownload.Size = new System.Drawing.Size(249, 17); + this.chkSettingsGeneralClearClipboardOnDownload.Size = new System.Drawing.Size(248, 17); this.chkSettingsGeneralClearClipboardOnDownload.TabIndex = 13; this.chkSettingsGeneralClearClipboardOnDownload.Text = "chkSettingsGeneralClearClipboardOnDownload"; this.tipSettings.SetToolTip(this.chkSettingsGeneralClearClipboardOnDownload, "chkSettingsGeneralClearClipboardOnDownloadHint"); @@ -247,7 +247,7 @@ private void InitializeComponent() { this.rbSettingsGeneralCustomArgumentsSaveInSettings.Checked = true; this.rbSettingsGeneralCustomArgumentsSaveInSettings.Location = new System.Drawing.Point(200, 20); this.rbSettingsGeneralCustomArgumentsSaveInSettings.Name = "rbSettingsGeneralCustomArgumentsSaveInSettings"; - this.rbSettingsGeneralCustomArgumentsSaveInSettings.Size = new System.Drawing.Size(266, 17); + this.rbSettingsGeneralCustomArgumentsSaveInSettings.Size = new System.Drawing.Size(265, 17); this.rbSettingsGeneralCustomArgumentsSaveInSettings.TabIndex = 17; this.rbSettingsGeneralCustomArgumentsSaveInSettings.TabStop = true; this.rbSettingsGeneralCustomArgumentsSaveInSettings.Text = "rbSettingsGeneralCustomArgumentsSaveInSettings"; @@ -260,7 +260,7 @@ private void InitializeComponent() { this.rbSettingsGeneralCustomArgumentsSaveAsArgsText.AutoSize = true; this.rbSettingsGeneralCustomArgumentsSaveAsArgsText.Location = new System.Drawing.Point(89, 20); this.rbSettingsGeneralCustomArgumentsSaveAsArgsText.Name = "rbSettingsGeneralCustomArgumentsSaveAsArgsText"; - this.rbSettingsGeneralCustomArgumentsSaveAsArgsText.Size = new System.Drawing.Size(273, 17); + this.rbSettingsGeneralCustomArgumentsSaveAsArgsText.Size = new System.Drawing.Size(272, 17); this.rbSettingsGeneralCustomArgumentsSaveAsArgsText.TabIndex = 16; this.rbSettingsGeneralCustomArgumentsSaveAsArgsText.Text = "rbSettingsGeneralCustomArgumentsSaveAsArgsText"; this.tipSettings.SetToolTip(this.rbSettingsGeneralCustomArgumentsSaveAsArgsText, "rbSettingsGeneralCustomArgumentsSaveAsArgsText"); @@ -272,7 +272,7 @@ private void InitializeComponent() { this.rbSettingsGeneralCustomArgumentsDontSave.AutoSize = true; this.rbSettingsGeneralCustomArgumentsDontSave.Location = new System.Drawing.Point(8, 20); this.rbSettingsGeneralCustomArgumentsDontSave.Name = "rbSettingsGeneralCustomArgumentsDontSave"; - this.rbSettingsGeneralCustomArgumentsDontSave.Size = new System.Drawing.Size(242, 17); + this.rbSettingsGeneralCustomArgumentsDontSave.Size = new System.Drawing.Size(241, 17); this.rbSettingsGeneralCustomArgumentsDontSave.TabIndex = 15; this.rbSettingsGeneralCustomArgumentsDontSave.Text = "rbSettingsGeneralCustomArgumentsDontSave"; this.tipSettings.SetToolTip(this.rbSettingsGeneralCustomArgumentsDontSave, "rbSettingsGeneralCustomArgumentsDontSave"); @@ -318,7 +318,7 @@ private void InitializeComponent() { this.chkSettingsGeneralUseStaticYoutubeDl.AutoSize = true; this.chkSettingsGeneralUseStaticYoutubeDl.Location = new System.Drawing.Point(122, 11); this.chkSettingsGeneralUseStaticYoutubeDl.Name = "chkSettingsGeneralUseStaticYoutubeDl"; - this.chkSettingsGeneralUseStaticYoutubeDl.Size = new System.Drawing.Size(215, 17); + this.chkSettingsGeneralUseStaticYoutubeDl.Size = new System.Drawing.Size(214, 17); this.chkSettingsGeneralUseStaticYoutubeDl.TabIndex = 2; this.chkSettingsGeneralUseStaticYoutubeDl.Text = "chkSettingsGeneralUseStaticYoutubeDl"; this.tipSettings.SetToolTip(this.chkSettingsGeneralUseStaticYoutubeDl, "chkSettingsGeneralUseStaticYoutubeDl"); @@ -330,7 +330,7 @@ private void InitializeComponent() { this.chkSettingsGeneralUseStaticFFmpeg.AutoSize = true; this.chkSettingsGeneralUseStaticFFmpeg.Location = new System.Drawing.Point(122, 58); this.chkSettingsGeneralUseStaticFFmpeg.Name = "chkSettingsGeneralUseStaticFFmpeg"; - this.chkSettingsGeneralUseStaticFFmpeg.Size = new System.Drawing.Size(203, 17); + this.chkSettingsGeneralUseStaticFFmpeg.Size = new System.Drawing.Size(202, 17); this.chkSettingsGeneralUseStaticFFmpeg.TabIndex = 6; this.chkSettingsGeneralUseStaticFFmpeg.Text = "chkSettingsGeneralUseStaticFFmpeg"; this.tipSettings.SetToolTip(this.chkSettingsGeneralUseStaticFFmpeg, "chkSettingsGeneralUseStaticFFmpeg"); @@ -385,7 +385,7 @@ private void InitializeComponent() { this.chkSettingsGeneralClearUrlOnDownload.AutoSize = true; this.chkSettingsGeneralClearUrlOnDownload.Location = new System.Drawing.Point(52, 175); this.chkSettingsGeneralClearUrlOnDownload.Name = "chkSettingsGeneralClearUrlOnDownload"; - this.chkSettingsGeneralClearUrlOnDownload.Size = new System.Drawing.Size(218, 17); + this.chkSettingsGeneralClearUrlOnDownload.Size = new System.Drawing.Size(217, 17); this.chkSettingsGeneralClearUrlOnDownload.TabIndex = 12; this.chkSettingsGeneralClearUrlOnDownload.Text = "chkSettingsGeneralClearUrlOnDownload"; this.tipSettings.SetToolTip(this.chkSettingsGeneralClearUrlOnDownload, "chkSettingsGeneralClearUrlOnDownloadHint"); @@ -399,7 +399,7 @@ private void InitializeComponent() { this.chkSettingsGeneralHoverOverUrlToPasteClipboard.CheckState = System.Windows.Forms.CheckState.Checked; this.chkSettingsGeneralHoverOverUrlToPasteClipboard.Location = new System.Drawing.Point(27, 152); this.chkSettingsGeneralHoverOverUrlToPasteClipboard.Name = "chkSettingsGeneralHoverOverUrlToPasteClipboard"; - this.chkSettingsGeneralHoverOverUrlToPasteClipboard.Size = new System.Drawing.Size(268, 17); + this.chkSettingsGeneralHoverOverUrlToPasteClipboard.Size = new System.Drawing.Size(267, 17); this.chkSettingsGeneralHoverOverUrlToPasteClipboard.TabIndex = 11; this.chkSettingsGeneralHoverOverUrlToPasteClipboard.Text = "chkSettingsGeneralHoverOverUrlToPasteClipboard"; this.tipSettings.SetToolTip(this.chkSettingsGeneralHoverOverUrlToPasteClipboard, "chkSettingsGeneralHoverOverUrlToPasteClipboard"); @@ -411,7 +411,7 @@ private void InitializeComponent() { this.chkSettingsGeneralCheckForUpdatesOnLaunch.AutoSize = true; this.chkSettingsGeneralCheckForUpdatesOnLaunch.Location = new System.Drawing.Point(33, 129); this.chkSettingsGeneralCheckForUpdatesOnLaunch.Name = "chkSettingsGeneralCheckForUpdatesOnLaunch"; - this.chkSettingsGeneralCheckForUpdatesOnLaunch.Size = new System.Drawing.Size(255, 17); + this.chkSettingsGeneralCheckForUpdatesOnLaunch.Size = new System.Drawing.Size(254, 17); this.chkSettingsGeneralCheckForUpdatesOnLaunch.TabIndex = 10; this.chkSettingsGeneralCheckForUpdatesOnLaunch.Text = "chkSettingsGeneralCheckForUpdatesOnLaunch"; this.tipSettings.SetToolTip(this.chkSettingsGeneralCheckForUpdatesOnLaunch, "chkSettingsGeneralCheckForUpdatesOnLaunch"); @@ -477,7 +477,7 @@ private void InitializeComponent() { this.chkSettingsDownloadsKeepOriginalFiles.AutoSize = true; this.chkSettingsDownloadsKeepOriginalFiles.Location = new System.Drawing.Point(224, 75); this.chkSettingsDownloadsKeepOriginalFiles.Name = "chkSettingsDownloadsKeepOriginalFiles"; - this.chkSettingsDownloadsKeepOriginalFiles.Size = new System.Drawing.Size(216, 17); + this.chkSettingsDownloadsKeepOriginalFiles.Size = new System.Drawing.Size(215, 17); this.chkSettingsDownloadsKeepOriginalFiles.TabIndex = 7; this.chkSettingsDownloadsKeepOriginalFiles.Text = "chkSettingsDownloadsKeepOriginalFiles"; this.tipSettings.SetToolTip(this.chkSettingsDownloadsKeepOriginalFiles, "chkSettingsDownloadsKeepOriginalFilesHint"); @@ -488,7 +488,7 @@ private void InitializeComponent() { this.chkSettingsDownloadsWriteMetadataToFile.AutoSize = true; this.chkSettingsDownloadsWriteMetadataToFile.Location = new System.Drawing.Point(216, 52); this.chkSettingsDownloadsWriteMetadataToFile.Name = "chkSettingsDownloadsWriteMetadataToFile"; - this.chkSettingsDownloadsWriteMetadataToFile.Size = new System.Drawing.Size(234, 17); + this.chkSettingsDownloadsWriteMetadataToFile.Size = new System.Drawing.Size(233, 17); this.chkSettingsDownloadsWriteMetadataToFile.TabIndex = 5; this.chkSettingsDownloadsWriteMetadataToFile.Text = "chkSettingsDownloadsWriteMetadataToFile"; this.tipSettings.SetToolTip(this.chkSettingsDownloadsWriteMetadataToFile, "chkSettingsDownloadsWriteMetadataToFileHint"); @@ -499,7 +499,7 @@ private void InitializeComponent() { this.chkSettingsDownloadsEmbedSubtitles.AutoSize = true; this.chkSettingsDownloadsEmbedSubtitles.Location = new System.Drawing.Point(234, 29); this.chkSettingsDownloadsEmbedSubtitles.Name = "chkSettingsDownloadsEmbedSubtitles"; - this.chkSettingsDownloadsEmbedSubtitles.Size = new System.Drawing.Size(208, 17); + this.chkSettingsDownloadsEmbedSubtitles.Size = new System.Drawing.Size(207, 17); this.chkSettingsDownloadsEmbedSubtitles.TabIndex = 3; this.chkSettingsDownloadsEmbedSubtitles.Text = "chkSettingsDownloadsEmbedSubtitles"; this.tipSettings.SetToolTip(this.chkSettingsDownloadsEmbedSubtitles, "chkSettingsDownloadsEmbedSubtitlesHint"); @@ -510,7 +510,7 @@ private void InitializeComponent() { this.chkSettingsDownloadsEmbedThumbnails.AutoSize = true; this.chkSettingsDownloadsEmbedThumbnails.Location = new System.Drawing.Point(225, 121); this.chkSettingsDownloadsEmbedThumbnails.Name = "chkSettingsDownloadsEmbedThumbnails"; - this.chkSettingsDownloadsEmbedThumbnails.Size = new System.Drawing.Size(222, 17); + this.chkSettingsDownloadsEmbedThumbnails.Size = new System.Drawing.Size(221, 17); this.chkSettingsDownloadsEmbedThumbnails.TabIndex = 10; this.chkSettingsDownloadsEmbedThumbnails.Text = "chkSettingsDownloadsEmbedThumbnails"; this.tipSettings.SetToolTip(this.chkSettingsDownloadsEmbedThumbnails, "chkSettingsDownloadsEmbedSubtitlesHint"); @@ -521,7 +521,7 @@ private void InitializeComponent() { this.chkSettingsDownloadsSaveThumbnails.AutoSize = true; this.chkSettingsDownloadsSaveThumbnails.Location = new System.Drawing.Point(6, 121); this.chkSettingsDownloadsSaveThumbnails.Name = "chkSettingsDownloadsSaveThumbnails"; - this.chkSettingsDownloadsSaveThumbnails.Size = new System.Drawing.Size(214, 17); + this.chkSettingsDownloadsSaveThumbnails.Size = new System.Drawing.Size(213, 17); this.chkSettingsDownloadsSaveThumbnails.TabIndex = 9; this.chkSettingsDownloadsSaveThumbnails.Text = "chkSettingsDownloadsSaveThumbnails"; this.chkSettingsDownloadsSaveThumbnails.UseVisualStyleBackColor = true; @@ -532,7 +532,7 @@ private void InitializeComponent() { this.chkSettingsDownloadsSaveFormatQuality.AutoSize = true; this.chkSettingsDownloadsSaveFormatQuality.Location = new System.Drawing.Point(6, 6); this.chkSettingsDownloadsSaveFormatQuality.Name = "chkSettingsDownloadsSaveFormatQuality"; - this.chkSettingsDownloadsSaveFormatQuality.Size = new System.Drawing.Size(224, 17); + this.chkSettingsDownloadsSaveFormatQuality.Size = new System.Drawing.Size(223, 17); this.chkSettingsDownloadsSaveFormatQuality.TabIndex = 1; this.chkSettingsDownloadsSaveFormatQuality.Text = "chkSettingsDownloadsSaveFormatQuality"; this.tipSettings.SetToolTip(this.chkSettingsDownloadsSaveFormatQuality, "chkSettingsDownloadsSaveFormatQuality"); @@ -543,7 +543,7 @@ private void InitializeComponent() { this.chkSettingsDownloadsSaveAnnotations.AutoSize = true; this.chkSettingsDownloadsSaveAnnotations.Location = new System.Drawing.Point(6, 98); this.chkSettingsDownloadsSaveAnnotations.Name = "chkSettingsDownloadsSaveAnnotations"; - this.chkSettingsDownloadsSaveAnnotations.Size = new System.Drawing.Size(216, 17); + this.chkSettingsDownloadsSaveAnnotations.Size = new System.Drawing.Size(215, 17); this.chkSettingsDownloadsSaveAnnotations.TabIndex = 8; this.chkSettingsDownloadsSaveAnnotations.Text = "chkSettingsDownloadsSaveAnnotations"; this.chkSettingsDownloadsSaveAnnotations.UseVisualStyleBackColor = true; @@ -553,7 +553,7 @@ private void InitializeComponent() { this.chkSettingsDownloadsAutomaticallyDeleteYoutubeDlWhenClosing.AutoSize = true; this.chkSettingsDownloadsAutomaticallyDeleteYoutubeDlWhenClosing.Location = new System.Drawing.Point(6, 144); this.chkSettingsDownloadsAutomaticallyDeleteYoutubeDlWhenClosing.Name = "chkSettingsDownloadsAutomaticallyDeleteYoutubeDlWhenClosing"; - this.chkSettingsDownloadsAutomaticallyDeleteYoutubeDlWhenClosing.Size = new System.Drawing.Size(341, 17); + this.chkSettingsDownloadsAutomaticallyDeleteYoutubeDlWhenClosing.Size = new System.Drawing.Size(340, 17); this.chkSettingsDownloadsAutomaticallyDeleteYoutubeDlWhenClosing.TabIndex = 11; this.chkSettingsDownloadsAutomaticallyDeleteYoutubeDlWhenClosing.Text = "chkSettingsDownloadsAutomaticallyDeleteYoutubeDlWhenClosing"; this.tipSettings.SetToolTip(this.chkSettingsDownloadsAutomaticallyDeleteYoutubeDlWhenClosing, "chkSettingsDownloadsAutomaticallyDeleteYoutubeDlWhenClosing"); @@ -564,7 +564,7 @@ private void InitializeComponent() { this.chkSettingsDownloadsSaveDescription.AutoSize = true; this.chkSettingsDownloadsSaveDescription.Location = new System.Drawing.Point(6, 75); this.chkSettingsDownloadsSaveDescription.Name = "chkSettingsDownloadsSaveDescription"; - this.chkSettingsDownloadsSaveDescription.Size = new System.Drawing.Size(213, 17); + this.chkSettingsDownloadsSaveDescription.Size = new System.Drawing.Size(212, 17); this.chkSettingsDownloadsSaveDescription.TabIndex = 6; this.chkSettingsDownloadsSaveDescription.Text = "chkSettingsDownloadsSaveDescription"; this.chkSettingsDownloadsSaveDescription.UseVisualStyleBackColor = true; @@ -574,7 +574,7 @@ private void InitializeComponent() { this.chkSettingsDownloadsDownloadSubtitles.AutoSize = true; this.chkSettingsDownloadsDownloadSubtitles.Location = new System.Drawing.Point(6, 29); this.chkSettingsDownloadsDownloadSubtitles.Name = "chkSettingsDownloadsDownloadSubtitles"; - this.chkSettingsDownloadsDownloadSubtitles.Size = new System.Drawing.Size(223, 17); + this.chkSettingsDownloadsDownloadSubtitles.Size = new System.Drawing.Size(222, 17); this.chkSettingsDownloadsDownloadSubtitles.TabIndex = 2; this.chkSettingsDownloadsDownloadSubtitles.Text = "chkSettingsDownloadsDownloadSubtitles"; this.tipSettings.SetToolTip(this.chkSettingsDownloadsDownloadSubtitles, "chkSettingsDownloadsDownloadSubtitles"); @@ -586,7 +586,7 @@ private void InitializeComponent() { this.chkSettingsDownloadsSaveVideoInfo.AutoSize = true; this.chkSettingsDownloadsSaveVideoInfo.Location = new System.Drawing.Point(6, 52); this.chkSettingsDownloadsSaveVideoInfo.Name = "chkSettingsDownloadsSaveVideoInfo"; - this.chkSettingsDownloadsSaveVideoInfo.Size = new System.Drawing.Size(205, 17); + this.chkSettingsDownloadsSaveVideoInfo.Size = new System.Drawing.Size(204, 17); this.chkSettingsDownloadsSaveVideoInfo.TabIndex = 4; this.chkSettingsDownloadsSaveVideoInfo.Text = "chkSettingsDownloadsSaveVideoInfo"; this.chkSettingsDownloadsSaveVideoInfo.UseVisualStyleBackColor = true; @@ -610,7 +610,7 @@ private void InitializeComponent() { this.chkSettingsDownloadsSeparateDownloadsToDifferentFolders.CheckState = System.Windows.Forms.CheckState.Checked; this.chkSettingsDownloadsSeparateDownloadsToDifferentFolders.Location = new System.Drawing.Point(6, 6); this.chkSettingsDownloadsSeparateDownloadsToDifferentFolders.Name = "chkSettingsDownloadsSeparateDownloadsToDifferentFolders"; - this.chkSettingsDownloadsSeparateDownloadsToDifferentFolders.Size = new System.Drawing.Size(318, 17); + this.chkSettingsDownloadsSeparateDownloadsToDifferentFolders.Size = new System.Drawing.Size(317, 17); this.chkSettingsDownloadsSeparateDownloadsToDifferentFolders.TabIndex = 1; this.chkSettingsDownloadsSeparateDownloadsToDifferentFolders.Text = "chkSettingsDownloadsSeparateDownloadsToDifferentFolders"; this.tipSettings.SetToolTip(this.chkSettingsDownloadsSeparateDownloadsToDifferentFolders, "chkSettingsDownloadsSeparateDownloadsToDifferentFolders"); @@ -623,7 +623,7 @@ private void InitializeComponent() { this.chkSettingsDownloadsSeparateIntoWebsiteUrl.CheckState = System.Windows.Forms.CheckState.Checked; this.chkSettingsDownloadsSeparateIntoWebsiteUrl.Location = new System.Drawing.Point(6, 29); this.chkSettingsDownloadsSeparateIntoWebsiteUrl.Name = "chkSettingsDownloadsSeparateIntoWebsiteUrl"; - this.chkSettingsDownloadsSeparateIntoWebsiteUrl.Size = new System.Drawing.Size(248, 17); + this.chkSettingsDownloadsSeparateIntoWebsiteUrl.Size = new System.Drawing.Size(247, 17); this.chkSettingsDownloadsSeparateIntoWebsiteUrl.TabIndex = 2; this.chkSettingsDownloadsSeparateIntoWebsiteUrl.Text = "chkSettingsDownloadsSeparateIntoWebsiteUrl"; this.tipSettings.SetToolTip(this.chkSettingsDownloadsSeparateIntoWebsiteUrl, "chkSettingsDownloadsSeparateIntoWebsiteUrl"); @@ -646,7 +646,7 @@ private void InitializeComponent() { this.chkSettingsDownloadsPreferFFmpeg.AutoSize = true; this.chkSettingsDownloadsPreferFFmpeg.Location = new System.Drawing.Point(6, 29); this.chkSettingsDownloadsPreferFFmpeg.Name = "chkSettingsDownloadsPreferFFmpeg"; - this.chkSettingsDownloadsPreferFFmpeg.Size = new System.Drawing.Size(201, 17); + this.chkSettingsDownloadsPreferFFmpeg.Size = new System.Drawing.Size(200, 17); this.chkSettingsDownloadsPreferFFmpeg.TabIndex = 2; this.chkSettingsDownloadsPreferFFmpeg.Text = "chkSettingsDownloadsPreferFFmpeg"; this.tipSettings.SetToolTip(this.chkSettingsDownloadsPreferFFmpeg, "chkSettingsDownloadsPreferFFmpegHint"); @@ -659,7 +659,7 @@ private void InitializeComponent() { this.chkSettingsDownloadsFixVReddIt.CheckState = System.Windows.Forms.CheckState.Checked; this.chkSettingsDownloadsFixVReddIt.Location = new System.Drawing.Point(6, 6); this.chkSettingsDownloadsFixVReddIt.Name = "chkSettingsDownloadsFixVReddIt"; - this.chkSettingsDownloadsFixVReddIt.Size = new System.Drawing.Size(187, 17); + this.chkSettingsDownloadsFixVReddIt.Size = new System.Drawing.Size(186, 17); this.chkSettingsDownloadsFixVReddIt.TabIndex = 1; this.chkSettingsDownloadsFixVReddIt.Text = "chkSettingsDownloadsFixVReddIt"; this.tipSettings.SetToolTip(this.chkSettingsDownloadsFixVReddIt, "chkSettingsDownloadsFixVReddItHint"); @@ -732,7 +732,7 @@ private void InitializeComponent() { this.chkSettingsDownloadsForceIpv6.AutoSize = true; this.chkSettingsDownloadsForceIpv6.Location = new System.Drawing.Point(6, 81); this.chkSettingsDownloadsForceIpv6.Name = "chkSettingsDownloadsForceIpv6"; - this.chkSettingsDownloadsForceIpv6.Size = new System.Drawing.Size(183, 17); + this.chkSettingsDownloadsForceIpv6.Size = new System.Drawing.Size(182, 17); this.chkSettingsDownloadsForceIpv6.TabIndex = 7; this.chkSettingsDownloadsForceIpv6.Text = "chkSettingsDownloadsForceIpv6"; this.tipSettings.SetToolTip(this.chkSettingsDownloadsForceIpv6, "chkSettingsDownloadsForceIpv6Hint"); @@ -744,7 +744,7 @@ private void InitializeComponent() { this.chkSettingsDownloadsForceIpv4.AutoSize = true; this.chkSettingsDownloadsForceIpv4.Location = new System.Drawing.Point(6, 58); this.chkSettingsDownloadsForceIpv4.Name = "chkSettingsDownloadsForceIpv4"; - this.chkSettingsDownloadsForceIpv4.Size = new System.Drawing.Size(183, 17); + this.chkSettingsDownloadsForceIpv4.Size = new System.Drawing.Size(182, 17); this.chkSettingsDownloadsForceIpv4.TabIndex = 6; this.chkSettingsDownloadsForceIpv4.Text = "chkSettingsDownloadsForceIpv4"; this.tipSettings.SetToolTip(this.chkSettingsDownloadsForceIpv4, "chkSettingsDownloadsForceIpv4Hint"); @@ -757,7 +757,7 @@ private void InitializeComponent() { this.chkSettingsDownloadsUseProxy.AutoSize = true; this.chkSettingsDownloadsUseProxy.Location = new System.Drawing.Point(6, 110); this.chkSettingsDownloadsUseProxy.Name = "chkSettingsDownloadsUseProxy"; - this.chkSettingsDownloadsUseProxy.Size = new System.Drawing.Size(180, 17); + this.chkSettingsDownloadsUseProxy.Size = new System.Drawing.Size(179, 17); this.chkSettingsDownloadsUseProxy.TabIndex = 8; this.chkSettingsDownloadsUseProxy.Text = "chkSettingsDownloadsUseProxy"; this.tipSettings.SetToolTip(this.chkSettingsDownloadsUseProxy, "chkSettingsDownloadsUseProxy"); @@ -823,7 +823,7 @@ private void InitializeComponent() { this.chkSettingsDownloadsLimitDownload.AutoSize = true; this.chkSettingsDownloadsLimitDownload.Location = new System.Drawing.Point(6, 6); this.chkSettingsDownloadsLimitDownload.Name = "chkSettingsDownloadsLimitDownload"; - this.chkSettingsDownloadsLimitDownload.Size = new System.Drawing.Size(204, 17); + this.chkSettingsDownloadsLimitDownload.Size = new System.Drawing.Size(203, 17); this.chkSettingsDownloadsLimitDownload.TabIndex = 1; this.chkSettingsDownloadsLimitDownload.Text = "chkSettingsDownloadsLimitDownload"; this.tipSettings.SetToolTip(this.chkSettingsDownloadsLimitDownload, "chkSettingsDownloadsLimitDownloadHint"); @@ -845,7 +845,7 @@ private void InitializeComponent() { this.chksettingsDownloadsUseYoutubeDlsUpdater.AutoSize = true; this.chksettingsDownloadsUseYoutubeDlsUpdater.Location = new System.Drawing.Point(6, 6); this.chksettingsDownloadsUseYoutubeDlsUpdater.Name = "chksettingsDownloadsUseYoutubeDlsUpdater"; - this.chksettingsDownloadsUseYoutubeDlsUpdater.Size = new System.Drawing.Size(245, 17); + this.chksettingsDownloadsUseYoutubeDlsUpdater.Size = new System.Drawing.Size(244, 17); this.chksettingsDownloadsUseYoutubeDlsUpdater.TabIndex = 1; this.chksettingsDownloadsUseYoutubeDlsUpdater.Text = "chksettingsDownloadsUseYoutubeDlsUpdater"; this.tipSettings.SetToolTip(this.chksettingsDownloadsUseYoutubeDlsUpdater, "chksettingsDownloadsUseYoutubeDlsUpdater"); @@ -917,6 +917,19 @@ private void InitializeComponent() { this.lbSettingsDownloadsFileNameSchema.TabIndex = 4; this.lbSettingsDownloadsFileNameSchema.Text = "lbSettingsDownloadsFileNameSchema"; // + // txtSettingsDownloadsFileNameSchema + // + this.txtSettingsDownloadsFileNameSchema.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.txtSettingsDownloadsFileNameSchema.FormattingEnabled = true; + this.txtSettingsDownloadsFileNameSchema.Location = new System.Drawing.Point(30, 79); + this.txtSettingsDownloadsFileNameSchema.Name = "txtSettingsDownloadsFileNameSchema"; + this.txtSettingsDownloadsFileNameSchema.Size = new System.Drawing.Size(260, 21); + this.txtSettingsDownloadsFileNameSchema.TabIndex = 9; + this.txtSettingsDownloadsFileNameSchema.Text = "%(title)s-%(id)s.%(ext)s"; + this.tipSettings.SetToolTip(this.txtSettingsDownloadsFileNameSchema, "txtSettingsDownloadsFileNameSchemaHint"); + this.txtSettingsDownloadsFileNameSchema.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtSettingsDownloadsFileNameSchema_KeyPress); + // // tabSettingsConverter // this.tabSettingsConverter.Controls.Add(this.chkSettingsConverterHideFFmpegCompileInfo); @@ -937,7 +950,7 @@ private void InitializeComponent() { this.chkSettingsConverterHideFFmpegCompileInfo.AutoSize = true; this.chkSettingsConverterHideFFmpegCompileInfo.Location = new System.Drawing.Point(17, 81); this.chkSettingsConverterHideFFmpegCompileInfo.Name = "chkSettingsConverterHideFFmpegCompileInfo"; - this.chkSettingsConverterHideFFmpegCompileInfo.Size = new System.Drawing.Size(243, 17); + this.chkSettingsConverterHideFFmpegCompileInfo.Size = new System.Drawing.Size(242, 17); this.chkSettingsConverterHideFFmpegCompileInfo.TabIndex = 4; this.chkSettingsConverterHideFFmpegCompileInfo.Text = "chkSettingsConverterHideFFmpegCompileInfo"; this.tipSettings.SetToolTip(this.chkSettingsConverterHideFFmpegCompileInfo, "chkSettingsConverterHideFFmpegCompileInfo"); @@ -950,7 +963,7 @@ private void InitializeComponent() { this.chkSettingsConverterDetectOutputFileType.CheckState = System.Windows.Forms.CheckState.Checked; this.chkSettingsConverterDetectOutputFileType.Location = new System.Drawing.Point(17, 58); this.chkSettingsConverterDetectOutputFileType.Name = "chkSettingsConverterDetectOutputFileType"; - this.chkSettingsConverterDetectOutputFileType.Size = new System.Drawing.Size(232, 17); + this.chkSettingsConverterDetectOutputFileType.Size = new System.Drawing.Size(231, 17); this.chkSettingsConverterDetectOutputFileType.TabIndex = 3; this.chkSettingsConverterDetectOutputFileType.Text = "chkSettingsConverterDetectOutputFileType"; this.tipSettings.SetToolTip(this.chkSettingsConverterDetectOutputFileType, "chkSettingsConverterDetectOutputFileType"); @@ -1001,7 +1014,7 @@ private void InitializeComponent() { this.chkUseVideoCRF.CheckState = System.Windows.Forms.CheckState.Checked; this.chkUseVideoCRF.Location = new System.Drawing.Point(72, 96); this.chkUseVideoCRF.Name = "chkUseVideoCRF"; - this.chkUseVideoCRF.Size = new System.Drawing.Size(15, 14); + this.chkUseVideoCRF.Size = new System.Drawing.Size(14, 13); this.chkUseVideoCRF.TabIndex = 11; this.chkUseVideoCRF.UseVisualStyleBackColor = true; // @@ -1011,7 +1024,7 @@ private void InitializeComponent() { this.chkUseVideoProfile.AutoSize = true; this.chkUseVideoProfile.Location = new System.Drawing.Point(72, 70); this.chkUseVideoProfile.Name = "chkUseVideoProfile"; - this.chkUseVideoProfile.Size = new System.Drawing.Size(15, 14); + this.chkUseVideoProfile.Size = new System.Drawing.Size(14, 13); this.chkUseVideoProfile.TabIndex = 8; this.chkUseVideoProfile.UseVisualStyleBackColor = true; // @@ -1021,7 +1034,7 @@ private void InitializeComponent() { this.chkSettingsConverterVideoPreset.AutoSize = true; this.chkSettingsConverterVideoPreset.Location = new System.Drawing.Point(72, 43); this.chkSettingsConverterVideoPreset.Name = "chkSettingsConverterVideoPreset"; - this.chkSettingsConverterVideoPreset.Size = new System.Drawing.Size(15, 14); + this.chkSettingsConverterVideoPreset.Size = new System.Drawing.Size(14, 13); this.chkSettingsConverterVideoPreset.TabIndex = 5; this.chkSettingsConverterVideoPreset.UseVisualStyleBackColor = true; // @@ -1031,7 +1044,7 @@ private void InitializeComponent() { this.chkUseVideoBitrate.AutoSize = true; this.chkUseVideoBitrate.Location = new System.Drawing.Point(72, 16); this.chkUseVideoBitrate.Name = "chkUseVideoBitrate"; - this.chkUseVideoBitrate.Size = new System.Drawing.Size(15, 14); + this.chkUseVideoBitrate.Size = new System.Drawing.Size(14, 13); this.chkUseVideoBitrate.TabIndex = 1; this.chkUseVideoBitrate.UseVisualStyleBackColor = true; // @@ -1041,7 +1054,7 @@ private void InitializeComponent() { this.chkSettingsConverterVideoFastStart.AutoSize = true; this.chkSettingsConverterVideoFastStart.Location = new System.Drawing.Point(117, 126); this.chkSettingsConverterVideoFastStart.Name = "chkSettingsConverterVideoFastStart"; - this.chkSettingsConverterVideoFastStart.Size = new System.Drawing.Size(197, 17); + this.chkSettingsConverterVideoFastStart.Size = new System.Drawing.Size(196, 17); this.chkSettingsConverterVideoFastStart.TabIndex = 14; this.chkSettingsConverterVideoFastStart.Text = "chkSettingsConverterVideoFastStart"; this.tipSettings.SetToolTip(this.chkSettingsConverterVideoFastStart, "chkSettingsConverterVideoFastStart"); @@ -1199,7 +1212,7 @@ private void InitializeComponent() { this.chkUseAudioBitrate.CheckState = System.Windows.Forms.CheckState.Checked; this.chkUseAudioBitrate.Location = new System.Drawing.Point(88, 21); this.chkUseAudioBitrate.Name = "chkUseAudioBitrate"; - this.chkUseAudioBitrate.Size = new System.Drawing.Size(15, 14); + this.chkUseAudioBitrate.Size = new System.Drawing.Size(14, 13); this.chkUseAudioBitrate.TabIndex = 1; this.chkUseAudioBitrate.UseVisualStyleBackColor = true; // @@ -1296,7 +1309,7 @@ private void InitializeComponent() { this.chkSettingsConverterClearInputAfterConverting.AutoSize = true; this.chkSettingsConverterClearInputAfterConverting.Location = new System.Drawing.Point(17, 35); this.chkSettingsConverterClearInputAfterConverting.Name = "chkSettingsConverterClearInputAfterConverting"; - this.chkSettingsConverterClearInputAfterConverting.Size = new System.Drawing.Size(249, 17); + this.chkSettingsConverterClearInputAfterConverting.Size = new System.Drawing.Size(248, 17); this.chkSettingsConverterClearInputAfterConverting.TabIndex = 2; this.chkSettingsConverterClearInputAfterConverting.Text = "chkSettingsConverterClearInputAfterConverting"; this.tipSettings.SetToolTip(this.chkSettingsConverterClearInputAfterConverting, "chkSettingsConverterClearInputAfterConverting"); @@ -1307,7 +1320,7 @@ private void InitializeComponent() { this.chkSettingsConverterClearOutputAfterConverting.AutoSize = true; this.chkSettingsConverterClearOutputAfterConverting.Location = new System.Drawing.Point(17, 12); this.chkSettingsConverterClearOutputAfterConverting.Name = "chkSettingsConverterClearOutputAfterConverting"; - this.chkSettingsConverterClearOutputAfterConverting.Size = new System.Drawing.Size(257, 17); + this.chkSettingsConverterClearOutputAfterConverting.Size = new System.Drawing.Size(256, 17); this.chkSettingsConverterClearOutputAfterConverting.TabIndex = 1; this.chkSettingsConverterClearOutputAfterConverting.Text = "chkSettingsConverterClearOutputAfterConverting"; this.tipSettings.SetToolTip(this.chkSettingsConverterClearOutputAfterConverting, "chkSettingsConverterClearOutputAfterConverting"); @@ -1441,7 +1454,7 @@ private void InitializeComponent() { this.chkSettingsErrorsSaveErrorsAsErrorLog.AutoSize = true; this.chkSettingsErrorsSaveErrorsAsErrorLog.Location = new System.Drawing.Point(8, 6); this.chkSettingsErrorsSaveErrorsAsErrorLog.Name = "chkSettingsErrorsSaveErrorsAsErrorLog"; - this.chkSettingsErrorsSaveErrorsAsErrorLog.Size = new System.Drawing.Size(213, 17); + this.chkSettingsErrorsSaveErrorsAsErrorLog.Size = new System.Drawing.Size(212, 17); this.chkSettingsErrorsSaveErrorsAsErrorLog.TabIndex = 1; this.chkSettingsErrorsSaveErrorsAsErrorLog.Text = "chkSettingsErrorsSaveErrorsAsErrorLog"; this.tipSettings.SetToolTip(this.chkSettingsErrorsSaveErrorsAsErrorLog, "chkSettingsErrorsSaveErrorsAsErrorLog"); @@ -1453,7 +1466,7 @@ private void InitializeComponent() { this.chkSettingsErrorsShowDetailedErrors.Enabled = false; this.chkSettingsErrorsShowDetailedErrors.Location = new System.Drawing.Point(8, 52); this.chkSettingsErrorsShowDetailedErrors.Name = "chkSettingsErrorsShowDetailedErrors"; - this.chkSettingsErrorsShowDetailedErrors.Size = new System.Drawing.Size(202, 17); + this.chkSettingsErrorsShowDetailedErrors.Size = new System.Drawing.Size(201, 17); this.chkSettingsErrorsShowDetailedErrors.TabIndex = 3; this.chkSettingsErrorsShowDetailedErrors.Text = "chkSettingsErrorsShowDetailedErrors"; this.tipSettings.SetToolTip(this.chkSettingsErrorsShowDetailedErrors, "chkSettingsErrorsShowDetailedErrors"); @@ -1465,7 +1478,7 @@ private void InitializeComponent() { this.chkSettingsErrorsSuppressErrors.AutoSize = true; this.chkSettingsErrorsSuppressErrors.Location = new System.Drawing.Point(8, 29); this.chkSettingsErrorsSuppressErrors.Name = "chkSettingsErrorsSuppressErrors"; - this.chkSettingsErrorsSuppressErrors.Size = new System.Drawing.Size(180, 17); + this.chkSettingsErrorsSuppressErrors.Size = new System.Drawing.Size(179, 17); this.chkSettingsErrorsSuppressErrors.TabIndex = 2; this.chkSettingsErrorsSuppressErrors.Text = "chkSettingsErrorsSuppressErrors"; this.tipSettings.SetToolTip(this.chkSettingsErrorsSuppressErrors, "chkSettingsErrorsSuppressErrors"); @@ -1514,17 +1527,6 @@ private void InitializeComponent() { this.tipSettings.ReshowDelay = 100; this.tipSettings.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info; // - // txtSettingsDownloadsFileNameSchema - // - this.txtSettingsDownloadsFileNameSchema.FormattingEnabled = true; - this.txtSettingsDownloadsFileNameSchema.Location = new System.Drawing.Point(30, 79); - this.txtSettingsDownloadsFileNameSchema.Name = "txtSettingsDownloadsFileNameSchema"; - this.txtSettingsDownloadsFileNameSchema.Size = new System.Drawing.Size(260, 21); - this.txtSettingsDownloadsFileNameSchema.TabIndex = 9; - this.txtSettingsDownloadsFileNameSchema.Text = "%(title)s-%(id)s.%(ext)s"; - this.tipSettings.SetToolTip(this.txtSettingsDownloadsFileNameSchema, "txtSettingsDownloadsFileNameSchemaHint"); - this.txtSettingsDownloadsFileNameSchema.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtSettingsDownloadsFileNameSchema_KeyPress); - // // frmSettings // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/Forms/frmSettings.resx b/Forms/frmSettings.resx index 09a14dd3..07823a19 100644 --- a/Forms/frmSettings.resx +++ b/Forms/frmSettings.resx @@ -120,7 +120,4 @@ 17, 17 - - 17, 17 - \ No newline at end of file diff --git a/Program.cs b/Program.cs index 65958a7e..b5a07d62 100644 --- a/Program.cs +++ b/Program.cs @@ -70,9 +70,12 @@ static void Main(string[] args) { if (!IsPortable) { Properties.Settings.Default.Save(); + Downloads.Default.Save(); + } + else { + CheckSettings.CreatePortableSettings(); } - CheckSettings.CreatePortableSettings(); AllowLaunch = true; } @@ -116,12 +119,7 @@ static void Main(string[] args) { [System.Diagnostics.Conditional("DEBUG")] static void DebugOnlyMethod() { IsDebug = true; - //string Date = DateTime.Now.Year + "-"; - //if (DateTime.Now.Month.ToString().Length == 1) { Date += "0"; } - //Date += DateTime.Now.Month + "-"; - //if (DateTime.Now.Day.ToString().Length == 1) { Date += "0"; } - //Date += DateTime.Now.Day; - //Properties.Settings.Default.debugDate = Date; + } static void LoadClasses() { diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs index cea4620c..3299dc51 100644 --- a/Properties/Settings.Designer.cs +++ b/Properties/Settings.Designer.cs @@ -25,7 +25,7 @@ public static Settings Default { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("2.251")] + [global::System.Configuration.DefaultSettingValueAttribute("2.252")] public decimal appVersion { get { return ((decimal)(this["appVersion"])); @@ -44,18 +44,6 @@ public bool firstTime { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool jsonSupport { - get { - return ((bool)(this["jsonSupport"])); - } - set { - this["jsonSupport"] = value; - } - } - [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("1")] @@ -65,16 +53,13 @@ public decimal stubVersion { } } - [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("2020-10-24")] + [global::System.Configuration.DefaultSettingValueAttribute("2020-12-31")] public string debugDate { get { return ((string)(this["debugDate"])); } - set { - this["debugDate"] = value; - } } [global::System.Configuration.UserScopedSettingAttribute()] @@ -100,5 +85,26 @@ public string YoutubeDlVersion { this["YoutubeDlVersion"] = value; } } + + [global::System.Configuration.ApplicationScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool IsBetaVersion { + get { + return ((bool)(this["IsBetaVersion"])); + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("2.26-pre2")] + public string BetaVersion { + get { + return ((string)(this["BetaVersion"])); + } + set { + this["BetaVersion"] = value; + } + } } } diff --git a/Properties/Settings.settings b/Properties/Settings.settings index 7a6a6027..6141c03c 100644 --- a/Properties/Settings.settings +++ b/Properties/Settings.settings @@ -3,19 +3,16 @@ - 2.251 + 2.252 True - - True - 1 - - 2020-10-24 + + 2020-12-31 -1 @@ -23,5 +20,11 @@ + + True + + + 2.26-pre2 + \ No newline at end of file diff --git a/youtube-dl-gui.csproj.user b/youtube-dl-gui.csproj.user index 65b1e7aa..3f8b7a1c 100644 --- a/youtube-dl-gui.csproj.user +++ b/youtube-dl-gui.csproj.user @@ -1,7 +1,8 @@  - ytdl:youtube.com/aaaa... + + publish\