Merge remote-tracking branch 'refs/remotes/shiftos-game/master'

2 files changed, 236 insertions, 32 deletions

diff --git a/ShiftOS.WinForms/Controls/ShiftedProgressBar.cs b/ShiftOS.WinForms/Controls/ShiftedProgressBar.cs
index e5a2c33..c5a6d05 100644
--- a/ShiftOS.WinForms/Controls/ShiftedProgressBar.cs
+++ b/ShiftOS.WinForms/Controls/ShiftedProgressBar.cs
@@ -31,6 +31,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using ShiftOS.Engine;
 
 namespace ShiftOS.WinForms.Controls
 {
@@ -46,7 +47,7 @@ namespace ShiftOS.WinForms.Controls
             t.Interval = 100;
             t.Tick += (o, a) =>
             {
-                if(this._style == ProgressBarStyle.Marquee)
+                if(this.Style == ProgressBarStyle.Marquee)
                 {
                     if(_marqueePos >= this.Width)
                     {
@@ -89,47 +90,115 @@ namespace ShiftOS.WinForms.Controls
             }
         }
 
-        public ProgressBarStyle _style = ProgressBarStyle.Continuous;
-
         public ProgressBarStyle Style
         {
-            get { return _style; }
-            set { _style = value; this.Refresh(); }
+            get
+            {
+                return SkinEngine.LoadedSkin.ProgressBarStyle;
+            }
         }
 
-        private int _blocksize = 5;
-
         public int BlockSize
         {
-            get { return _blocksize; }
-            set
+            get
             {
-                _blocksize = value;
-                this.Refresh();
+                return SkinEngine.LoadedSkin.ProgressBarBlockSize;
+            }
+        }
+
+        public Color RealBackColor
+        {
+            get
+            {
+                return SkinEngine.LoadedSkin.ProgressBarBackgroundColor;
+            }
+        }
+
+        public Image RealBackgroundImage
+        {
+            get
+            {
+                return SkinEngine.GetImage("progressbarbg");
+            }
+        }
+
+        public Image ProgressImage
+        {
+            get
+            {
+                return SkinEngine.GetImage("progress");
+            }
+        }
+
+        public Color ProgressColor
+        {
+            get
+            {
+                return SkinEngine.LoadedSkin.ProgressColor;
             }
         }
 
         protected override void OnPaint(PaintEventArgs pe)
         {
-            pe.Graphics.Clear(Color.Black);
-            switch (_style)
+            try
             {
-                case ProgressBarStyle.Continuous:
-                    double width = linear(this.Value, 0, this.Maximum, 0, this.Width);
-                    pe.Graphics.FillRectangle(new SolidBrush(Color.Green), new RectangleF(0, 0, (float)width, this.Height));
-                    break;
-                case ProgressBarStyle.Blocks:
-                    int block_count = this.Width / (this._blocksize + 2);
-                    int blocks = (int)linear(this.Value, 0, this.Maximum, 0, block_count);
-                    for(int i = 0; i < blocks - 1; i++)
-                    {
-                        int position = i * (_blocksize + 2);
-                        pe.Graphics.FillRectangle(new SolidBrush(Color.Green), new Rectangle(position, 0, _blocksize, this.Height));
-                    }
-                    break;
-                case ProgressBarStyle.Marquee:
-                    pe.Graphics.FillRectangle(new SolidBrush(Color.Green), new Rectangle(_marqueePos, 0, this.Width / 4, this.Height));
-                    break;
+                pe.Graphics.Clear(this.RealBackColor);
+                if (RealBackgroundImage != null)
+                {
+                    pe.Graphics.FillRectangle(new TextureBrush(RealBackgroundImage), new Rectangle(0, 0, this.Width, this.Height));
+                }
+                switch (Style)
+                {
+                    case ProgressBarStyle.Continuous:
+                        double width = linear(this.Value, 0, this.Maximum, 0, this.Width);
+                        if (ProgressImage != null)
+                        {
+                            pe.Graphics.FillRectangle(new TextureBrush(ProgressImage), new RectangleF(0, 0, (float)width, this.Height));
+                        }
+                        else
+                        {
+                            pe.Graphics.FillRectangle(new SolidBrush(ProgressColor), new RectangleF(0, 0, (float)width, this.Height));
+                        }
+                        break;
+                    case ProgressBarStyle.Blocks:
+                        int block_count = this.Width / (this.BlockSize + 2);
+                        int blocks = (int)linear(this.Value, 0, this.Maximum, 0, block_count);
+                        for (int i = 0; i < blocks - 1; i++)
+                        {
+                            int position = i * (BlockSize + 2);
+                            if (ProgressImage != null)
+                            {
+                                pe.Graphics.FillRectangle(new TextureBrush(ProgressImage), new Rectangle(position, 0, BlockSize, this.Height));
+
+                            }
+                            else
+                            {
+                                pe.Graphics.FillRectangle(new SolidBrush(ProgressColor), new Rectangle(position, 0, BlockSize, this.Height));
+                            }
+                        }
+                        break;
+                    case ProgressBarStyle.Marquee:
+                        if (ProgressImage != null)
+                        {
+                            pe.Graphics.FillRectangle(new TextureBrush(ProgressImage), new Rectangle(_marqueePos, 0, this.Width / 4, this.Height));
+                        }
+                        else
+                        {
+                            pe.Graphics.FillRectangle(new SolidBrush(ProgressColor), new Rectangle(_marqueePos, 0, this.Width / 4, this.Height));
+                        }
+                        break;
+                }
+            }
+            catch
+            {
+                pe.Graphics.Clear(Color.Black);
+                string text = "Preview mode. This control can't be drawn without an initiated ShiftOS engine.";
+                SizeF sz = pe.Graphics.MeasureString(text, this.Font);
+                PointF loc = new PointF(
+                        (this.Width - sz.Width) / 2,
+                        (this.Height - sz.Height) / 2
+                    );
+                pe.Graphics.DrawString(text, Font, new SolidBrush(Color.White), loc);
             }
         }
 
diff --git a/ShiftOS.WinForms/Controls/TerminalBox.cs b/ShiftOS.WinForms/Controls/TerminalBox.cs
index cdb0965..c188321 100644
--- a/ShiftOS.WinForms/Controls/TerminalBox.cs
+++ b/ShiftOS.WinForms/Controls/TerminalBox.cs
@@ -64,9 +64,9 @@ namespace ShiftOS.WinForms.Controls
         public void Write(string text)
         {
             this.HideSelection = true;
-            this.SelectionFont = ConstructFont();
             this.SelectionColor = ControlManager.ConvertColor(ConsoleEx.ForegroundColor);
             this.SelectionBackColor = ControlManager.ConvertColor(ConsoleEx.BackgroundColor);
+            this.SelectionFont = ConstructFont();
             this.AppendText(Localization.Parse(text));
             this.HideSelection = false;
         }
@@ -86,17 +86,20 @@ namespace ShiftOS.WinForms.Controls
 
         public void WriteLine(string text)
         {
+            Engine.AudioManager.PlayStream(Properties.Resources.writesound);
             this.HideSelection = true;
-            this.Select(this.TextLength, 0);
-            this.SelectionFont = ConstructFont();
             this.SelectionColor = ControlManager.ConvertColor(ConsoleEx.ForegroundColor);
             this.SelectionBackColor = ControlManager.ConvertColor(ConsoleEx.BackgroundColor);
+            this.SelectionFont = ConstructFont();
+            this.Select(this.TextLength, 0);
             this.AppendText(Localization.Parse(text) + Environment.NewLine);
             this.HideSelection = false;
         }
 
         bool quickCopying = false;
 
+        bool busy = false;
+
         protected override void OnMouseDown(MouseEventArgs e)
         {
             //if right-clicking, then we initiate a quick-copy.
@@ -119,8 +122,140 @@ namespace ShiftOS.WinForms.Controls
             base.OnMouseUp(mevent);
         }
 
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+            if (!TerminalBackend.InStory)
+            {
+                switch (e.KeyCode) {
+                    case Keys.Add:
+                    case Keys.Alt:
+                    case Keys.Apps:
+                    case Keys.Attn:
+                    case Keys.BrowserBack:
+                    case Keys.BrowserFavorites:
+                    case Keys.BrowserForward:
+                    case Keys.BrowserHome:
+                    case Keys.BrowserRefresh:
+                    case Keys.BrowserSearch:
+                    case Keys.BrowserStop:
+                    case Keys.Cancel:
+                    case Keys.Capital:
+                    case Keys.Clear:
+                    case Keys.Control:
+                    case Keys.ControlKey:
+                    case Keys.Crsel:
+                    case Keys.Decimal:
+                    case Keys.Divide:
+                    case Keys.Down:
+                    case Keys.End:
+                    case Keys.Enter:
+                    case Keys.EraseEof:
+                    case Keys.Escape:
+                    case Keys.Execute:
+                    case Keys.Exsel:
+                    case Keys.F1:
+                    case Keys.F10:
+                    case Keys.F11:
+                    case Keys.F12:
+                    case Keys.F13:
+                    case Keys.F14:
+                    case Keys.F15:
+                    case Keys.F16:
+                    case Keys.F17:
+                    case Keys.F18:
+                    case Keys.F19:
+                    case Keys.F2:
+                    case Keys.F20:
+                    case Keys.F21:
+                    case Keys.F22:
+                    case Keys.F23:
+                    case Keys.F24:
+                    case Keys.F3:
+                    case Keys.F4:
+                    case Keys.F5:
+                    case Keys.F6:
+                    case Keys.F7:
+                    case Keys.F8:
+                    case Keys.F9:
+                    case Keys.FinalMode:
+                    case Keys.HanguelMode:
+                    case Keys.HanjaMode:
+                    case Keys.Help:
+                    case Keys.Home:
+                    case Keys.IMEAccept:
+                    case Keys.IMEConvert:
+                    case Keys.IMEModeChange:
+                    case Keys.IMENonconvert:
+                    case Keys.Insert:
+                    case Keys.JunjaMode:
+                    case Keys.KeyCode:
+                    case Keys.LaunchApplication1:
+                    case Keys.LaunchApplication2:
+                    case Keys.LaunchMail:
+                    case Keys.LButton:
+                    case Keys.LControlKey:
+                    case Keys.Left:
+                    case Keys.LineFeed:
+                    case Keys.LMenu:
+                    case Keys.LShiftKey:
+                    case Keys.LWin:
+                    case Keys.MButton:
+                    case Keys.MediaNextTrack:
+                    case Keys.MediaPlayPause:
+                    case Keys.MediaPreviousTrack:
+                    case Keys.MediaStop:
+                    case Keys.Menu:
+                    case Keys.Modifiers:
+                    case Keys.Multiply:
+                    case Keys.Next:
+                    case Keys.NoName:
+                    case Keys.None:
+                    case Keys.NumLock:
+                    case Keys.Pa1:
+                    case Keys.Packet:
+                    case Keys.PageUp:
+                    case Keys.Pause:
+                    case Keys.Play:
+                    case Keys.Print:
+                    case Keys.PrintScreen:
+                    case Keys.ProcessKey:
+                    case Keys.RButton:
+                    case Keys.RControlKey:
+                    case Keys.Right:
+                    case Keys.RMenu:
+                    case Keys.RShiftKey:
+                    case Keys.RWin:
+                    case Keys.Scroll:
+                    case Keys.Select:
+                    case Keys.SelectMedia:
+                    case Keys.Separator:
+                    case Keys.Shift:
+                    case Keys.ShiftKey:
+                    case Keys.Sleep:
+                    case Keys.Subtract:
+                    case Keys.Tab:
+                    case Keys.Up:
+                    case Keys.VolumeDown:
+                    case Keys.VolumeMute:
+                    case Keys.VolumeUp:
+                    case Keys.XButton1:
+                    case Keys.XButton2:
+                    case Keys.Zoom:
+
+                        break;
+                    default:
+                        //Engine.AudioManager.PlayStream(Properties.Resources.typesound); // infernal beeping noise only enable for the trailers
+                        break;
+            }
+        }
+        }
+
+        public string ThreadId = "";
+
         public TerminalBox() : base()
         {
+            ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
             this.Tag = "keepbg keepfg keepfont";
         }
     }