diff --git a/Form1.cs b/Form1.cs
index edcf152..3d853aa 100644
--- a/Form1.cs
+++ b/Form1.cs
@@ -95,6 +95,7 @@ private void Form1_Load(object sender, EventArgs e)
FiletypeBox.SelectedIndex = 0;
}
destinationBox.Text = Settings.Default.Destination == "" ? Application.StartupPath : Settings.Default.Destination;
+ filenameBox.Enabled = !useTitleCheckbox.Checked;
CultureInfo currentCulture = Thread.CurrentThread.CurrentUICulture;
@@ -321,7 +322,7 @@ private void ModifyQueue(string ID, string filename, string path, int filetype,
{
Video video = new Video(this);
video.ID = ID;
- video.name = filename;
+ video.name = filename == "%(title)s.%(ext)s" ? videoItem.Snippet.Title + ".%(ext)s": filename + ".%(ext)s"; //Temporary until title gathering returns to normal via YT-DL
video.path = path;
video.filetype = filetype;
video.thumbURL = videoItem.Snippet.Thumbnails.Default__.Url;
diff --git a/Form1.resx b/Form1.resx
index acb3d33..63c08bb 100644
--- a/Form1.resx
+++ b/Form1.resx
@@ -118,1263 +118,1257 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 277, 464
-
-
- mp4 - 720p (video only)
-
-
- mp4 - 640x360 (video and audio)
-
-
- 22
-
-
- 571, 251
-
-
- Text File|*.txt
+
+ 81, 27
-
- 16
+
+ 503, 20
-
- 14
-
-
- Filetype:
-
-
- 17
-
-
- Verbose Status
+
+ 0
-
- 8
+
+ UrlBox
-
- mp4 - 240p (video only)
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
$this
-
- 12, 135
-
-
- 6, 13
-
-
- EditFilenameBox
-
-
- 596, 600
+
+ 34
-
- 12
+
+ True
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 12, 30
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 48, 13
-
- 183, 48
+
+ 1
-
- 0, 13
+
+ URL/ID:
-
- 81, 56
+
+ label1
-
- System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
$this
-
- DownloadButton
+
+ 33
-
- 305
+
+ False
-
- 7
+
+ 447, 552
-
- True
+
+ 137, 23
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 2
-
- 126, 22
+
+ Download
-
- flac (audio only)
+
+ DownloadButton
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
$this
-
- Text File|*.txt
-
-
- 36
-
-
- True
+
+ 32
-
- 137, 23
+
+ 17, 17
+
+
+ 80, 17
-
- 18
+
+ No Download
-
- 300, 20
+
+ 56, 17
-
- System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 0.0 MiB/s
-
- label5
+
+ MiddleRight
-
- deleteContextMenuItem
+
+ 0, 17
-
- System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 0, 17
-
- 6
+
+ 0, 578
-
- 12, 59
+
+ 596, 22
3
-
- flv
+
+ statusStrip
-
- EditDestinationButton
+
+ StatusStrip
-
- 1
+
+ System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- mp4 - 720p (video only)
+
+ $this
-
- exportQueueDialog
+
+ 30
-
- #
+
+ m4a - 130k (audio only)
-
- System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ mp3 (audio only)
-
- $this
+
+ flac (audio only)
-
- 24
+
+ mp4 - 144p (video only)
-
- default
+
+ mp4 - 240p (video only)
-
- 169, 417
+
+ mp4 - 360p (video only)
-
- 0
+
+ mp4 - 480p (video only)
-
- $this
+
+ mp4 - 720p (video only)
-
- False
+
+ 3gp - 176x144
-
- System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 3gp - 320x240
-
- Youtube-DL GUI
+
+ flv - 400x240
-
+
webm - 640x360
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ mp4 - 640x360 (video and audio)
mp4 -1280x720 (video and audio)
-
- button1
+
+ avi
-
- FilenameCard
+
+ default
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 81, 108
-
- False
+
+ 502, 21
-
- 179, 22
+
+ 4
-
- 52, 20
+
+ FiletypeBox
-
- Use Video Title
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
$this
-
- MiddleRight
+
+ 29
-
- 11
+
+ True
-
- System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 12, 111
-
- label9
+
+ 53, 13
-
- destinationBox
+
+ 5
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ File Type:
-
-
- NoControl
+
+ label2
-
- 110, 23
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
$this
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 23
+
+ 28
-
- True
+
+ 12, 523
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 571, 23
-
- 0.0 MiB/s
+
+ 7
-
- 29
+
+ progressBar1
-
- DownloadGrid
+
+ System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
$this
-
- 11
-
-
- 53, 13
-
-
- 21
+
+ 27
-
- 28
+
+ #
-
- 0, 0
+
+ 20
-
- 393, 20
+
+ Title
-
- 33
+
+ 305
-
- 480, 495
+
+ Video ID
200
-
- $this
+
+ 721, 17
+
+
+ 182, 22
-
- 596, 24
+
+ Delete from Queue
-
- 3
+
+ 182, 22
-
- 63, 13
+
+ Edit Video Attributes
-
- 277, 439
+
+ 183, 48
-
- Download
+
+ contextMenuStrip
-
- $this
+
+ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- m4a - 130k (audio only)
+
+ 12, 135
-
- FiletypeCard
+
+ 571, 251
-
- False
+
+ 8
-
- Language
+
+ DownloadGrid
-
- 12, 111
+
+ System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 27
+
+ $this
-
- avi
+
+ 26
-
- 0, 13
+
+ 479, 54
-
- True
+
+ 104, 23
-
- 57, 13
+
+ 9
-
- System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ Select Folder
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ button1
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ $this
-
- 596, 22
+
+ 25
-
- 20
+
+ True
-
- portuguêsBrasileiroToolStripMenuItem
+
+ 12, 59
-
- 0, 13
+
+ 63, 13
-
- $this
+
+ 10
-
- 80, 17
+
+ Destination:
-
- 571, 23
+
+ label3
-
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
$this
-
- 169, 496
+
+ 24
-
- 81, 82
+
+ 81, 56
-
- NoControl
+
+ 393, 20
-
- 503, 20
+
+ 11
-
- English
+
+ destinationBox
-
- Português Brasileiro
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 0, 13
+
+ $this
-
- settingsToolStripMenuItem
-
-
- 33
+
+ 23
-
- mp4 - 480p (video only)
+
+ True
-
- UseTitleInEditCheckbox
+
+ 12, 85
-
- 277, 493
+
+ 57, 13
-
- $this
+
+ 12
-
- Delete from Queue
+
+ File Name:
-
- True
+
+ label4
-
- 34
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 148, 102
+
+ $this
-
- mp4 - 144p (video only)
+
+ 22
-
- 104, 23
+
+ 81, 82
-
- File Name:
+
+ 393, 20
-
- True
+
+ 13
-
- StatusStrip
+
+ filenameBox
-
- 31
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Tools
+
+ $this
-
- DownloadStatus
+
+ 21
-
- 329, 552
+
+ True
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 479, 85
-
- PathCard
+
+ 98, 17
-
- alertOnFinishToolStripMenuItem
+
+ 14
-
- 48, 13
+
+ Use Video Title
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ useTitleCheckbox
-
- Add from Text File
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- label8
+
+ $this
-
- 32
+
+ 20
-
- 277, 469
+
+ 126, 17
+
+
+ 12, 552
-
- True
+
+ 107, 23
-
- mp4 - 360p (video only)
+
+ 16
-
- 20
+
+ Add to Queue
-
- 197, 20
+
+ queueButton
-
- NoControl
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ $this
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 19
-
- 9
+
+ 289, 17
+
+
+ 15, 392
-
- Alert on Finish
+
+ 148, 102
-
- mp4 - 480p (video only)
+
+ 18
-
- System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ ThumbnailBox
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- filenameBox
+
+ $this
-
- label1
+
+ 18
-
- IDCard
+
+ True
-
- 21
+
+ 169, 392
-
- EditFiletypeBox
+
+ 60, 13
-
- $this
+
+ 19
-
- System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ Video Title:
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ label5
-
- True
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- URL/ID:
+
+ $this
-
- toolStripStatusLabel1
+
+ 17
-
- progressBar1
+
+ True
-
- m4a - 130k (audio only)
+
+ 169, 417
51, 13
-
- 150, 22
-
-
- 0, 578
+
+ 20
-
- 30
+
+ Video ID:
-
- 479, 85
+
+ label6
-
- menuStrip1
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- statusStrip
+
+ $this
-
- False
+
+ 16
-
- 3gp - 320x240
+
+ True
-
- 26
+
+ 169, 442
-
- 25
+
+ 46, 13
-
- Video Title:
-
-
- downloadSpeedLabel
+
+ 21
-
- 52, 13
+
+ Filetype:
-
- 2
+
+ label7
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 169, 392
+
+ $this
-
- True
+
+ 15
-
+
True
-
- mp3 (audio only)
+
+ 169, 469
-
- label2
+
+ 102, 13
-
- default
+
+ 22
-
- 18
+
+ Download Location:
-
- 277, 496
+
+ label8
-
+
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 102, 13
+
+ $this
-
- 12
+
+ 14
-
- System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ True
-
- $this
+
+ 277, 392
-
- webm - 640x360
+
+ 0, 13
-
- 16
+
+ 23
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ TitleCard
-
- 13
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- File Type:
+
+ $this
-
- 479, 54
+
+ 13
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ True
277, 417
-
- True
+
+ 0, 13
-
- $this
+
+ 24
-
- 10
+
+ IDCard
-
- System.ComponentModel.BackgroundWorker, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- No Download
+
+ $this
-
- 81, 108
+
+ 12
-
- 12, 552
+
+ True
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 277, 442
-
- Download Location:
+
+ 0, 13
-
- About
+
+ 25
-
- $this
+
+ FiletypeCard
-
- 61, 20
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
$this
-
- Select Folder
-
-
- 2
-
-
- ThumbnailBox
-
-
- 56, 17
-
-
- 22
+
+ 11
-
- False
+
+ True
-
- 60, 13
+
+ 277, 469
-
+
0, 13
-
- flv - 400x240
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 26
-
- queueButton
+
+ PathCard
-
+
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- contextMenuStrip
-
-
- 150, 22
-
-
- 3gp - 176x144
+
+ $this
-
- 12, 30
+
+ 10
+
+ 466, 17
+
179, 22
-
- Add to Queue
+
+ Português Brasileiro
-
- AddFromTextButton
+
+ 179, 22
-
- 3gp - 320x240
+
+ English
-
- VideoID
+
+ 126, 22
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ Language
-
- $this
+
+ 150, 22
-
- 502, 21
+
+ Verbose Status
-
- $this
+
+ 150, 22
-
- 4
+
+ Alert on Finish
-
- 19
+
+ 126, 22
-
- flac (audio only)
+
+ Display
-
- 126, 22
+
+ 61, 20
Settings
-
- Title
-
-
- Export Queue
+
+ 52, 20
-
- useTitleCheckbox
-
-
- $this
+
+ About
-
- Destination:
+
+ 126, 22
-
- True
+
+ Converter
-
- displayVerboseStatusToolStripMenuItem
+
+ 47, 20
-
- 447, 552
+
+ Tools
-
- 300, 21
+
+ 0, 0
-
- System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 596, 24
-
- $this
+
+ 27
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ menuStrip1
-
- FiletypeBox
+
+ menuStrip1
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
$this
-
- 19
-
-
- mp4 - 240p (video only)
-
-
- ExportButton
+
+ 31
-
- System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 125, 552
-
- 26
+
+