Made code neater and fixed Address Book bugs!

2 files changed, 53 insertions, 33 deletions

diff --git a/Histacom2/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.Designer.cs b/Histacom2/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.Designer.cs
index 85bccf0..20f5af2 100644
--- a/Histacom2/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.Designer.cs
+++ b/Histacom2/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.Designer.cs
@@ -105,67 +105,67 @@
             // newContactToolStripMenuItem
             // 
             this.newContactToolStripMenuItem.Name = "newContactToolStripMenuItem";
-            this.newContactToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.newContactToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
             this.newContactToolStripMenuItem.Text = "New contact...";
             this.newContactToolStripMenuItem.Click += new System.EventHandler(this.newContactToolStripMenuItem_Click);
             // 
             // newFolderToolStripMenuItem
             // 
             this.newFolderToolStripMenuItem.Name = "newFolderToolStripMenuItem";
-            this.newFolderToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.newFolderToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
             this.newFolderToolStripMenuItem.Text = "New folder...";
             this.newFolderToolStripMenuItem.Click += new System.EventHandler(this.newFolderToolStripMenuItem_Click);
             // 
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(147, 6);
             // 
             // propertiesToolStripMenuItem
             // 
             this.propertiesToolStripMenuItem.Name = "propertiesToolStripMenuItem";
-            this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
             this.propertiesToolStripMenuItem.Text = "Properties";
             this.propertiesToolStripMenuItem.Click += new System.EventHandler(this.propertiesToolStripMenuItem_Click);
             // 
             // deleteToolStripMenuItem
             // 
             this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem";
-            this.deleteToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.deleteToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
             this.deleteToolStripMenuItem.Text = "Delete";
             this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click);
             // 
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6);
+            this.toolStripSeparator2.Size = new System.Drawing.Size(147, 6);
             // 
             // importToolStripMenuItem
             // 
             this.importToolStripMenuItem.Name = "importToolStripMenuItem";
-            this.importToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.importToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
             this.importToolStripMenuItem.Text = "Import...";
             // 
             // exportToolStripMenuItem
             // 
             this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
-            this.exportToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.exportToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
             this.exportToolStripMenuItem.Text = "Export...";
             // 
             // toolStripSeparator3
             // 
             this.toolStripSeparator3.Name = "toolStripSeparator3";
-            this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6);
+            this.toolStripSeparator3.Size = new System.Drawing.Size(147, 6);
             // 
             // toolStripSeparator4
             // 
             this.toolStripSeparator4.Name = "toolStripSeparator4";
-            this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6);
+            this.toolStripSeparator4.Size = new System.Drawing.Size(147, 6);
             // 
             // exitToolStripMenuItem
             // 
             this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
-            this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.exitToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
             this.exitToolStripMenuItem.Text = "Exit";
             this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
             // 
@@ -247,6 +247,7 @@
             this.aboutAddressBookToolStripMenuItem.Name = "aboutAddressBookToolStripMenuItem";
             this.aboutAddressBookToolStripMenuItem.Size = new System.Drawing.Size(182, 22);
             this.aboutAddressBookToolStripMenuItem.Text = "About Address Book";
+            this.aboutAddressBookToolStripMenuItem.Click += new System.EventHandler(this.aboutAddressBookToolStripMenuItem_Click);
             // 
             // contactsView
             // 
diff --git a/Histacom2/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.cs b/Histacom2/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.cs
index c4c6960..0c6701a 100644
--- a/Histacom2/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.cs
+++ b/Histacom2/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.cs
@@ -42,7 +42,7 @@ namespace Histacom2.OS.Win95.Win95Apps
             {
                 new AddressBookContactList()
                 {
-                    AttachedNode = treeView1.Nodes[0].Text,
+                    AttachedNode = treeView1.Nodes[0].Text
                 }
             };
         }
@@ -82,17 +82,8 @@ namespace Histacom2.OS.Win95.Win95Apps
                     {
                         foreach (AddressBookContact contact in ContactList.Contacts)
                         {
-                            if (contact != null)
-                            {
-                                if (contact.FirstName != null)
-                                {
-                                    contactsView.Items.Add(contact.FirstName + " " + contact.MiddleName + " " + contact.LastName);
-                                }
-                            }
-                            else
-                            {
-                                MessageBox.Show("Null contact!");
-                            }
+                            if (contact.FirstName != null)
+                                contactsView.Items.Add(contact.FirstName + " " + contact.MiddleName + " " + contact.LastName);
                         }
                     }
                 }
@@ -182,9 +173,16 @@ namespace Histacom2.OS.Win95.Win95Apps
                     {
                         foreach (AddressBookContact Contact in ContactList.Contacts)
                         {
-                            if ((Contact.FirstName + " " + Contact.MiddleName + " " + Contact.LastName) == contactsView.FocusedItem.Text)
+                            if (contactsView.FocusedItem == null)
+                            { // Most likely they are trying to view a whole folder!
+                                wm.StartInfobox95("Properties of a folder", "You cannot view the properties of a contact folder.", InfoboxType.Warning, InfoboxButtons.OK);
+                            }
+                            else
                             {
-                                abnc.toSet = Contact;
+                                if ((Contact.FirstName + " " + Contact.MiddleName + " " + Contact.LastName) == contactsView.FocusedItem.Text)
+                                {
+                                    abnc.toSet = Contact;
+                                }
                             }
                         }
                     }
@@ -228,22 +226,38 @@ namespace Histacom2.OS.Win95.Win95Apps
 
         void DeleteContact()
         {
-            if (treeView1.SelectedNode != null)
+            try
             {
-                foreach (AddressBookContactList ContactList in AddressBookObjects)
+                if (treeView1.SelectedNode != null)
                 {
-                    if (ContactList.AttachedNode == treeView1.SelectedNode.Text)
+                    foreach (AddressBookContactList ContactList in AddressBookObjects)
                     {
-                        foreach (AddressBookContact Contact in ContactList.Contacts)
+                        if (ContactList.AttachedNode == treeView1.SelectedNode.Text)
                         {
-                            if ((Contact.FirstName + " " + Contact.MiddleName + " " + Contact.LastName) == contactsView.FocusedItem.Text)
+                            foreach (AddressBookContact Contact in ContactList.Contacts)
                             {
-                                ContactList.Contacts.Remove(Contact);
+                                if (contactsView.FocusedItem == null)
+                                { // Most likely they are trying to delete a whole folder!
+                                    if (treeView1.SelectedNode.Text != "Shared Contacts")
+                                        if (treeView1.SelectedNode != null)
+                                        {
+                                            AddressBookObjects.Remove(ContactList);
+                                            treeView1.Nodes.Remove(treeView1.SelectedNode);
+                                            UpdateContactListFromNodeName("Shared Contacts");
+                                        }
+                                }
+                                else
+                                {
+                                    if ((Contact.FirstName + " " + Contact.MiddleName + " " + Contact.LastName) == contactsView.FocusedItem.Text)
+                                    {
+                                        ContactList.Contacts.Remove(Contact);
+                                    }
+                                }
                             }
                         }
                     }
                 }
-            }
+            } catch { }
         }
 
         private void toolDelete_Click(object sender, EventArgs e)
@@ -278,7 +292,12 @@ namespace Histacom2.OS.Win95.Win95Apps
 
         private void toolNew_Click(object sender, EventArgs e)
         {
-            newContext.Show();
+            newContext.Show(MousePosition);
+        }
+
+        private void aboutAddressBookToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+
         }
     }