diff options
Diffstat (limited to 'Histacom2/OS/Win95/Win95Apps')
7 files changed, 67 insertions, 102 deletions
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs index 9e09cb0..63e056b 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs @@ -37,7 +37,7 @@ "???.html"}, 1, System.Drawing.Color.Black, System.Drawing.Color.Empty, null); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WinClassicFTPClient)); this.topBar = new System.Windows.Forms.Panel(); - this.btnLogin = new System.Windows.Forms.Button(); + this.btnLogin = new Histacom2.Engine.UI.ClassicButton(); this.infoLabel = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.textBox4 = new System.Windows.Forms.TextBox(); @@ -49,7 +49,7 @@ this.hostnameBox = new System.Windows.Forms.TextBox(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.panel1 = new System.Windows.Forms.Panel(); - this.btnCancel = new System.Windows.Forms.Button(); + this.btnCancel = new Histacom2.Engine.UI.ClassicButton(); this.welcomeLabel = new System.Windows.Forms.Label(); this.ftpFiles = new System.Windows.Forms.ListView(); this.fileIcons = new System.Windows.Forms.ImageList(this.components); @@ -78,13 +78,14 @@ // // btnLogin // - this.btnLogin.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnLogin.Location = new System.Drawing.Point(585, 2); + this.btnLogin.BackColor = System.Drawing.Color.Silver; + this.btnLogin.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnLogin.ForeColor = System.Drawing.Color.Black; + this.btnLogin.Location = new System.Drawing.Point(585, 4); this.btnLogin.Name = "btnLogin"; - this.btnLogin.Size = new System.Drawing.Size(44, 23); - this.btnLogin.TabIndex = 5; + this.btnLogin.Size = new System.Drawing.Size(44, 20); + this.btnLogin.TabIndex = 9; this.btnLogin.Text = "Login"; - this.btnLogin.UseVisualStyleBackColor = true; this.btnLogin.Click += new System.EventHandler(this.button1_Click); // // infoLabel @@ -183,13 +184,13 @@ // // btnCancel // - this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnCancel.BackColor = System.Drawing.Color.Silver; + this.btnCancel.ForeColor = System.Drawing.Color.Black; this.btnCancel.Location = new System.Drawing.Point(3, 2); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.TabIndex = 0; this.btnCancel.Text = "Cancel"; - this.btnCancel.UseVisualStyleBackColor = true; this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); // // welcomeLabel @@ -266,11 +267,11 @@ private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; public System.Windows.Forms.TextBox hostnameBox; private System.Windows.Forms.Label infoLabel; - private System.Windows.Forms.Button btnLogin; private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Button btnCancel; + private Engine.UI.ClassicButton btnCancel; private System.Windows.Forms.Label welcomeLabel; internal System.Windows.Forms.ListView ftpFiles; private System.Windows.Forms.ImageList fileIcons; + private Engine.UI.ClassicButton btnLogin; } } diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs index b6195ae..4dd74fb 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs @@ -117,12 +117,6 @@ namespace Histacom2.OS.Win95.Win95Apps } } - private void DoClassicButtons() - { - btnLogin.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); - btnCancel.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); - } - private void btnCancel_Click(object sender, EventArgs e) { ParentForm.Close(); @@ -130,7 +124,12 @@ namespace Histacom2.OS.Win95.Win95Apps private void WinClassicFTPClient_Load(object sender, EventArgs e) { - DoClassicButtons(); + + } + + private void topBar_Paint(object sender, PaintEventArgs e) + { + topBar.BackColor = SaveSystem.currentTheme.threeDObjectsColor; } } } diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx index 0869aa0..9dd3ac3 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx @@ -128,7 +128,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABe - EgAAAk1TRnQBSQFMAgEBAwEAASABAAEgAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + EgAAAk1TRnQBSQFMAgEBAwEAATABAAEwAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABgAMAASADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs index ee8021c..6b92d11 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs @@ -31,9 +31,9 @@ this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.comboBox1 = new System.Windows.Forms.ComboBox(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.applyButton = new System.Windows.Forms.Button(); - this.cancelButton = new System.Windows.Forms.Button(); - this.okButton = new System.Windows.Forms.Button(); + this.applyButton = new Histacom2.Engine.UI.ClassicButton(); + this.cancelButton = new Histacom2.Engine.UI.ClassicButton(); + this.okButton = new Histacom2.Engine.UI.ClassicButton(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); @@ -73,35 +73,29 @@ // // applyButton // - this.applyButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.applyButton.Location = new System.Drawing.Point(209, 245); this.applyButton.Name = "applyButton"; this.applyButton.Size = new System.Drawing.Size(75, 23); this.applyButton.TabIndex = 3; this.applyButton.Text = "Apply"; - this.applyButton.UseVisualStyleBackColor = true; this.applyButton.Click += new System.EventHandler(this.applyButton_Click); // // cancelButton // - this.cancelButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cancelButton.Location = new System.Drawing.Point(128, 245); this.cancelButton.Name = "cancelButton"; this.cancelButton.Size = new System.Drawing.Size(75, 23); this.cancelButton.TabIndex = 4; this.cancelButton.Text = "Cancel"; - this.cancelButton.UseVisualStyleBackColor = true; this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click); // // okButton // - this.okButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.okButton.Location = new System.Drawing.Point(47, 245); this.okButton.Name = "okButton"; this.okButton.Size = new System.Drawing.Size(75, 23); this.okButton.TabIndex = 5; this.okButton.Text = "OK"; - this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.okButton_Click); // // WinClassicThemePanel @@ -129,8 +123,8 @@ private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.ComboBox comboBox1; private System.Windows.Forms.PictureBox pictureBox2; - private System.Windows.Forms.Button applyButton; - private System.Windows.Forms.Button cancelButton; - private System.Windows.Forms.Button okButton; + private Histacom2.Engine.UI.ClassicButton applyButton; + private Histacom2.Engine.UI.ClassicButton cancelButton; + private Histacom2.Engine.UI.ClassicButton okButton; } } diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs index fb790cb..f22ee89 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs @@ -61,46 +61,17 @@ namespace Histacom2.OS.Win95.Win95Apps private void applyButton_Click(object sender, EventArgs e) { - switch ((string)comboBox1.SelectedItem) - { - 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; - } - foreach (Form f in Application.OpenForms) - { - if (f is WinClassic) - { - if (((WinClassic)f).isActive) - { - ((WinClassic)f).programtopbar.BackColor = SaveSystem.currentTheme.activeTitleBarColor; - ((WinClassic)f).Title.ForeColor = SaveSystem.currentTheme.activeTitleTextColor; - } else - { - ((WinClassic)f).programtopbar.BackColor = SaveSystem.currentTheme.inactiveTitleBarColor; - ((WinClassic)f).Title.ForeColor = SaveSystem.currentTheme.inactiveTitleTextColor; - } - } - } + ChangeTheme(); } private void okButton_Click(object sender, EventArgs e) { + ChangeTheme(); + ParentForm.Close(); + } + + private void ChangeTheme() + { switch ((string)comboBox1.SelectedItem) { case "Default": @@ -136,9 +107,22 @@ namespace Histacom2.OS.Win95.Win95Apps ((WinClassic)f).programtopbar.BackColor = SaveSystem.currentTheme.inactiveTitleBarColor; ((WinClassic)f).Title.ForeColor = SaveSystem.currentTheme.inactiveTitleTextColor; } + f.Invalidate(); + ((WinClassic)f).programContent.Invalidate(); + ((WinClassic)f).top.Invalidate(); + ((WinClassic)f).toprightcorner.Invalidate(); + ((WinClassic)f).right.Invalidate(); + ((WinClassic)f).bottomrightcorner.Invalidate(); + ((WinClassic)f).bottom.Invalidate(); + ((WinClassic)f).bottomleftcorner.Invalidate(); + ((WinClassic)f).left.Invalidate(); + ((WinClassic)f).topleftcorner.Invalidate(); + foreach (Control c in ((WinClassic)f).progContent.Controls) c.Invalidate(); + ((WinClassic)f).progContent.BackColor = SaveSystem.currentTheme.threeDObjectsColor; } } - ParentForm.Close(); + TitleScreen.frm95.taskbar.Invalidate(); + TitleScreen.frm95.clockPanel.Invalidate(); } } } diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs index ca3f22d..8c1f84a 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs @@ -30,10 +30,10 @@ { this.imgTip = new System.Windows.Forms.PictureBox(); this.imgPnl = new System.Windows.Forms.PictureBox(); - this.btnClose = new System.Windows.Forms.Button(); - this.btnOnline = new System.Windows.Forms.Button(); - this.btnTour = new System.Windows.Forms.Button(); this.imgWelcome = new System.Windows.Forms.PictureBox(); + this.btnClose = new Histacom2.Engine.UI.ClassicButton(); + this.btnOnline = new Histacom2.Engine.UI.ClassicButton(); + this.btnTour = new Histacom2.Engine.UI.ClassicButton(); ((System.ComponentModel.ISupportInitialize)(this.imgTip)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.imgPnl)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.imgWelcome)).BeginInit(); @@ -59,52 +59,46 @@ this.imgPnl.TabIndex = 16; this.imgPnl.TabStop = false; // + // imgWelcome + // + this.imgWelcome.BackgroundImage = global::Histacom2.Properties.Resources.win95_welcome; + this.imgWelcome.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.imgWelcome.Location = new System.Drawing.Point(19, 17); + this.imgWelcome.Name = "imgWelcome"; + this.imgWelcome.Size = new System.Drawing.Size(292, 19); + this.imgWelcome.TabIndex = 18; + this.imgWelcome.TabStop = false; + // // btnClose // this.btnClose.BackColor = System.Drawing.Color.Silver; - this.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnClose.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnClose.ForeColor = System.Drawing.Color.Black; this.btnClose.Location = new System.Drawing.Point(358, 156); this.btnClose.Name = "btnClose"; this.btnClose.Size = new System.Drawing.Size(115, 26); this.btnClose.TabIndex = 15; this.btnClose.Text = "Close"; - this.btnClose.UseVisualStyleBackColor = false; this.btnClose.Click += new System.EventHandler(this.btnClose_Click); // // btnOnline // this.btnOnline.BackColor = System.Drawing.Color.Silver; - this.btnOnline.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnOnline.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnOnline.ForeColor = System.Drawing.Color.Black; this.btnOnline.Location = new System.Drawing.Point(356, 78); this.btnOnline.Name = "btnOnline"; this.btnOnline.Size = new System.Drawing.Size(115, 26); this.btnOnline.TabIndex = 14; - this.btnOnline.Text = "Online Registration"; - this.btnOnline.UseVisualStyleBackColor = false; + this.btnOnline.Text = "&Online Registration"; // // btnTour // this.btnTour.BackColor = System.Drawing.Color.Silver; - this.btnTour.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnTour.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnTour.ForeColor = System.Drawing.Color.Black; this.btnTour.Location = new System.Drawing.Point(356, 49); this.btnTour.Name = "btnTour"; this.btnTour.Size = new System.Drawing.Size(115, 26); this.btnTour.TabIndex = 12; - this.btnTour.Text = "What\'s New"; - this.btnTour.UseVisualStyleBackColor = false; - // - // imgWelcome - // - this.imgWelcome.BackgroundImage = global::Histacom2.Properties.Resources.win95_welcome; - this.imgWelcome.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.imgWelcome.Location = new System.Drawing.Point(19, 17); - this.imgWelcome.Name = "imgWelcome"; - this.imgWelcome.Size = new System.Drawing.Size(292, 19); - this.imgWelcome.TabIndex = 18; - this.imgWelcome.TabStop = false; + this.btnTour.Text = "What\'s &New"; // // WinClassicWelcome // @@ -130,9 +124,9 @@ private System.Windows.Forms.PictureBox imgTip; private System.Windows.Forms.PictureBox imgPnl; - private System.Windows.Forms.Button btnClose; - private System.Windows.Forms.Button btnOnline; - private System.Windows.Forms.Button btnTour; + private Histacom2.Engine.UI.ClassicButton btnClose; + private Histacom2.Engine.UI.ClassicButton btnOnline; + private Histacom2.Engine.UI.ClassicButton btnTour; private System.Windows.Forms.PictureBox imgWelcome; } } diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs index 4804ca5..6ec79a4 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs @@ -15,13 +15,6 @@ namespace Histacom2.OS.Win95.Win95Apps public WinClassicWelcome() { InitializeComponent(); - - btnTour.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - btnTour.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); - btnOnline.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - btnOnline.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); - btnClose.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - btnClose.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); } private void btnClose_Click(object sender, EventArgs e) |