diff options
Diffstat (limited to 'Histacom2')
| -rw-r--r-- | Histacom2/GlobalPrograms/WinClassicCalculator.cs | 18 | ||||
| -rw-r--r-- | Histacom2/GlobalPrograms/WinClassicDownloader.Designer.cs | 4 | ||||
| -rw-r--r-- | Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs | 4 |
3 files changed, 7 insertions, 19 deletions
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; |