Merge a fuckton of shit.

3 files changed, 0 insertions, 794 deletions

diff --git a/ShiftOS.WinForms/Applications/Terminal.cs b/ShiftOS.WinForms/Applications/Terminal.cs
deleted file mode 100644
index 32c5363..0000000
--- a/ShiftOS.WinForms/Applications/Terminal.cs
+++ /dev/null
@@ -1,496 +0,0 @@
-/*
- * MIT License
- * 
- * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-//#define TRAILER
-//#define CRASHONSTART
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Diagnostics;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using System.Text.RegularExpressions;
-using System.Collections;
-using static ShiftOS.Engine.SkinEngine;
-using ShiftOS.Engine;
-using ShiftOS.Objects;
-using ShiftOS.WinForms.Tools;
-
-namespace ShiftOS.WinForms.Applications
-{
-    [Launcher("Terminal", false, null, "Utilities")]
-    [WinOpen("terminal")]
-    [DefaultIcon("iconTerminal")]
-    public partial class Terminal : UserControl, IShiftOSWindow
-    {
-        public static Stack<string> ConsoleStack = new Stack<string>();
-
-        public static System.Windows.Forms.Timer ti = new System.Windows.Forms.Timer();
-
-        public static string latestCommmand = "";
-
-        public static bool IsInRemoteSystem = false;
-        public static string RemoteGuid = "";
-
-        [Obsolete("This is used for compatibility with old parts of the backend. Please use TerminalBackend instead.")]
-        public static bool PrefixEnabled
-        {
-            get
-            {
-                return TerminalBackend.PrefixEnabled;
-            }
-            set
-            {
-                TerminalBackend.PrefixEnabled = value;
-            }
-        }
-
-        [Obsolete("This is used for compatibility with old parts of the backend. Please use TerminalBackend instead.")]
-        public static bool InStory
-        {
-            get
-            {
-                return TerminalBackend.InStory;
-            }
-            set
-            {
-                TerminalBackend.InStory = value;
-            }
-        }
-
-        [Obsolete("This is used for compatibility with old parts of the backend. Please use TerminalBackend instead.")]
-        public static string LastCommand
-        {
-            get
-            {
-                return TerminalBackend.LastCommand;
-            }
-            set
-            {
-                TerminalBackend.LastCommand = value;
-            }
-        }
-
-        public int TutorialProgress
-        {
-            get
-            {
-                throw new NotImplementedException();
-            }
-
-            set
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        [Obsolete("This is used for compatibility with old parts of the backend. Please use TerminalBackend instead.")]
-        public static void InvokeCommand(string text)
-        {
-
-            TerminalBackend.InvokeCommand(text);
-        }
-
-        public Terminal()
-        {
-
-            InitializeComponent();
-            SaveSystem.GameReady += () =>
-            {
-                try
-                {
-                    this.Invoke(new Action(() =>
-                    {
-                        ResetAllKeywords();
-                        rtbterm.Text = "";
-                        if (!Shiftorium.UpgradeInstalled("desktop"))
-                        {
-                            TerminalBackend.PrefixEnabled = true;
-                            TerminalBackend.InStory = false;
-                            TerminalBackend.PrintPrompt();
-                            if (Shiftorium.UpgradeInstalled("wm_free_placement"))
-                            {
-                                this.ParentForm.Width = 640;
-                                this.ParentForm.Height = 480;
-                                this.ParentForm.Left = (Screen.PrimaryScreen.Bounds.Width - 640) / 2;
-                                this.ParentForm.Top = (Screen.PrimaryScreen.Bounds.Height - 480) / 2;
-
-                            }
-                        }
-                        else
-                        {
-                            AppearanceManager.Close(this);
-                        }
-                    }));
-                }
-                catch { }
-            };
-
-
-            this.DoubleBuffered = true;
-
-        }
-
-        public void FocusOnTerminal()
-        {
-            rtbterm.Focus();
-        }
-
-        public static string GetTime()
-        {
-            var time = DateTime.Now;
-            if (ShiftoriumFrontend.UpgradeInstalled("full_precision_time"))
-            {
-                return DateTime.Now.ToString("h:mm:ss tt");
-            }
-            else if (ShiftoriumFrontend.UpgradeInstalled("clock_am_and_pm"))
-            {
-                return time.TimeOfDay.TotalHours > 12 ? $"{time.Hour - 12} PM" : $"{time.Hour} AM";
-            }
-            else if (ShiftoriumFrontend.UpgradeInstalled("clock_hours"))
-            {
-                return ((int)time.TimeOfDay.TotalHours).ToString();
-            }
-            else if (ShiftoriumFrontend.UpgradeInstalled("clock_minutes"))
-            {
-                return ((int)time.TimeOfDay.TotalMinutes).ToString();
-            }
-            else if (ShiftoriumFrontend.UpgradeInstalled("clock"))
-            {
-                return ((int)time.TimeOfDay.TotalSeconds).ToString();
-            }
-
-            return "";
-        }
-
-
-        public static event TextSentEventHandler TextSent;
-
-        public void ResetAllKeywords()
-        {
-            string primary = SaveSystem.CurrentUser.Username + " ";
-            string secondary = "shiftos ";
-
-
-            var asm = Assembly.GetExecutingAssembly();
-
-            var types = asm.GetTypes();
-
-            foreach (var type in types)
-            {
-                foreach (var a in type.GetCustomAttributes(false))
-                {
-                    if (ShiftoriumFrontend.UpgradeAttributesUnlocked(type))
-                    {
-                        if (a is Namespace)
-                        {
-                            var ns = a as Namespace;
-                            if (!primary.Contains(ns.name))
-                            {
-                                primary += ns.name + " ";
-                            }
-                            foreach (var method in type.GetMethods(BindingFlags.Public | BindingFlags.Static))
-                            {
-                                if (ShiftoriumFrontend.UpgradeAttributesUnlocked(method))
-                                {
-                                    foreach (var ma in method.GetCustomAttributes(false))
-                                    {
-                                        if (ma is Command)
-                                        {
-                                            var cmd = ma as Command;
-                                            if (!secondary.Contains(cmd.name))
-                                                secondary += cmd.name + " ";
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-
-        }
-
-        public static void MakeWidget(Controls.TerminalBox txt)
-        {
-            AppearanceManager.StartConsoleOut();
-            txt.GotFocus += (o, a) =>
-            {
-                AppearanceManager.ConsoleOut = txt;
-            };
-            txt.KeyDown += (o, a) =>
-            {
-                if (a.Control == true || a.Alt == true)
-                {
-                    a.SuppressKeyPress = true;
-                    return;
-                }
-
-                if (a.KeyCode == Keys.Enter)
-                {
-                    try
-                    {
-                        a.SuppressKeyPress = true;
-                        Console.WriteLine("");
-                        var text = txt.Lines.ToArray();
-                        var text2 = text[text.Length - 2];
-                        var text3 = "";
-                        var text4 = Regex.Replace(text2, @"\t|\n|\r", "");
-
-                        if (IsInRemoteSystem == true)
-                        {
-                            ServerManager.SendMessage("trm_invcmd", JsonConvert.SerializeObject(new
-                            {
-                                guid = RemoteGuid,
-                                command = text4
-                            }));
-                        }
-                        else
-                        {
-                            if (TerminalBackend.PrefixEnabled)
-                            {
-                                text3 = text4.Remove(0, $"{SaveSystem.CurrentUser.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ".Length);
-                            }
-                            TerminalBackend.LastCommand = text3;
-                            TextSent?.Invoke(text4);
-                            TerminalBackend.SendText(text4);
-                            if (TerminalBackend.InStory == false)
-                            {
-                                if (text3 == "stop theme")
-                                {
-                                    CurrentCommandParser.parser = null;
-                                }
-                                else
-                                {
-                                    if (CurrentCommandParser.parser == null)
-                                    {
-                                        TerminalBackend.InvokeCommand(text3);
-                                    }
-                                    else
-                                    {
-                                        var result = CurrentCommandParser.parser.ParseCommand(text3);
-
-                                        if (result.Equals(default(KeyValuePair<KeyValuePair<string, string>, Dictionary<string, string>>)))
-                                        {
-                                            Console.WriteLine("Syntax Error: Syntax Error");
-                                        }
-                                        else
-                                        {
-                                            TerminalBackend.InvokeCommand(result.Key.Key, result.Key.Value, result.Value);
-                                        }
-                                    }
-                                }
-                            }
-                            if (TerminalBackend.PrefixEnabled)
-                            {
-                                TerminalBackend.PrintPrompt();
-                            }
-                        }
-                    }
-                    catch
-                    {
-                    }
-                }
-                else if (a.KeyCode == Keys.Back)
-                {
-                    try
-                    {
-                        var tostring3 = txt.Lines[txt.Lines.Length - 1];
-                        var tostringlen = tostring3.Length + 1;
-                        var workaround = $"{SaveSystem.CurrentUser.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ";
-                        var derp = workaround.Length + 1;
-                        if (tostringlen != derp)
-                        {
-                            AppearanceManager.CurrentPosition--;
-                        }
-                        else
-                        {
-                            a.SuppressKeyPress = true;
-                        }
-                    }
-                    catch
-                    {
-                        Debug.WriteLine("Drunky alert in terminal.");
-                    }
-                }
-                else if (a.KeyCode == Keys.Left)
-                {
-                    var getstring = txt.Lines[txt.Lines.Length - 1];
-                    var stringlen = getstring.Length + 1;
-                    var header = $"{SaveSystem.CurrentUser.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ";
-                    var headerlen = header.Length + 1;
-                    var selstart = txt.SelectionStart;
-                    var remstrlen = txt.TextLength - stringlen;
-                    var finalnum = selstart - remstrlen;
-
-                    if (finalnum != headerlen)
-                    {
-                        AppearanceManager.CurrentPosition--;
-                    }
-                    else
-                    {
-                        a.SuppressKeyPress = true;
-                    }
-                }
-                else if (a.KeyCode == Keys.Up)
-                {
-                    var tostring3 = txt.Lines[txt.Lines.Length - 1];
-                    if (tostring3 == $"{SaveSystem.CurrentUser.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ")
-                        Console.Write(TerminalBackend.LastCommand);
-                    a.SuppressKeyPress = true;
-
-                }
-                else
-                {
-                    if (TerminalBackend.InStory)
-                    {
-                        a.SuppressKeyPress = true;
-                    }
-                    AppearanceManager.CurrentPosition++;
-                }
-
-            };
-
-            AppearanceManager.ConsoleOut = txt;
-
-            txt.Focus();
-
-            txt.Font = LoadedSkin.TerminalFont;
-            txt.ForeColor = ControlManager.ConvertColor(LoadedSkin.TerminalForeColorCC);
-            txt.BackColor = ControlManager.ConvertColor(LoadedSkin.TerminalBackColorCC);
-
-        }
-
-        private void Terminal_Load(object sender, EventArgs e)
-        {
-            ServerManager.MessageReceived += (msg) =>
-            {
-                if (msg.Name == "trm_handshake_guid")
-                {
-                    IsInRemoteSystem = true;
-                    RemoteGuid = msg.GUID;
-                }
-                else if (msg.Name == "trm_handshake_stop")
-                {
-                    IsInRemoteSystem = false;
-                    RemoteGuid = "";
-                }
-            };
-        }
-
-        private void Terminal_FormClosing(object sender, FormClosingEventArgs e)
-        {
-            ti.Stop();
-            IsInRemoteSystem = false;
-            RemoteGuid = "";
-        }
-
-        public void OnLoad()
-        {
-            MakeWidget(rtbterm);
-
-            if (SaveSystem.CurrentSave != null)
-            {
-                if (!ShiftoriumFrontend.UpgradeInstalled("window_manager"))
-                {
-                    rtbterm.Select(rtbterm.TextLength, 0);
-                }
-            }
-
-            new Thread(() =>
-            {
-                Thread.Sleep(1000);
-                TerminalBackend.PrintPrompt();
-            }).Start();
-        }
-
-        public void OnSkinLoad()
-        {
-            try
-            {
-                rtbterm.Font = LoadedSkin.TerminalFont;
-                rtbterm.ForeColor = ControlManager.ConvertColor(LoadedSkin.TerminalForeColorCC);
-                rtbterm.BackColor = ControlManager.ConvertColor(LoadedSkin.TerminalBackColorCC);
-            }
-            catch
-            {
-
-            }
-
-        }
-
-        public bool OnUnload()
-        {
-            if (SaveSystem.ShuttingDown == false)
-            {
-                if (!ShiftoriumFrontend.UpgradeInstalled("desktop"))
-                {
-                    if (AppearanceManager.OpenForms.Count <= 1)
-                    {
-                        Console.WriteLine("");
-                        Console.WriteLine("{WIN_CANTCLOSETERMINAL}");
-                        try
-                        {
-                            Console.WriteLine("");
-
-                            if (TerminalBackend.PrefixEnabled)
-                            {
-                                Console.Write($"{SaveSystem.CurrentUser.Username}@shiftos:~$ ");
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            Console.WriteLine(ex);
-                        }
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-
-        public void OnUpgrade()
-        {
-        }
-
-        private void rtbterm_TextChanged(object sender, EventArgs e)
-        {
-
-        }
-
-        internal void ClearText()
-        {
-            rtbterm.Text = "";
-        }
-    }
-}
\ No newline at end of file
diff --git a/ShiftOS.WinForms/Applications/UpdateManager.Designer.cs b/ShiftOS.WinForms/Applications/UpdateManager.Designer.cs
deleted file mode 100644
index 0b23b8e..0000000
--- a/ShiftOS.WinForms/Applications/UpdateManager.Designer.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-namespace ShiftOS.WinForms.Applications
-{
-    partial class UpdateManager
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.lbupdatetitle = new System.Windows.Forms.Label();
-            this.pnlupdatebar = new System.Windows.Forms.Panel();
-            this.pgdownload = new ShiftOS.WinForms.Controls.ShiftedProgressBar();
-            this.btnaction = new System.Windows.Forms.Button();
-            this.btnclose = new System.Windows.Forms.Button();
-            this.wbstatus = new System.Windows.Forms.WebBrowser();
-            this.pnlupdatebar.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // lbupdatetitle
-            // 
-            this.lbupdatetitle.AutoSize = true;
-            this.lbupdatetitle.Dock = System.Windows.Forms.DockStyle.Top;
-            this.lbupdatetitle.Location = new System.Drawing.Point(0, 0);
-            this.lbupdatetitle.Margin = new System.Windows.Forms.Padding(10);
-            this.lbupdatetitle.Name = "lbupdatetitle";
-            this.lbupdatetitle.Size = new System.Drawing.Size(117, 13);
-            this.lbupdatetitle.TabIndex = 0;
-            this.lbupdatetitle.Tag = "header1";
-            this.lbupdatetitle.Text = "Checking for updates...";
-            // 
-            // pnlupdatebar
-            // 
-            this.pnlupdatebar.Controls.Add(this.pgdownload);
-            this.pnlupdatebar.Controls.Add(this.btnaction);
-            this.pnlupdatebar.Controls.Add(this.btnclose);
-            this.pnlupdatebar.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pnlupdatebar.Location = new System.Drawing.Point(0, 426);
-            this.pnlupdatebar.Name = "pnlupdatebar";
-            this.pnlupdatebar.Size = new System.Drawing.Size(597, 33);
-            this.pnlupdatebar.TabIndex = 1;
-            // 
-            // pgdownload
-            // 
-            this.pgdownload.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pgdownload.BlockSize = 5;
-            this.pgdownload.Location = new System.Drawing.Point(86, 4);
-            this.pgdownload.Maximum = 100;
-            this.pgdownload.Name = "pgdownload";
-            this.pgdownload.Size = new System.Drawing.Size(427, 23);
-            this.pgdownload.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
-            this.pgdownload.TabIndex = 2;
-            this.pgdownload.Text = "Updating...";
-            this.pgdownload.Value = 0;
-            // 
-            // btnaction
-            // 
-            this.btnaction.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnaction.Location = new System.Drawing.Point(519, 4);
-            this.btnaction.Name = "btnaction";
-            this.btnaction.Size = new System.Drawing.Size(75, 23);
-            this.btnaction.TabIndex = 1;
-            this.btnaction.Text = "Update";
-            this.btnaction.UseVisualStyleBackColor = true;
-            // 
-            // btnclose
-            // 
-            this.btnclose.Location = new System.Drawing.Point(4, 4);
-            this.btnclose.Name = "btnclose";
-            this.btnclose.Size = new System.Drawing.Size(75, 23);
-            this.btnclose.TabIndex = 0;
-            this.btnclose.Text = "{CLOSE}";
-            this.btnclose.UseVisualStyleBackColor = true;
-            this.btnclose.Click += new System.EventHandler(this.btnclose_Click);
-            // 
-            // wbstatus
-            // 
-            this.wbstatus.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.wbstatus.Location = new System.Drawing.Point(0, 13);
-            this.wbstatus.MinimumSize = new System.Drawing.Size(20, 20);
-            this.wbstatus.Name = "wbstatus";
-            this.wbstatus.Size = new System.Drawing.Size(597, 413);
-            this.wbstatus.TabIndex = 2;
-            // 
-            // UpdateManager
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.wbstatus);
-            this.Controls.Add(this.pnlupdatebar);
-            this.Controls.Add(this.lbupdatetitle);
-            this.Name = "UpdateManager";
-            this.Size = new System.Drawing.Size(597, 459);
-            this.pnlupdatebar.ResumeLayout(false);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Label lbupdatetitle;
-        private System.Windows.Forms.Panel pnlupdatebar;
-        private Controls.ShiftedProgressBar pgdownload;
-        private System.Windows.Forms.Button btnaction;
-        private System.Windows.Forms.Button btnclose;
-        private System.Windows.Forms.WebBrowser wbstatus;
-    }
-}
diff --git a/ShiftOS.WinForms/Applications/VideoPlayer.Designer.cs b/ShiftOS.WinForms/Applications/VideoPlayer.Designer.cs
deleted file mode 100644
index d915c31..0000000
--- a/ShiftOS.WinForms/Applications/VideoPlayer.Designer.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-namespace ShiftOS.WinForms.Applications
-{
-    partial class VideoPlayer
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(VideoPlayer));
-            this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer();
-            this.flcontrols = new System.Windows.Forms.FlowLayoutPanel();
-            this.btnplay = new System.Windows.Forms.Button();
-            this.pgplaytime = new ShiftOS.WinForms.Controls.ShiftedProgressBar();
-            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
-            this.addSongToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.wpaudio = new AxWMPLib.AxWindowsMediaPlayer();
-            this.toolStripContainer1.ContentPanel.SuspendLayout();
-            this.toolStripContainer1.TopToolStripPanel.SuspendLayout();
-            this.toolStripContainer1.SuspendLayout();
-            this.flcontrols.SuspendLayout();
-            this.menuStrip1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.wpaudio)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // toolStripContainer1
-            // 
-            // 
-            // toolStripContainer1.ContentPanel
-            // 
-            this.toolStripContainer1.ContentPanel.Controls.Add(this.wpaudio);
-            this.toolStripContainer1.ContentPanel.Controls.Add(this.flcontrols);
-            this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(805, 402);
-            this.toolStripContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.toolStripContainer1.LeftToolStripPanelVisible = false;
-            this.toolStripContainer1.Location = new System.Drawing.Point(0, 0);
-            this.toolStripContainer1.Name = "toolStripContainer1";
-            this.toolStripContainer1.RightToolStripPanelVisible = false;
-            this.toolStripContainer1.Size = new System.Drawing.Size(805, 426);
-            this.toolStripContainer1.TabIndex = 3;
-            this.toolStripContainer1.Text = "toolStripContainer1";
-            // 
-            // toolStripContainer1.TopToolStripPanel
-            // 
-            this.toolStripContainer1.TopToolStripPanel.Controls.Add(this.menuStrip1);
-            // 
-            // flcontrols
-            // 
-            this.flcontrols.AutoSize = true;
-            this.flcontrols.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.flcontrols.Controls.Add(this.btnplay);
-            this.flcontrols.Controls.Add(this.pgplaytime);
-            this.flcontrols.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.flcontrols.Location = new System.Drawing.Point(0, 373);
-            this.flcontrols.Name = "flcontrols";
-            this.flcontrols.Size = new System.Drawing.Size(805, 29);
-            this.flcontrols.TabIndex = 0;
-            // 
-            // btnplay
-            // 
-            this.btnplay.AutoSize = true;
-            this.btnplay.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnplay.Location = new System.Drawing.Point(3, 3);
-            this.btnplay.Name = "btnplay";
-            this.btnplay.Size = new System.Drawing.Size(37, 23);
-            this.btnplay.TabIndex = 0;
-            this.btnplay.Text = "Play";
-            this.btnplay.UseVisualStyleBackColor = true;
-            this.btnplay.Click += new System.EventHandler(this.btnplay_Click);
-            // 
-            // pgplaytime
-            // 
-            this.pgplaytime.BlockSize = 5;
-            this.pgplaytime.Location = new System.Drawing.Point(46, 3);
-            this.pgplaytime.Maximum = 100;
-            this.pgplaytime.Name = "pgplaytime";
-            this.pgplaytime.Size = new System.Drawing.Size(749, 23);
-            this.pgplaytime.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
-            this.pgplaytime.TabIndex = 1;
-            this.pgplaytime.Tag = "keepbg";
-            this.pgplaytime.Text = "shiftedProgressBar1";
-            this.pgplaytime.Value = 0;
-            this.pgplaytime.MouseDown += new System.Windows.Forms.MouseEventHandler(this.startScrub);
-            this.pgplaytime.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pgplaytime_MouseMove);
-            this.pgplaytime.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pgplaytime_MouseUp);
-            // 
-            // menuStrip1
-            // 
-            this.menuStrip1.Dock = System.Windows.Forms.DockStyle.None;
-            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.addSongToolStripMenuItem});
-            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
-            this.menuStrip1.Name = "menuStrip1";
-            this.menuStrip1.Size = new System.Drawing.Size(805, 24);
-            this.menuStrip1.TabIndex = 0;
-            this.menuStrip1.Text = "menuStrip1";
-            // 
-            // addSongToolStripMenuItem
-            // 
-            this.addSongToolStripMenuItem.Name = "addSongToolStripMenuItem";
-            this.addSongToolStripMenuItem.Size = new System.Drawing.Size(81, 20);
-            this.addSongToolStripMenuItem.Text = "Open Video";
-            this.addSongToolStripMenuItem.Click += new System.EventHandler(this.addSongToolStripMenuItem_Click);
-            // 
-            // wpaudio
-            // 
-            this.wpaudio.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.wpaudio.Enabled = true;
-            this.wpaudio.Location = new System.Drawing.Point(0, 0);
-            this.wpaudio.Name = "wpaudio";
-            this.wpaudio.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("wpaudio.OcxState")));
-            this.wpaudio.Size = new System.Drawing.Size(805, 373);
-            this.wpaudio.TabIndex = 2;
-            this.wpaudio.Visible = false;
-            // 
-            // VideoPlayer
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.toolStripContainer1);
-            this.Name = "VideoPlayer";
-            this.Size = new System.Drawing.Size(805, 426);
-            this.toolStripContainer1.ContentPanel.ResumeLayout(false);
-            this.toolStripContainer1.ContentPanel.PerformLayout();
-            this.toolStripContainer1.TopToolStripPanel.ResumeLayout(false);
-            this.toolStripContainer1.TopToolStripPanel.PerformLayout();
-            this.toolStripContainer1.ResumeLayout(false);
-            this.toolStripContainer1.PerformLayout();
-            this.flcontrols.ResumeLayout(false);
-            this.flcontrols.PerformLayout();
-            this.menuStrip1.ResumeLayout(false);
-            this.menuStrip1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.wpaudio)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-        private System.Windows.Forms.ToolStripContainer toolStripContainer1;
-        private System.Windows.Forms.FlowLayoutPanel flcontrols;
-        private System.Windows.Forms.Button btnplay;
-        private Controls.ShiftedProgressBar pgplaytime;
-        private System.Windows.Forms.MenuStrip menuStrip1;
-        private System.Windows.Forms.ToolStripMenuItem addSongToolStripMenuItem;
-        private AxWMPLib.AxWindowsMediaPlayer wpaudio;
-    }
-}