From 21320c8f96c2833860203a9df50e5f6afd7305b9 Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Wed, 31 May 2017 09:23:32 +0100 Subject: Fixed taskbar bug.............. again......... --- .../WinClassicWindowsExplorer.Designer.cs | 33 +++++++++++++--------- .../Win95/Win95Apps/WinClassicWindowsExplorer.cs | 28 +++++++++--------- .../Win95/Win95Apps/WinClassicWindowsExplorer.resx | 20 ++++++------- 3 files changed, 42 insertions(+), 39 deletions(-) (limited to 'TimeHACK.Main/OS') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs index d90eee2..a423686 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs @@ -32,6 +32,7 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WinClassicWindowsExplorer)); this.program = new System.Windows.Forms.Panel(); this.diskView = new System.Windows.Forms.ListView(); + this.icons = new System.Windows.Forms.ImageList(this.components); this.btnGo = new System.Windows.Forms.Button(); this.MenuStrip1 = new System.Windows.Forms.MenuStrip(); this.FileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -93,7 +94,6 @@ this.LinkLabel1 = new System.Windows.Forms.LinkLabel(); this.Label3 = new System.Windows.Forms.Label(); this.Label2 = new System.Windows.Forms.Label(); - this.icons = new System.Windows.Forms.ImageList(this.components); this.program.SuspendLayout(); this.MenuStrip1.SuspendLayout(); this.pnlSave.SuspendLayout(); @@ -131,6 +131,14 @@ this.diskView.View = System.Windows.Forms.View.List; this.diskView.DoubleClick += new System.EventHandler(this.diskView_DoubleClick); // + // icons + // + this.icons.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("icons.ImageStream"))); + this.icons.TransparentColor = System.Drawing.Color.Transparent; + this.icons.Images.SetKeyName(0, "nwnp32_1_SERVER_ICON.png"); + this.icons.Images.SetKeyName(1, "shell32_21.ico_16x16.png"); + this.icons.Images.SetKeyName(2, "blank-file-Windows95Icon.gif"); + // // btnGo // this.btnGo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -535,15 +543,16 @@ this.pnlSave.Controls.Add(this.Button1); this.pnlSave.Controls.Add(this.Label1); this.pnlSave.Controls.Add(this.txtSave); - this.pnlSave.Location = new System.Drawing.Point(162, 474); + this.pnlSave.Location = new System.Drawing.Point(3, 474); this.pnlSave.Name = "pnlSave"; - this.pnlSave.Size = new System.Drawing.Size(253, 35); + this.pnlSave.Size = new System.Drawing.Size(850, 35); this.pnlSave.TabIndex = 18; this.pnlSave.Visible = false; // // Button1 // - this.Button1.Location = new System.Drawing.Point(166, 3); + this.Button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.Button1.Location = new System.Drawing.Point(772, 3); this.Button1.Name = "Button1"; this.Button1.Size = new System.Drawing.Size(75, 23); this.Button1.TabIndex = 17; @@ -554,7 +563,7 @@ // Label1 // this.Label1.AutoSize = true; - this.Label1.Location = new System.Drawing.Point(3, 3); + this.Label1.Location = new System.Drawing.Point(3, 6); this.Label1.Name = "Label1"; this.Label1.Size = new System.Drawing.Size(57, 13); this.Label1.TabIndex = 16; @@ -562,9 +571,11 @@ // // txtSave // + this.txtSave.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.txtSave.Location = new System.Drawing.Point(60, 3); this.txtSave.Name = "txtSave"; - this.txtSave.Size = new System.Drawing.Size(100, 20); + this.txtSave.Size = new System.Drawing.Size(706, 20); this.txtSave.TabIndex = 15; // // mainView @@ -576,6 +587,8 @@ this.mainView.Location = new System.Drawing.Point(222, 54); this.mainView.Name = "mainView"; this.mainView.Size = new System.Drawing.Size(631, 417); + this.mainView.SmallImageList = this.icons; + this.mainView.StateImageList = this.icons; this.mainView.TabIndex = 10; this.mainView.UseCompatibleStateImageBehavior = false; this.mainView.DoubleClick += new System.EventHandler(this.mainView_DoubleClick); @@ -625,14 +638,6 @@ this.Label2.TabIndex = 0; this.Label2.Text = "This directory is hidden"; // - // icons - // - this.icons.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("icons.ImageStream"))); - this.icons.TransparentColor = System.Drawing.Color.Transparent; - this.icons.Images.SetKeyName(0, "nwnp32_1_SERVER_ICON.png"); - this.icons.Images.SetKeyName(1, "shell32_21.ico_16x16.png"); - this.icons.Images.SetKeyName(2, "blank-file-Windows95Icon.gif"); - // // WinClassicWindowsExplorer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs index 0cd2510..6ad1bb1 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs @@ -63,24 +63,22 @@ namespace TimeHACK.OS.Win95.Win95Apps String ReadDataFile(String reqDirectory, Boolean returnYesIfProtected = false) { String Val = ""; - try - { - String directoryFileInfo; - directoryFileInfo = File.ReadAllText(reqDirectory); - FileSystemFolderInfo toRead = new FileSystemFolderInfo(); - toRead = JsonConvert.DeserializeObject(directoryFileInfo); + String directoryFileInfo; + directoryFileInfo = File.ReadAllText(reqDirectory); + FileSystemFolderInfo toRead = new FileSystemFolderInfo(); + toRead = JsonConvert.DeserializeObject(directoryFileInfo); - if (returnYesIfProtected == true) + MessageBox.Show(toRead.label); + if (returnYesIfProtected == true) + { + if (toRead.Isprotected == true) { - if (toRead.Isprotected == true) - { - return "yes"; - } - } else { - return toRead.label; + return "yes"; } - } catch (Exception ex) { - + } + else + { + return toRead.label; } return Val; } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx index 6581824..55cb7ea 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD8 - CQAAAk1TRnQBSQFMAgEBAwEAAQgBAAEIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAwEAARgBAAEYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -155,15 +155,15 @@ AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wEAAe0NFAHyMQANBwH3 AW0B8jAAAgcBMwQHAe0CbQESAW0B7QH3AewBFDAABwcB7wT3Ae8B9wHsARQCAAvsBQAB8AhtAfMUAA0H - Ae8B7AEUAgAB7AH/AQcB+wEHAfsBBwH7AQcB+wHsBQAB7wEHBv8B+AHyFQABBwsUAW0BkgEUAQAB7AH/ - AQcB+wEHAfsBBwH7AQcB+wEHAQAB7AQAAe8BBwb/AfgB8hUAAfAK8QH3AW0BkgHzAQAB7AH/AfsBBwH7 - AQcB+wEHAfsBBwHsBgAB7wEHBv8B+AHyFQAB8AHxAQQHoQG1AfcB+AHvAQAB7AH/AfsBBwH7AQcB+wEH - AfsBBwH7AgABBwQAAe8BBwb/AfgB8hUAAfAB8QEEAvwBhgL4ARQB/AHPAfcB+AHvAQAB7An/AewBAAH8 - Af8BBwMAAe8BBwb/AfgB8hUAAfAB8QEEAfwB6gHsAv8B+AH8Ac8B9wH4Ae8BAAzsAv8EAAHvAQcG/wH4 - AfIVAAHwAfEBBAH8AQcB7gG1AQQBhQH8Ac8B9wH4Ae8CAAHsAf8B+wEHAewC/wH8Af8B/AL/BQAB7wEH - BP8CEQEOAfIVAAHwAfEBBAHNAwQBoQL8Ac8B9wH4Ae8CAAHsAf8BBwH7AQcB7AL/AfwC/wEAAewEAAHv - AQcE/wHsAfcB8BYAAfAB8QEKBwQBzwH3AfgB7wIAAewB/wH7AQcB+wEHAewD/wEAAuwEAAHvARUEEwER - AfMXAAHwAfEI9wEHAfcB+AHvAwAB7AT/AuwB/ycAAf8BvAnxAbwB7AHvBAAE7CsAAf8BBwn3AZIB8jEA + Ae8B7AEUAgAB7AH/AQcB+wEHAfsBBwH7AQcB+wHsBQAB7wEHBv8B7AHyFQABBwsUAW0BkgEUAQAB7AH/ + AQcB+wEHAfsBBwH7AQcB+wEHAQAB7AQAAe8BBwb/AewB8hUAAfAK8QH3AW0BkgHzAQAB7AH/AfsBBwH7 + AQcB+wEHAfsBBwHsBgAB7wEHBv8B7AHyFQAB8AHxAQQHoQG1AfcB7AHvAQAB7AH/AfsBBwH7AQcB+wEH + AfsBBwH7AgABBwQAAe8BBwb/AewB8hUAAfAB8QEEAvwBhgLsARQB/AHPAfcB7AHvAQAB7An/AewBAAH8 + Af8BBwMAAe8BBwb/AewB8hUAAfAB8QEEAfwB6gHsAv8B7AH8Ac8B9wHsAe8BAAzsAv8EAAHvAQcG/wHs + AfIVAAHwAfEBBAH8AQcBvAG1AQQBhQH8Ac8B9wHsAe8CAAHsAf8B+wEHAewC/wH8Af8B/AL/BQAB7wEH + BP8CEQEOAfIVAAHwAfEBBAHNAwQBoQL8Ac8B9wHsAe8CAAHsAf8BBwH7AQcB7AL/AfwC/wEAAewEAAHv + AQcE/wHsAfcB8BYAAfAB8QEKBwQBzwH3AewB7wIAAewB/wH7AQcB+wEHAewD/wEAAuwEAAHvARUEEwER + AfMXAAHwAfEI9wEHAfcB7AHvAwAB7AT/AuwB/ycAAf8BvAnxAbwB7AHvBAAE7CsAAf8BBwn3AZIB8jEA AUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/8CAAEBBP8EAAT/BAAB4AEBAv8EAAHA AQEBwAEPBAABwAEBAcABDwIAAYABAAGAAQEBwAEPAgABgAEAAYABAQHAAQ8CAAGAAQEBAAEJAcABDwIA AYABAQIAAcABDwIAAYABAQEAAQEBwAEPAgABgAEBAYABAQHAAQ8CAAGAAQEBgAEBAcABHwIAAYABAQGA -- cgit v1.2.3