Window menu to show sorted document forms only; Open dialog to allow *.gv files

diff --git a/windows/FormController.cs b/windows/FormController.cs
index eb88685e020f713dd2b9b1b66ee9fabc548f5e05..59f0074edb3f5109ef947007a27418530f90f9e6 100755 (executable)
--- a/windows/FormController.cs
+++ b/windows/FormController.cs
@@ -89,7 +89,7 @@ namespace Graphviz
                                                                OpenFiles(filesToOpen);\r
                                                };\r
 \r
-                                               /* window menu shows a list of all forms, select one to activate it */\r
+                                               /* window menu shows a list of all document forms, select one to activate it */\r
                                                documentFormMenus.WindowMenuItem.DropDownOpening += delegate(object sender, EventArgs eventArgs)\r
                                                {\r
                                                        ToolStripMenuItem windowMenuItem = sender as ToolStripMenuItem;\r
@@ -97,7 +97,7 @@ namespace Graphviz
                                                        {\r
                                                                windowMenuItem.DropDownItems.Clear();\r
                                                                int i = 0;\r
-                                                               foreach (Form form in Application.OpenForms)\r
+                                                               foreach (Form form in _documentForms.Values)\r
                                                                {\r
                                                                        Form innerForm = form;\r
                                                                        ToolStripMenuItem formMenuItem = new ToolStripMenuItem(string.Format("{0} {1}", ++i, form.Text));\r
@@ -140,10 +140,10 @@ namespace Graphviz
                private FormController()\r
                {\r
                        _openFileDialog = new OpenFileDialog();\r
-                       _openFileDialog.Filter = "Graphviz graphs (*.dot)|*.dot|All files (*.*)|*.*";\r
+                       _openFileDialog.Filter = "Graphviz graphs (*.dot;*.gv)|*.dot;*.gv|All files (*.*)|*.*";\r
                        _openFileDialog.Multiselect = true;\r
                        \r
-                       _documentForms = new Dictionary<string, Form>();\r
+                       _documentForms = new SortedDictionary<string, Form>();\r
                        _mainForm = null;\r
                }\r
 \r
@@ -154,7 +154,7 @@ namespace Graphviz
 \r
                private static FormController _instance = new FormController();\r
                private readonly OpenFileDialog _openFileDialog;\r
-               private readonly Dictionary<string, Form> _documentForms;\r
+               private readonly SortedDictionary<string, Form> _documentForms;\r
                private Form _mainForm;\r
        }\r
 }\r