Merge branch 'release/0.1.3.010' into 'master'

Release/0.1.3.010

See merge request SympatheticFire/video-preview!7

MainForm.Designer.cs

@@ -53,12 +53,14 @@ namespace VideoPreview
             this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.refreshToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.loadNextFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
+            this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.viewHelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
             this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
-            this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.menuStrip1.SuspendLayout();
             this.SuspendLayout();
@@ -71,8 +73,6 @@ namespace VideoPreview
             this.label1.TabIndex = 3;
             this.label1.Text = "File Name";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.label1.DragDrop += new System.Windows.Forms.DragEventHandler(this.Form1_DragDrop);
-            this.label1.DragOver += new System.Windows.Forms.DragEventHandler(this.Form1_DragOver);
             // 
             // label2
             // 
@@ -83,24 +83,21 @@ namespace VideoPreview
             this.label2.TabIndex = 5;
             this.label2.Text = "-";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.label2.DragDrop += new System.Windows.Forms.DragEventHandler(this.Form1_DragDrop);
-            this.label2.DragOver += new System.Windows.Forms.DragEventHandler(this.Form1_DragOver);
             // 
             // button1
             // 
+            this.button1.ActiveImage = null;
             this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.button1.BackColor = System.Drawing.Color.Transparent;
-            this.button1.DefaultImage = null;
-            this.button1.DownImage = null;
-            this.button1.IsSelected = false;
+            this.button1.HoverImage = null;
+            this.button1.IdleImage = null;
             this.button1.LabelText = "&Close";
             this.button1.Location = new System.Drawing.Point(296, 705);
-            this.button1.Margin = new System.Windows.Forms.Padding(10, 0, 10, 10);
+            this.button1.Margin = new System.Windows.Forms.Padding(10, 0, 0, 10);
             this.button1.Name = "button1";
-            this.button1.OverImage = null;
             this.button1.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3);
             this.button1.Size = new System.Drawing.Size(149, 37);
-            this.button1.TabIndex = 8;
+            this.button1.TabIndex = 5;
             this.button1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.button1_MouseClick);
             // 
             // tHorizontalSeparator1
@@ -118,8 +115,7 @@ namespace VideoPreview
             this.tHorizontalSeparator1.Padding = new System.Windows.Forms.Padding(0, 10, 0, 10);
             this.tHorizontalSeparator1.Size = new System.Drawing.Size(454, 22);
             this.tHorizontalSeparator1.TabIndex = 9;
-            this.tHorizontalSeparator1.DragDrop += new System.Windows.Forms.DragEventHandler(this.Form1_DragDrop);
-            this.tHorizontalSeparator1.DragOver += new System.Windows.Forms.DragEventHandler(this.Form1_DragOver);
+            this.tHorizontalSeparator1.TabStop = false;
             // 
             // tHorizontalSeparator3
             // 
@@ -136,6 +132,7 @@ namespace VideoPreview
             this.tHorizontalSeparator3.Padding = new System.Windows.Forms.Padding(0, 10, 0, 10);
             this.tHorizontalSeparator3.Size = new System.Drawing.Size(454, 22);
             this.tHorizontalSeparator3.TabIndex = 13;
+            this.tHorizontalSeparator3.TabStop = false;
             // 
             // flowLayoutPanel1
             // 
@@ -147,10 +144,8 @@ namespace VideoPreview
             this.flowLayoutPanel1.Location = new System.Drawing.Point(12, 130);
             this.flowLayoutPanel1.Name = "flowLayoutPanel1";
             this.flowLayoutPanel1.Size = new System.Drawing.Size(433, 540);
-            this.flowLayoutPanel1.TabIndex = 14;
+            this.flowLayoutPanel1.TabIndex = 1;
             this.flowLayoutPanel1.WrapContents = false;
-            this.flowLayoutPanel1.DragDrop += new System.Windows.Forms.DragEventHandler(this.Form1_DragDrop);
-            this.flowLayoutPanel1.DragOver += new System.Windows.Forms.DragEventHandler(this.Form1_DragOver);
             // 
             // pictureBox1
             // 
@@ -166,75 +161,69 @@ namespace VideoPreview
             // 
             // textBox1
             // 
+            this.textBox1.AcceptButton = null;
             this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.textBox1.BackColor = System.Drawing.Color.Transparent;
             this.textBox1.FileDialog = null;
             this.textBox1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            this.textBox1.HighlightImage = ((System.Drawing.Image)(resources.GetObject("textBox1.HighlightImage")));
+            this.textBox1.HighlightImage = null;
             this.textBox1.Location = new System.Drawing.Point(111, 9);
             this.textBox1.Margin = new System.Windows.Forms.Padding(10, 0, 0, 10);
             this.textBox1.Name = "textBox1";
-            this.textBox1.NormalImage = ((System.Drawing.Image)(resources.GetObject("textBox1.NormalImage")));
+            this.textBox1.NormalImage = null;
             this.textBox1.Padding = new System.Windows.Forms.Padding(10, 9, 9, 9);
             this.textBox1.Size = new System.Drawing.Size(334, 34);
-            this.textBox1.SubmitButton = null;
-            this.textBox1.TabIndex = 16;
+            this.textBox1.TabIndex = 0;
             this.textBox1.UseSystemPasswordChar = false;
             // 
             // button2
             // 
+            this.button2.ActiveImage = null;
             this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.button2.BackColor = System.Drawing.Color.Transparent;
