Merge branch 'master' of https://github.com/Histacom2-Devs/Histacom2

1 files changed, 13 insertions, 3 deletions

diff --git a/Histacom2.Engine/Template/Infobox95.cs b/Histacom2.Engine/Template/Infobox95.cs
index f0ed0db..6408177 100644
--- a/Histacom2.Engine/Template/Infobox95.cs
+++ b/Histacom2.Engine/Template/Infobox95.cs
@@ -13,9 +13,8 @@ namespace Histacom2.Engine.Template
         public Infobox95(InfoboxType type, InfoboxButtons btns)
         {
             InitializeComponent();
-            button1.Paint += (sender, args) => Paintbrush.PaintClassicBorders(sender, args, 2);
-            button2.Paint += (sender, args) => Paintbrush.PaintClassicBorders(sender, args, 2);
-            button3.Paint += (sender, args) => Paintbrush.PaintClassicBorders(sender, args, 2);
+            this.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
+            this.programContent.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
 
             switch (type)
             {
@@ -23,21 +22,26 @@ namespace Histacom2.Engine.Template
                     pictureBox1.Image = Properties.Resources.Win95Info;
                     SoundPlayer spa = new SoundPlayer(SaveSystem.currentTheme.asteriskSound);
                     spa.Play();
+                    spa.Stream.Position = 0;
+
                     break;
                 case InfoboxType.Question:
                     pictureBox1.Image = Properties.Resources.Win95Question;
                     SoundPlayer spq = new SoundPlayer(SaveSystem.currentTheme.questionSound);
                     spq.Play();
+                    spq.Stream.Position = 0;
                     break;
                 case InfoboxType.Warning:
                     pictureBox1.Image = Properties.Resources.Win95Warning;
                     SoundPlayer spw = new SoundPlayer(SaveSystem.currentTheme.exclamationSound);
                     spw.Play();
+                    spw.Stream.Position = 0;
                     break;
                 case InfoboxType.Error:
                     pictureBox1.Image = Properties.Resources.Win95Error;
                     SoundPlayer spe = new SoundPlayer(SaveSystem.currentTheme.critStopSound);
                     spe.Play();
+                    spe.Stream.Position = 0;
                     break;
             }
 
@@ -66,6 +70,12 @@ namespace Histacom2.Engine.Template
         {
             if (btnStatus == 0) this.ParentForm.Close();
         }
+
+        private void programContent_Paint(object sender, PaintEventArgs e)
+        {
+            this.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
+            this.programContent.BackColor = SaveSystem.currentTheme.threeDObjectsColor;
+        }
     }
 
     public enum InfoboxType