diff options
| author | FloppyDiskDrive <[email protected]> | 2017-09-13 19:07:23 -0500 |
|---|---|---|
| committer | FloppyDiskDrive <[email protected]> | 2017-09-13 19:07:23 -0500 |
| commit | efc8583dad8c9b22172cdb74e156df4803cfeadd (patch) | |
| tree | 23cbe04f662e649d3fe28bf7c120d826ae51788f /Histacom2/OS/Win95/Win95Apps | |
| parent | 282cdbca58ef7b4c3decaa942ad20333e3c15cfd (diff) | |
| parent | ca482366718339b0684f64980dc67587222b4850 (diff) | |
| download | histacom2-efc8583dad8c9b22172cdb74e156df4803cfeadd.tar.gz histacom2-efc8583dad8c9b22172cdb74e156df4803cfeadd.tar.bz2 histacom2-efc8583dad8c9b22172cdb74e156df4803cfeadd.zip | |
Merge remote-tracking branch 'refs/remotes/Histacom2-Devs/master'
Diffstat (limited to 'Histacom2/OS/Win95/Win95Apps')
| -rw-r--r-- | Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs | 4 | ||||
| -rw-r--r-- | Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs | 3 |
2 files changed, 2 insertions, 5 deletions
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; diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs index f22ee89..2529e10 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs @@ -77,19 +77,16 @@ namespace Histacom2.OS.Win95.Win95Apps case "Default": SaveSystem.CurrentSave.ThemeName = "default95"; SaveSystem.currentTheme = new Default95Theme(); - TitleScreen.frm95.BackgroundImage = null; TitleScreen.frm95.desktopicons.BackgroundImage = null; break; case "Dangerous Creatures": SaveSystem.CurrentSave.ThemeName = "dangeranimals"; SaveSystem.currentTheme = new DangerousCreaturesTheme(); - TitleScreen.frm95.BackgroundImage = Properties.Resources.DCTheme_BG; TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.DCTheme_BG, TitleScreen.frm95.Width, TitleScreen.frm95.Height); break; case "Inside Your Computer": SaveSystem.CurrentSave.ThemeName = "insidepc"; SaveSystem.currentTheme = new InsideComputerTheme(); - TitleScreen.frm95.BackgroundImage = Properties.Resources.ICTheme_BG; TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.ICTheme_BG, TitleScreen.frm95.Width, TitleScreen.frm95.Height); break; } |