From 1cdbf9659b0153285bb56bd35ab58e0a70f4d632 Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Sat, 4 Nov 2017 22:00:05 +0000 Subject: Final commit! --- Histacom2.Engine/UI/ClassicDropDown.cs | 13 +- Histacom2.Engine/UI/ClassicTextBox.Designer.cs | 8 +- Histacom2.Engine/UI/ClassicTextbox.cs | 14 +- Histacom2/Histacom2.csproj | 3 + .../OS/Win95/Win95Apps/Win95WindowsExplorer.cs | 2 +- .../Win95Apps/WinClassicFTPClient.Designer.cs | 217 +++++++++++---------- .../OS/Win95/Win95Apps/WinClassicFTPClient.cs | 6 +- .../OS/Win95/Win95Apps/WinClassicFTPClient.resx | 2 +- .../AddressBook/WinClassicAddressBook.Designer.cs | 2 +- .../Win98Apps/AddressBook/WinClassicAddressBook.cs | 7 +- .../WinClassicWindowsExplorer.Designer.cs | 150 +++++++------- .../Win98/Win98Apps/WinClassicWindowsExplorer.cs | 32 ++- .../Win98/Win98Apps/WinClassicWindowsExplorer.resx | 9 + Histacom2/Properties/Resources.resx | 6 + Histacom2/Properties/Resources1.Designer.cs | 26 ++- Histacom2/Resources/WinClassicAddressBookBig.png | Bin 0 -> 2146 bytes Histacom2/Resources/WinClassicDrive.png | Bin 0 -> 238 bytes Histacom2/Resources/addrbook.ico_32x32[1].png | Bin 0 -> 2146 bytes 18 files changed, 294 insertions(+), 203 deletions(-) create mode 100644 Histacom2/Resources/WinClassicAddressBookBig.png create mode 100644 Histacom2/Resources/WinClassicDrive.png create mode 100644 Histacom2/Resources/addrbook.ico_32x32[1].png diff --git a/Histacom2.Engine/UI/ClassicDropDown.cs b/Histacom2.Engine/UI/ClassicDropDown.cs index edf2268..e01ca2a 100644 --- a/Histacom2.Engine/UI/ClassicDropDown.cs +++ b/Histacom2.Engine/UI/ClassicDropDown.cs @@ -14,7 +14,6 @@ namespace Histacom2.Engine.UI public partial class ClassicDropDown : UserControl { public DropDownOverlay thisOverlay = new DropDownOverlay(); - public bool UseSystemPasswordChar { get; set; } public bool dropDownShown; public override string Text @@ -29,6 +28,18 @@ namespace Histacom2.Engine.UI } } + public bool UseSystemPasswordChar + { + get + { + return textBox1.UseSystemPasswordChar; + } + set + { + textBox1.UseSystemPasswordChar = value; + } + } + public static Color textboxcolor = Color.Black; public static Color _lightBack = Color.Silver; diff --git a/Histacom2.Engine/UI/ClassicTextBox.Designer.cs b/Histacom2.Engine/UI/ClassicTextBox.Designer.cs index af6b199..06df3fb 100644 --- a/Histacom2.Engine/UI/ClassicTextBox.Designer.cs +++ b/Histacom2.Engine/UI/ClassicTextBox.Designer.cs @@ -42,7 +42,7 @@ // bborder // this.bborder.Dock = System.Windows.Forms.DockStyle.Bottom; - this.bborder.Location = new System.Drawing.Point(2, 15); + this.bborder.Location = new System.Drawing.Point(2, 18); this.bborder.Name = "bborder"; this.bborder.Size = new System.Drawing.Size(96, 2); this.bborder.TabIndex = 0; @@ -53,7 +53,7 @@ this.lborder.Dock = System.Windows.Forms.DockStyle.Left; this.lborder.Location = new System.Drawing.Point(0, 0); this.lborder.Name = "lborder"; - this.lborder.Size = new System.Drawing.Size(2, 17); + this.lborder.Size = new System.Drawing.Size(2, 20); this.lborder.TabIndex = 1; this.lborder.TabStop = false; // @@ -62,7 +62,7 @@ this.rborder.Dock = System.Windows.Forms.DockStyle.Right; this.rborder.Location = new System.Drawing.Point(98, 0); this.rborder.Name = "rborder"; - this.rborder.Size = new System.Drawing.Size(2, 17); + this.rborder.Size = new System.Drawing.Size(2, 20); this.rborder.TabIndex = 2; this.rborder.TabStop = false; // @@ -94,7 +94,7 @@ this.Controls.Add(this.rborder); this.Controls.Add(this.lborder); this.Name = "ClassicTextBox"; - this.Size = new System.Drawing.Size(100, 17); + this.Size = new System.Drawing.Size(100, 20); ((System.ComponentModel.ISupportInitialize)(this.bborder)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.lborder)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.rborder)).EndInit(); diff --git a/Histacom2.Engine/UI/ClassicTextbox.cs b/Histacom2.Engine/UI/ClassicTextbox.cs index f89df03..4847ed5 100644 --- a/Histacom2.Engine/UI/ClassicTextbox.cs +++ b/Histacom2.Engine/UI/ClassicTextbox.cs @@ -12,8 +12,6 @@ namespace Histacom2.Engine.UI { public partial class ClassicTextBox : UserControl { - public bool UseSystemPasswordChar { get; set; } - public static Color textboxcolor = Color.Black; public static Color _lightBack = Color.Silver; @@ -31,6 +29,18 @@ namespace Histacom2.Engine.UI } } + public bool UseSystemPasswordChar + { + get + { + return textBox1.UseSystemPasswordChar; + } + set + { + textBox1.UseSystemPasswordChar = value; + } + } + public ClassicTextBox() { InitializeComponent(); diff --git a/Histacom2/Histacom2.csproj b/Histacom2/Histacom2.csproj index 1c34422..19cf5dc 100644 --- a/Histacom2/Histacom2.csproj +++ b/Histacom2/Histacom2.csproj @@ -759,6 +759,7 @@ + @@ -878,6 +879,8 @@ + + diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs index 1ac4512..e743b30 100644 --- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs +++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs @@ -88,7 +88,7 @@ namespace Histacom2.OS.Win95.Win95Apps Properties.Resources.WinClassicGTN, Properties.Resources.WinClassicFTP, Properties.Resources.WinClassicRtfFile, // 20 - Properties.Resources.WinClassicAddressBook}); + Properties.Resources.WinClassicAddressBookBig}); program.BringToFront(); diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs index c112e61..ead2483 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs @@ -38,21 +38,21 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WinClassicFTPClient)); this.topBar = new System.Windows.Forms.Panel(); this.btnLogin = new Histacom2.Engine.UI.ClassicButton(); - this.infoLabel = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.textBox4 = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.passBox = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.usernameBox = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.hostnameBox = new System.Windows.Forms.TextBox(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.panel1 = new System.Windows.Forms.Panel(); this.btnCancel = new Histacom2.Engine.UI.ClassicButton(); this.welcomeLabel = new System.Windows.Forms.Label(); this.ftpFiles = new System.Windows.Forms.ListView(); this.fileIcons = new System.Windows.Forms.ImageList(this.components); + this.hostnameBox = new Histacom2.Engine.UI.ClassicTextBox(); + this.usernameBox = new Histacom2.Engine.UI.ClassicTextBox(); + this.passBox = new Histacom2.Engine.UI.ClassicTextBox(); + this.infoLabel = new Histacom2.Engine.UI.ClassicLabel(); + this.textBox4 = new Histacom2.Engine.UI.ClassicTextBox(); + this.classicLabel1 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel2 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel3 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel4 = new Histacom2.Engine.UI.ClassicLabel(); this.topBar.SuspendLayout(); this.panel1.SuspendLayout(); this.SuspendLayout(); @@ -60,16 +60,16 @@ // topBar // this.topBar.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.topBar.Controls.Add(this.btnLogin); this.topBar.Controls.Add(this.infoLabel); - this.topBar.Controls.Add(this.label4); this.topBar.Controls.Add(this.textBox4); - this.topBar.Controls.Add(this.label3); this.topBar.Controls.Add(this.passBox); - this.topBar.Controls.Add(this.label2); this.topBar.Controls.Add(this.usernameBox); - this.topBar.Controls.Add(this.label1); this.topBar.Controls.Add(this.hostnameBox); + this.topBar.Controls.Add(this.btnLogin); + this.topBar.Controls.Add(this.classicLabel4); + this.topBar.Controls.Add(this.classicLabel3); + this.topBar.Controls.Add(this.classicLabel2); + this.topBar.Controls.Add(this.classicLabel1); this.topBar.Dock = System.Windows.Forms.DockStyle.Top; this.topBar.Location = new System.Drawing.Point(0, 0); this.topBar.Name = "topBar"; @@ -85,91 +85,13 @@ this.btnLogin.DialogResult = System.Windows.Forms.DialogResult.None; this.btnLogin.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); this.btnLogin.ForeColor = System.Drawing.Color.Black; - this.btnLogin.Location = new System.Drawing.Point(585, 4); + this.btnLogin.Location = new System.Drawing.Point(571, 4); this.btnLogin.Name = "btnLogin"; this.btnLogin.Size = new System.Drawing.Size(44, 20); this.btnLogin.TabIndex = 9; this.btnLogin.Text = "Login"; this.btnLogin.Click += new System.EventHandler(this.button1_Click); // - // infoLabel - // - this.infoLabel.AutoSize = true; - this.infoLabel.ForeColor = System.Drawing.Color.Red; - this.infoLabel.Location = new System.Drawing.Point(635, 7); - this.infoLabel.Name = "infoLabel"; - this.infoLabel.Size = new System.Drawing.Size(35, 13); - this.infoLabel.TabIndex = 8; - this.infoLabel.Text = "label5"; - this.infoLabel.Visible = false; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(503, 7); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(29, 13); - this.label4.TabIndex = 6; - this.label4.Text = "&Port:"; - // - // textBox4 - // - this.textBox4.Enabled = false; - this.textBox4.Location = new System.Drawing.Point(538, 4); - this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(41, 20); - this.textBox4.TabIndex = 7; - this.textBox4.Text = "21"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(335, 7); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(56, 13); - this.label3.TabIndex = 4; - this.label3.Text = "Pass&word:"; - // - // passBox - // - this.passBox.Location = new System.Drawing.Point(397, 4); - this.passBox.Name = "passBox"; - this.passBox.PasswordChar = '*'; - this.passBox.Size = new System.Drawing.Size(100, 20); - this.passBox.TabIndex = 5; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(156, 7); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(58, 13); - this.label2.TabIndex = 2; - this.label2.Text = "&Username:"; - // - // usernameBox - // - this.usernameBox.Location = new System.Drawing.Point(214, 4); - this.usernameBox.Name = "usernameBox"; - this.usernameBox.Size = new System.Drawing.Size(100, 20); - this.usernameBox.TabIndex = 3; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(8, 7); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(32, 13); - this.label1.TabIndex = 1; - this.label1.Text = "&Host:"; - // - // hostnameBox - // - this.hostnameBox.Location = new System.Drawing.Point(41, 4); - this.hostnameBox.Name = "hostnameBox"; - this.hostnameBox.Size = new System.Drawing.Size(100, 20); - this.hostnameBox.TabIndex = 1; - // // contextMenuStrip1 // this.contextMenuStrip1.Name = "contextMenuStrip1"; @@ -246,6 +168,96 @@ this.fileIcons.Images.SetKeyName(1, "WinClassicNotepad.png"); this.fileIcons.Images.SetKeyName(2, "WinClassicSetup.png"); // + // hostnameBox + // + this.hostnameBox.BackColor = System.Drawing.Color.White; + this.hostnameBox.Location = new System.Drawing.Point(37, 4); + this.hostnameBox.Name = "hostnameBox"; + this.hostnameBox.Size = new System.Drawing.Size(113, 20); + this.hostnameBox.TabIndex = 10; + this.hostnameBox.UseSystemPasswordChar = false; + // + // usernameBox + // + this.usernameBox.BackColor = System.Drawing.Color.White; + this.usernameBox.Location = new System.Drawing.Point(220, 4); + this.usernameBox.Name = "usernameBox"; + this.usernameBox.Size = new System.Drawing.Size(109, 20); + this.usernameBox.TabIndex = 10; + this.usernameBox.UseSystemPasswordChar = false; + // + // passBox + // + this.passBox.BackColor = System.Drawing.Color.White; + this.passBox.Location = new System.Drawing.Point(392, 4); + this.passBox.Name = "passBox"; + this.passBox.Size = new System.Drawing.Size(105, 20); + this.passBox.TabIndex = 10; + this.passBox.UseSystemPasswordChar = true; + // + // infoLabel + // + this.infoLabel.DropShadow = false; + this.infoLabel.ForeColor = System.Drawing.Color.Red; + this.infoLabel.Location = new System.Drawing.Point(621, 7); + this.infoLabel.Name = "infoLabel"; + this.infoLabel.Size = new System.Drawing.Size(75, 13); + this.infoLabel.TabIndex = 11; + this.infoLabel.Text = "classicLabel1"; + // + // textBox4 + // + this.textBox4.BackColor = System.Drawing.Color.White; + this.textBox4.Location = new System.Drawing.Point(530, 4); + this.textBox4.Name = "textBox4"; + this.textBox4.Size = new System.Drawing.Size(36, 20); + this.textBox4.TabIndex = 10; + this.textBox4.UseSystemPasswordChar = false; + // + // classicLabel1 + // + this.classicLabel1.BackColor = System.Drawing.Color.Transparent; + this.classicLabel1.DropShadow = false; + this.classicLabel1.ForeColor = System.Drawing.Color.Black; + this.classicLabel1.Location = new System.Drawing.Point(3, 7); + this.classicLabel1.Name = "classicLabel1"; + this.classicLabel1.Size = new System.Drawing.Size(75, 13); + this.classicLabel1.TabIndex = 11; + this.classicLabel1.Text = "Host:"; + // + // classicLabel2 + // + this.classicLabel2.BackColor = System.Drawing.Color.Transparent; + this.classicLabel2.DropShadow = false; + this.classicLabel2.ForeColor = System.Drawing.Color.Black; + this.classicLabel2.Location = new System.Drawing.Point(156, 7); + this.classicLabel2.Name = "classicLabel2"; + this.classicLabel2.Size = new System.Drawing.Size(75, 13); + this.classicLabel2.TabIndex = 11; + this.classicLabel2.Text = "Username:"; + // + // classicLabel3 + // + this.classicLabel3.BackColor = System.Drawing.Color.Transparent; + this.classicLabel3.DropShadow = false; + this.classicLabel3.ForeColor = System.Drawing.Color.Black; + this.classicLabel3.Location = new System.Drawing.Point(335, 7); + this.classicLabel3.Name = "classicLabel3"; + this.classicLabel3.Size = new System.Drawing.Size(75, 13); + this.classicLabel3.TabIndex = 11; + this.classicLabel3.Text = "Password:"; + // + // classicLabel4 + // + this.classicLabel4.BackColor = System.Drawing.Color.Transparent; + this.classicLabel4.DropShadow = false; + this.classicLabel4.ForeColor = System.Drawing.Color.Black; + this.classicLabel4.Location = new System.Drawing.Point(503, 7); + this.classicLabel4.Name = "classicLabel4"; + this.classicLabel4.Size = new System.Drawing.Size(75, 13); + this.classicLabel4.TabIndex = 11; + this.classicLabel4.Text = "Port:"; + // // WinClassicFTPClient // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -257,7 +269,6 @@ this.Size = new System.Drawing.Size(762, 499); this.Load += new System.EventHandler(this.WinClassicFTPClient_Load); this.topBar.ResumeLayout(false); - this.topBar.PerformLayout(); this.panel1.ResumeLayout(false); this.ResumeLayout(false); @@ -266,21 +277,21 @@ #endregion private System.Windows.Forms.Panel topBar; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.TextBox textBox4; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.TextBox passBox; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.TextBox usernameBox; - private System.Windows.Forms.Label label1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; - public System.Windows.Forms.TextBox hostnameBox; - private System.Windows.Forms.Label infoLabel; private System.Windows.Forms.Panel panel1; private Engine.UI.ClassicButton btnCancel; private System.Windows.Forms.Label welcomeLabel; internal System.Windows.Forms.ListView ftpFiles; private System.Windows.Forms.ImageList fileIcons; private Engine.UI.ClassicButton btnLogin; + private Engine.UI.ClassicTextBox hostnameBox; + private Engine.UI.ClassicTextBox passBox; + private Engine.UI.ClassicTextBox usernameBox; + private Engine.UI.ClassicLabel infoLabel; + private Engine.UI.ClassicTextBox textBox4; + private Engine.UI.ClassicLabel classicLabel1; + private Engine.UI.ClassicLabel classicLabel3; + private Engine.UI.ClassicLabel classicLabel2; + private Engine.UI.ClassicLabel classicLabel4; } } diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs index df531c3..d20563e 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs @@ -17,6 +17,10 @@ namespace Histacom2.OS.Win95.Win95Apps public WinClassicFTPClient() { InitializeComponent(); + + hostnameBox.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((0))); + usernameBox.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((0))); + passBox.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((0))); } @@ -64,7 +68,7 @@ namespace Histacom2.OS.Win95.Win95Apps private void WinClassicFTPClient_Load(object sender, EventArgs e) { - + textBox4.Text = "21"; } private void topBar_Paint(object sender, PaintEventArgs e) diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx index e03fcd1..067a121 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx @@ -128,7 +128,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABe - EgAAAk1TRnQBSQFMAgEBAwEAAUABAAFAAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + EgAAAk1TRnQBSQFMAgEBAwEAAUgBAAFIAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABgAMAASADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/Histacom2/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.Designer.cs b/Histacom2/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.Designer.cs index 5452184..f76bb99 100644 --- a/Histacom2/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.Designer.cs +++ b/Histacom2/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.Designer.cs @@ -383,7 +383,7 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; private System.Windows.Forms.ListView contactsView; - private System.Windows.Forms.TreeView treeView1; + public System.Windows.Forms.TreeView treeView1; private System.Windows.Forms.ToolStripMenuItem toolbarToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem foldersToolStripMenuItem; private System.Windows.Forms.Panel toolbar; diff --git a/Histacom2/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.cs b/Histacom2/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.cs index bf4f648..fd2bf0f 100644 --- a/Histacom2/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.cs +++ b/Histacom2/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.cs @@ -388,8 +388,11 @@ namespace Histacom2.OS.Win95.Win95Apps public void UpdateTreeView(AddressBookContactList lst, int count = 0) { try - { - string[] parts = lst.NodePath.Split('\\'); + { + string[] parts = new string[] { "Shared Contacts" }; + if (lst.NodePath != null) + parts = lst.NodePath.Split('\\'); + if (count == 0) UpdatePrevParent = treeView1.Nodes[0]; if (lst.NodePath != FindNodePath(treeView1.Nodes[0])) { diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs index f88d451..586c6c2 100644 --- a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs +++ b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.Designer.cs @@ -29,24 +29,25 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WinClassicWindowsExplorer)); this.program = new System.Windows.Forms.Panel(); this.mainView = new System.Windows.Forms.ListView(); this.pnlInfo = new System.Windows.Forms.Panel(); + this.txtInfoTitle = new Histacom2.Engine.UI.ClassicLabel(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.txtInfoTitle = new System.Windows.Forms.Label(); this.pnlInfoContent = new System.Windows.Forms.Panel(); this.InfoDesc = new System.Windows.Forms.Panel(); - this.txtInfoDescSize = new System.Windows.Forms.Label(); - this.txtInfoDescModified = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.txtInfoDescType = new System.Windows.Forms.Label(); - this.txtInfoDescName = new System.Windows.Forms.Label(); - this.txtInfoTip = new System.Windows.Forms.Label(); + this.classicLabel3 = new Histacom2.Engine.UI.ClassicLabel(); + this.txtInfoDescSize = new Histacom2.Engine.UI.ClassicLabel(); + this.txtInfoDescModified = new Histacom2.Engine.UI.ClassicLabel(); + this.txtInfoDescType = new Histacom2.Engine.UI.ClassicLabel(); + this.txtInfoDescName = new Histacom2.Engine.UI.ClassicLabel(); + this.txtInfoTip = new Histacom2.Engine.UI.ClassicLabel(); this.pnlFolders = new System.Windows.Forms.Panel(); this.diskView = new System.Windows.Forms.TreeView(); this.pnlFoldersTop = new System.Windows.Forms.Panel(); - this.label2 = new System.Windows.Forms.Label(); this.btnFolderClose = new System.Windows.Forms.PictureBox(); + this.classicLabel4 = new Histacom2.Engine.UI.ClassicLabel(); this.toprightcorner = new System.Windows.Forms.Panel(); this.bottomrightcorner = new System.Windows.Forms.Panel(); this.bottomleftcorner = new System.Windows.Forms.Panel(); @@ -127,8 +128,8 @@ this.pnlInfo.BackColor = System.Drawing.Color.White; this.pnlInfo.BackgroundImage = global::Histacom2.Properties.Resources.Win98WebBackground; this.pnlInfo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pnlInfo.Controls.Add(this.pictureBox1); this.pnlInfo.Controls.Add(this.txtInfoTitle); + this.pnlInfo.Controls.Add(this.pictureBox1); this.pnlInfo.Controls.Add(this.pnlInfoContent); this.pnlInfo.Dock = System.Windows.Forms.DockStyle.Left; this.pnlInfo.Location = new System.Drawing.Point(196, 24); @@ -136,28 +137,28 @@ this.pnlInfo.Size = new System.Drawing.Size(200, 439); this.pnlInfo.TabIndex = 19; // + // txtInfoTitle + // + this.txtInfoTitle.BackColor = System.Drawing.Color.Transparent; + this.txtInfoTitle.DropShadow = false; + this.txtInfoTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F); + this.txtInfoTitle.Location = new System.Drawing.Point(13, 56); + this.txtInfoTitle.Name = "txtInfoTitle"; + this.txtInfoTitle.Size = new System.Drawing.Size(194, 30); + this.txtInfoTitle.TabIndex = 23; + this.txtInfoTitle.Text = "FOLDER_NAME"; + // // pictureBox1 // this.pictureBox1.BackColor = System.Drawing.Color.Transparent; - this.pictureBox1.Image = global::Histacom2.Properties.Resources.WinClassicFolderSmall; + this.pictureBox1.Image = global::Histacom2.Properties.Resources.WinClassicFolder; this.pictureBox1.Location = new System.Drawing.Point(15, 18); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(30, 30); + this.pictureBox1.Size = new System.Drawing.Size(32, 32); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 20; this.pictureBox1.TabStop = false; // - // txtInfoTitle - // - this.txtInfoTitle.AutoSize = true; - this.txtInfoTitle.BackColor = System.Drawing.Color.Transparent; - this.txtInfoTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtInfoTitle.Location = new System.Drawing.Point(3, 51); - this.txtInfoTitle.Name = "txtInfoTitle"; - this.txtInfoTitle.Size = new System.Drawing.Size(192, 29); - this.txtInfoTitle.TabIndex = 0; - this.txtInfoTitle.Text = "FOLDER_NAME"; - // // pnlInfoContent // this.pnlInfoContent.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -173,73 +174,72 @@ // // InfoDesc // + this.InfoDesc.Controls.Add(this.classicLabel3); this.InfoDesc.Controls.Add(this.txtInfoDescSize); this.InfoDesc.Controls.Add(this.txtInfoDescModified); - this.InfoDesc.Controls.Add(this.label5); this.InfoDesc.Controls.Add(this.txtInfoDescType); this.InfoDesc.Controls.Add(this.txtInfoDescName); this.InfoDesc.Dock = System.Windows.Forms.DockStyle.Top; - this.InfoDesc.Location = new System.Drawing.Point(0, 25); + this.InfoDesc.Location = new System.Drawing.Point(0, 26); this.InfoDesc.Name = "InfoDesc"; this.InfoDesc.Size = new System.Drawing.Size(199, 94); this.InfoDesc.TabIndex = 22; this.InfoDesc.Visible = false; // + // classicLabel3 + // + this.classicLabel3.DropShadow = false; + this.classicLabel3.Location = new System.Drawing.Point(13, 38); + this.classicLabel3.Name = "classicLabel3"; + this.classicLabel3.Size = new System.Drawing.Size(179, 13); + this.classicLabel3.TabIndex = 1; + this.classicLabel3.Text = "Last modified:"; + // // txtInfoDescSize // - this.txtInfoDescSize.AutoSize = true; - this.txtInfoDescSize.Location = new System.Drawing.Point(12, 81); + this.txtInfoDescSize.DropShadow = false; + this.txtInfoDescSize.Location = new System.Drawing.Point(15, 76); this.txtInfoDescSize.Name = "txtInfoDescSize"; - this.txtInfoDescSize.Size = new System.Drawing.Size(59, 13); - this.txtInfoDescSize.TabIndex = 0; + this.txtInfoDescSize.Size = new System.Drawing.Size(179, 13); + this.txtInfoDescSize.TabIndex = 1; this.txtInfoDescSize.Text = "FILE_SIZE"; // // txtInfoDescModified // - this.txtInfoDescModified.AutoSize = true; - this.txtInfoDescModified.Location = new System.Drawing.Point(12, 54); + this.txtInfoDescModified.DropShadow = false; + this.txtInfoDescModified.Location = new System.Drawing.Point(13, 57); this.txtInfoDescModified.Name = "txtInfoDescModified"; - this.txtInfoDescModified.Size = new System.Drawing.Size(92, 13); - this.txtInfoDescModified.TabIndex = 0; - this.txtInfoDescModified.Text = "LAST_MODIFIED"; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(12, 41); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(73, 13); - this.label5.TabIndex = 0; - this.label5.Text = "Last Modified:"; + this.txtInfoDescModified.Size = new System.Drawing.Size(179, 13); + this.txtInfoDescModified.TabIndex = 1; + this.txtInfoDescModified.Text = "DATE_MODIFIED"; // // txtInfoDescType // - this.txtInfoDescType.AutoSize = true; - this.txtInfoDescType.Location = new System.Drawing.Point(12, 18); + this.txtInfoDescType.DropShadow = false; + this.txtInfoDescType.Location = new System.Drawing.Point(13, 19); this.txtInfoDescType.Name = "txtInfoDescType"; - this.txtInfoDescType.Size = new System.Drawing.Size(63, 13); - this.txtInfoDescType.TabIndex = 0; + this.txtInfoDescType.Size = new System.Drawing.Size(183, 13); + this.txtInfoDescType.TabIndex = 1; this.txtInfoDescType.Text = "FILE_TYPE"; // // txtInfoDescName // - this.txtInfoDescName.AutoSize = true; - this.txtInfoDescName.Location = new System.Drawing.Point(12, 5); + this.txtInfoDescName.DropShadow = false; + this.txtInfoDescName.Location = new System.Drawing.Point(13, 2); this.txtInfoDescName.Name = "txtInfoDescName"; - this.txtInfoDescName.Size = new System.Drawing.Size(66, 13); - this.txtInfoDescName.TabIndex = 0; + this.txtInfoDescName.Size = new System.Drawing.Size(179, 13); + this.txtInfoDescName.TabIndex = 1; this.txtInfoDescName.Text = "FILE_NAME"; // // txtInfoTip // - this.txtInfoTip.BackColor = System.Drawing.Color.Transparent; this.txtInfoTip.Dock = System.Windows.Forms.DockStyle.Top; + this.txtInfoTip.DropShadow = false; this.txtInfoTip.Location = new System.Drawing.Point(0, 0); this.txtInfoTip.Name = "txtInfoTip"; - this.txtInfoTip.Size = new System.Drawing.Size(199, 25); - this.txtInfoTip.TabIndex = 21; - this.txtInfoTip.Text = "Select an item to view its description."; - this.txtInfoTip.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.txtInfoTip.Size = new System.Drawing.Size(199, 26); + this.txtInfoTip.TabIndex = 23; + this.txtInfoTip.Text = "Please choose an item to view it\'s description."; // // pnlFolders // @@ -263,23 +263,14 @@ // pnlFoldersTop // this.pnlFoldersTop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(208)))), ((int)(((byte)(200))))); - this.pnlFoldersTop.Controls.Add(this.label2); this.pnlFoldersTop.Controls.Add(this.btnFolderClose); + this.pnlFoldersTop.Controls.Add(this.classicLabel4); this.pnlFoldersTop.Dock = System.Windows.Forms.DockStyle.Top; this.pnlFoldersTop.Location = new System.Drawing.Point(0, 0); this.pnlFoldersTop.Name = "pnlFoldersTop"; this.pnlFoldersTop.Size = new System.Drawing.Size(196, 22); this.pnlFoldersTop.TabIndex = 20; // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(3, 3); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(41, 13); - this.label2.TabIndex = 1; - this.label2.Text = "Folders"; - // // btnFolderClose // this.btnFolderClose.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(212)))), ((int)(((byte)(208)))), ((int)(((byte)(200))))); @@ -294,6 +285,15 @@ this.btnFolderClose.MouseEnter += new System.EventHandler(this.pictureBox1_MouseEnter); this.btnFolderClose.MouseLeave += new System.EventHandler(this.btnFolderClose_MouseLeave); // + // classicLabel4 + // + this.classicLabel4.DropShadow = false; + this.classicLabel4.Location = new System.Drawing.Point(3, 5); + this.classicLabel4.Name = "classicLabel4"; + this.classicLabel4.Size = new System.Drawing.Size(179, 13); + this.classicLabel4.TabIndex = 1; + this.classicLabel4.Text = "Folders"; + // // toprightcorner // this.toprightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -365,6 +365,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.cmbType.BackColor = System.Drawing.Color.White; this.cmbType.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.cmbType.Items = ((System.Collections.Generic.List)(resources.GetObject("cmbType.Items"))); this.cmbType.Location = new System.Drawing.Point(64, 32); this.cmbType.Name = "cmbType"; this.cmbType.Size = new System.Drawing.Size(549, 20); @@ -596,14 +597,11 @@ this.program.ResumeLayout(false); this.program.PerformLayout(); this.pnlInfo.ResumeLayout(false); - this.pnlInfo.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.pnlInfoContent.ResumeLayout(false); this.InfoDesc.ResumeLayout(false); - this.InfoDesc.PerformLayout(); this.pnlFolders.ResumeLayout(false); this.pnlFoldersTop.ResumeLayout(false); - this.pnlFoldersTop.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.btnFolderClose)).EndInit(); this.pnlSave.ResumeLayout(false); this.MenuStrip1.ResumeLayout(false); @@ -646,17 +644,9 @@ private System.Windows.Forms.Panel pnlFolders; private System.Windows.Forms.Panel pnlFoldersTop; private System.Windows.Forms.PictureBox btnFolderClose; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label txtInfoTitle; private System.Windows.Forms.PictureBox pictureBox1; - private System.Windows.Forms.Label txtInfoTip; private System.Windows.Forms.Panel pnlInfoContent; private System.Windows.Forms.Panel InfoDesc; - private System.Windows.Forms.Label txtInfoDescModified; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label txtInfoDescType; - private System.Windows.Forms.Label txtInfoDescName; - private System.Windows.Forms.Label txtInfoDescSize; private System.Windows.Forms.Timer refresh; private Engine.UI.ClassicButton btnCanc; private Engine.UI.ClassicDropDown cmbType; @@ -664,5 +654,13 @@ private Engine.UI.ClassicLabel classicLabel2; private Engine.UI.ClassicLabel classicLabel1; private Engine.UI.ClassicButton btnSave; + private Engine.UI.ClassicLabel txtInfoTitle; + private Engine.UI.ClassicLabel txtInfoTip; + private Engine.UI.ClassicLabel txtInfoDescName; + private Engine.UI.ClassicLabel txtInfoDescType; + private Engine.UI.ClassicLabel classicLabel3; + private Engine.UI.ClassicLabel txtInfoDescModified; + private Engine.UI.ClassicLabel txtInfoDescSize; + private Engine.UI.ClassicLabel classicLabel4; } } diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs index 947f9ba..bc121e6 100644 --- a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs +++ b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs @@ -38,11 +38,6 @@ namespace Histacom2.OS.Win95.Win95Apps void WinClassicWindowsExplorer_Load(object sender, EventArgs e) { - if (SaveSystem.CurrentSave.CurrentOS == "2000") - { - pnlInfo.Width = 200; - txtInfoTitle.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((0))); - } diskView.ImageList = new ImageList(); @@ -82,7 +77,7 @@ namespace Histacom2.OS.Win95.Win95Apps Properties.Resources.WinClassicGTN, Properties.Resources.WinClassicFTP, Properties.Resources.WinClassicRtfFile, // 20 - Properties.Resources.WinClassicAddressBook}); + Properties.Resources.WinClassicAddressBookBig}); program.BringToFront(); @@ -122,6 +117,9 @@ namespace Histacom2.OS.Win95.Win95Apps cmbType.Items.Add(str); cmbType.Text = onlyViewExtension.FirstOrDefault(); + + txtSave.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + cmbType.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); } //'Private Sub TreeView1_AfterSelect(ByVal sender As System.Object, ByVal e As System.Windows.Forms.TreeViewEventArgs) @@ -168,10 +166,10 @@ namespace Histacom2.OS.Win95.Win95Apps pictureBox1.Image = Properties.Resources.Win95ComputerIcon; } else if (CurrentDirectory == ProfileMyComputerDirectory) { txtInfoTitle.Text = "C:"; - pictureBox1.Image = Properties.Resources.WinClassicFolderSmall; // TODO: ADD DRIVE ICON + pictureBox1.Image = Properties.Resources.WinClassicDrive; } else { txtInfoTitle.Text = Path.GetFileName(CurrentDirectory); - pictureBox1.Image = Properties.Resources.WinClassicFolderSmall; + pictureBox1.Image = Properties.Resources.WinClassicFolder; } @@ -283,6 +281,19 @@ namespace Histacom2.OS.Win95.Win95Apps case 12: OpenApplication(FileDialogBoxManager.ReadTextFile(fileDir), fileDir); break; + case 13: + WinClassicAddressBook wcab = new WinClassicAddressBook(); + wcab.AddressBookObjects = JsonConvert.DeserializeObject>(File.ReadAllText(fileDir)); + + wcab.treeView1.Nodes.Clear(); + wcab.treeView1.Nodes.Add("Shared Contacts"); + foreach (AddressBookContactList lst in wcab.AddressBookObjects) + wcab.UpdateTreeView(lst); + + WinClassic app3 = wm.Init(wcab, "Address Book", Properties.Resources.WinClassicAddressBook, true, true); + + Program.AddTaskbarItem(app3, app3.Tag.ToString(), "Address Book", Properties.Resources.WinClassicAddressBook); + break; } } catch @@ -407,9 +418,10 @@ namespace Histacom2.OS.Win95.Win95Apps case ".bmp": case ".zip": return 11; - case ".exe": return 12; + case ".wab": + return 13; case ".avi": case ".m4v": case ".mp4": @@ -820,6 +832,8 @@ namespace Histacom2.OS.Win95.Win95Apps return "Image File"; case 12: return "Executable File"; + case 13: + return "Address Book File"; case 21: return "Video File"; case 16: diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx index e1edd06..3b47ace 100644 --- a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx +++ b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.resx @@ -120,6 +120,15 @@ 17, 17 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAJoBbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1u + ZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9u + PTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OQUB + AAAAMFN5c3RlbS5Db2xsZWN0aW9ucy5HZW5lcmljLkxpc3RgMVtbU3lzdGVtLlN0cmluZwMAAAAGX2l0 + ZW1zBV9zaXplCF92ZXJzaW9uBgAACAgCAAAACQMAAAAAAAAAAAAAABEDAAAAAAAAAAs= + + 132, 17 diff --git a/Histacom2/Properties/Resources.resx b/Histacom2/Properties/Resources.resx index c34dd0c..605ba09 100644 --- a/Histacom2/Properties/Resources.resx +++ b/Histacom2/Properties/Resources.resx @@ -2123,4 +2123,10 @@ ..\Resources\distort fail.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\WinClassicAddressBookBig.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassicDrive.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Histacom2/Properties/Resources1.Designer.cs b/Histacom2/Properties/Resources1.Designer.cs index a053ed4..69aefb6 100644 --- a/Histacom2/Properties/Resources1.Designer.cs +++ b/Histacom2/Properties/Resources1.Designer.cs @@ -19,7 +19,7 @@ namespace Histacom2.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { @@ -976,7 +976,9 @@ namespace Histacom2.Properties { /// "btn4txt": "", /// "btn4tag": "", /// "btn5txt": "", - /// "btn5tag": " [rest of string was truncated]";. + /// "btn5tag": "" + /// }, + /// "inthe [rest of string was truncated]";. /// public static string std_story { get { @@ -1613,6 +1615,16 @@ namespace Histacom2.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap WinClassicAddressBookBig { + get { + object obj = ResourceManager.GetObject("WinClassicAddressBookBig", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -1703,6 +1715,16 @@ namespace Histacom2.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap WinClassicDrive { + get { + object obj = ResourceManager.GetObject("WinClassicDrive", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/Histacom2/Resources/WinClassicAddressBookBig.png b/Histacom2/Resources/WinClassicAddressBookBig.png new file mode 100644 index 0000000..ceee626 Binary files /dev/null and b/Histacom2/Resources/WinClassicAddressBookBig.png differ diff --git a/Histacom2/Resources/WinClassicDrive.png b/Histacom2/Resources/WinClassicDrive.png new file mode 100644 index 0000000..5ac1517 Binary files /dev/null and b/Histacom2/Resources/WinClassicDrive.png differ diff --git a/Histacom2/Resources/addrbook.ico_32x32[1].png b/Histacom2/Resources/addrbook.ico_32x32[1].png new file mode 100644 index 0000000..ceee626 Binary files /dev/null and b/Histacom2/Resources/addrbook.ico_32x32[1].png differ -- cgit v1.2.3