-            this.button2.DefaultImage = ((System.Drawing.Image)(resources.GetObject("button2.DefaultImage")));
-            this.button2.DownImage = ((System.Drawing.Image)(resources.GetObject("button2.DownImage")));
-            this.button2.IsSelected = false;
+            this.button2.HoverImage = null;
+            this.button2.IdleImage = null;
             this.button2.LabelText = "";
             this.button2.Location = new System.Drawing.Point(12, 705);
-            this.button2.Margin = new System.Windows.Forms.Padding(10, 0, 10, 10);
+            this.button2.Margin = new System.Windows.Forms.Padding(10, 0, 0, 10);
             this.button2.Name = "button2";
-            this.button2.OverImage = ((System.Drawing.Image)(resources.GetObject("button2.OverImage")));
             this.button2.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3);
             this.button2.Size = new System.Drawing.Size(37, 37);
-            this.button2.TabIndex = 17;
+            this.button2.TabIndex = 2;
             this.toolTip1.SetToolTip(this.button2, "Options");
-            this.button2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.button2_MouseClick);
             // 
             // button3
             // 
+            this.button3.ActiveImage = null;
             this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.button3.BackColor = System.Drawing.Color.Transparent;
-            this.button3.DefaultImage = ((System.Drawing.Image)(resources.GetObject("button3.DefaultImage")));
-            this.button3.DownImage = ((System.Drawing.Image)(resources.GetObject("button3.DownImage")));
-            this.button3.IsSelected = false;
+            this.button3.HoverImage = null;
+            this.button3.IdleImage = null;
             this.button3.LabelText = "";
             this.button3.Location = new System.Drawing.Point(53, 705);
-            this.button3.Margin = new System.Windows.Forms.Padding(10, 0, 10, 10);
+            this.button3.Margin = new System.Windows.Forms.Padding(10, 0, 0, 10);
             this.button3.Name = "button3";
-            this.button3.OverImage = ((System.Drawing.Image)(resources.GetObject("button3.OverImage")));
             this.button3.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3);
             this.button3.Size = new System.Drawing.Size(35, 37);
-            this.button3.TabIndex = 23;
+            this.button3.TabIndex = 3;
             this.toolTip1.SetToolTip(this.button3, "Refresh");
-            this.button3.MouseClick += new System.Windows.Forms.MouseEventHandler(this.button3_MouseClick);
             // 
             // button4
             // 
+            this.button4.ActiveImage = null;
             this.button4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.button4.BackColor = System.Drawing.Color.Transparent;
-            this.button4.DefaultImage = ((System.Drawing.Image)(resources.GetObject("button4.DefaultImage")));
-            this.button4.DownImage = ((System.Drawing.Image)(resources.GetObject("button4.DownImage")));
-            this.button4.IsSelected = false;
+            this.button4.HoverImage = null;
+            this.button4.IdleImage = null;
             this.button4.LabelText = "";
             this.button4.Location = new System.Drawing.Point(94, 705);
-            this.button4.Margin = new System.Windows.Forms.Padding(10, 0, 10, 10);
+            this.button4.Margin = new System.Windows.Forms.Padding(10, 0, 0, 10);
             this.button4.Name = "button4";
-            this.button4.OverImage = ((System.Drawing.Image)(resources.GetObject("button4.OverImage")));
             this.button4.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3);
             this.button4.Size = new System.Drawing.Size(37, 37);
-            this.button4.TabIndex = 24;
+            this.button4.TabIndex = 4;
             this.toolTip1.SetToolTip(this.button4, "Next");
-            this.button4.MouseClick += new System.Windows.Forms.MouseEventHandler(this.button4_MouseClick);
             // 
             // label4
             // 
@@ -310,7 +299,9 @@ namespace VideoPreview
             // 
             this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.refreshToolStripMenuItem,
-            this.loadNextFileToolStripMenuItem});
+            this.loadNextFileToolStripMenuItem,
+            this.toolStripSeparator1,
+            this.toolStripMenuItem3});
             this.editToolStripMenuItem.Name = "editToolStripMenuItem";
             this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
             this.editToolStripMenuItem.Text = "&Edit";
@@ -319,7 +310,7 @@ namespace VideoPreview
             // 
             this.refreshToolStripMenuItem.Name = "refreshToolStripMenuItem";
             this.refreshToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5;
-            this.refreshToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
+            this.refreshToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
             this.refreshToolStripMenuItem.Text = "&Refresh";
             this.refreshToolStripMenuItem.Click += new System.EventHandler(this.refreshToolStripMenuItem_Click);
             // 
@@ -327,10 +318,39 @@ namespace VideoPreview
             // 
             this.loadNextFileToolStripMenuItem.Name = "loadNextFileToolStripMenuItem";
             this.loadNextFileToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F3;
-            this.loadNextFileToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
+            this.loadNextFileToolStripMenuItem.Size = new System.Drawing.Size(209, 22);
             this.loadNextFileToolStripMenuItem.Text = "&Load Next File";
             this.loadNextFileToolStripMenuItem.Click += new System.EventHandler(this.loadNextFileToolStripMenuItem_Click);
             // 
+            // toolStripSeparator1
+            // 
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
+            this.toolStripSeparator1.Size = new System.Drawing.Size(206, 6);
+            // 
+            // toolStripMenuItem3
+            // 
+            this.toolStripMenuItem3.Name = "toolStripMenuItem3";
+            this.toolStripMenuItem3.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F11)));
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(209, 22);
+            this.toolStripMenuItem3.Text = "&Always On Top";
+            this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click);
+            // 
+            // toolStripMenuItem2
+            // 
+            this.toolStripMenuItem2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.optionsToolStripMenuItem});
+            this.toolStripMenuItem2.Name = "toolStripMenuItem2";
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(46, 20);
+            this.toolStripMenuItem2.Text = "&Tools";
+            // 
+            // optionsToolStripMenuItem
+            // 
+            this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
+            this.optionsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F12)));
+            this.optionsToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
+            this.optionsToolStripMenuItem.Text = "&Options";
+            this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click);
+            // 
             // helpToolStripMenuItem
             // 
             this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -345,38 +365,22 @@ namespace VideoPreview
             // 
             this.viewHelpToolStripMenuItem.Name = "viewHelpToolStripMenuItem";
             this.viewHelpToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F1;
