diff --git a/FFmpeg Utilizer/Core/Core.cs b/FFmpeg Utilizer/Core/Core.cs
index bdffb7f..c76197d 100644
--- a/FFmpeg Utilizer/Core/Core.cs
+++ b/FFmpeg Utilizer/Core/Core.cs
@@ -28,7 +28,7 @@ public static class Core
public static BuildTypes buildType = BuildTypes.Alpha;
public static int majorVersion = 0;
public static int minorVersion = 1;
- public static int buildVersion = 1;
+ public static int buildVersion = 2;
public enum BuildTypes
{
diff --git a/FFmpeg Utilizer/Forms/Main.Designer.cs b/FFmpeg Utilizer/Forms/Main.Designer.cs
index dc6caac..12fd541 100644
--- a/FFmpeg Utilizer/Forms/Main.Designer.cs
+++ b/FFmpeg Utilizer/Forms/Main.Designer.cs
@@ -29,10 +29,10 @@ protected override void Dispose(bool disposing)
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- System.Windows.Forms.ListViewItem listViewItem3 = new System.Windows.Forms.ListViewItem(new string[] {
+ System.Windows.Forms.ListViewItem listViewItem1 = new System.Windows.Forms.ListViewItem(new string[] {
"0",
"Drag and drop a folder or multiple files here..."}, -1);
- System.Windows.Forms.ListViewItem listViewItem4 = new System.Windows.Forms.ListViewItem(new string[] {
+ System.Windows.Forms.ListViewItem listViewItem2 = new System.Windows.Forms.ListViewItem(new string[] {
"Drag and drop a folder or multiple files here...",
""}, -1);
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main));
@@ -273,6 +273,7 @@ private void InitializeComponent()
this.panel96 = new System.Windows.Forms.Panel();
this.label41 = new System.Windows.Forms.Label();
this.panel97 = new System.Windows.Forms.Panel();
+ this.pictureBox11 = new System.Windows.Forms.PictureBox();
this.panel40 = new System.Windows.Forms.Panel();
this.SpeedLabel = new System.Windows.Forms.Label();
this.Update_ProgressBar = new System.Windows.Forms.ProgressBar();
@@ -311,9 +312,11 @@ private void InitializeComponent()
this.AuthorLabel = new System.Windows.Forms.Label();
this.SoftwareLabel = new System.Windows.Forms.Label();
this.InfoText = new System.Windows.Forms.Label();
+ this.InfoIcon = new System.Windows.Forms.PictureBox();
this.Menu_UpdatesTab = new System.Windows.Forms.Panel();
this.Menu_UpdatesTabLabel = new System.Windows.Forms.Label();
this.panel38 = new System.Windows.Forms.Panel();
+ this.pictureBox9 = new System.Windows.Forms.PictureBox();
this.panel39 = new System.Windows.Forms.Panel();
this.Menu_UpdatesTabIndicator = new System.Windows.Forms.Panel();
this.panel33 = new System.Windows.Forms.Panel();
@@ -323,36 +326,43 @@ private void InitializeComponent()
this.Menu_SettingsTab = new System.Windows.Forms.Panel();
this.Menu_SettingsTabLabel = new System.Windows.Forms.Label();
this.panel19 = new System.Windows.Forms.Panel();
+ this.pictureBox5 = new System.Windows.Forms.PictureBox();
this.panel20 = new System.Windows.Forms.Panel();
this.Menu_SettingsTabIndicator = new System.Windows.Forms.Panel();
this.Menu_ArgumentsTab = new System.Windows.Forms.Panel();
this.Menu_ArgumentsTabLabel = new System.Windows.Forms.Label();
this.panel15 = new System.Windows.Forms.Panel();
+ this.pictureBox4 = new System.Windows.Forms.PictureBox();
this.panel16 = new System.Windows.Forms.Panel();
this.Menu_ArgumentsTabIndicator = new System.Windows.Forms.Panel();
this.Menu_M3U8Tab = new System.Windows.Forms.Panel();
this.Menu_M3U8TabLabel = new System.Windows.Forms.Label();
this.panel11 = new System.Windows.Forms.Panel();
+ this.pictureBox3 = new System.Windows.Forms.PictureBox();
this.panel12 = new System.Windows.Forms.Panel();
this.Menu_M3U8TabIndicator = new System.Windows.Forms.Panel();
this.Menu_MergeTab = new System.Windows.Forms.Panel();
this.Menu_MergeTabLabel = new System.Windows.Forms.Label();
this.panel29 = new System.Windows.Forms.Panel();
+ this.pictureBox7 = new System.Windows.Forms.PictureBox();
this.panel30 = new System.Windows.Forms.Panel();
this.Menu_MergeTabIndicator = new System.Windows.Forms.Panel();
this.Menu_CutTab = new System.Windows.Forms.Panel();
this.Menu_CutTabLabel = new System.Windows.Forms.Label();
this.panel25 = new System.Windows.Forms.Panel();
+ this.pictureBox6 = new System.Windows.Forms.PictureBox();
this.panel26 = new System.Windows.Forms.Panel();
this.Menu_CutTabIndicator = new System.Windows.Forms.Panel();
this.Menu_CutMergeTab = new System.Windows.Forms.Panel();
this.Menu_CutMergeTabLabel = new System.Windows.Forms.Label();
this.panel7 = new System.Windows.Forms.Panel();
+ this.pictureBox2 = new System.Windows.Forms.PictureBox();
this.panel8 = new System.Windows.Forms.Panel();
this.Menu_CutMergeTabIndicator = new System.Windows.Forms.Panel();
this.Menu_EncoderTab = new System.Windows.Forms.Panel();
this.Menu_EncoderTabLabel = new System.Windows.Forms.Label();
this.panel5 = new System.Windows.Forms.Panel();
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.panel4 = new System.Windows.Forms.Panel();
this.Menu_EncoderTabIndicator = new System.Windows.Forms.Panel();
this.MenuSpacerTop = new System.Windows.Forms.Panel();
@@ -361,29 +371,19 @@ private void InitializeComponent()
this.Button1 = new System.Windows.Forms.Button();
this.BottomRightPanel = new System.Windows.Forms.Panel();
this.label11 = new System.Windows.Forms.Label();
+ this.pictureBox8 = new System.Windows.Forms.PictureBox();
this.label10 = new System.Windows.Forms.Label();
this.Button2 = new System.Windows.Forms.Button();
this.panel22 = new System.Windows.Forms.Panel();
this.label8 = new System.Windows.Forms.Label();
this.Button3 = new System.Windows.Forms.Button();
this.TopPanel = new System.Windows.Forms.Panel();
+ this.ToTrayButton = new System.Windows.Forms.PictureBox();
this.ApplicationMinimizeButton = new System.Windows.Forms.Label();
this.ApplicationCloseButton = new System.Windows.Forms.Label();
+ this.TopLogo = new System.Windows.Forms.PictureBox();
this.toolTip = new System.Windows.Forms.ToolTip(this.components);
this.TraySystem = new System.Windows.Forms.NotifyIcon(this.components);
- this.pictureBox11 = new System.Windows.Forms.PictureBox();
- this.InfoIcon = new System.Windows.Forms.PictureBox();
- this.pictureBox9 = new System.Windows.Forms.PictureBox();
- this.pictureBox5 = new System.Windows.Forms.PictureBox();
- this.pictureBox4 = new System.Windows.Forms.PictureBox();
- this.pictureBox3 = new System.Windows.Forms.PictureBox();
- this.pictureBox7 = new System.Windows.Forms.PictureBox();
- this.pictureBox6 = new System.Windows.Forms.PictureBox();
- this.pictureBox2 = new System.Windows.Forms.PictureBox();
- this.pictureBox1 = new System.Windows.Forms.PictureBox();
- this.pictureBox8 = new System.Windows.Forms.PictureBox();
- this.ToTrayButton = new System.Windows.Forms.PictureBox();
- this.TopLogo = new System.Windows.Forms.PictureBox();
this.FullPanel.SuspendLayout();
this.panel95.SuspendLayout();
this.CutMainPanel.SuspendLayout();
@@ -447,6 +447,7 @@ private void InitializeComponent()
this.panel94.SuspendLayout();
this.panel96.SuspendLayout();
this.panel97.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox11)).BeginInit();
this.panel40.SuspendLayout();
this.panel42.SuspendLayout();
this.panel73.SuspendLayout();
@@ -462,38 +463,37 @@ private void InitializeComponent()
this.NoticePanel.SuspendLayout();
this.MenuPanel.SuspendLayout();
this.panel3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.InfoIcon)).BeginInit();
this.Menu_UpdatesTab.SuspendLayout();
this.panel38.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox9)).BeginInit();
this.panel33.SuspendLayout();
this.Menu_SettingsTab.SuspendLayout();
this.panel19.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit();
this.Menu_ArgumentsTab.SuspendLayout();
this.panel15.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
this.Menu_M3U8Tab.SuspendLayout();
this.panel11.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
this.Menu_MergeTab.SuspendLayout();
this.panel29.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
this.Menu_CutTab.SuspendLayout();
this.panel25.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit();
this.Menu_CutMergeTab.SuspendLayout();
this.panel7.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
this.Menu_EncoderTab.SuspendLayout();
this.panel5.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.FooterPanel.SuspendLayout();
this.BottomRightPanel.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox8)).BeginInit();
this.panel22.SuspendLayout();
this.TopPanel.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.InfoIcon)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.ToTrayButton)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.TopLogo)).BeginInit();
this.SuspendLayout();
@@ -513,13 +513,13 @@ private void InitializeComponent()
//
// panel95
//
+ this.panel95.Controls.Add(this.UpdateMainPanel);
this.panel95.Controls.Add(this.CutMainPanel);
this.panel95.Controls.Add(this.ArgumentMainPanel);
this.panel95.Controls.Add(this.MergeMainPanel);
this.panel95.Controls.Add(this.M3U8MainPanel);
this.panel95.Controls.Add(this.EncoderMainPanel);
this.panel95.Controls.Add(this.SettingsMainPanel);
- this.panel95.Controls.Add(this.UpdateMainPanel);
this.panel95.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel95.Location = new System.Drawing.Point(159, 80);
this.panel95.Name = "panel95";
@@ -1595,7 +1595,7 @@ private void InitializeComponent()
this.Merge_listView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.Merge_listView.HideSelection = false;
this.Merge_listView.Items.AddRange(new System.Windows.Forms.ListViewItem[] {
- listViewItem3});
+ listViewItem1});
this.Merge_listView.Location = new System.Drawing.Point(6, 44);
this.Merge_listView.MultiSelect = false;
this.Merge_listView.Name = "Merge_listView";
@@ -2270,7 +2270,7 @@ private void InitializeComponent()
this.Encoder_FilesList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.Encoder_FilesList.HideSelection = false;
this.Encoder_FilesList.Items.AddRange(new System.Windows.Forms.ListViewItem[] {
- listViewItem4});
+ listViewItem2});
this.Encoder_FilesList.Location = new System.Drawing.Point(6, 95);
this.Encoder_FilesList.MultiSelect = false;
this.Encoder_FilesList.Name = "Encoder_FilesList";
@@ -3252,6 +3252,18 @@ private void InitializeComponent()
this.panel97.Size = new System.Drawing.Size(55, 38);
this.panel97.TabIndex = 0;
//
+ // pictureBox11
+ //
+ this.pictureBox11.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.pictureBox11.Image = global::FFmpeg_Utilizer.Properties.Resources.Icon_question_outline;
+ this.pictureBox11.Location = new System.Drawing.Point(17, 9);
+ this.pictureBox11.Name = "pictureBox11";
+ this.pictureBox11.Size = new System.Drawing.Size(20, 20);
+ this.pictureBox11.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+ this.pictureBox11.TabIndex = 2;
+ this.pictureBox11.TabStop = false;
+ this.toolTip.SetToolTip(this.pictureBox11, "Software Information Area.");
+ //
// panel40
//
this.panel40.BackColor = System.Drawing.Color.White;
@@ -3691,6 +3703,19 @@ private void InitializeComponent()
this.InfoText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.InfoText.Click += new System.EventHandler(this.InfoIcon_Click);
//
+ // InfoIcon
+ //
+ this.InfoIcon.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.InfoIcon.Image = global::FFmpeg_Utilizer.Properties.Resources.Icon_question_outline;
+ this.InfoIcon.Location = new System.Drawing.Point(0, 0);
+ this.InfoIcon.Name = "InfoIcon";
+ this.InfoIcon.Size = new System.Drawing.Size(20, 20);
+ this.InfoIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+ this.InfoIcon.TabIndex = 1;
+ this.InfoIcon.TabStop = false;
+ this.toolTip.SetToolTip(this.InfoIcon, "Software Information Area.");
+ this.InfoIcon.Click += new System.EventHandler(this.InfoIcon_Click);
+ //
// Menu_UpdatesTab
//
this.Menu_UpdatesTab.Controls.Add(this.Menu_UpdatesTabLabel);
@@ -3728,6 +3753,19 @@ private void InitializeComponent()
this.panel38.Size = new System.Drawing.Size(31, 49);
this.panel38.TabIndex = 2;
//
+ // pictureBox9
+ //
+ this.pictureBox9.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.pictureBox9.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.pictureBox9.Image = global::FFmpeg_Utilizer.Properties.Resources.Icon_language_outline;
+ this.pictureBox9.Location = new System.Drawing.Point(0, 0);
+ this.pictureBox9.Name = "pictureBox9";
+ this.pictureBox9.Size = new System.Drawing.Size(31, 49);
+ this.pictureBox9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+ this.pictureBox9.TabIndex = 0;
+ this.pictureBox9.TabStop = false;
+ this.pictureBox9.Click += new System.EventHandler(this.Menu_UpdatesTabIndicator_Click);
+ //
// panel39
//
this.panel39.Cursor = System.Windows.Forms.Cursors.Hand;
@@ -3826,6 +3864,19 @@ private void InitializeComponent()
this.panel19.Size = new System.Drawing.Size(31, 49);
this.panel19.TabIndex = 2;
//
+ // pictureBox5
+ //
+ this.pictureBox5.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.pictureBox5.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.pictureBox5.Image = global::FFmpeg_Utilizer.Properties.Resources.Icon_settings_outline;
+ this.pictureBox5.Location = new System.Drawing.Point(0, 0);
+ this.pictureBox5.Name = "pictureBox5";
+ this.pictureBox5.Size = new System.Drawing.Size(31, 49);
+ this.pictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+ this.pictureBox5.TabIndex = 0;
+ this.pictureBox5.TabStop = false;
+ this.pictureBox5.Click += new System.EventHandler(this.Menu_SettingsTabIndicator_Click);
+ //
// panel20
//
this.panel20.Cursor = System.Windows.Forms.Cursors.Hand;
@@ -3884,6 +3935,19 @@ private void InitializeComponent()
this.panel15.Size = new System.Drawing.Size(31, 49);
this.panel15.TabIndex = 2;
//
+ // pictureBox4
+ //
+ this.pictureBox4.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.pictureBox4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.pictureBox4.Image = global::FFmpeg_Utilizer.Properties.Resources.Icon_edit_outline;
+ this.pictureBox4.Location = new System.Drawing.Point(0, 0);
+ this.pictureBox4.Name = "pictureBox4";
+ this.pictureBox4.Size = new System.Drawing.Size(31, 49);
+ this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+ this.pictureBox4.TabIndex = 0;
+ this.pictureBox4.TabStop = false;
+ this.pictureBox4.Click += new System.EventHandler(this.Menu_ArgumentsTabIndicator_Click);
+ //
// panel16
//
this.panel16.Cursor = System.Windows.Forms.Cursors.Hand;
@@ -3942,6 +4006,19 @@ private void InitializeComponent()
this.panel11.Size = new System.Drawing.Size(31, 49);
this.panel11.TabIndex = 2;
//
+ // pictureBox3
+ //
+ this.pictureBox3.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.pictureBox3.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.pictureBox3.Image = global::FFmpeg_Utilizer.Properties.Resources.Icon_download_outline;
+ this.pictureBox3.Location = new System.Drawing.Point(0, 0);
+ this.pictureBox3.Name = "pictureBox3";
+ this.pictureBox3.Size = new System.Drawing.Size(31, 49);
+ this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+ this.pictureBox3.TabIndex = 0;
+ this.pictureBox3.TabStop = false;
+ this.pictureBox3.Click += new System.EventHandler(this.Menu_M3U8TabIndicator_Click);
+ //
// panel12
//
this.panel12.Cursor = System.Windows.Forms.Cursors.Hand;
@@ -4000,6 +4077,19 @@ private void InitializeComponent()
this.panel29.Size = new System.Drawing.Size(31, 23);
this.panel29.TabIndex = 2;
//
+ // pictureBox7
+ //
+ this.pictureBox7.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.pictureBox7.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.pictureBox7.Image = global::FFmpeg_Utilizer.Properties.Resources.Icon_menu_point_h_outline;
+ this.pictureBox7.Location = new System.Drawing.Point(0, 0);
+ this.pictureBox7.Name = "pictureBox7";
+ this.pictureBox7.Size = new System.Drawing.Size(31, 23);
+ this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+ this.pictureBox7.TabIndex = 0;
+ this.pictureBox7.TabStop = false;
+ this.pictureBox7.Click += new System.EventHandler(this.Menu_MergeTabIndicator_Click);
+ //
// panel30
//
this.panel30.Cursor = System.Windows.Forms.Cursors.Hand;
@@ -4058,6 +4148,19 @@ private void InitializeComponent()
this.panel25.Size = new System.Drawing.Size(31, 23);
this.panel25.TabIndex = 2;
//
+ // pictureBox6
+ //
+ this.pictureBox6.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.pictureBox6.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.pictureBox6.Image = global::FFmpeg_Utilizer.Properties.Resources.Icon_divide_outline;
+ this.pictureBox6.Location = new System.Drawing.Point(0, 0);
+ this.pictureBox6.Name = "pictureBox6";
+ this.pictureBox6.Size = new System.Drawing.Size(31, 23);
+ this.pictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+ this.pictureBox6.TabIndex = 0;
+ this.pictureBox6.TabStop = false;
+ this.pictureBox6.Click += new System.EventHandler(this.Menu_CutTabIndicator_Click);
+ //
// panel26
//
this.panel26.Cursor = System.Windows.Forms.Cursors.Hand;
@@ -4116,6 +4219,19 @@ private void InitializeComponent()
this.panel7.Size = new System.Drawing.Size(31, 49);
this.panel7.TabIndex = 2;
//
+ // pictureBox2
+ //
+ this.pictureBox2.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.pictureBox2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.pictureBox2.Image = global::FFmpeg_Utilizer.Properties.Resources.Icon_apps_outline;
+ this.pictureBox2.Location = new System.Drawing.Point(0, 0);
+ this.pictureBox2.Name = "pictureBox2";
+ this.pictureBox2.Size = new System.Drawing.Size(31, 49);
+ this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+ this.pictureBox2.TabIndex = 0;
+ this.pictureBox2.TabStop = false;
+ this.pictureBox2.Click += new System.EventHandler(this.Menu_CutMergeTabIndicator_Click);
+ //
// panel8
//
this.panel8.Cursor = System.Windows.Forms.Cursors.Hand;
@@ -4175,6 +4291,19 @@ private void InitializeComponent()
this.panel5.Size = new System.Drawing.Size(31, 49);
this.panel5.TabIndex = 2;
//
+ // pictureBox1
+ //
+ this.pictureBox1.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.pictureBox1.Image = global::FFmpeg_Utilizer.Properties.Resources.Icon_reload_outline;
+ this.pictureBox1.Location = new System.Drawing.Point(0, 0);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(31, 49);
+ this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+ this.pictureBox1.TabIndex = 0;
+ this.pictureBox1.TabStop = false;
+ this.pictureBox1.Click += new System.EventHandler(this.Menu_EncoderTabIndicator_Click);
+ //
// panel4
//
this.panel4.Cursor = System.Windows.Forms.Cursors.Hand;
@@ -4264,6 +4393,16 @@ private void InitializeComponent()
this.label11.Text = "V2 Edition";
this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
+ // pictureBox8
+ //
+ this.pictureBox8.Image = global::FFmpeg_Utilizer.Properties.Resources.Icon_love_solid;
+ this.pictureBox8.Location = new System.Drawing.Point(86, 24);
+ this.pictureBox8.Name = "pictureBox8";
+ this.pictureBox8.Size = new System.Drawing.Size(24, 25);
+ this.pictureBox8.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+ this.pictureBox8.TabIndex = 2;
+ this.pictureBox8.TabStop = false;
+ //
// label10
//
this.label10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(53)))), ((int)(((byte)(64)))), ((int)(((byte)(82)))));
@@ -4335,6 +4474,19 @@ private void InitializeComponent()
this.TopPanel.TabIndex = 1;
this.TopPanel.MouseDown += new System.Windows.Forms.MouseEventHandler(this.TopLogo_MouseDown);
//
+ // ToTrayButton
+ //
+ this.ToTrayButton.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.ToTrayButton.Image = global::FFmpeg_Utilizer.Properties.Resources.TrayIcon;
+ this.ToTrayButton.Location = new System.Drawing.Point(1001, 0);
+ this.ToTrayButton.Name = "ToTrayButton";
+ this.ToTrayButton.Size = new System.Drawing.Size(29, 27);
+ this.ToTrayButton.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+ this.ToTrayButton.TabIndex = 8;
+ this.ToTrayButton.TabStop = false;
+ this.toolTip.SetToolTip(this.ToTrayButton, "Minimize to tray");
+ this.ToTrayButton.Click += new System.EventHandler(this.ToTrayButton_Click);
+ //
// ApplicationMinimizeButton
//
this.ApplicationMinimizeButton.BackColor = System.Drawing.Color.White;
@@ -4364,6 +4516,18 @@ private void InitializeComponent()
this.ApplicationCloseButton.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.ApplicationCloseButton.Click += new System.EventHandler(this.SoftwareCloseButton_Click);
//
+ // TopLogo
+ //
+ this.TopLogo.Dock = System.Windows.Forms.DockStyle.Left;
+ this.TopLogo.Image = global::FFmpeg_Utilizer.Properties.Resources.ffmpegUtilizerLogo;
+ this.TopLogo.Location = new System.Drawing.Point(0, 0);
+ this.TopLogo.Name = "TopLogo";
+ this.TopLogo.Size = new System.Drawing.Size(200, 27);
+ this.TopLogo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.TopLogo.TabIndex = 0;
+ this.TopLogo.TabStop = false;
+ this.TopLogo.MouseDown += new System.Windows.Forms.MouseEventHandler(this.TopLogo_MouseDown);
+ //
// toolTip
//
this.toolTip.AutomaticDelay = 250;
@@ -4377,170 +4541,6 @@ private void InitializeComponent()
this.TraySystem.Text = "FFmpeg Utilizer";
this.TraySystem.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.TraySystem_MouseDoubleClick);
//
- // pictureBox11
- //
- this.pictureBox11.Cursor = System.Windows.Forms.Cursors.Hand;
- this.pictureBox11.Image = global::FFmpeg_Utilizer.Properties.Resources.Icon_question_outline;
- this.pictureBox11.Location = new System.Drawing.Point(17, 9);
- this.pictureBox11.Name = "pictureBox11";
- this.pictureBox11.Size = new System.Drawing.Size(20, 20);
- this.pictureBox11.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
- this.pictureBox11.TabIndex = 2;
- this.pictureBox11.TabStop = false;
- this.toolTip.SetToolTip(this.pictureBox11, "Software Information Area.");
- //
- // InfoIcon
- //
- this.InfoIcon.Cursor = System.Windows.Forms.Cursors.Hand;
- this.InfoIcon.Image = global::FFmpeg_Utilizer.Properties.Resources.Icon_question_outline;
- this.InfoIcon.Location = new System.Drawing.Point(0, 0);
- this.InfoIcon.Name = "InfoIcon";
- this.InfoIcon.Size = new System.Drawing.Size(20, 20);
- this.InfoIcon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
- this.InfoIcon.TabIndex = 1;
- this.InfoIcon.TabStop = false;
- this.toolTip.SetToolTip(this.InfoIcon, "Software Information Area.");
- this.InfoIcon.Click += new System.EventHandler(this.InfoIcon_Click);
- //
- // pictureBox9
- //
- this.pictureBox9.Cursor = System.Windows.Forms.Cursors.Hand;
- this.pictureBox9.Dock = System.Windows.Forms.DockStyle.Fill;
- this.pictureBox9.Image = global::FFmpeg_Utilizer.Properties.Resources.Icon_language_outline;
- this.pictureBox9.Location = new System.Drawing.Point(0, 0);
- this.pictureBox9.Name = "pictureBox9";
- this.pictureBox9.Size = new System.Drawing.Size(31, 49);
- this.pictureBox9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
- this.pictureBox9.TabIndex = 0;
- this.pictureBox9.TabStop = false;
- this.pictureBox9.Click += new System.EventHandler(this.Menu_UpdatesTabIndicator_Click);
- //
- // pictureBox5
- //
- this.pictureBox5.Cursor = System.Windows.Forms.Cursors.Hand;
- this.pictureBox5.Dock = System.Windows.Forms.DockStyle.Fill;
- this.pictureBox5.Image = global::FFmpeg_Utilizer.Properties.Resources.Icon_settings_outline;
- this.pictureBox5.Location = new System.Drawing.Point(0, 0);
- this.pictureBox5.Name = "pictureBox5";
- this.pictureBox5.Size = new System.Drawing.Size(31, 49);
- this.pictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
- this.pictureBox5.TabIndex = 0;
- this.pictureBox5.TabStop = false;
- this.pictureBox5.Click += new System.EventHandler(this.Menu_SettingsTabIndicator_Click);
- //
- // pictureBox4
- //
- this.pictureBox4.Cursor = System.Windows.Forms.Cursors.Hand;
- this.pictureBox4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.pictureBox4.Image = global::FFmpeg_Utilizer.Properties.Resources.Icon_edit_outline;
- this.pictureBox4.Location = new System.Drawing.Point(0, 0);
- this.pictureBox4.Name = "pictureBox4";
- this.pictureBox4.Size = new System.Drawing.Size(31, 49);
- this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
- this.pictureBox4.TabIndex = 0;
- this.pictureBox4.TabStop = false;
- this.pictureBox4.Click += new System.EventHandler(this.Menu_ArgumentsTabIndicator_Click);
- //
- // pictureBox3
- //
- this.pictureBox3.Cursor = System.Windows.Forms.Cursors.Hand;
- this.pictureBox3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.pictureBox3.Image = global::FFmpeg_Utilizer.Properties.Resources.Icon_download_outline;
- this.pictureBox3.Location = new System.Drawing.Point(0, 0);
- this.pictureBox3.Name = "pictureBox3";
- this.pictureBox3.Size = new System.Drawing.Size(31, 49);
- this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
- this.pictureBox3.TabIndex = 0;
- this.pictureBox3.TabStop = false;
- this.pictureBox3.Click += new System.EventHandler(this.Menu_M3U8TabIndicator_Click);
- //
- // pictureBox7
- //
- this.pictureBox7.Cursor = System.Windows.Forms.Cursors.Hand;
- this.pictureBox7.Dock = System.Windows.Forms.DockStyle.Fill;
- this.pictureBox7.Image = global::FFmpeg_Utilizer.Properties.Resources.Icon_menu_point_h_outline;
- this.pictureBox7.Location = new System.Drawing.Point(0, 0);
- this.pictureBox7.Name = "pictureBox7";
- this.pictureBox7.Size = new System.Drawing.Size(31, 23);
- this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
- this.pictureBox7.TabIndex = 0;
- this.pictureBox7.TabStop = false;
- this.pictureBox7.Click += new System.EventHandler(this.Menu_MergeTabIndicator_Click);
- //
- // pictureBox6
- //
- this.pictureBox6.Cursor = System.Windows.Forms.Cursors.Hand;
- this.pictureBox6.Dock = System.Windows.Forms.DockStyle.Fill;
- this.pictureBox6.Image = global::FFmpeg_Utilizer.Properties.Resources.Icon_divide_outline;
- this.pictureBox6.Location = new System.Drawing.Point(0, 0);
- this.pictureBox6.Name = "pictureBox6";
- this.pictureBox6.Size = new System.Drawing.Size(31, 23);
- this.pictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
- this.pictureBox6.TabIndex = 0;
- this.pictureBox6.TabStop = false;
- this.pictureBox6.Click += new System.EventHandler(this.Menu_CutTabIndicator_Click);
- //
- // pictureBox2
- //
- this.pictureBox2.Cursor = System.Windows.Forms.Cursors.Hand;
- this.pictureBox2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.pictureBox2.Image = global::FFmpeg_Utilizer.Properties.Resources.Icon_apps_outline;
- this.pictureBox2.Location = new System.Drawing.Point(0, 0);
- this.pictureBox2.Name = "pictureBox2";
- this.pictureBox2.Size = new System.Drawing.Size(31, 49);
- this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
- this.pictureBox2.TabIndex = 0;
- this.pictureBox2.TabStop = false;
- this.pictureBox2.Click += new System.EventHandler(this.Menu_CutMergeTabIndicator_Click);
- //
- // pictureBox1
- //
- this.pictureBox1.Cursor = System.Windows.Forms.Cursors.Hand;
- this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.pictureBox1.Image = global::FFmpeg_Utilizer.Properties.Resources.Icon_reload_outline;
- this.pictureBox1.Location = new System.Drawing.Point(0, 0);
- this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(31, 49);
- this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
- this.pictureBox1.TabIndex = 0;
- this.pictureBox1.TabStop = false;
- this.pictureBox1.Click += new System.EventHandler(this.Menu_EncoderTabIndicator_Click);
- //
- // pictureBox8
- //
- this.pictureBox8.Image = global::FFmpeg_Utilizer.Properties.Resources.Icon_love_solid;
- this.pictureBox8.Location = new System.Drawing.Point(86, 24);
- this.pictureBox8.Name = "pictureBox8";
- this.pictureBox8.Size = new System.Drawing.Size(24, 25);
- this.pictureBox8.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
- this.pictureBox8.TabIndex = 2;
- this.pictureBox8.TabStop = false;
- //
- // ToTrayButton
- //
- this.ToTrayButton.Cursor = System.Windows.Forms.Cursors.Hand;
- this.ToTrayButton.Image = global::FFmpeg_Utilizer.Properties.Resources.TrayIcon;
- this.ToTrayButton.Location = new System.Drawing.Point(1001, 0);
- this.ToTrayButton.Name = "ToTrayButton";
- this.ToTrayButton.Size = new System.Drawing.Size(29, 27);
- this.ToTrayButton.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
- this.ToTrayButton.TabIndex = 8;
- this.ToTrayButton.TabStop = false;
- this.toolTip.SetToolTip(this.ToTrayButton, "Minimize to tray");
- this.ToTrayButton.Click += new System.EventHandler(this.ToTrayButton_Click);
- //
- // TopLogo
- //
- this.TopLogo.Dock = System.Windows.Forms.DockStyle.Left;
- this.TopLogo.Image = global::FFmpeg_Utilizer.Properties.Resources.ffmpegUtilizerLogo;
- this.TopLogo.Location = new System.Drawing.Point(0, 0);
- this.TopLogo.Name = "TopLogo";
- this.TopLogo.Size = new System.Drawing.Size(200, 27);
- this.TopLogo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.TopLogo.TabIndex = 0;
- this.TopLogo.TabStop = false;
- this.TopLogo.MouseDown += new System.Windows.Forms.MouseEventHandler(this.TopLogo_MouseDown);
- //
// Main
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -4631,6 +4631,7 @@ private void InitializeComponent()
this.panel94.ResumeLayout(false);
this.panel96.ResumeLayout(false);
this.panel97.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox11)).EndInit();
this.panel40.ResumeLayout(false);
this.panel42.ResumeLayout(false);
this.panel73.ResumeLayout(false);
@@ -4646,38 +4647,37 @@ private void InitializeComponent()
this.NoticePanel.ResumeLayout(false);
this.MenuPanel.ResumeLayout(false);
this.panel3.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.InfoIcon)).EndInit();
this.Menu_UpdatesTab.ResumeLayout(false);
this.panel38.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox9)).EndInit();
this.panel33.ResumeLayout(false);
this.Menu_SettingsTab.ResumeLayout(false);
this.panel19.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit();
this.Menu_ArgumentsTab.ResumeLayout(false);
this.panel15.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
this.Menu_M3U8Tab.ResumeLayout(false);
this.panel11.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
this.Menu_MergeTab.ResumeLayout(false);
this.panel29.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit();
this.Menu_CutTab.ResumeLayout(false);
this.panel25.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit();
this.Menu_CutMergeTab.ResumeLayout(false);
this.panel7.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
this.Menu_EncoderTab.ResumeLayout(false);
this.panel5.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.FooterPanel.ResumeLayout(false);
this.BottomRightPanel.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox8)).EndInit();
this.panel22.ResumeLayout(false);
this.TopPanel.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.InfoIcon)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.ToTrayButton)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.TopLogo)).EndInit();
this.ResumeLayout(false);
diff --git a/FFmpeg Utilizer/Forms/Main.cs b/FFmpeg Utilizer/Forms/Main.cs
index 4d66483..268f765 100644
--- a/FFmpeg Utilizer/Forms/Main.cs
+++ b/FFmpeg Utilizer/Forms/Main.cs
@@ -15,6 +15,7 @@
// TODO: Comments
// TODO: ADD libs etc till cut
+// TODO: Fix crash on stop update feature...
namespace FFmpeg_Utilizer
{
@@ -112,6 +113,8 @@ private void SetInternetFeatures()
///
private void Main_Load(object sender, EventArgs e)
{
+ notice.SetNotice("This software works best with the 'Libx264' Video Codec and 'AAC' Audio Codec library.", NoticeModule.TypeNotice.Info);
+
// If we have determined we have internet; Check for updates.
if (hasInternet)
updater.StartUpdateCheckAsync();
@@ -1081,7 +1084,6 @@ private string GetTimespanString()
string start = startHour.ToString() + ":" + startMinutes + ":" + startSeconds.ToString() + "." + startMiliseconds.ToString();
string end = endHour.ToString() + ":" + endMinutes + ":" + endSeconds.ToString() + "." + endMiliseconds.ToString();
- decimal _start = startHour + startMinute + startSeconds + startMiliseconds;
decimal _end = endHour + endMinute + endSeconds + endMiliseconds;
if (_end == 0) Cut_PreviewLabel.ForeColor = Color.FromArgb(255, 128, 128);
@@ -1104,7 +1106,6 @@ private void Cut_AddTimespanButton_Click(object sender, EventArgs e)
}
string timespan = GetTimespanString();
- string start = timespan.Split(' ')[0];
string end = timespan.Split(' ')[2];
if (end != "0:00:0.0" && Cut_listView.FindItemWithText(timespan) == null)
diff --git a/FFmpeg Utilizer/Forms/Main.resx b/FFmpeg Utilizer/Forms/Main.resx
index 753f5fe..f826b53 100644
--- a/FFmpeg Utilizer/Forms/Main.resx
+++ b/FFmpeg Utilizer/Forms/Main.resx
@@ -117,12 +117,6 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 17, 17
-
-
- 17, 17
-
When launched FFmpeg Utilizer always create the default folders (Downloads, Output, tmp, Tools). These folders will help to automate FFmpeg Utilizer.
The download of FFmpeg & FFplay will always be the stable essentials release from https://www.gyan.dev/ffmpeg/builds/
@@ -131,6 +125,9 @@ Once the downloaded file has been moved, FFmpeg Utilizer will unpack into a subf
When the process has finished all steps it will finaly remove the downloaded file in the Downloads folder to clean up.
Download- and unpack-speed will vary depending on world location, server requests and your connection.
+
+ 17, 17
+
107, 17
diff --git a/FFmpeg Utilizer/Modules/UtilityUpdaterModule.cs b/FFmpeg Utilizer/Modules/UtilityUpdaterModule.cs
index 53b8808..a7eb734 100644
--- a/FFmpeg Utilizer/Modules/UtilityUpdaterModule.cs
+++ b/FFmpeg Utilizer/Modules/UtilityUpdaterModule.cs
@@ -21,6 +21,7 @@ public class UtilityUpdaterModule
private bool CheckingVersion = false;
private bool updating = false;
+ private bool aborted = false;
//Temporary version data...
public string downloadedVersion = "";
@@ -137,10 +138,12 @@ public void StartUpdate()
{
if (updating)
{
+ aborted = true;
client?.CancelAsync();
extractThread?.Abort();
updating = false;
ResetUI();
+ SetUtilityDownloader(UtilityType.Download);
return;
}
else if (CheckingVersion)
@@ -149,6 +152,7 @@ public void StartUpdate()
return;
}
updating = true;
+ aborted = false;
client = new WebClient();
@@ -194,6 +198,12 @@ private void Wc_Download_DownloadProgressChanged(object sender, DownloadProgress
private void Wc_Download_DownloadFileCompleted(object sender, AsyncCompletedEventArgs e)
{
+ if (aborted)
+ {
+ ResetUI();
+ return;
+ }
+
main.Update_StatusLabel.Text = "Status: Extracting 0/3";
main.SpeedLabel.Text = "";
main.Update_ProgressBar.Value = 0;