diff options
16 files changed, 53 insertions, 23 deletions
diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo Binary files differindex f9d9208..e0961c5 100644 --- a/.vs/TimeHACK/v14/.suo +++ b/.vs/TimeHACK/v14/.suo diff --git a/TimeHACK.Engine/Template/WinClassic.Designer.cs b/TimeHACK.Engine/Template/WinClassic.Designer.cs index 0bd8a43..0d26710 100644 --- a/TimeHACK.Engine/Template/WinClassic.Designer.cs +++ b/TimeHACK.Engine/Template/WinClassic.Designer.cs @@ -32,6 +32,7 @@ this.program = new System.Windows.Forms.Panel(); this.programContent = new System.Windows.Forms.Panel(); this.programtopbar = new System.Windows.Forms.Panel(); + this.programIcon = new System.Windows.Forms.PictureBox(); this.maximizebutton = new System.Windows.Forms.PictureBox(); this.minimizebutton = new System.Windows.Forms.PictureBox(); this.Title = new System.Windows.Forms.Label(); @@ -44,13 +45,12 @@ this.bottom = new System.Windows.Forms.Panel(); this.right = new System.Windows.Forms.Panel(); this.top = new System.Windows.Forms.Panel(); - this.programIcon = new System.Windows.Forms.PictureBox(); this.program.SuspendLayout(); this.programtopbar.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.programIcon)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.maximizebutton)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.minimizebutton)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.closebutton)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.programIcon)).BeginInit(); this.SuspendLayout(); // // program @@ -93,7 +93,18 @@ this.programtopbar.Name = "programtopbar"; this.programtopbar.Size = new System.Drawing.Size(292, 18); this.programtopbar.TabIndex = 0; - this.programtopbar.MouseDown += new System.Windows.Forms.MouseEventHandler(this.programtopbar_drag); + this.programtopbar.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Programtopbar_drag); + // + // programIcon + // + this.programIcon.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.programIcon.ErrorImage = null; + this.programIcon.InitialImage = null; + this.programIcon.Location = new System.Drawing.Point(2, 1); + this.programIcon.Name = "programIcon"; + this.programIcon.Size = new System.Drawing.Size(16, 16); + this.programIcon.TabIndex = 0; + this.programIcon.TabStop = false; // // maximizebutton // @@ -126,6 +137,7 @@ this.Title.Size = new System.Drawing.Size(99, 13); this.Title.TabIndex = 3; this.Title.Text = "Application Title"; + this.Title.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Programtopbar_drag); // // closebutton // @@ -214,17 +226,6 @@ this.top.Size = new System.Drawing.Size(300, 4); this.top.TabIndex = 8; // - // programIcon - // - this.programIcon.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.programIcon.ErrorImage = null; - this.programIcon.InitialImage = null; - this.programIcon.Location = new System.Drawing.Point(2, 1); - this.programIcon.Name = "programIcon"; - this.programIcon.Size = new System.Drawing.Size(16, 16); - this.programIcon.TabIndex = 0; - this.programIcon.TabStop = false; - // // WinClassic // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -237,10 +238,10 @@ this.program.ResumeLayout(false); this.programtopbar.ResumeLayout(false); this.programtopbar.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.programIcon)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.maximizebutton)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.minimizebutton)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.closebutton)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.programIcon)).EndInit(); this.ResumeLayout(false); } diff --git a/TimeHACK.Engine/Template/WinClassic.cs b/TimeHACK.Engine/Template/WinClassic.cs index da8494d..8814e70 100644 --- a/TimeHACK.Engine/Template/WinClassic.cs +++ b/TimeHACK.Engine/Template/WinClassic.cs @@ -22,7 +22,7 @@ namespace TimeHACK.Engine.Template [DllImportAttribute("user32.dll")] public static extern bool ReleaseCapture(); - private void programtopbar_drag(object sender, MouseEventArgs e) + private void Programtopbar_drag(object sender, MouseEventArgs e) { if (e.Button == MouseButtons.Left) { @@ -51,6 +51,7 @@ namespace TimeHACK.Engine.Template this.topleftcorner.Hide(); this.toprightcorner.Hide(); this.Dock = DockStyle.Fill; + this.WindowState = FormWindowState.Maximized; max = true; maximizebutton.Image = Properties.Resources.WinClassicRestore; } @@ -65,6 +66,7 @@ namespace TimeHACK.Engine.Template this.topleftcorner.Show(); this.toprightcorner.Show(); this.Dock = DockStyle.None; + this.WindowState = FormWindowState.Normal; max = false; maximizebutton.Image = Properties.Resources.WinClassicMax; } diff --git a/TimeHACK.Engine/WindowManager.cs b/TimeHACK.Engine/WindowManager.cs index d471835..c59cd26 100644 --- a/TimeHACK.Engine/WindowManager.cs +++ b/TimeHACK.Engine/WindowManager.cs @@ -11,6 +11,7 @@ namespace TimeHACK.Engine { // Setup Window WinClassic app = new WinClassic(); + app.Text = title; app.Title.Text = title; app.Width = content.Width + 8; app.Height = content.Height + 26; @@ -29,7 +30,7 @@ namespace TimeHACK.Engine if (MaxButton == false) { app.maximizebutton.Visible = false; - app.minimizebutton.Location = new Point(app.closebutton.Location.X - 16, app.minimizebutton.Location.Y); + app.minimizebutton.Location = new Point(app.closebutton.Location.X - 14, app.minimizebutton.Location.Y); } // Check if Min button is enabled diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csprojResolveAssemblyReference.cache b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csprojResolveAssemblyReference.cache Binary files differindex 7901de8..934fb3e 100644 --- a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csprojResolveAssemblyReference.cache +++ b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csprojResolveAssemblyReference.cache diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll Binary files differindex e569db6..4dce794 100644 --- a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll +++ b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb Binary files differindex 668c688..7d792d6 100644 --- a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb +++ b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index 69a2769..5f54cca 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -139,7 +139,7 @@ <DependentUpon>WinClassicInstaller.cs</DependentUpon> </Compile> <Compile Include="WinClassicForms\WinClassicIE4.cs"> - <SubType>Form</SubType> + <SubType>UserControl</SubType> </Compile> <Compile Include="WinClassicForms\WinClassicIE4.Designer.cs"> <DependentUpon>WinClassicIE4.cs</DependentUpon> diff --git a/TimeHACK.Main/WinClassicForms/WinClassicDownloader.Designer.cs b/TimeHACK.Main/WinClassicForms/WinClassicDownloader.Designer.cs index 20d218f..cd0b55c 100644 --- a/TimeHACK.Main/WinClassicForms/WinClassicDownloader.Designer.cs +++ b/TimeHACK.Main/WinClassicForms/WinClassicDownloader.Designer.cs @@ -35,6 +35,7 @@ this.locationLbl = new System.Windows.Forms.Label(); this.transferLbl = new System.Windows.Forms.Label(); this.dlTimer = new System.Windows.Forms.Timer(this.components); + this.dlSpeed = new System.Windows.Forms.Timer(this.components); this.SuspendLayout(); // // progBar @@ -88,6 +89,11 @@ this.dlTimer.Interval = 1000; this.dlTimer.Tick += new System.EventHandler(this.dlTimer_Tick); // + // dlSpeed + // + this.dlSpeed.Interval = 750; + this.dlSpeed.Tick += new System.EventHandler(this.dlSpeed_Tick); + // // WinClassicDownloader // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -113,5 +119,6 @@ internal System.Windows.Forms.Label locationLbl; internal System.Windows.Forms.Label transferLbl; private System.Windows.Forms.Timer dlTimer; + private System.Windows.Forms.Timer dlSpeed; } } diff --git a/TimeHACK.Main/WinClassicForms/WinClassicDownloader.cs b/TimeHACK.Main/WinClassicForms/WinClassicDownloader.cs index b5aa521..4cdcd43 100644 --- a/TimeHACK.Main/WinClassicForms/WinClassicDownloader.cs +++ b/TimeHACK.Main/WinClassicForms/WinClassicDownloader.cs @@ -9,9 +9,20 @@ namespace TimeHACK.WinClassicForms public WinClassicDownloader() { InitializeComponent(); + + } + + private string DownloadSpeed(string str) + { + Random rnd = new Random(); + int dl1 = rnd.Next(7, 9); + int dl2 = rnd.Next(1, 9); + int dl3 = rnd.Next(1, 9); + string speed = dl1.ToString() + "." + dl2.ToString() + dl3.ToString(); + return speed; } + int amountToDL = 100; - int downloadSpeed = 8; int amountDLed = 0; Windows95 Windows95 = new Windows95(); @@ -19,13 +30,13 @@ namespace TimeHACK.WinClassicForms private void WinClassicDownloader_Load(object sender, EventArgs e) { dlTimer.Start(); - transferLbl.Text = ("Transfer speed: " + downloadSpeed + " KB/s"); + dlSpeed.Start(); } private void dlTimer_Tick(object sender, EventArgs e) { - amountDLed = amountDLed + downloadSpeed; - if(downloadSpeed > amountToDL - amountDLed){ + amountDLed = amountDLed + 8; + if(8 > amountToDL - amountDLed){ progBar.Value = 100; amountLbl.Text = ("Downloaded " + amountDLed + " KB out of " + amountToDL + " KB"); @@ -67,5 +78,10 @@ namespace TimeHACK.WinClassicForms } amountLbl.Text = ("Downloaded " + amountDLed + " KB out of " + amountToDL); } + + private void dlSpeed_Tick(object sender, EventArgs e) + { + transferLbl.Text = ("Transfer speed: " + DownloadSpeed("") + " KB/s"); + } } } diff --git a/TimeHACK.Main/WinClassicForms/WinClassicDownloader.resx b/TimeHACK.Main/WinClassicForms/WinClassicDownloader.resx index e5280c3..daf1933 100644 --- a/TimeHACK.Main/WinClassicForms/WinClassicDownloader.resx +++ b/TimeHACK.Main/WinClassicForms/WinClassicDownloader.resx @@ -120,4 +120,7 @@ <metadata name="dlTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> + <metadata name="dlSpeed.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>110, 17</value> + </metadata> </root>
\ No newline at end of file diff --git a/TimeHACK.Main/obj/Release/CoreCompileInputs.cache b/TimeHACK.Main/obj/Release/CoreCompileInputs.cache index 387d3d4..127cfef 100644 --- a/TimeHACK.Main/obj/Release/CoreCompileInputs.cache +++ b/TimeHACK.Main/obj/Release/CoreCompileInputs.cache @@ -1 +1 @@ -a6a030bebb8324fd56257f6ce480ed30b633ae1e +b3db32e3541a4770807ecd8afe2fc9c3e7d8371d diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache Binary files differindex 9c508b5..d9d452e 100644 --- a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache +++ b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources b/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources Binary files differindex bd42262..02404da 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources +++ b/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources diff --git a/TimeHACK.Main/obj/Release/TimeHACK.TitleScreen.resources b/TimeHACK.Main/obj/Release/TimeHACK.TitleScreen.resources Binary files differindex 96f2158..51ab95c 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.TitleScreen.resources +++ b/TimeHACK.Main/obj/Release/TimeHACK.TitleScreen.resources diff --git a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicTemplate.resources b/TimeHACK.Main/obj/Release/TimeHACK.WinClassicTemplate.resources Binary files differnew file mode 100644 index 0000000..2a79d99 --- /dev/null +++ b/TimeHACK.Main/obj/Release/TimeHACK.WinClassicTemplate.resources |