-            this.viewHelpToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.viewHelpToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
             this.viewHelpToolStripMenuItem.Text = "&View Help";
             this.viewHelpToolStripMenuItem.Click += new System.EventHandler(this.viewHelpToolStripMenuItem_Click);
             // 
             // toolStripMenuItem1
             // 
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(177, 6);
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(143, 6);
             // 
             // aboutToolStripMenuItem
             // 
             this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
-            this.aboutToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.aboutToolStripMenuItem.Size = new System.Drawing.Size(146, 22);
             this.aboutToolStripMenuItem.Text = "&About";
             this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
             // 
-            // toolStripMenuItem2
-            // 
-            this.toolStripMenuItem2.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.optionsToolStripMenuItem});
-            this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(46, 20);
-            this.toolStripMenuItem2.Text = "&Tools";
-            // 
-            // optionsToolStripMenuItem
-            // 
-            this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
-            this.optionsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F12)));
-            this.optionsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.optionsToolStripMenuItem.Text = "&Options";
-            this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click);
-            // 
             // MainForm
             // 
             this.AllowDrop = true;
@@ -405,8 +409,6 @@ namespace VideoPreview
             this.MainMenuStrip = this.menuStrip1;
             this.Name = "MainForm";
             this.Text = "Video Preview";
-            this.DragDrop += new System.Windows.Forms.DragEventHandler(this.Form1_DragDrop);
-            this.DragOver += new System.Windows.Forms.DragEventHandler(this.Form1_DragOver);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.menuStrip1.ResumeLayout(false);
             this.menuStrip1.PerformLayout();
@@ -444,6 +446,8 @@ namespace VideoPreview
         private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2;
         private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3;
     }
 }
 

MainForm.cs

@@ -27,11 +27,19 @@ namespace VideoPreview
         {
             InitializeComponent();
 
+            button3.Click += delegate { refreshToolStripMenuItem_Click(null, null); };
+            button4.Click += delegate { loadNextFileToolStripMenuItem_Click(null, null); };
+            button2.Click += delegate { optionsToolStripMenuItem_Click(null, null); };
+
+            button2.SetIcon("settings");
+            button3.SetIcon("refresh-cw");
+            button4.SetIcon("arrow-right-circle");
+
             randy = new Random();
 
-            textBox1.InnerTextBox.ReadOnly = true;
-            textBox1.InnerTextBox.BackColor = Color.White;
-            textBox1.InnerTextBox.TextChanged += textBox1_TextChanged;
+            textBox1.TextBox.ReadOnly = true;
+            textBox1.TextBox.BackColor = Color.White;
+            textBox1.TextBox.TextChanged += textBox1_TextChanged;
         }
 
         protected override void OnLoad(EventArgs e)
@@ -41,7 +49,6 @@ namespace VideoPreview
             textBox1_TextChanged(null, null);
         }
 
-
         protected override void OnFormClosing(FormClosingEventArgs e)
         {
             if (this.IsBusy)
@@ -53,31 +60,17 @@ namespace VideoPreview
             base.OnFormClosing(e);
         }
 
-
-        public bool IsBusy
+        protected override void OnDragOver(DragEventArgs e)
         {
-            get => isBusy;
-            set
-            {
-                isBusy = value;
+            base.OnDragOver(e);
 
-                ThreadControl.SetValue(pictureBox1, (isBusy ? RyzStudio.UIResource.loading_block : null));
-                ThreadControl.SetEnable(textBox1, !isBusy);
-                ThreadControl.SetEnable(button1, !isBusy);
-                ThreadControl.SetEnable(button2, !isBusy);
-                ThreadControl.SetEnable(button3, !isBusy);
-                ThreadControl.SetEnable(button4, !isBusy);
-            }
-        }
-
-
-        private void Form1_DragOver(object sender, DragEventArgs e)
-        {
             e.Effect = (e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Copy : DragDropEffects.None);
         }
 
