Merge remote-tracking branch 'Github_origin/ExeptionCatch' into feature

Author: trojanobelix

EDSEditorGUI/Form1.Designer.cs

@@ -26,7 +26,9 @@ You should have received a copy of the GNU General Public License
 using System.Windows.Forms;
 using System.IO;
 using libEDSsharp;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
+//using static System.Windows.Forms.VisualStyles.VisualStyleElement;
+//using SourceGrid.Cells.Controllers;
+//using ToolTip = System.Windows.Forms.ToolTip;
 
 namespace ODEditor
 {
@@ -189,6 +191,12 @@ private void openEDSfile(string path,InfoSection.Filetype ft)
             {
                 EDSsharp eds = new EDSsharp();
 
+                if (!File.Exists(path))
+                {
+                    MessageBox.Show("File " +path + "\ndoes not exist.");
+                    return;
+                }
+
                 eds.Loadfile(path);
 
                 DeviceView device = new DeviceView(eds, network);
@@ -327,6 +335,11 @@ private void openToolStripMenuItem_Click(object sender, EventArgs e)
 
         private void openXDDfile(string path)
         {
+            if (!File.Exists(path))
+            {
+                MessageBox.Show("File " + path + "\ndoes not exist.");
+                return;
+            }
             try
             {
                 EDSsharp eds;
@@ -449,13 +462,13 @@ private void Eds_onDataDirty(bool dirty, EDSsharp sender)
             {
                 foreach(Control c in page.Controls)
                 {
-                    if(c.GetType() == typeof(DeviceView))
+                    if (c.GetType() == typeof(DeviceView))
                     {
                         DeviceView d = (DeviceView)c;
                         if (d.eds.Dirty == true)
                         {
                             page.BackColor = Color.Tomato;
-                        }
+                         }
                         else
                         {
                             page.BackColor = default(Color);
@@ -1329,34 +1342,52 @@ private void preferencesToolStripMenuItem_Click(object sender, EventArgs e)
 
         private void tabControl1_MouseClick(object sender, MouseEventArgs e)
         {
-            TabPage tp;
             if (e.Button == MouseButtons.Right)
             {
                 for (int i = 0; i <= tabControl1.TabCount - 1; i++)
                 {
                     if (tabControl1.GetTabRect(i).Contains(e.Location))
                     {
-                        tp = tabControl1.TabPages[i];
-
                         DialogResult dialogResult = MessageBox.Show(tabControl1.TabPages[i].Text, "Close file?", MessageBoxButtons.YesNo);
                         if (dialogResult == DialogResult.Yes)
                         {
-
-                                DeviceView device = (DeviceView)tabControl1.TabPages[i].Controls[0];
-
-                                if (device.eds.Dirty == true)
-                                {
-                                    if (MessageBox.Show("All unsaved changes will be lost\n continue?", "Unsaved changes", MessageBoxButtons.YesNo) == DialogResult.No)
-                                        return;
-                                }
-
-                                network.Remove(device.eds);
-
-                                tabControl1.TabPages.Remove(tabControl1.TabPages[i]);
+                            DeviceView device = (DeviceView)tabControl1.TabPages[i].Controls[0];
+                            if (device.eds.Dirty == true)
+                            {
+                                if (MessageBox.Show("All unsaved changes will be lost\n continue?", "Unsaved changes", MessageBoxButtons.YesNo) == DialogResult.No)
+                                    return;
+                            }
+                            network.Remove(device.eds);
+                            tabControl1.TabPages.Remove(tabControl1.TabPages[i]);
                         }                        
                     }
                 }
             }
         }
+        private void tabControl1_MouseHover(object sender, EventArgs e)
+        {
+
+            TabControl tabControl = sender as TabControl;
+            Point mousePosition = tabControl.PointToClient(Cursor.Position);
+            for (int i = 0; i < tabControl.TabCount; i++)
+            {
+                Rectangle tabRect = tabControl.GetTabRect(i);
+                if (tabRect.Contains(mousePosition))
+                {
+                    ToolTip toolTip = new ToolTip();
+                    // Set up the delays for the ToolTip.
+
+                    toolTip.AutoPopDelay = 5000;
+                    toolTip.InitialDelay = 1000;
+                    toolTip.ReshowDelay = 500;
+                    // Force the ToolTip text to be displayed whether or not the form is active.
+                    toolTip.ShowAlways = true;
+                    DeviceView device = (DeviceView)tabControl1.TabPages[i].Controls[0];
+                    toolTip.SetToolTip(tabControl, device.eds.projectFilename);
+                    break;
+                }
+            }
+        }
+        
     }
 }

EDSEditorGUI/Form1.cs

@@ -130,7 +130,7 @@
         gqUTTxJHNd2gfCHts8Z5i7NeLLN6n/yF4ayxvMR1qkHEsYBFyBChoowNFOEgRrtBio0knUst/AOeXyaX
         Sq4NMHLMowQdiucH/4Pfs7VzE+N+UlgC2l9c92MYCO0CtYrrfh+7bu0ECD4DV0bDX6oC05+kVxpa9Ajo
         2QYurhuaugdc7gD9T6ZiKZ4UpBJyOeD9jL4pA/TeAp2r/tzq5zh9AFI0q8QNcHAIjOQpe63Fuzua5/bn
-        HW9+kH4AMgFyjcd8GS4AAAAJcEhZcwAACw4AAAsOAUC+4UEAAAAHdElNRQfkCwILIglO4xvLAAAAD3RF
+        HW9+kH4AMgFyjcd8GS4AAAAJcEhZcwAACwwAAAsMAT9AIsgAAAAHdElNRQfkCwILIglO4xvLAAAAD3RF
         WHRDb21tZW50AENBTm9wZW7cllV1AAAC8UlEQVRYR9WWz2sTQRTHkx6SQy5RxFv1JDGHogiVIkqFEqLE
         QigetKY3iSUpPYh/gD8uoQiJIEKJ0UNNRZKjTaQiHozePAk21eagCC20NdW1plTa8X3f7mw3cZNuzSr6
         hQ+8zn6/M29nZts6/hWdIu4T4xZJE2cJ23QvGAyKRCJhCXgp80CN2qNxTAyVP5QZZVXhn6H5mRlGCl5k

EDSEditorGUI/Form1.resx

@@ -825,8 +825,13 @@ public void Loadfile(string filename)
             int lineno = 1;
             foreach (string linex in System.IO.File.ReadLines(filename))
             {
-                Parseline(linex, lineno);
-                lineno++;
+                try
+                {
+                    Parseline(linex, lineno);
+                    lineno++;
+                }
+                catch (Exception) { Warnings.warning_list.Add("Failed to open file \n" + filename);}
+
             }
 
             di = new DeviceInfo(eds["DeviceInfo"]);

libEDSsharp/CanOpenEDS.cs

@@ -100,8 +100,16 @@ public EDSsharp ReadXML(string file)
                 dev = (ISO15745ProfileContainer)serializer.Deserialize(reader);
                 reader.Close();
             }
-            catch (Exception)
+            catch (Exception e)
             {
+                if (e is System.InvalidOperationException)
+                {
+                    Warnings.warning_list.Add(String.Format("{0} {1} Action aborted!", e.Message, e.InnerException.Message));
+                }
+                else
+                {
+                    Warnings.warning_list.Add(String.Format("{0} Action aborted!", e.ToString()));
+                }
                 return null;
             }