From 049491ca1cf569153eb8a5004a8a657292bf8f39 Mon Sep 17 00:00:00 2001 From: lempamo Date: Mon, 27 Mar 2017 10:53:12 -0400 Subject: added title bar font --- .vs/TimeHACK/v14/.suo | Bin 100352 -> 122880 bytes TimeHACK.Engine/Template/WinClassic.Designer.cs | 2 +- TimeHACK.Engine/Template/WinClassic.cs | 2 + TimeHACK.Engine/WindowManager.cs | 3 +- TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 20480 -> 20480 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 24064 -> 24064 bytes .../DesignTimeResolveAssemblyReferences.cache | Bin 0 -> 868 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 20480 -> 20480 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 24064 -> 24064 bytes TimeHACK.Main/TimeHACK.Main.csproj | 9 - .../WinClassicForms/WinClassicIE4.Designer.cs | 2 +- TimeHACK.Main/WinClassicForms/WinClassicIE4.cs | 2 +- .../WinClassicInstaller.Designer.cs | 2 +- .../WinClassicForms/WinClassicInstaller.cs | 2 +- .../WinClassicForms/WinClassicTemplate.Designer.cs | 235 --------------------- .../WinClassicForms/WinClassicTemplate.cs | 12 -- .../WinClassicForms/WinClassicTemplate.resx | 163 -------------- TimeHACK.Main/Windows95.cs | 12 +- TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 20480 -> 20480 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 24064 -> 24064 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 4292608 -> 4286464 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 6 +- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 116224 -> 112128 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 6 +- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 4292608 -> 4286464 bytes .../DesignTimeResolveAssemblyReferences.cache | Bin 14465 -> 14503 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 12375 -> 12377 bytes .../TimeHACK.Engine.WinClassicInstaller.resources | Bin 1385 -> 0 bytes .../TimeHACK.Main.csproj.FileListAbsolute.txt | 5 +- ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 25530 -> 25540 bytes ...imeHACK.WinClassicForms.WinClassicIE4.resources | Bin 0 -> 3209 bytes ...K.WinClassicForms.WinClassicInstaller.resources | Bin 0 -> 1385 bytes .../obj/Release/TimeHACK.WinClassicIE4.resources | Bin 3209 -> 0 bytes .../Release/TimeHACK.WinClassicTemplate.resources | Bin 2609 -> 0 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 4292608 -> 4286464 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 6 +- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 116224 -> 112128 bytes 40 files changed, 29 insertions(+), 446 deletions(-) create mode 100644 TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache delete mode 100644 TimeHACK.Main/WinClassicForms/WinClassicTemplate.Designer.cs delete mode 100644 TimeHACK.Main/WinClassicForms/WinClassicTemplate.cs delete mode 100644 TimeHACK.Main/WinClassicForms/WinClassicTemplate.resx delete mode 100644 TimeHACK.Main/obj/Release/TimeHACK.Engine.WinClassicInstaller.resources create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicIE4.resources create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicInstaller.resources delete mode 100644 TimeHACK.Main/obj/Release/TimeHACK.WinClassicIE4.resources delete mode 100644 TimeHACK.Main/obj/Release/TimeHACK.WinClassicTemplate.resources diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index fdbfad0..daa342a 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Engine/Template/WinClassic.Designer.cs b/TimeHACK.Engine/Template/WinClassic.Designer.cs index 6fc4a78..0bd8a43 100644 --- a/TimeHACK.Engine/Template/WinClassic.Designer.cs +++ b/TimeHACK.Engine/Template/WinClassic.Designer.cs @@ -119,7 +119,7 @@ // Title // this.Title.AutoSize = true; - this.Title.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Title.Font = fnt; this.Title.ForeColor = System.Drawing.Color.White; this.Title.Location = new System.Drawing.Point(23, 3); this.Title.Name = "Title"; diff --git a/TimeHACK.Engine/Template/WinClassic.cs b/TimeHACK.Engine/Template/WinClassic.cs index 1bd11e3..da8494d 100644 --- a/TimeHACK.Engine/Template/WinClassic.cs +++ b/TimeHACK.Engine/Template/WinClassic.cs @@ -11,6 +11,8 @@ namespace TimeHACK.Engine.Template InitializeComponent(); } + public System.Drawing.Font fnt; + public const int WM_NCLBUTTONDOWN = 0xA1; public const int HT_CAPTION = 0x2; diff --git a/TimeHACK.Engine/WindowManager.cs b/TimeHACK.Engine/WindowManager.cs index 52a74d1..d471835 100644 --- a/TimeHACK.Engine/WindowManager.cs +++ b/TimeHACK.Engine/WindowManager.cs @@ -7,13 +7,14 @@ namespace TimeHACK.Engine { public class WindowManager { - public void startWinClassic(UserControl content, String title, PictureBox icon, Boolean MaxButton, Boolean MinButton) + public void startWinClassic(UserControl content, String title, PictureBox icon, Boolean MaxButton, Boolean MinButton, Font fnt) { // Setup Window WinClassic app = new WinClassic(); app.Title.Text = title; app.Width = content.Width + 8; app.Height = content.Height + 26; + app.fnt = fnt; content.Parent = app.programContent; content.BringToFront(); content.Dock = DockStyle.Fill; diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index a54d615..66d9ebe 100644 Binary files a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll and b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb index 2cef144..39001d6 100644 Binary files a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb and b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache new file mode 100644 index 0000000..22cb9e6 Binary files /dev/null and b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll index a54d615..66d9ebe 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb index 2cef144..39001d6 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index da207ac..73f18b5 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -138,12 +138,6 @@ WinClassicInstaller.cs - - Form - - - WinClassicTemplate.cs - Form @@ -187,9 +181,6 @@ TitleScreen.cs - - WinClassicTemplate.cs - SettingsSingleFileGenerator Settings.Designer.cs diff --git a/TimeHACK.Main/WinClassicForms/WinClassicIE4.Designer.cs b/TimeHACK.Main/WinClassicForms/WinClassicIE4.Designer.cs index 288ed7b..9b440f2 100644 --- a/TimeHACK.Main/WinClassicForms/WinClassicIE4.Designer.cs +++ b/TimeHACK.Main/WinClassicForms/WinClassicIE4.Designer.cs @@ -1,4 +1,4 @@ -namespace TimeHACK +namespace TimeHACK.WinClassicForms { partial class WinClassicIE4 { diff --git a/TimeHACK.Main/WinClassicForms/WinClassicIE4.cs b/TimeHACK.Main/WinClassicForms/WinClassicIE4.cs index e819238..a43bb7b 100644 --- a/TimeHACK.Main/WinClassicForms/WinClassicIE4.cs +++ b/TimeHACK.Main/WinClassicForms/WinClassicIE4.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using System.Windows.Forms; -namespace TimeHACK +namespace TimeHACK.WinClassicForms { public partial class WinClassicIE4 : UserControl { diff --git a/TimeHACK.Main/WinClassicForms/WinClassicInstaller.Designer.cs b/TimeHACK.Main/WinClassicForms/WinClassicInstaller.Designer.cs index 0afe1c8..7f0fa09 100644 --- a/TimeHACK.Main/WinClassicForms/WinClassicInstaller.Designer.cs +++ b/TimeHACK.Main/WinClassicForms/WinClassicInstaller.Designer.cs @@ -1,4 +1,4 @@ -namespace TimeHACK.Engine +namespace TimeHACK.WinClassicForms { partial class WinClassicInstaller { diff --git a/TimeHACK.Main/WinClassicForms/WinClassicInstaller.cs b/TimeHACK.Main/WinClassicForms/WinClassicInstaller.cs index 11e5ba9..708ec51 100644 --- a/TimeHACK.Main/WinClassicForms/WinClassicInstaller.cs +++ b/TimeHACK.Main/WinClassicForms/WinClassicInstaller.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace TimeHACK.Engine +namespace TimeHACK.WinClassicForms { public partial class WinClassicInstaller : UserControl { diff --git a/TimeHACK.Main/WinClassicForms/WinClassicTemplate.Designer.cs b/TimeHACK.Main/WinClassicForms/WinClassicTemplate.Designer.cs deleted file mode 100644 index 252c147..0000000 --- a/TimeHACK.Main/WinClassicForms/WinClassicTemplate.Designer.cs +++ /dev/null @@ -1,235 +0,0 @@ -namespace TimeHACK -{ - partial class WinClassicTemplate - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WinClassicTemplate)); - this.program = new System.Windows.Forms.Panel(); - this.programtopbar = new System.Windows.Forms.Panel(); - this.maximizebutton = new System.Windows.Forms.PictureBox(); - this.minimizebutton = new System.Windows.Forms.PictureBox(); - this.programname = new System.Windows.Forms.Label(); - this.closebutton = new System.Windows.Forms.PictureBox(); - this.toprightcorner = new System.Windows.Forms.Panel(); - this.bottomrightcorner = new System.Windows.Forms.Panel(); - this.bottomleftcorner = new System.Windows.Forms.Panel(); - this.topleftcorner = new System.Windows.Forms.Panel(); - this.left = new System.Windows.Forms.Panel(); - this.bottom = new System.Windows.Forms.Panel(); - this.right = new System.Windows.Forms.Panel(); - this.top = new System.Windows.Forms.Panel(); - this.program.SuspendLayout(); - this.programtopbar.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.maximizebutton)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.minimizebutton)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.closebutton)).BeginInit(); - this.SuspendLayout(); - // - // program - // - this.program.BackColor = System.Drawing.Color.Silver; - this.program.Controls.Add(this.programtopbar); - this.program.Controls.Add(this.toprightcorner); - this.program.Controls.Add(this.bottomrightcorner); - this.program.Controls.Add(this.bottomleftcorner); - this.program.Controls.Add(this.topleftcorner); - this.program.Controls.Add(this.left); - this.program.Controls.Add(this.bottom); - this.program.Controls.Add(this.right); - this.program.Controls.Add(this.top); - this.program.Dock = System.Windows.Forms.DockStyle.Fill; - this.program.Location = new System.Drawing.Point(0, 0); - this.program.Name = "program"; - this.program.Size = new System.Drawing.Size(320, 240); - this.program.TabIndex = 7; - // - // programtopbar - // - this.programtopbar.BackColor = System.Drawing.Color.DarkBlue; - this.programtopbar.Controls.Add(this.maximizebutton); - this.programtopbar.Controls.Add(this.minimizebutton); - this.programtopbar.Controls.Add(this.programname); - this.programtopbar.Controls.Add(this.closebutton); - this.programtopbar.Dock = System.Windows.Forms.DockStyle.Top; - this.programtopbar.Location = new System.Drawing.Point(4, 4); - this.programtopbar.Name = "programtopbar"; - this.programtopbar.Size = new System.Drawing.Size(312, 18); - this.programtopbar.TabIndex = 0; - // - // maximizebutton - // - this.maximizebutton.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.maximizebutton.BackgroundImage = global::TimeHACK.Properties.Resources.WinClassicMax; - this.maximizebutton.Location = new System.Drawing.Point(277, 2); - this.maximizebutton.Name = "maximizebutton"; - this.maximizebutton.Size = new System.Drawing.Size(16, 14); - this.maximizebutton.TabIndex = 6; - this.maximizebutton.TabStop = false; - // - // minimizebutton - // - this.minimizebutton.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.minimizebutton.BackgroundImage = global::TimeHACK.Properties.Resources.WinClassicMin; - this.minimizebutton.Location = new System.Drawing.Point(261, 2); - this.minimizebutton.Name = "minimizebutton"; - this.minimizebutton.Size = new System.Drawing.Size(16, 14); - this.minimizebutton.TabIndex = 5; - this.minimizebutton.TabStop = false; - // - // programname - // - this.programname.AutoSize = true; - this.programname.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.programname.ForeColor = System.Drawing.Color.White; - this.programname.Location = new System.Drawing.Point(3, 2); - this.programname.Name = "programname"; - this.programname.Size = new System.Drawing.Size(59, 13); - this.programname.TabIndex = 3; - this.programname.Text = "Template"; - // - // closebutton - // - this.closebutton.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.closebutton.BackgroundImage = global::TimeHACK.Properties.Resources.WinClassicClose; - this.closebutton.Location = new System.Drawing.Point(295, 2); - this.closebutton.Name = "closebutton"; - this.closebutton.Size = new System.Drawing.Size(16, 14); - this.closebutton.TabIndex = 4; - this.closebutton.TabStop = false; - // - // toprightcorner - // - this.toprightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.toprightcorner.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("toprightcorner.BackgroundImage"))); - this.toprightcorner.Location = new System.Drawing.Point(316, 0); - this.toprightcorner.Name = "toprightcorner"; - this.toprightcorner.Size = new System.Drawing.Size(4, 4); - this.toprightcorner.TabIndex = 6; - // - // bottomrightcorner - // - this.bottomrightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.bottomrightcorner.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("bottomrightcorner.BackgroundImage"))); - this.bottomrightcorner.Cursor = System.Windows.Forms.Cursors.SizeNWSE; - this.bottomrightcorner.Location = new System.Drawing.Point(316, 236); - this.bottomrightcorner.Name = "bottomrightcorner"; - this.bottomrightcorner.Size = new System.Drawing.Size(4, 4); - this.bottomrightcorner.TabIndex = 4; - // - // bottomleftcorner - // - this.bottomleftcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.bottomleftcorner.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("bottomleftcorner.BackgroundImage"))); - this.bottomleftcorner.Location = new System.Drawing.Point(0, 236); - this.bottomleftcorner.Name = "bottomleftcorner"; - this.bottomleftcorner.Size = new System.Drawing.Size(4, 4); - this.bottomleftcorner.TabIndex = 2; - // - // topleftcorner - // - this.topleftcorner.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("topleftcorner.BackgroundImage"))); - this.topleftcorner.Location = new System.Drawing.Point(0, 0); - this.topleftcorner.Name = "topleftcorner"; - this.topleftcorner.Size = new System.Drawing.Size(4, 4); - this.topleftcorner.TabIndex = 1; - // - // left - // - this.left.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("left.BackgroundImage"))); - this.left.Dock = System.Windows.Forms.DockStyle.Left; - this.left.Location = new System.Drawing.Point(0, 4); - this.left.Name = "left"; - this.left.Size = new System.Drawing.Size(4, 232); - this.left.TabIndex = 3; - // - // bottom - // - this.bottom.BackgroundImage = global::TimeHACK.Properties.Resources.BottomSide; - this.bottom.Cursor = System.Windows.Forms.Cursors.SizeNS; - this.bottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.bottom.Location = new System.Drawing.Point(0, 236); - this.bottom.Name = "bottom"; - this.bottom.Size = new System.Drawing.Size(316, 4); - this.bottom.TabIndex = 5; - // - // right - // - this.right.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("right.BackgroundImage"))); - this.right.Cursor = System.Windows.Forms.Cursors.SizeWE; - this.right.Dock = System.Windows.Forms.DockStyle.Right; - this.right.Location = new System.Drawing.Point(316, 4); - this.right.Name = "right"; - this.right.Size = new System.Drawing.Size(4, 236); - this.right.TabIndex = 7; - // - // top - // - this.top.BackgroundImage = global::TimeHACK.Properties.Resources.TopSide; - this.top.Dock = System.Windows.Forms.DockStyle.Top; - this.top.Location = new System.Drawing.Point(0, 0); - this.top.Name = "top"; - this.top.Size = new System.Drawing.Size(320, 4); - this.top.TabIndex = 8; - // - // WinClassicTemplate - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(320, 240); - this.Controls.Add(this.program); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Name = "WinClassicTemplate"; - this.Text = "WinClassicTemplate"; - this.program.ResumeLayout(false); - this.programtopbar.ResumeLayout(false); - this.programtopbar.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.maximizebutton)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.minimizebutton)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.closebutton)).EndInit(); - this.ResumeLayout(false); - - } - - #endregion - - internal System.Windows.Forms.Panel program; - internal System.Windows.Forms.Panel programtopbar; - internal System.Windows.Forms.PictureBox maximizebutton; - internal System.Windows.Forms.PictureBox minimizebutton; - internal System.Windows.Forms.Label programname; - internal System.Windows.Forms.PictureBox closebutton; - internal System.Windows.Forms.Panel toprightcorner; - internal System.Windows.Forms.Panel bottomrightcorner; - internal System.Windows.Forms.Panel bottomleftcorner; - internal System.Windows.Forms.Panel topleftcorner; - internal System.Windows.Forms.Panel left; - internal System.Windows.Forms.Panel bottom; - internal System.Windows.Forms.Panel right; - internal System.Windows.Forms.Panel top; - } -} \ No newline at end of file diff --git a/TimeHACK.Main/WinClassicForms/WinClassicTemplate.cs b/TimeHACK.Main/WinClassicForms/WinClassicTemplate.cs deleted file mode 100644 index 9152521..0000000 --- a/TimeHACK.Main/WinClassicForms/WinClassicTemplate.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Windows.Forms; - -namespace TimeHACK -{ - public partial class WinClassicTemplate : Form - { - public WinClassicTemplate() - { - InitializeComponent(); - } - } -} diff --git a/TimeHACK.Main/WinClassicForms/WinClassicTemplate.resx b/TimeHACK.Main/WinClassicForms/WinClassicTemplate.resx deleted file mode 100644 index cd30725..0000000 --- a/TimeHACK.Main/WinClassicForms/WinClassicTemplate.resx +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAdSURBVBhXYzh8 - /DQEMQDBfzBo6+oDcSDCGBwGBgAJoRsoKGRD1QAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAdSURBVBhXYzh8 - /DQQtXX1MQABCgdIQRCIgwAMDABm/hFrLt/K7gAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAdSURBVBhXYzh8 - /PT///+BJBBhcNq6+iCIAQEYGACcHRsocGQwIQAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAaSURBVBhXYzh8 - /DQcgTj/YQDKQZEBcY6fBgAaSCiZEc9BxAAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAAAQAAAABCAIAAAB2XpiaAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAUSURBVBhXYzh8 - /PT///+B5OHjpwFB1wn9nx9JYgAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAAAQAAAABCAIAAAB2XpiaAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAUSURBVBhXYzh8 - /DQQtXX1MTAwAAA0WgZJrWm8iAAAAABJRU5ErkJggg== - - - \ No newline at end of file diff --git a/TimeHACK.Main/Windows95.cs b/TimeHACK.Main/Windows95.cs index bfae46b..dc84193 100644 --- a/TimeHACK.Main/Windows95.cs +++ b/TimeHACK.Main/Windows95.cs @@ -124,14 +124,14 @@ namespace TimeHACK { WindowManager wm = new WindowManager(); TestApp test = new TestApp(); - wm.startWinClassic(test, "TestApp", null, true, true); + wm.startWinClassic(test, "TestApp", null, true, true, new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)))); } private void downloaderTestToolStripMenuItem_Click(object sender, EventArgs e) { WinClassicDownloader opendownload = new WinClassicDownloader(); WindowManager wm = new WindowManager(); - wm.startWinClassic(opendownload, "Downloader", null, false, true); + wm.startWinClassic(opendownload, "Downloader", null, false, true, new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)))); opendownload.appName.Text = "Downloading: Survive The Day"; } @@ -139,14 +139,14 @@ namespace TimeHACK { WinClassicInstaller openinstaller = new WinClassicInstaller(); WindowManager wm = new WindowManager(); - wm.startWinClassic(openinstaller, "Installer", null, false, true); + wm.startWinClassic(openinstaller, "Installer", null, false, true, new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)))); } private void InternetExplorerToolStripMenuItem_Click(object sender, EventArgs e) { WinClassicIE4 ie = new WinClassicIE4(); - ie.Show(); - ie.BringToFront(); + WindowManager wm = new WindowManager(); + wm.startWinClassic(ie, "Internet Explorer 4", null, true, true, new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)))); startmenu.Hide(); } @@ -164,7 +164,7 @@ namespace TimeHACK { WinClassicIE4 ie = new WinClassicIE4(); WindowManager wm = new WindowManager(); - wm.startWinClassic(ie, "Internet Explorer 4", null, true, true); + wm.startWinClassic(ie, "Internet Explorer 4", null, true, true, new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)))); startmenu.Hide(); } } diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index a54d615..66d9ebe 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll and b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb index 2cef144..39001d6 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb and b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index e75830d..debd4e3 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - ZhaYmBKx601mfkJ5cHtI3xbkNCfE0iTlUWmYpUvhLxA= + 8j+r70aNp5W1b19C3kqSgrqGZJWLHCT9oP+658Ah/Po= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 7560985..13bbba9 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.exe and b/TimeHACK.Main/bin/Release/TimeHACK.exe differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest index 1a62adb..89bcbb9 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -44,14 +44,14 @@ - + - dS7NxTFLVMVSdOZdI9xYuo9v2VHN7BFTXFMk74E8y9w= + XYo/EDDYKENFIOwKMfqjyJv2EPjGNhmuITwygmKYv8A= @@ -63,7 +63,7 @@ - 40SJFsjwh7iOvayhlw43ahAHbk+XQREZ93piy54Apew= + S0uhE4PQQvEZ/MvDkYq5w6dL6BEb4F3u5SG9200c6kY= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index e96fc72..a1f37b6 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.pdb and b/TimeHACK.Main/bin/Release/TimeHACK.pdb differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application index e75830d..debd4e3 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - ZhaYmBKx601mfkJ5cHtI3xbkNCfE0iTlUWmYpUvhLxA= + 8j+r70aNp5W1b19C3kqSgrqGZJWLHCT9oP+658Ah/Po= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index 1a62adb..89bcbb9 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -44,14 +44,14 @@ - + - dS7NxTFLVMVSdOZdI9xYuo9v2VHN7BFTXFMk74E8y9w= + XYo/EDDYKENFIOwKMfqjyJv2EPjGNhmuITwygmKYv8A= @@ -63,7 +63,7 @@ - 40SJFsjwh7iOvayhlw43ahAHbk+XQREZ93piy54Apew= + S0uhE4PQQvEZ/MvDkYq5w6dL6BEb4F3u5SG9200c6kY= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index 7560985..13bbba9 100644 Binary files a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe and b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe differ diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache index 3d67944..a1946ec 100644 Binary files a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 5bfa09b..07e085b 100644 Binary files a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Engine.WinClassicInstaller.resources b/TimeHACK.Main/obj/Release/TimeHACK.Engine.WinClassicInstaller.resources deleted file mode 100644 index 281b38f..0000000 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Engine.WinClassicInstaller.resources and /dev/null differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt index cfcbe76..ee1e27a 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt @@ -60,12 +60,9 @@ C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK. C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.Main.csprojResolveAssemblyReference.cache C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.TestApp.resources C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicDownloader.resources -C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.WinClassicIE4.resources -C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.Engine.WinClassicInstaller.resources C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.Windows95.resources C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.Properties.Resources.resources C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.TitleScreen.resources -C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.WinClassicTemplate.resources C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.Main.csproj.GenerateResource.Cache C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\bin\Release\TimeHACK.exe.manifest C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\bin\Release\TimeHACK.application @@ -75,3 +72,5 @@ C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\bin\Release\TimeHACK. C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\bin\Release\TimeHACK.Engine.pdb C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.exe.manifest C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.application +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicIE4.resources +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicInstaller.resources diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache index 82386a6..305a136 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicIE4.resources b/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicIE4.resources new file mode 100644 index 0000000..9b1b2c8 Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicIE4.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicInstaller.resources b/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicInstaller.resources new file mode 100644 index 0000000..281b38f Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicInstaller.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicIE4.resources b/TimeHACK.Main/obj/Release/TimeHACK.WinClassicIE4.resources deleted file mode 100644 index 9b1b2c8..0000000 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicIE4.resources and /dev/null differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicTemplate.resources b/TimeHACK.Main/obj/Release/TimeHACK.WinClassicTemplate.resources deleted file mode 100644 index f52d56e..0000000 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicTemplate.resources and /dev/null differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index e75830d..debd4e3 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - ZhaYmBKx601mfkJ5cHtI3xbkNCfE0iTlUWmYpUvhLxA= + 8j+r70aNp5W1b19C3kqSgrqGZJWLHCT9oP+658Ah/Po= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 7560985..13bbba9 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.exe and b/TimeHACK.Main/obj/Release/TimeHACK.exe differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest index 1a62adb..89bcbb9 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -44,14 +44,14 @@ - + - dS7NxTFLVMVSdOZdI9xYuo9v2VHN7BFTXFMk74E8y9w= + XYo/EDDYKENFIOwKMfqjyJv2EPjGNhmuITwygmKYv8A= @@ -63,7 +63,7 @@ - 40SJFsjwh7iOvayhlw43ahAHbk+XQREZ93piy54Apew= + S0uhE4PQQvEZ/MvDkYq5w6dL6BEb4F3u5SG9200c6kY= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index e96fc72..a1f37b6 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3