-        private async void Form1_DragDrop(object sender, DragEventArgs e)
+        protected override async void OnDragDrop(DragEventArgs e)
         {
+            base.OnDragDrop(e);
+
             string[] fileList = e.Data.GetData(DataFormats.FileDrop) as string[];
             if (fileList == null)
             {
@@ -107,31 +100,101 @@ namespace VideoPreview
         }
 
 
+        public bool IsBusy
+        {
+            get => isBusy;
+            set
+            {
+                isBusy = value;
+
+                ThreadControl.SetValue(pictureBox1, (isBusy ? UIcon.GetImage("loading_block") : null));
+                ThreadControl.SetEnable(textBox1, !isBusy);
+                ThreadControl.SetEnable(button1, !isBusy);
+                ThreadControl.SetEnable(button2, !isBusy);
+                ThreadControl.SetEnable(button3, !isBusy);
+                ThreadControl.SetEnable(button4, !isBusy);
+            }
+        }
+
         public AppSession CurrentSession { get; set; } = new AppSession();
 
 
-#region main menu
-
         /// <summary>
         /// Refresh
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void refreshToolStripMenuItem_Click(object sender, EventArgs e) => button3_MouseClick(null, null);
+        private async void refreshToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (this.IsBusy)
+            {
+                return;
+            }
+
+            if (string.IsNullOrWhiteSpace(textBox1.Text))
+            {
+                return;
+            }
+
+            await ReadVideoFile(textBox1.Text);
+        }
 
         /// <summary>
         /// Load next file
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void loadNextFileToolStripMenuItem_Click(object sender, EventArgs e) => button4_MouseClick(null, null);
+        private async void loadNextFileToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (this.IsBusy)
+            {
+                return;
+            }
+
+            if (string.IsNullOrWhiteSpace(textBox1.Text))
+            {
+                return;
+            }
+
+            await Task.Run(() =>
+            {
+                string path = AccessibleDirectory.GetNextFile(textBox1.Text, "*.avi;*.mkv;*.mp4;*.ogm;*.mov;*.mpg;*.mpeg");
+                if (string.IsNullOrWhiteSpace(path)) return;
+
+                textBox1.Text = path;
+            });
+        }
 
         /// <summary>
         /// Options
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void optionsToolStripMenuItem_Click(object sender, EventArgs e) => button2_MouseClick(null, null);
+        private void optionsToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (this.IsBusy)
+            {
+                return;
+            }
+
+            if (optionsForm == null) optionsForm = new OptionsForm(this.CurrentSession);
+            if (optionsForm.ShowDialog() == DialogResult.OK)
+            {
+                this.CurrentSession = optionsForm.Session;
+
+                this.TopMost = this.CurrentSession.AlwaysOnTop;
+            }
+        }
+
+        /// <summary>
+        /// Always-On-Top
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void toolStripMenuItem3_Click(object sender, EventArgs e)
+        {
+            this.TopMost = this.CurrentSession.AlwaysOnTop = !this.TopMost;
+        }
 
         /// <summary>
         /// View help
@@ -164,61 +227,6 @@ namespace VideoPreview
             MessageBox.Show(Application.ProductName + " v" + Application.ProductVersion, "About", MessageBoxButtons.OK, MessageBoxIcon.Information);
         }
 
-#endregion
-
-        /// <summary>
-        /// Refresh
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private async void button3_MouseClick(object sender, MouseEventArgs e)
-        {
-            if (this.IsBusy) return;
-            if (string.IsNullOrWhiteSpace(textBox1.Text)) return;
-
-            await ReadVideoFile(textBox1.Text);
-        }
-
-        /// <summary>
-        /// Options
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void button2_MouseClick(object sender, MouseEventArgs e)
-        {
-            if (this.IsBusy)
-            {
-                return;
-            }
-
-            if (optionsForm == null) optionsForm = new OptionsForm(this.CurrentSession);
-            if (optionsForm.ShowDialog() == DialogResult.OK)
-            {
-                this.CurrentSession = optionsForm.Session;
-
-                this.TopMost = this.CurrentSession.AlwaysOnTop;
-            }
-        }
-
-        /// <summary>
-        /// Next file
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private async void button4_MouseClick(object sender, MouseEventArgs e)
-        {
-            await Task.Run(() =>
-            {
-                if (this.IsBusy) return;
-                if (string.IsNullOrWhiteSpace(textBox1.Text)) return;
-
-                string path = AccessibleDirectory.GetNextFile(textBox1.Text, "*.avi;*.mkv;*.mp4;*.ogm;*.mov;*.mpg;*.mpeg");
-                if (string.IsNullOrWhiteSpace(path)) return;
-
-                textBox1.Text = path;
-            });
-        }
-
         /// <summary>
         /// Close
         /// </summary>
@@ -270,7 +278,7 @@ namespace VideoPreview
                 Padding = new Padding(0),
                 SizeMode = PictureBoxSizeMode.Zoom,
                 Width = width,
-                Height = height,
+                Height = height
             };
             imageBox.Load(filename);
 
