aboutsummaryrefslogtreecommitdiff
path: root/Histacom2/OS/Win95
diff options
context:
space:
mode:
authorlempamo <[email protected]>2017-10-23 21:14:20 -0500
committerGitHub <[email protected]>2017-10-23 21:14:20 -0500
commitaff052b475abc5d4035369a85fa471f62cad021b (patch)
tree70ccdd91154536e8f50828569f9faa3d61c70748 /Histacom2/OS/Win95
parent680e4930a893fc144a169d267878eb9407dd656f (diff)
parentf6da3b0cfd6c63c5d1d07df8b7e41f499de645fa (diff)
downloadhistacom2-aff052b475abc5d4035369a85fa471f62cad021b.tar.gz
histacom2-aff052b475abc5d4035369a85fa471f62cad021b.tar.bz2
histacom2-aff052b475abc5d4035369a85fa471f62cad021b.zip
Merge pull request #167 from jtsshieh/master
Added Welcome Screen and fixed another theme bug
Diffstat (limited to 'Histacom2/OS/Win95')
-rw-r--r--Histacom2/OS/Win95/Win95.cs2
-rw-r--r--Histacom2/OS/Win95/Win95Apps/Win95Welcome.Designer.cs (renamed from Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs)2
-rw-r--r--Histacom2/OS/Win95/Win95Apps/Win95Welcome.cs (renamed from Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs)4
-rw-r--r--Histacom2/OS/Win95/Win95Apps/Win95Welcome.resx (renamed from Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.resx)0
4 files changed, 4 insertions, 4 deletions
diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs
index 38129ab..e330ea0 100644
--- a/Histacom2/OS/Win95/Win95.cs
+++ b/Histacom2/OS/Win95/Win95.cs
@@ -118,7 +118,7 @@ namespace Histacom2.OS.Win95
{
CurrentSave.FTime95 = true;
SaveGame();
- welcome = wm.Init(new WinClassicWelcome(), "Welcome", null, false, false, resize: false);
+ welcome = wm.Init(new Win95Welcome(), "Welcome", null, false, false, resize: false);
AddTaskBarItem(welcome, welcome.Tag.ToString(), "Welcome", null);
nonimportantapps.Add(welcome);
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs b/Histacom2/OS/Win95/Win95Apps/Win95Welcome.Designer.cs
index 8c1f84a..d9110f7 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Win95Welcome.Designer.cs
@@ -1,6 +1,6 @@
namespace Histacom2.OS.Win95.Win95Apps
{
- partial class WinClassicWelcome
+ partial class Win95Welcome
{
/// <summary>
/// Required designer variable.
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs b/Histacom2/OS/Win95/Win95Apps/Win95Welcome.cs
index 6ec79a4..9b7280b 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Win95Welcome.cs
@@ -10,9 +10,9 @@ using System.Windows.Forms;
namespace Histacom2.OS.Win95.Win95Apps
{
- public partial class WinClassicWelcome : UserControl
+ public partial class Win95Welcome : UserControl
{
- public WinClassicWelcome()
+ public Win95Welcome()
{
InitializeComponent();
}
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.resx b/Histacom2/OS/Win95/Win95Apps/Win95Welcome.resx
index 1af7de1..1af7de1 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.resx
+++ b/Histacom2/OS/Win95/Win95Apps/Win95Welcome.resx