aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtsshieh <[email protected]>2017-10-22 22:11:46 -0400
committerjtsshieh <[email protected]>2017-10-22 22:11:46 -0400
commit4ab4aa2f2d91eb117bdd54bc42bb2091f2f380fb (patch)
treed87851f5ec52e6e35d105eb95017ae087857a1a5
parent7505e8439ee04d6d3556c91e4491ce15a88148e5 (diff)
downloadhistacom2-4ab4aa2f2d91eb117bdd54bc42bb2091f2f380fb.tar.gz
histacom2-4ab4aa2f2d91eb117bdd54bc42bb2091f2f380fb.tar.bz2
histacom2-4ab4aa2f2d91eb117bdd54bc42bb2091f2f380fb.zip
added first combobox validation
-rw-r--r--Histacom2.Engine/Theme.cs2
-rw-r--r--Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs33
-rw-r--r--Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs31
3 files changed, 64 insertions, 2 deletions
diff --git a/Histacom2.Engine/Theme.cs b/Histacom2.Engine/Theme.cs
index abc5bff..defe419 100644
--- a/Histacom2.Engine/Theme.cs
+++ b/Histacom2.Engine/Theme.cs
@@ -473,7 +473,7 @@ namespace Histacom2.Engine
{
public MoreWin()
{
- defaultWallpaper = Properties.Resources.Win95PlusMoreWinWallpaper;
+ defaultWallpaper = Properties.Resources.Win95PlusMoreWin;
themeName = "MoreWin";
}
}
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs
index 6b92d11..5caf02f 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs
@@ -53,8 +53,18 @@
this.comboBox1.FormattingEnabled = true;
this.comboBox1.Items.AddRange(new object[] {
"Default",
+ "Windows 95 Default Plus",
"Dangerous Creatures",
- "Inside Your Computer"});
+ "Inside Your Computer",
+ "Leonardo da Vinci",
+ "More Windows",
+ "Mystery",
+ "Nature",
+ "Science",
+ "Sports",
+ "The 60\'s USA",
+ "The Golden Era",
+ "Travel"});
this.comboBox1.Location = new System.Drawing.Point(15, 201);
this.comboBox1.Name = "comboBox1";
this.comboBox1.Size = new System.Drawing.Size(269, 21);
@@ -73,6 +83,13 @@
//
// applyButton
//
+ this.applyButton.AdaptBackColorWithTheme = true;
+ this.applyButton.AdaptFontWithTheme = true;
+ this.applyButton.AdaptForeColorWithTheme = true;
+ this.applyButton.BackColor = System.Drawing.Color.Silver;
+ this.applyButton.DialogResult = System.Windows.Forms.DialogResult.None;
+ this.applyButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+ this.applyButton.ForeColor = System.Drawing.Color.Black;
this.applyButton.Location = new System.Drawing.Point(209, 245);
this.applyButton.Name = "applyButton";
this.applyButton.Size = new System.Drawing.Size(75, 23);
@@ -82,6 +99,13 @@
//
// cancelButton
//
+ this.cancelButton.AdaptBackColorWithTheme = true;
+ this.cancelButton.AdaptFontWithTheme = true;
+ this.cancelButton.AdaptForeColorWithTheme = true;
+ this.cancelButton.BackColor = System.Drawing.Color.Silver;
+ this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.None;
+ this.cancelButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+ this.cancelButton.ForeColor = System.Drawing.Color.Black;
this.cancelButton.Location = new System.Drawing.Point(128, 245);
this.cancelButton.Name = "cancelButton";
this.cancelButton.Size = new System.Drawing.Size(75, 23);
@@ -91,6 +115,13 @@
//
// okButton
//
+ this.okButton.AdaptBackColorWithTheme = true;
+ this.okButton.AdaptFontWithTheme = true;
+ this.okButton.AdaptForeColorWithTheme = true;
+ this.okButton.BackColor = System.Drawing.Color.Silver;
+ this.okButton.DialogResult = System.Windows.Forms.DialogResult.None;
+ this.okButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+ this.okButton.ForeColor = System.Drawing.Color.Black;
this.okButton.Location = new System.Drawing.Point(47, 245);
this.okButton.Name = "okButton";
this.okButton.Size = new System.Drawing.Size(75, 23);
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs
index 2529e10..5634000 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs
@@ -51,6 +51,37 @@ namespace Histacom2.OS.Win95.Win95Apps
case "insidepc":
comboBox1.SelectedItem = "Inside Your Computer";
break;
+ case "default95plus":
+ comboBox1.SelectedItem = "Windows 95 Default Plus";
+ break;
+ case "goldenera":
+ comboBox1.SelectedItem = "The Golden Era";
+ break;
+ case "Leo":
+ comboBox1.SelectedItem = "Leonardo da Vinci";
+ break;
+ case "Mystery":
+ comboBox1.SelectedItem = "Mystery";
+ break;
+ case "Nature":
+ comboBox1.SelectedItem = "Nature";
+ break;
+ case "Science":
+ comboBox1.SelectedItem = "Science";
+ break;
+ case "Sports":
+ comboBox1.SelectedItem = "Sports";
+ break;
+ case "The60":
+ comboBox1.SelectedItem = "The 60's USA";
+ break;
+ case "Travel":
+ comboBox1.SelectedItem = "Travel";
+ break;
+ case "MoreWin":
+ comboBox1.SelectedItem = "More Windows";
+ break;
+
}
}