@@ -326,10 +334,13 @@ namespace VideoPreview
 
         protected async Task ReadVideoFile(string filename)
         {
+            if (this.IsBusy)
+            {
+                return;
+            }
+
             await Task.Run(() =>
             {
-                if (this.IsBusy) return;
-
                 this.IsBusy = true;
 
                 Clear();

MainForm.resx

@@ -52,144 +52,18 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="textBox1.HighlightImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAAK9JREFUOE/t0zsKwkAURuGp1BWJK3EhIrgAV+EOLLWwtRQLwQdiIbbiIkwynj+O
-        IVwnyhR2XvjyInNIkXHee8f0cEQBPbDOaKEarSvXhsAJO4wirlB4jipiA3phoIvIrLFChhnKiA3o8Ckw
-        RR93LNBODVwwwRL62kNKYIxNzQ1FSsDOEHk08HrYJMw/8KtA06/cCef6KJDZgDbTFrHNZO3x9idqOyui
-        m2+07bvPgHcPXOhtG3D6cUIAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="textBox1.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAAMZJREFUOE/tk7sNwjAQQF3BRohJGAQhMQBTsAElFLSUiAKJTxIXhBZlCILNuyRG
-        iXEQKeg46fmsO/slhU9Za5XWehiXYcD6JElygZ6qhdwTioVDGo4wDXDjsohXdYkvMDTHVa8R9Hb0tpCz
-        XzqJL5Df/CRYRFE0Yn8nr9M07XcSwBXmXN6QDfncRTCjt6+Rgfla4Adfn3D+ERS4Yht/wY8FxVN2xTac
-        gLP5qyYLAhmmA4SGyeeEoPkSq3EWydsoB4gRDEqBVU/p15ajstHKCgAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="button2.DefaultImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAFfSURBVDhPhZO7
-        LkVREIY3NWpHKRq3E4VEJ6GjwzvgAQ4iVDwACjqJ0q3gCXgBt0ZJQqJza9AI37f2Wjt2JPv8yZfMzF4z
-        6zKzswpNwmNEu6laoAfag5cn7kceDKAuGALXlmTgGH7gDTaiPQLD0d6Dr2gfQUlW9cMUrMAlrIGFpQHn
-        MAsz4NpuKFQDq88Fr1qr8AptwfujXTjLzaBB2IoMGIjydF6x0DjcwjcsGUB1+AQXX0U7FVkHr1B05x5O
-        YBTS67qria2Ra9gEpe/jFt15Al+4VyfKAialAjeQCriJnTmAUMBXfQGPtWwAeVyPbRGTP6Af1AK41uQJ
-        A8pdduAieLks4q6SkpXt9MQldcA7OAPNZKtteWfwohzhNEjz4C6LkB7Vq9kRZyANkp0qyfH0g9WdCdtq
-        Z/rA+DY45tqHkIoXMmDVdDRn4xS87zP4Tv5opRGu0hjcgW2eNvBfWfYLENJXYOLz8osAAAAASUVORK5C
-        YII=
-</value>
-  </data>
-  <data name="button2.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAGxSURBVDhPfZO9
-        SgNBFIVXa7VWS0njX7AIpBO00059B+MD+EOIlT5AYqGdkFKNhT6BeQFNzM8SCChESOdfo2nC+p3ZuyEK
-        64Wze+6Zc+/Mzsx6ceH7/nqj0XgRxE2OjyAIRprNZqLVao0rVyH5hQDvSGNsmnxJXuWDkIDpGgQYPnjn
-        jafr9XpKHBRBz3jJSsNQVw1g3gA5+AM4UmMBbRdPGWyjb8lbq9VmrNx97xRiD0PGpNjAdwje8Y6ZFAbC
-        OQN3lnrMsIh2IjDBgslqoNXlLXWFqwg+6IMDaSw5Cf8GMlfEoybwY6B9CE8H8gxuSJaj3dWsaBXyUQFe
-        RStoTDk8DcLT4dEFRWadlUFhDapDDR6HGmhTU+AyaqBdfQM6tqxMWi65PqEKVPwF5jVG4Z68oIO2Ji1a
-        1hmD904g1AStYHDFCniZ4qKlYbTb7QnETxrkTIoNGmTw6sgnTXJiQsuigS7Sjs2yr++18Sy5TkR3wF0k
-        fElXHAViSQNA3XUn+joZ+Jzpp3Bdc/GrqPkgbHeTmNzSMOlu3AL9A6/aJ/1ov67wf0HRCs2eeHdpvGny
-        n/C8H8kC+pfUUBF2AAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="button2.OverImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAGxSURBVDhPfZO9
-        SgNBFIVXa7VWS0njX7AIpBO00059B+MD+EOIlT5AYqGdkFKNhT6BeQFNzM8SCChESOdfo2nC+p3ZuyEK
-        64Wze+6Zc+/Mzsx6ceH7/nqj0XgRxE2OjyAIRprNZqLVao0rVyH5hQDvSGNsmnxJXuWDkIDpGgQYPnjn
-        jafr9XpKHBRBz3jJSsNQVw1g3gA5+AM4UmMBbRdPGWyjb8lbq9VmrNx97xRiD0PGpNjAdwje8Y6ZFAbC
-        OQN3lnrMsIh2IjDBgslqoNXlLXWFqwg+6IMDaSw5Cf8GMlfEoybwY6B9CE8H8gxuSJaj3dWsaBXyUQFe
-        RStoTDk8DcLT4dEFRWadlUFhDapDDR6HGmhTU+AyaqBdfQM6tqxMWi65PqEKVPwF5jVG4Z68oIO2Ji1a
-        1hmD904g1AStYHDFCniZ4qKlYbTb7QnETxrkTIoNGmTw6sgnTXJiQsuigS7Sjs2yr++18Sy5TkR3wF0k
-        fElXHAViSQNA3XUn+joZ+Jzpp3Bdc/GrqPkgbHeTmNzSMOlu3AL9A6/aJ/1ov67wf0HRCs2eeHdpvGny
-        n/C8H8kC+pfUUBF2AAAAAElFTkSuQmCC
-</value>
-  </data>
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <data name="button3.DefaultImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAA0AAAALCAYAAACksgdhAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        ygAAC8oBZVGvqQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAADFSURBVChTndE5
-        CgIxAIXh4BVEC5dCL2AtqOgtRG0svId3UOwE7cUzuZQuhWIhCPq/LAOaVD74IJmZhJeM+UkVCxzxwgFz
-        6LmSQ98NXdq4YunH+rCFFU7ooYg3bAo4Y2RncQa4YYhs0RQbN4yiSnVM8EC2qIGyG0ZpQrXljif+i1Zq
-        h7Cbdk5FTdTIRh3VVZ3VXWdIZQud3UaLdCvhdlIZQ9eetzOiRbr/LvRijQ5q/pnmF3zV1h8OlSqYYQed
-        de/nJfgY8wE3XCtphp1t4wAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="button3.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAA0AAAALCAYAAACksgdhAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        ygAAC8oBZVGvqQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAECSURBVChTlZA9
-        TkJBFIVf3ILBQqGQDVCbKIFdELChYB/uAWNnIr1xKS/v/71SoUQpMBQkJuN3bkYi03GSk5l7zj03dyb6
-        jzzPO2VZPhVFseL84VzCR+nynXNn1CNrFmi6Q9hwPuvuB9yivcA1HKZpesHpLBDHcYvik8Z7EwIQHuNv
-        syybHEI0P1C8WhFAK9HcxZ/RtzuEuPSSJLmyIgCBG/yNSOibc++tE6Gkn2DTNNlbR9Am+D0ruDi/60y7
-        6w1mBOAz3vR2KxTyv7LFmJgYAH2Kv67r+twEhfT/TBnIgIuqqvpo115bwK+jtRFGfyvR2Kaew3e4hx+q
-        m6a5tGZDFP0CdsL4wtxbk8QAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="button3.OverImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAA0AAAALCAYAAACksgdhAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        ygAAC8oBZVGvqQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAECSURBVChTlZA9
-        TkJBFIVf3ILBQqGQDVCbKIFdELChYB/uAWNnIr1xKS/v/71SoUQpMBQkJuN3bkYi03GSk5l7zj03dyb6
-        jzzPO2VZPhVFseL84VzCR+nynXNn1CNrFmi6Q9hwPuvuB9yivcA1HKZpesHpLBDHcYvik8Z7EwIQHuNv
-        syybHEI0P1C8WhFAK9HcxZ/RtzuEuPSSJLmyIgCBG/yNSOibc++tE6Gkn2DTNNlbR9Am+D0ruDi/60y7
-        6w1mBOAz3vR2KxTyv7LFmJgYAH2Kv67r+twEhfT/TBnIgIuqqvpo115bwK+jtRFGfyvR2Kaew3e4hx+q
-        m6a5tGZDFP0CdsL4wtxbk8QAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="button4.DefaultImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAASBJREFUOE+dkzFOAzEQRS0KisBJIFeBih6ukAsgQAolIBJKWhKOABKnAG6QOpGA
-        LkHwnrMO641ZCb70JI93xhp/z4aCduACnuGt4gUuYRd+1SZcwwJmMILTinG15zdzzM3kxhOYYMEWNLUN
-        Z2COudkhA/DDfozaZU7qJMp7uXESo1wHcLhcZrJLa/QrmjOFUtt9+IJejH5krp5YGx2+c1HQBtxC6ZB7
-        8KXCB9Tbt+2HGo8wAQ8ZQpI11v7pAM1OsubdxSv85wrORrzCFWhix6Chc2gz0YkNXfiEY4OGvM7Rcpkp
-        PeNqtG9gDnsxalcapLofq1H2EDspXce2Nc7itVFWbtiJCXqisRaIa/f85lOuFdelJxrr6/gr+1SuC79z
-        CN8yTFaSEVoBOQAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="button4.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAAVBJREFUOE+Vk0FOwlAYhBsXLNSTgFfRFXu9ghcgYKJLagSWbhGPoIk36KZpywlc
-        10TcqanflGktFkyYZNL3Zub/8/f1NfiLLMu6aZqOE8Dz3RRCvJ5jbWB2qLnj+UX4DT7AkYi2kCbPmY7L
-        1pBA4MXFoziOj2zVwDvGu3JG2d8mCBMZ8MzSTiijrCaphJ6FYSk0gN6n+bm3NTSlamBXmxDmO8a+xivg
-        paUSyqLpnEI1EOb2NlAUxQFN7vFbTZj4ESZq8NEc32M/VWT/DF9ZF8vlcuqYGgxVu1cDOHGsarBSgwzu
-        /QroC5okWtxi5lEUHdqrgX+zrbhxiOOA9zph8U2jgf0aaH144W0N8tVnXF9thBn8hKel8A8oKi8S2fo8
-        JJZXWU1YD7a9jsbWwbl48yoLbjJzIIdzFYhaS7M3bRU3oTMhoIPV19GvvPJ6y+8cBD/MdMJz9za4mgAA
-        AABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="button4.OverImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAAVBJREFUOE+Vk0FOwlAYhBsXLNSTgFfRFXu9ghcgYKJLagSWbhGPoIk36KZpywlc
-        10TcqanflGktFkyYZNL3Zub/8/f1NfiLLMu6aZqOE8Dz3RRCvJ5jbWB2qLnj+UX4DT7AkYi2kCbPmY7L
-        1pBA4MXFoziOj2zVwDvGu3JG2d8mCBMZ8MzSTiijrCaphJ6FYSk0gN6n+bm3NTSlamBXmxDmO8a+xivg
-        paUSyqLpnEI1EOb2NlAUxQFN7vFbTZj4ESZq8NEc32M/VWT/DF9ZF8vlcuqYGgxVu1cDOHGsarBSgwzu
-        /QroC5okWtxi5lEUHdqrgX+zrbhxiOOA9zph8U2jgf0aaH144W0N8tVnXF9thBn8hKel8A8oKi8S2fo8
-        JJZXWU1YD7a9jsbWwbl48yoLbjJzIIdzFYhaS7M3bRU3oTMhoIPV19GvvPJ6y+8cBD/MdMJz9za4mgAA
-        AABJRU5ErkJggg==
-</value>
-  </data>
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>114, 17</value>
   </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAQAMDAAAAEAIACoJQAARgAAACAgAAABACAAqBAAAO4lAAAYGAAAAQAgAIgJAACWNgAAEBAAAAEA

OptionsForm.cs

@@ -32,26 +32,26 @@ namespace VideoPreview
             this.tHorizontalSeparator2 = new RyzStudio.Windows.Forms.THorizontalSeparator();
             this.pickerBox2 = new RyzStudio.Windows.ThemedForms.TNumericPickerBox();
             this.SuspendLayout();
-            //
+            // 
             // button1
-            //
+            // 
+            this.button1.ActiveImage = null;
             this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.button1.BackColor = System.Drawing.Color.Transparent;
-            this.button1.DefaultImage = null;
-            this.button1.DownImage = null;
-            this.button1.IsSelected = false;
+            this.button1.HoverImage = null;
+            this.button1.IdleImage = null;
             this.button1.LabelText = "&Save";
             this.button1.Location = new System.Drawing.Point(241, 469);
-            this.button1.Margin = new System.Windows.Forms.Padding(10);
+            this.button1.Margin = new System.Windows.Forms.Padding(10, 0, 0, 10);
             this.button1.Name = "button1";
-            this.button1.OverImage = null;
             this.button1.Padding = new System.Windows.Forms.Padding(4, 4, 3, 3);
             this.button1.Size = new System.Drawing.Size(128, 32);
-            this.button1.TabIndex = 173;
+            this.button1.TabIndex = 2;
             this.button1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.button1_MouseClick);
-            //
+            // 
             // pickerBox1
-            //
+            // 
+            this.pickerBox1.AcceptButton = null;
             this.pickerBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.pickerBox1.BackColor = System.Drawing.Color.Transparent;
             this.pickerBox1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
@@ -59,13 +59,12 @@ namespace VideoPreview
             this.pickerBox1.Margin = new System.Windows.Forms.Padding(10, 4, 10, 4);
             this.pickerBox1.Name = "pickerBox1";
             this.pickerBox1.Padding = new System.Windows.Forms.Padding(10, 6, 7, 5);
-            this.pickerBox1.Size = new System.Drawing.Size(84, 34);
-            this.pickerBox1.SubmitButton = null;
-            this.pickerBox1.TabIndex = 183;
+            this.pickerBox1.Size = new System.Drawing.Size(84, 35);
+            this.pickerBox1.TabIndex = 0;
             this.pickerBox1.Value = true;
-            //
+            // 
             // label6
-            //
+            // 
             this.label6.AutoSize = true;
             this.label6.BackColor = System.Drawing.Color.Transparent;
             this.label6.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -77,9 +76,9 @@ namespace VideoPreview
             this.label6.TabIndex = 182;
             this.label6.Text = "Generate No. Frames";
             this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            //
+            // 
             // label8
-            //
+            // 
             this.label8.AutoSize = true;
             this.label8.BackColor = System.Drawing.Color.Transparent;
             this.label8.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -91,41 +90,44 @@ namespace VideoPreview
             this.label8.TabIndex = 186;
             this.label8.Text = "Always-On-Top";
             this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            //
+            // 
             // tHorizontalSeparator1
-            //
-            this.tHorizontalSeparator1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+            // 
+            this.tHorizontalSeparator1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.tHorizontalSeparator1.AutoScrollMargin = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator1.AutoScrollMinSize = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator1.BackColor = System.Drawing.Color.Transparent;
             this.tHorizontalSeparator1.Location = new System.Drawing.Point(10, 437);
-            this.tHorizontalSeparator1.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0);
+            this.tHorizontalSeparator1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 10);
             this.tHorizontalSeparator1.MaximumSize = new System.Drawing.Size(4920, 2);
             this.tHorizontalSeparator1.MinimumSize = new System.Drawing.Size(0, 22);
             this.tHorizontalSeparator1.Name = "tHorizontalSeparator1";
             this.tHorizontalSeparator1.Padding = new System.Windows.Forms.Padding(0, 10, 0, 10);
             this.tHorizontalSeparator1.Size = new System.Drawing.Size(364, 22);
             this.tHorizontalSeparator1.TabIndex = 188;
