aboutsummaryrefslogtreecommitdiff
path: root/Histacom2
diff options
context:
space:
mode:
Diffstat (limited to 'Histacom2')
-rw-r--r--Histacom2/OS/Win95/Win95.Designer.cs6
-rw-r--r--Histacom2/OS/Win95/Win95.resx2
-rw-r--r--Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs2
-rw-r--r--Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs40
-rw-r--r--Histacom2/OS/Win98/Win98.cs2
-rw-r--r--Histacom2/Resources/WinClassic/Win95SideBar.pngbin835 -> 843 bytes
6 files changed, 26 insertions, 26 deletions
diff --git a/Histacom2/OS/Win95/Win95.Designer.cs b/Histacom2/OS/Win95/Win95.Designer.cs
index 753dfd6..40f40ca 100644
--- a/Histacom2/OS/Win95/Win95.Designer.cs
+++ b/Histacom2/OS/Win95/Win95.Designer.cs
@@ -218,7 +218,7 @@ namespace Histacom2.OS.Win95
this.SuspendToolStripMenuItem,
this.ShutdownToolStripMenuItem});
this.startmenuitems.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow;
- this.startmenuitems.Location = new System.Drawing.Point(28, 2);
+ this.startmenuitems.Location = new System.Drawing.Point(26, 2);
this.startmenuitems.Margin = new System.Windows.Forms.Padding(0, 0, 5, 0);
this.startmenuitems.Name = "startmenuitems";
this.startmenuitems.Padding = new System.Windows.Forms.Padding(6, 2, 0, 0);
@@ -930,7 +930,7 @@ namespace Histacom2.OS.Win95
this.ossidestartmenu.Controls.Add(this.osimage);
this.ossidestartmenu.Location = new System.Drawing.Point(0, 0);
this.ossidestartmenu.Name = "ossidestartmenu";
- this.ossidestartmenu.Size = new System.Drawing.Size(26, 297);
+ this.ossidestartmenu.Size = new System.Drawing.Size(23, 297);
this.ossidestartmenu.TabIndex = 4;
//
// osimage
@@ -939,7 +939,7 @@ namespace Histacom2.OS.Win95
this.osimage.Image = global::Histacom2.Properties.Resources.Win95SideBar;
this.osimage.Location = new System.Drawing.Point(0, 0);
this.osimage.Name = "osimage";
- this.osimage.Size = new System.Drawing.Size(26, 297);
+ this.osimage.Size = new System.Drawing.Size(23, 297);
this.osimage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.osimage.TabIndex = 0;
this.osimage.TabStop = false;
diff --git a/Histacom2/OS/Win95/Win95.resx b/Histacom2/OS/Win95/Win95.resx
index 25103b3..419e624 100644
--- a/Histacom2/OS/Win95/Win95.resx
+++ b/Histacom2/OS/Win95/Win95.resx
@@ -374,7 +374,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACO
- hAAAAk1TRnQBSQFMAgEBDQEAATQBAgE0AQIBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
+ hAAAAk1TRnQBSQFMAgEBDQEAAUQBAgFEAQIBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
AwABgAMAAQEBAAEgBwABASQAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH//wChAAOAAf8DwAH/
A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/
diff --git a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs
index 1dc99da..76b9baf 100644
--- a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs
@@ -270,7 +270,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story
await Task.Delay(2000);
sp.Stop();
- SaveSystem.UpgradeFileSystem("95", "98");
+ SaveSystem.UpgradeFileSystem("98");
SaveSystem.CurrentSave.CurrentOS = "98";
SaveSystem.currentTheme = new Default98Theme();
SaveSystem.CurrentSave.ThemeName = "default98";
diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs
index 3269e83..c3b4ded 100644
--- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.Designer.cs
@@ -107,7 +107,7 @@
//
// MenuStrip1
//
- this.MenuStrip1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(208)))), ((int)(((byte)(200)))));
+ this.MenuStrip1.BackColor = System.Drawing.Color.Silver;
this.MenuStrip1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.MenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FileToolStripMenuItem,
@@ -128,7 +128,7 @@
this.RenameToolStripMenuItem,
this.CloseToolStripMenuItem});
this.FileToolStripMenuItem.Name = "FileToolStripMenuItem";
- this.FileToolStripMenuItem.Size = new System.Drawing.Size(40, 20);
+ this.FileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
this.FileToolStripMenuItem.Text = "File";
//
// CreateShortcutToolStripMenuItem
@@ -139,52 +139,52 @@
this.TextDocumentToolStripMenuItem,
this.BitmapImageToolStripMenuItem});
this.CreateShortcutToolStripMenuItem.Name = "CreateShortcutToolStripMenuItem";
- this.CreateShortcutToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
+ this.CreateShortcutToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
this.CreateShortcutToolStripMenuItem.Text = "New";
//
// FolderToolStripMenuItem
//
this.FolderToolStripMenuItem.Name = "FolderToolStripMenuItem";
- this.FolderToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
+ this.FolderToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
this.FolderToolStripMenuItem.Text = "Folder";
this.FolderToolStripMenuItem.Click += new System.EventHandler(this.FolderToolStripMenuItem_Click);
//
// ShortcutToolStripMenuItem
//
this.ShortcutToolStripMenuItem.Name = "ShortcutToolStripMenuItem";
- this.ShortcutToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
+ this.ShortcutToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
this.ShortcutToolStripMenuItem.Text = "Shortcut";
//
// TextDocumentToolStripMenuItem
//
this.TextDocumentToolStripMenuItem.Name = "TextDocumentToolStripMenuItem";
- this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
+ this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
this.TextDocumentToolStripMenuItem.Text = "Text Document";
//
// BitmapImageToolStripMenuItem
//
this.BitmapImageToolStripMenuItem.Name = "BitmapImageToolStripMenuItem";
- this.BitmapImageToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
+ this.BitmapImageToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
this.BitmapImageToolStripMenuItem.Text = "Bitmap Image";
//
// DeleteToolStripMenuItem
//
this.DeleteToolStripMenuItem.Name = "DeleteToolStripMenuItem";
- this.DeleteToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
+ this.DeleteToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
this.DeleteToolStripMenuItem.Text = "Delete";
this.DeleteToolStripMenuItem.Click += new System.EventHandler(this.DeleteToolStripMenuItem_Click);
//
// RenameToolStripMenuItem
//
this.RenameToolStripMenuItem.Name = "RenameToolStripMenuItem";
- this.RenameToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
+ this.RenameToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
this.RenameToolStripMenuItem.Text = "Rename";
this.RenameToolStripMenuItem.Click += new System.EventHandler(this.RenameToolStripMenuItem_Click);
//
// CloseToolStripMenuItem
//
this.CloseToolStripMenuItem.Name = "CloseToolStripMenuItem";
- this.CloseToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
+ this.CloseToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
this.CloseToolStripMenuItem.Text = "Close";
this.CloseToolStripMenuItem.Click += new System.EventHandler(this.CloseToolStripMenuItem_Click);
//
@@ -196,34 +196,34 @@
this.PasteToolStripMenuItem,
this.SellectAllCtrlAToolStripMenuItem});
this.EditToolStripMenuItem.Name = "EditToolStripMenuItem";
- this.EditToolStripMenuItem.Size = new System.Drawing.Size(43, 20);
+ this.EditToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
this.EditToolStripMenuItem.Text = "Edit";
//
// CutCtrlXToolStripMenuItem
//
this.CutCtrlXToolStripMenuItem.Name = "CutCtrlXToolStripMenuItem";
- this.CutCtrlXToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
+ this.CutCtrlXToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
this.CutCtrlXToolStripMenuItem.Text = "Cut Ctrl+X";
this.CutCtrlXToolStripMenuItem.Click += new System.EventHandler(this.CutCtrlXToolStripMenuItem_Click);
//
// CopyCtrlCToolStripMenuItem
//
this.CopyCtrlCToolStripMenuItem.Name = "CopyCtrlCToolStripMenuItem";
- this.CopyCtrlCToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
+ this.CopyCtrlCToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
this.CopyCtrlCToolStripMenuItem.Text = "Copy Ctrl+C";
this.CopyCtrlCToolStripMenuItem.Click += new System.EventHandler(this.CopyCtrlCToolStripMenuItem_Click);
//
// PasteToolStripMenuItem
//
this.PasteToolStripMenuItem.Name = "PasteToolStripMenuItem";
- this.PasteToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
+ this.PasteToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
this.PasteToolStripMenuItem.Text = "Paste Ctrl+V";
this.PasteToolStripMenuItem.Click += new System.EventHandler(this.PasteToolStripMenuItem_Click);
//
// SellectAllCtrlAToolStripMenuItem
//
this.SellectAllCtrlAToolStripMenuItem.Name = "SellectAllCtrlAToolStripMenuItem";
- this.SellectAllCtrlAToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
+ this.SellectAllCtrlAToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
this.SellectAllCtrlAToolStripMenuItem.Text = "Select All Ctrl+A";
this.SellectAllCtrlAToolStripMenuItem.Click += new System.EventHandler(this.SellectAllCtrlAToolStripMenuItem_Click);
//
@@ -232,13 +232,13 @@
this.ViewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.RefreshToolStripMenuItem});
this.ViewToolStripMenuItem.Name = "ViewToolStripMenuItem";
- this.ViewToolStripMenuItem.Size = new System.Drawing.Size(47, 20);
+ this.ViewToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
this.ViewToolStripMenuItem.Text = "View";
//
// RefreshToolStripMenuItem
//
this.RefreshToolStripMenuItem.Name = "RefreshToolStripMenuItem";
- this.RefreshToolStripMenuItem.Size = new System.Drawing.Size(121, 22);
+ this.RefreshToolStripMenuItem.Size = new System.Drawing.Size(113, 22);
this.RefreshToolStripMenuItem.Text = "Refresh";
this.RefreshToolStripMenuItem.Click += new System.EventHandler(this.RefreshToolStripMenuItem_Click);
//
@@ -248,19 +248,19 @@
this.HelpToolStripMenuItem1,
this.AboutWindows95ToolStripMenuItem});
this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem";
- this.HelpToolStripMenuItem.Size = new System.Drawing.Size(46, 20);
+ this.HelpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
this.HelpToolStripMenuItem.Text = "Help";
//
// HelpToolStripMenuItem1
//
this.HelpToolStripMenuItem1.Name = "HelpToolStripMenuItem1";
- this.HelpToolStripMenuItem1.Size = new System.Drawing.Size(188, 22);
+ this.HelpToolStripMenuItem1.Size = new System.Drawing.Size(174, 22);
this.HelpToolStripMenuItem1.Text = "Help Topics";
//
// AboutWindows95ToolStripMenuItem
//
this.AboutWindows95ToolStripMenuItem.Name = "AboutWindows95ToolStripMenuItem";
- this.AboutWindows95ToolStripMenuItem.Size = new System.Drawing.Size(188, 22);
+ this.AboutWindows95ToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
this.AboutWindows95ToolStripMenuItem.Text = "About Windows 95";
this.AboutWindows95ToolStripMenuItem.Click += new System.EventHandler(this.AboutWindows95ToolStripMenuItem_Click);
//
diff --git a/Histacom2/OS/Win98/Win98.cs b/Histacom2/OS/Win98/Win98.cs
index 3f75af7..146aa3c 100644
--- a/Histacom2/OS/Win98/Win98.cs
+++ b/Histacom2/OS/Win98/Win98.cs
@@ -71,7 +71,7 @@ namespace Histacom2.OS.Win98
// When New Game is clicked in TitleScreen.cs
private void Desktop_Load(object sender, EventArgs e)
{
- UpgradeFileSystem("95", "98");
+ UpgradeFileSystem( "98");
if (currentTheme.defaultWallpaper != null) desktopicons.BackgroundImage = new Bitmap(currentTheme.defaultWallpaper, Width, Height);
//Start Menu Color - Commented until it works reliably
diff --git a/Histacom2/Resources/WinClassic/Win95SideBar.png b/Histacom2/Resources/WinClassic/Win95SideBar.png
index 2f0e77b..f0ae5ab 100644
--- a/Histacom2/Resources/WinClassic/Win95SideBar.png
+++ b/Histacom2/Resources/WinClassic/Win95SideBar.png
Binary files differ
generated by cgit v1.2.3 (git 2.46.0) at 2026-06-11 18:46:48 +0000