Merge branch 'dev' of Repos/Funscripta into master

Funscripta/Form1.Designer.cs

@@ -65,6 +65,7 @@
             this.zoom = new Funscripta.Slider();
             this.position = new Funscripta.Slider();
             this.track1 = new Funscripta.Track();
+            this.addCurrentVideoToQueueToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip1.SuspendLayout();
             this.videoPanel.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@@ -242,7 +243,8 @@
             // 
             this.viewToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(55)))), ((int)(((byte)(55)))), ((int)(((byte)(55)))));
             this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.unpackManagerToolStripMenuItem});
+            this.unpackManagerToolStripMenuItem,
+            this.addCurrentVideoToQueueToolStripMenuItem});
             this.viewToolStripMenuItem.ForeColor = System.Drawing.Color.White;
             this.viewToolStripMenuItem.Name = "viewToolStripMenuItem";
             this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
@@ -253,7 +255,7 @@
             this.unpackManagerToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(55)))), ((int)(((byte)(55)))), ((int)(((byte)(55)))));
             this.unpackManagerToolStripMenuItem.ForeColor = System.Drawing.Color.White;
             this.unpackManagerToolStripMenuItem.Name = "unpackManagerToolStripMenuItem";
-            this.unpackManagerToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
+            this.unpackManagerToolStripMenuItem.Size = new System.Drawing.Size(219, 22);
             this.unpackManagerToolStripMenuItem.Text = "Unpack-Manager";
             this.unpackManagerToolStripMenuItem.Click += new System.EventHandler(this.unpackManagerToolStripMenuItem_Click);
             // 
@@ -337,6 +339,7 @@
             // framesPerStep
             // 
             this.framesPerStep.BackColor = System.Drawing.Color.White;
+            this.framesPerStep.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.framesPerStep.Name = "framesPerStep";
             this.framesPerStep.Size = new System.Drawing.Size(100, 23);
             this.framesPerStep.Text = "1";
@@ -443,6 +446,15 @@
             this.track1.Size = new System.Drawing.Size(776, 46);
             this.track1.TabIndex = 3;
             // 
+            // addCurrentVideoToQueueToolStripMenuItem
+            // 
+            this.addCurrentVideoToQueueToolStripMenuItem.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(55)))), ((int)(((byte)(55)))), ((int)(((byte)(55)))));
+            this.addCurrentVideoToQueueToolStripMenuItem.ForeColor = System.Drawing.Color.White;
+            this.addCurrentVideoToQueueToolStripMenuItem.Name = "addCurrentVideoToQueueToolStripMenuItem";
+            this.addCurrentVideoToQueueToolStripMenuItem.Size = new System.Drawing.Size(219, 22);
+            this.addCurrentVideoToQueueToolStripMenuItem.Text = "Add current video to queue";
+            this.addCurrentVideoToQueueToolStripMenuItem.Click += new System.EventHandler(this.addCurrentVideoToQueueToolStripMenuItem_Click);
+            // 
             // Form1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -511,6 +523,7 @@
         private System.Windows.Forms.ToolStripMenuItem undo;
         private System.Windows.Forms.ToolStripMenuItem redo;
         private System.Windows.Forms.ToolStripMenuItem redoAlt;
+        private System.Windows.Forms.ToolStripMenuItem addCurrentVideoToQueueToolStripMenuItem;
     }
 }
 

Funscripta/Form1.cs

@@ -19,6 +19,7 @@ namespace Funscripta
 {
     public partial class Form1 : Form
     {
+        private string OpenVideo { get; set; }
         private string FileName { get; set; }
         private string RawName { get; set; }
         private SaveFileDialog sfd = new SaveFileDialog();
@@ -100,6 +101,7 @@ namespace Funscripta
             try
             {
                 var fi = new FileInfo( videoFile );
+                OpenVideo = fi.FullName;
                 VFR.Open( videoFile );
                 lastFrame = -1;
                 Frame = 0;
@@ -298,13 +300,21 @@ namespace Funscripta
             position.Value = track1.FunScript.Find( ( long ) track1.CurrentTimestamp ).Position;
         }
 
-        private void unpackManagerToolStripMenuItem_Click( object sender, EventArgs e )
+        private Unpack_Manager UnpackManager
         {
-            foreach( var form in Application.OpenForms )
+            get
             {
-                if ( form.GetType() == typeof( Unpack_Manager ) ) return;
+                foreach ( var form in Application.OpenForms )
+                {
+                    if ( form.GetType() == typeof( Unpack_Manager ) ) return ( Unpack_Manager ) form;
+                }
+                return new Unpack_Manager();
             }
-            ( new Unpack_Manager() ).Show();
+        }
+
+        private void unpackManagerToolStripMenuItem_Click( object sender, EventArgs e )
+        {
+            UnpackManager.Show();
         }
 
         private void slider1_ValueChanged( float frame, Slider.Action sender )
@@ -348,5 +358,15 @@ namespace Funscripta
             zoom_ValueChanged( zoom.Value, Slider.Action.Script );
             base.OnClientSizeChanged( e );
         }
+
+        private void addCurrentVideoToQueueToolStripMenuItem_Click( object sender, EventArgs e )
+        {
+            if ( OpenVideo == null ) {
+                MessageBox.Show( "There is no video opened." );
+            }
+            var m = UnpackManager;
+            m.AddVideo( OpenVideo );
+            m.Show();
+        }
     }
 }

Funscripta/Unpack-Manager.cs

@@ -282,20 +282,22 @@ namespace Funscripta
         {
             if ( ofd.ShowDialog() == DialogResult.OK )
             {
-                foreach( var file in ofd.FileNames )
-                {
-                    var f = new FileInfo( file );
-                    if ( Videos.Contains( f.FullName ) ) continue;
-                    var thread = new PackThread( f );
-                    var lvi = new ListViewItem( f.Name );
-                    thread.Item = lvi;
-                    PackThreads.Add( thread );
-                    listView1.Items.Add( lvi );
-                    Videos.Add( f.FullName );
-                }
+                foreach( var file in ofd.FileNames ) AddVideo( file );
             }
         }
 
+        public void AddVideo( string filename )
+        {
+            var f = new FileInfo( filename );
+            if ( Videos.Contains( f.FullName ) ) return;
+            var thread = new PackThread( f );
+            var lvi = new ListViewItem( f.Name );
+            thread.Item = lvi;
+            PackThreads.Add( thread );
+            listView1.Items.Add( lvi );
+            Videos.Add( f.FullName );
+        }
+
         private void button2_Click( object sender, EventArgs e )
         {
             foreach( ListViewItem lvi in listView1.SelectedItems )