fixed the calc buttons font and a namespace issue

6 files changed, 11 insertions, 31 deletions

diff --git a/Histacom2.Engine/Histacom2.Engine.csproj b/Histacom2.Engine/Histacom2.Engine.csproj
index 050ad0c..889c071 100644
--- a/Histacom2.Engine/Histacom2.Engine.csproj
+++ b/Histacom2.Engine/Histacom2.Engine.csproj
@@ -15,7 +15,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
+    <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
diff --git a/Histacom2.Engine/UI/ClassicButton.cs b/Histacom2.Engine/UI/ClassicButton.cs
index 26dbd26..9b1db72 100644
--- a/Histacom2.Engine/UI/ClassicButton.cs
+++ b/Histacom2.Engine/UI/ClassicButton.cs
@@ -28,25 +28,17 @@ namespace Histacom2.Engine.UI
             }
         }
 
-        public bool AdaptForeColorWithTheme { get; set; }
-        public bool AdaptFontWithTheme { get; set; }
+        public bool AdaptForeColorWithTheme = true;
+        public bool AdaptFontWithTheme = true;
 
         public ClassicButton() : base()
         {
-            AdaptForeColorWithTheme = true;
-            AdaptFontWithTheme = true;
 
             if (SaveSystem.currentTheme != null) BackColor = SaveSystem.currentTheme.threeDObjectsColor;
             else BackColor = Color.Silver;
             _lightBack = ControlPaint.Light(BackColor, 50);
             _darkBack = ControlPaint.Dark(BackColor, 50);
 
-            if (SaveSystem.currentTheme != null) ForeColor = SaveSystem.currentTheme.threeDObjectsTextColor;
-            else ForeColor = Color.Black;
-
-            if (SaveSystem.currentTheme != null) Font = SaveSystem.currentTheme.buttonFont;
-            else Font = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular);
-
             MouseDown += (s, e) => { _pressing = true; Invalidate(); };
             MouseUp += (s, e) => { _pressing = false; Invalidate(); };
             Invalidate();
diff --git a/Histacom2.Engine/UI/IProgressBar.cs b/Histacom2.Engine/UI/IProgressBar.cs
index 071da18..2cd916d 100644
--- a/Histacom2.Engine/UI/IProgressBar.cs
+++ b/Histacom2.Engine/UI/IProgressBar.cs
@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace Histacom2.UI
+namespace Histacom2.Engine.UI
 {
     public class ProgressBar : Control
     {
diff --git a/Histacom2/GlobalPrograms/WinClassicCalculator.cs b/Histacom2/GlobalPrograms/WinClassicCalculator.cs
index 7f04e85..2fecae8 100644
--- a/Histacom2/GlobalPrograms/WinClassicCalculator.cs
+++ b/Histacom2/GlobalPrograms/WinClassicCalculator.cs
@@ -19,18 +19,6 @@ namespace Histacom2.OS.Win95.Win95Apps
         public WinClassicCalculator()
         {
             InitializeComponent();
-            foreach (Control c in Controls)
-            {
-                if (c is Button)
-                {
-                    c.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0)));
-                    c.Paint += (sender, args) => Paintbrush.PaintClassicBorders(sender, args, 2);
-                }
-                else
-                {
-                    c.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
-                }
-            }
             txtNumbers.Paint += (sender, args) => Paintbrush.PaintClassicBordersIndented(sender, args, 2);
         }
         private void number_click(object sender, EventArgs e)
@@ -40,7 +28,7 @@ namespace Histacom2.OS.Win95.Win95Apps
              if ((txtNumbers.Text == "0") || (operation_pressed))
                 txtNumbers.Text = "";
             operation_pressed = false;
-            Button num = (Button)sender;
+            Engine.UI.ClassicButton num = (Engine.UI.ClassicButton)sender;
             if (num.Text == ".")
             {
                 if (!txtNumbers.Text.Contains("."))
@@ -77,7 +65,7 @@ namespace Histacom2.OS.Win95.Win95Apps
 
         private void arithmitic_click(object sender, EventArgs e)
         {
-            Button num = (Button)sender;
+            Engine.UI.ClassicButton num = (Engine.UI.ClassicButton)sender;
             if (txtNumbers.Text.Contains("∞"))
                 txtNumbers.Clear();
             if (prevnum != 0)
@@ -135,7 +123,7 @@ namespace Histacom2.OS.Win95.Win95Apps
                     txtNumbers.Text = (prevnum / double.Parse(txtNumbers.Text)).ToString();
                     break;
             }
-            prevnum = Int32.Parse(txtNumbers.Text);
+            prevnum = int.Parse(txtNumbers.Text);
             operation = "";
         }
 
diff --git a/Histacom2/GlobalPrograms/WinClassicDownloader.Designer.cs b/Histacom2/GlobalPrograms/WinClassicDownloader.Designer.cs
index d62f676..78fb92b 100644
--- a/Histacom2/GlobalPrograms/WinClassicDownloader.Designer.cs
+++ b/Histacom2/GlobalPrograms/WinClassicDownloader.Designer.cs
@@ -36,7 +36,7 @@
             this.dlTimer = new System.Windows.Forms.Timer(this.components);
             this.dlSpeed = new System.Windows.Forms.Timer(this.components);
             this.progBar = new System.Windows.Forms.ProgressBar();
-            this.progressBar1 = new Histacom2.UI.ProgressBar();
+            this.progressBar1 = new Histacom2.Engine.UI.ProgressBar();
             this.SuspendLayout();
             // 
             // amountLbl
@@ -139,6 +139,6 @@
         private System.Windows.Forms.Timer dlTimer;
         private System.Windows.Forms.Timer dlSpeed;
         private System.Windows.Forms.ProgressBar progBar;
-        private UI.ProgressBar progressBar1;
+        private Engine.UI.ProgressBar progressBar1;
     }
 }
diff --git a/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs b/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs
index e53ceb3..20a51c7 100644
--- a/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs
@@ -48,7 +48,7 @@
             this.label6 = new System.Windows.Forms.Label();
             this.panel4 = new System.Windows.Forms.Panel();
             this.label7 = new System.Windows.Forms.Label();
-            this.progressBar1 = new Histacom2.UI.ProgressBar();
+            this.progressBar1 = new Histacom2.Engine.UI.ProgressBar();
             ((System.ComponentModel.ISupportInitialize)(this.installPic)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.panel1.SuspendLayout();
@@ -317,7 +317,7 @@
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.Panel panel3;
-        private UI.ProgressBar progressBar1;
+        private Engine.UI.ProgressBar progressBar1;
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.Panel panel4;
         private System.Windows.Forms.Label label7;