-            //
+            this.tHorizontalSeparator1.TabStop = false;
+            // 
             // tHorizontalSeparator2
-            //
-            this.tHorizontalSeparator2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+            // 
+            this.tHorizontalSeparator2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.tHorizontalSeparator2.AutoScrollMargin = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator2.AutoScrollMinSize = new System.Drawing.Size(0, 0);
             this.tHorizontalSeparator2.BackColor = System.Drawing.Color.Transparent;
             this.tHorizontalSeparator2.Location = new System.Drawing.Point(10, 59);
-            this.tHorizontalSeparator2.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0);
+            this.tHorizontalSeparator2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 10);
             this.tHorizontalSeparator2.MaximumSize = new System.Drawing.Size(4920, 2);
             this.tHorizontalSeparator2.MinimumSize = new System.Drawing.Size(0, 22);
             this.tHorizontalSeparator2.Name = "tHorizontalSeparator2";
             this.tHorizontalSeparator2.Padding = new System.Windows.Forms.Padding(0, 10, 0, 10);
             this.tHorizontalSeparator2.Size = new System.Drawing.Size(364, 22);
             this.tHorizontalSeparator2.TabIndex = 190;
-            //
+            this.tHorizontalSeparator2.TabStop = false;
+            // 
             // pickerBox2
