aboutsummaryrefslogtreecommitdiff
path: root/TimeHACK.Main
diff options
context:
space:
mode:
authorlempamo <[email protected]>2017-08-18 19:18:17 -0400
committerlempamo <[email protected]>2017-08-18 19:18:17 -0400
commit085ae85fd59c87df05e8f58009f04cdfc2bd7d8d (patch)
tree0fa2fcd816b289461478c320725912778afe7018 /TimeHACK.Main
parent3399ab978ca11faee44803d2b7c5f0f06855504a (diff)
downloadhistacom2-085ae85fd59c87df05e8f58009f04cdfc2bd7d8d.tar.gz
histacom2-085ae85fd59c87df05e8f58009f04cdfc2bd7d8d.tar.bz2
histacom2-085ae85fd59c87df05e8f58009f04cdfc2bd7d8d.zip
got rid of excess returntype things and did a thing to IE3
Diffstat (limited to 'TimeHACK.Main')
-rw-r--r--TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs70
-rw-r--r--TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE3.Designer.cs37
-rw-r--r--TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE3.cs2
-rw-r--r--TimeHACK.Main/Properties/Resources.Designer.cs10
-rw-r--r--TimeHACK.Main/Properties/Resources.resx3
-rw-r--r--TimeHACK.Main/Resources/IE3/IE3_RefreshHover.pngbin0 -> 670 bytes
-rw-r--r--TimeHACK.Main/TimeHACK.Main.csproj1
7 files changed, 39 insertions, 84 deletions
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
index 9448b3a..7496009 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
@@ -146,9 +146,9 @@ namespace TimeHACK.OS.Win95.Win95Apps
itm = this.mainView.Items.Add(Path.GetFileName(str));
itm.Tag = str;
}
- else break;
+ else continue;
}
- else break;
+ else continue;
}
else {
if (!(Path.GetFileName(str) == "_data.info"))
@@ -156,7 +156,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
itm = this.mainView.Items.Add(Path.GetFileName(str));
itm.Tag = str;
}
- else break;
+ else continue;
}
FileSystemFolderInfo fsfi = JsonConvert.DeserializeObject<FileSystemFolderInfo>(File.ReadAllText(Path.Combine(CurrentDirectory, "_data.info")));
foreach (var item in fsfi.Files)
@@ -220,7 +220,6 @@ namespace TimeHACK.OS.Win95.Win95Apps
WinClassic app = wm.StartWin95(np, "Notepad", Properties.Resources.Win95IconNotepad, true, true);
Program.AddTaskbarItem(app, app.Tag.ToString(), "Notepad", Properties.Resources.Win95IconNotepad);
-
break;
case 12:
OpenApplication(FileDialogBoxManager.ReadTextFile(fileDir), fileDir);
@@ -228,7 +227,6 @@ namespace TimeHACK.OS.Win95.Win95Apps
}
} catch {
}
-
}
void OpenApplication(string appname, string path)
@@ -419,70 +417,10 @@ namespace TimeHACK.OS.Win95.Win95Apps
fileType = 11;
returnVal = "Compressed ZIP file \n winrar";
break;
- case ".rar":
- fileType = 11;
- returnVal = "WINRAR Compressed file \n winrar";
- break;
- case ".gz":
- fileType = 11;
- returnVal = "WINRAR file \n winrar";
- break;
- case ".7z":
- fileType = 11;
- returnVal = "7ZIP file \n 7z";
- break;
- case ".ace":
- fileType = 11;
- returnVal = "WINRAR file \n winrar";
- break;
- case ".arj":
- fileType = 11;
- returnVal = "WINRAR file \n winrar";
- break;
- case ".bz2":
- fileType = 11;
- returnVal = "WINRAR file \n winrar";
- break;
- case ".gzip":
- fileType = 11;
- returnVal = "WINRAR file \n winrar";
- break;
- case ".lzh":
- fileType = 11;
- returnVal = "WINRAR file \n winrar";
- break;
- case ".tar":
- fileType = 11;
- returnVal = "WINRAR file \n winrar";
- break;
- case ".uue":
- fileType = 11;
- returnVal = "WINRAR file \n winrar";
- break;
- case ".xz":
- fileType = 11;
- returnVal = "WINRAR file \n winrar";
- break;
- case ".z":
- fileType = 11;
- returnVal = "WINRAR file \n winrar";
- break;
- case ".001":
- fileType = 11;
- returnVal = "WINRAR file \n winrar";
- break;
case ".exe":
fileType = 12;
returnVal = "Program \n exe";
break;
- case ".jar":
- fileType = 13;
- returnVal = "Java file \n java";
- break;
- case ".iso":
- fileType = 14;
- returnVal = "CD Image file \n iso";
- break;
case ".avi":
fileType = 15;
returnVal = "Video \n video";
@@ -577,7 +515,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
break;
case ".bat":
fileType = 18;
- returnVal = "MS-DOS Batch file \n winterm";
+ returnVal = "MS-DOS Batch File \n winterm";
break;
case ".url":
fileType = 19;
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE3.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE3.Designer.cs
index 92168ec..600d905 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE3.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE3.Designer.cs
@@ -42,7 +42,7 @@
this.Button7 = new System.Windows.Forms.Button();
this.Button6 = new System.Windows.Forms.Button();
this.HomeButton = new System.Windows.Forms.Button();
- this.Button4 = new System.Windows.Forms.Button();
+ this.RefreshButton = new System.Windows.Forms.Button();
this.StopButton = new System.Windows.Forms.Button();
this.ForwardButton = new System.Windows.Forms.Button();
this.BackButton = new System.Windows.Forms.Button();
@@ -362,21 +362,21 @@
this.HomeButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.HomeButton.UseVisualStyleBackColor = false;
//
- // Button4
- //
- this.Button4.BackColor = System.Drawing.Color.Transparent;
- this.Button4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
- this.Button4.Dock = System.Windows.Forms.DockStyle.Left;
- this.Button4.FlatAppearance.BorderSize = 0;
- this.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.Button4.Image = global::TimeHACK.Properties.Resources.IE3_Refresh;
- this.Button4.Location = new System.Drawing.Point(160, 0);
- this.Button4.Name = "Button4";
- this.Button4.Size = new System.Drawing.Size(50, 42);
- this.Button4.TabIndex = 3;
- this.Button4.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.Button4.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.Button4.UseVisualStyleBackColor = false;
+ // RefreshButton
+ //
+ this.RefreshButton.BackColor = System.Drawing.Color.Transparent;
+ this.RefreshButton.BackgroundImage = global::TimeHACK.Properties.Resources.IE3_Refresh;
+ this.RefreshButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
+ this.RefreshButton.Dock = System.Windows.Forms.DockStyle.Left;
+ this.RefreshButton.FlatAppearance.BorderSize = 0;
+ this.RefreshButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.RefreshButton.Location = new System.Drawing.Point(160, 0);
+ this.RefreshButton.Name = "RefreshButton";
+ this.RefreshButton.Size = new System.Drawing.Size(50, 42);
+ this.RefreshButton.TabIndex = 3;
+ this.RefreshButton.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.RefreshButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.RefreshButton.UseVisualStyleBackColor = false;
//
// StopButton
//
@@ -445,7 +445,7 @@
this.Panel1.Controls.Add(this.Button7);
this.Panel1.Controls.Add(this.Button6);
this.Panel1.Controls.Add(this.HomeButton);
- this.Panel1.Controls.Add(this.Button4);
+ this.Panel1.Controls.Add(this.RefreshButton);
this.Panel1.Controls.Add(this.StopButton);
this.Panel1.Controls.Add(this.ForwardButton);
this.Panel1.Controls.Add(this.BackButton);
@@ -505,6 +505,7 @@
//
// ToolStripMenuItem1
//
+ this.ToolStripMenuItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.ToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ToolStripMenuItem2,
this.ToolStripMenuItem8,
@@ -1342,7 +1343,7 @@
internal System.Windows.Forms.Button Button7;
internal System.Windows.Forms.Button Button6;
internal System.Windows.Forms.Button HomeButton;
- internal System.Windows.Forms.Button Button4;
+ internal System.Windows.Forms.Button RefreshButton;
internal System.Windows.Forms.Button StopButton;
internal System.Windows.Forms.Button ForwardButton;
internal System.Windows.Forms.Button BackButton;
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE3.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE3.cs
index 1b1fbc8..b5367d1 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE3.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE3.cs
@@ -28,6 +28,8 @@ namespace TimeHACK.OS.Win95.Win95Apps
ForwardButton.MouseLeave += (s, e) => ForwardButton.BackgroundImage = Properties.Resources.IE3_Forward;
StopButton.MouseEnter += (s, e) => StopButton.BackgroundImage = Properties.Resources.IE3_StopHover;
StopButton.MouseLeave += (s, e) => StopButton.BackgroundImage = Properties.Resources.IE3_Stop;
+ RefreshButton.MouseEnter += (s, e) => RefreshButton.BackgroundImage = Properties.Resources.IE3_RefreshHover;
+ RefreshButton.MouseLeave += (s, e) => RefreshButton.BackgroundImage = Properties.Resources.IE3_Refresh;
}
public static async void GoToPage(string url)
diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs
index 8f67f81..cbdc265 100644
--- a/TimeHACK.Main/Properties/Resources.Designer.cs
+++ b/TimeHACK.Main/Properties/Resources.Designer.cs
@@ -257,6 +257,16 @@ namespace TimeHACK.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
+ internal static System.Drawing.Bitmap IE3_RefreshHover {
+ get {
+ object obj = ResourceManager.GetObject("IE3_RefreshHover", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap IE3_Stop {
get {
object obj = ResourceManager.GetObject("IE3_Stop", resourceCulture);
diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx
index 6605b13..b86487a 100644
--- a/TimeHACK.Main/Properties/Resources.resx
+++ b/TimeHACK.Main/Properties/Resources.resx
@@ -801,6 +801,9 @@
<data name="IE3_Refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\IE3\IE3_Refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="IE3_RefreshHover" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\IE3\IE3_RefreshHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="IE3_StopHover" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\IE3\IE3_StopHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
diff --git a/TimeHACK.Main/Resources/IE3/IE3_RefreshHover.png b/TimeHACK.Main/Resources/IE3/IE3_RefreshHover.png
new file mode 100644
index 0000000..4f6361b
--- /dev/null
+++ b/TimeHACK.Main/Resources/IE3/IE3_RefreshHover.png
Binary files differ
diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj
index 5e04705..b70ee75 100644
--- a/TimeHACK.Main/TimeHACK.Main.csproj
+++ b/TimeHACK.Main/TimeHACK.Main.csproj
@@ -536,6 +536,7 @@
<None Include="Resources\IE3\IE3_BackHover.png" />
<None Include="Resources\IE3\IE3_ForwardHover.png" />
<None Include="Resources\IE3\IE3_StopHover.png" />
+ <None Include="Resources\IE3\IE3_RefreshHover.png" />
<Content Include="Resources\IE4\google.jpg" />
<Content Include="Resources\IE4\googlehome.html" />
<Content Include="Resources\IE4\googleprototype.html" />