diff options
Diffstat (limited to 'TimeHACK.Main')
24 files changed, 42 insertions, 14 deletions
diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index da207ac..312d25a 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -145,7 +145,7 @@ <DependentUpon>WinClassicTemplate.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/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll Binary files differindex a54d615..4dce794 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll +++ b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb Binary files differindex 2cef144..7d792d6 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb +++ b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index e75830d..72b3b66 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>ZhaYmBKx601mfkJ5cHtI3xbkNCfE0iTlUWmYpUvhLxA=</dsig:DigestValue> + <dsig:DigestValue>1KXDD9z4mTQXd8ju5A+nSAa6hHbz+FjyTAJJQuBSqEg=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe Binary files differindex 7560985..6628464 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest index 1a62adb..8ed52c4 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -51,19 +51,19 @@ <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>dS7NxTFLVMVSdOZdI9xYuo9v2VHN7BFTXFMk74E8y9w=</dsig:DigestValue> + <dsig:DigestValue>l8aVyeTJaDHcjgGw1AVyK+IzMWycpiGjKBYfDqQ2d2A=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> <dependency> - <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.Engine.dll" size="20480"> + <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.Engine.dll" size="21504"> <assemblyIdentity name="TimeHACK.Engine" version="1.0.0.0" language="neutral" processorArchitecture="msil" /> <hash> <dsig:Transforms> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>40SJFsjwh7iOvayhlw43ahAHbk+XQREZ93piy54Apew=</dsig:DigestValue> + <dsig:DigestValue>fNeLt6ocUBCGr1kWChKMN2eDYxMRVCMrBE42+OlZU2I=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb Binary files differindex e96fc72..213cc73 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.pdb +++ b/TimeHACK.Main/bin/Release/TimeHACK.pdb diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe Binary files differindex 7560985..6628464 100644 --- a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe +++ b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe 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 5bfa09b..39ebf41 100644 --- a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache +++ b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt index cfcbe76..6607f75 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt @@ -75,3 +75,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 +D:\Documents\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicDownloader.resources +D:\Documents\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Engine.WinClassicInstaller.resources diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache Binary files differindex 796d44d..8501fa1 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache Binary files differindex 82386a6..6b6cf1a 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.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 differindex f52d56e..2a79d99 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicTemplate.resources +++ b/TimeHACK.Main/obj/Release/TimeHACK.WinClassicTemplate.resources diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Windows95.resources b/TimeHACK.Main/obj/Release/TimeHACK.Windows95.resources Binary files differindex 2a7e59c..af0216b 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Windows95.resources +++ b/TimeHACK.Main/obj/Release/TimeHACK.Windows95.resources diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index e75830d..72b3b66 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>ZhaYmBKx601mfkJ5cHtI3xbkNCfE0iTlUWmYpUvhLxA=</dsig:DigestValue> + <dsig:DigestValue>1KXDD9z4mTQXd8ju5A+nSAa6hHbz+FjyTAJJQuBSqEg=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe Binary files differindex 7560985..6628464 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest index 1a62adb..8ed52c4 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -51,19 +51,19 @@ <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>dS7NxTFLVMVSdOZdI9xYuo9v2VHN7BFTXFMk74E8y9w=</dsig:DigestValue> + <dsig:DigestValue>l8aVyeTJaDHcjgGw1AVyK+IzMWycpiGjKBYfDqQ2d2A=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> <dependency> - <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.Engine.dll" size="20480"> + <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.Engine.dll" size="21504"> <assemblyIdentity name="TimeHACK.Engine" version="1.0.0.0" language="neutral" processorArchitecture="msil" /> <hash> <dsig:Transforms> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>40SJFsjwh7iOvayhlw43ahAHbk+XQREZ93piy54Apew=</dsig:DigestValue> + <dsig:DigestValue>fNeLt6ocUBCGr1kWChKMN2eDYxMRVCMrBE42+OlZU2I=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb Binary files differindex e96fc72..213cc73 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.pdb +++ b/TimeHACK.Main/obj/Release/TimeHACK.pdb |