-            //
+            // 
+            this.pickerBox2.AcceptButton = null;
             this.pickerBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.pickerBox2.BackColor = System.Drawing.Color.Transparent;
             this.pickerBox2.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
@@ -133,13 +135,12 @@ namespace VideoPreview
             this.pickerBox2.Margin = new System.Windows.Forms.Padding(10, 4, 10, 4);
             this.pickerBox2.Name = "pickerBox2";
             this.pickerBox2.Padding = new System.Windows.Forms.Padding(10, 6, 7, 5);
-            this.pickerBox2.Size = new System.Drawing.Size(84, 34);
-            this.pickerBox2.SubmitButton = null;
-            this.pickerBox2.TabIndex = 193;
+            this.pickerBox2.Size = new System.Drawing.Size(84, 35);
+            this.pickerBox2.TabIndex = 1;
             this.pickerBox2.Value = 0;
-            //
+            // 
             // OptionsForm
-            //
+            // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(384, 521);

Program.cs

@@ -1,7 +1,5 @@
+using RyzStudio.IO;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace VideoPreview
@@ -14,6 +12,8 @@ namespace VideoPreview
         [STAThread]
         static void Main()
         {
+            UIcon.UIResource = typeof(UIResource);
+
             Application.SetHighDpiMode(HighDpiMode.SystemAware);
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);

Properties/PublishProfiles/Release x64.pubxml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration>Release</Configuration>
-    <Platform>Any CPU</Platform>
-    <PublishDir>bin\Release\64\</PublishDir>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net5.0-windows</TargetFramework>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <SelfContained>false</SelfContained>
-    <PublishSingleFile>True</PublishSingleFile>
-    <PublishReadyToRun>False</PublishReadyToRun>
-  </PropertyGroup>
-</Project>

Properties/PublishProfiles/Release x86.pubxml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration>Release</Configuration>
-    <Platform>Any CPU</Platform>
-    <PublishDir>bin\Release\86\</PublishDir>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net5.0-windows</TargetFramework>
-    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
-    <SelfContained>false</SelfContained>
-    <PublishSingleFile>True</PublishSingleFile>
-    <PublishReadyToRun>False</PublishReadyToRun>
-  </PropertyGroup>
-</Project>

UIResource.Designer.cs

@@ -0,0 +1,153 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace VideoPreview {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class UIResource {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal UIResource() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("VideoPreview.UIResource", typeof(UIResource).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap arrow_right_circle {
+            get {
+                object obj = ResourceManager.GetObject("arrow_right_circle", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap arrow_right_circle_3 {
+            get {
+                object obj = ResourceManager.GetObject("arrow_right_circle_3", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap file {
+            get {
+                object obj = ResourceManager.GetObject("file", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap file_2 {
+            get {
+                object obj = ResourceManager.GetObject("file_2", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap loading_block {
+            get {
+                object obj = ResourceManager.GetObject("loading_block", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap refresh_cw {
+            get {
+                object obj = ResourceManager.GetObject("refresh_cw", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap refresh_cw_3 {
+            get {
+                object obj = ResourceManager.GetObject("refresh_cw_3", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap settings {
+            get {
+                object obj = ResourceManager.GetObject("settings", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap settings_3 {
+            get {
+                object obj = ResourceManager.GetObject("settings_3", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}

UIResource.resx

@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="arrow_right_circle" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\arrow-right-circle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="arrow_right_circle_3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\arrow-right-circle-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="file" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\file.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="file_2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\file-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="loading_block" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\loading-block.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="refresh_cw" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\refresh-cw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="refresh_cw_3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\refresh-cw-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="settings" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="settings_3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\settings-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>

VideoPreview.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows8.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <AssemblyName>videopreview</AssemblyName>
     <Authors>Ray Lam</Authors>
@@ -11,7 +11,7 @@
     <Copyright>Ray Lam</Copyright>
     <ApplicationIcon>favicon.ico</ApplicationIcon>
     <NoWin32Manifest>true</NoWin32Manifest>
-    <Version>0.1.1.022</Version>
+    <Version>0.1.3.010</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -19,57 +19,107 @@
     <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
+
   <ItemGroup>
-    <Compile Remove="Resources\UI\**" />
+    <Compile Remove="Resources\**" />
     <Compile Remove="RyzStudio3\**" />
     <Compile Remove="RyzStudio\**" />
-    <EmbeddedResource Remove="Resources\UI\**" />
+    <EmbeddedResource Remove="Resources\**" />
     <EmbeddedResource Remove="RyzStudio3\**" />
     <EmbeddedResource Remove="RyzStudio\**" />
-    <None Remove="Resources\UI\**" />
+    <None Remove="Resources\**" />
     <None Remove="RyzStudio3\**" />
     <None Remove="RyzStudio\**" />
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Remove="UIResource.Designer.cs" />
+    <None Remove=".gitignore" />
+    <None Remove="build.bat" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Remove="UIResource.resx" />
+    <None Include="Resources\settings-3.png" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Remove="Resources\loading-block.gif" />
+    <None Include="Resources\refresh-cw-3.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="Resources\arrow-right-circle-3.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="Resources\settings-2.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="Resources\settings.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="Resources\refresh-cw-2.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="Resources\refresh-cw.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="Resources\loading-block.gif" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="Resources\file-2.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="Resources\file.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="Resources\arrow-right-circle-2.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="Resources\arrow-right-circle.png" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="MediaToolkit" Version="1.1.0.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="AppResource.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>AppResource.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="AppResource.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>AppResource.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Resources\" />
-  </ItemGroup>
-
   <ItemGroup>
     <Reference Include="RyzStudio3">
       <HintPath>References\RyzStudio3.dll</HintPath>
     </Reference>
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="AppResource.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>AppResource.resx</DependentUpon>
+    </Compile>
+    <Compile Update="UIResource.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>UIResource.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="AppResource.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>AppResource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Update="UIResource.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>UIResource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
 </Project>

build.bat

@@ -0,0 +1,5 @@
+rmdir /s /q "bin\Release\64\"
+dotnet publish skye.sln -r win-x64 -c Release /p:PublishSingleFile=true /p:SelfContained=false /p:PublishReadyToRunfalse=true /p:PublishDir="bin\Release\64\"
+
+##rmdir /s /q "bin\Release\86\"
+##dotnet publish skye.sln -r win-x86 -c Release /p:PublishSingleFile=true /p:SelfContained=false /p:PublishReadyToRunfalse=true /p:PublishDir="bin\Release\86\"