Changeset 2199

Timestamp:

02/04/08 22:45:03 (7 months ago)

Author:

arj..@yirdis.nl

Message:

move diagram open code to main window.

Files:

• gaphor/trunk/gaphor/services/filemanager.py (modified) (2 diffs)
• gaphor/trunk/gaphor/ui/mainwindow.py (modified) (5 diffs)

gaphor/trunk/gaphor/services/filemanager.py

@@ -147 +147 @@
-        element_factory.notify_model()
-
-
-
+#
+#
-
-        self._app.handle(FileManagerStateChanged(self))
@@ -171 +171 @@
-                error_handler(message='Error while loading model from file %s' % filename, exc_info=worker.exc_info)
-
-            # Let this be handled by the main window itself:
-            #self._window.set_message('Model loaded successfully')
-            view = main_window.tree_view
-
-            self.filename = filename
-
-            # Expand all root elements:
-            view.expand_root_nodes()
-
-            # Open all diagrams under root node.
-            # TODO: move this! This is generic code.
-            # TODO: Make handlers for ModelFactoryEvent from within the GUI obj
-            model = main_window.tree_model
-            try:
-                iter = model.get_iter((0,))
-            except ValueError:
-                # no data
-                pass
-            else:
-                if model.iter_has_child(iter):
-                    iter = model.iter_children(iter)
-                    while iter:
-                        e = model.get_value(iter, 0)
-                        if isinstance(e, UML.Diagram):
-                            main_window.show_diagram(e)
-                        iter = model.iter_next(iter)
-        finally:
-            try:

gaphor/trunk/gaphor/ui/mainwindow.py

@@ -21 +21 @@
-from interfaces import IDiagramSelectionChange
-from gaphor.interfaces import IServiceEvent, IActionExecutedEvent
+from gaphor.UML.event import ModelFactoryEvent
-from event import DiagramSelectionChange
-from gaphor.application import Application
@@ -268 +269 @@
-
-        Application.register_handler(self._action_executed)
+        Application.register_handler(self._new_model_content)
-
-    def _update_toolbox(self, action_group):
@@ -356 +358 @@
-    # Signal callbacks:
-
+    @component.adapter(ModelFactoryEvent)
+    def _new_model_content(self, event):
+        """
+        Open the toplevel element and load toplevel diagrams.
+        """
+        # Expand all root elements:
+        self.tree_view.expand_root_nodes()
+
+        # Open all diagrams under root node.
+        # TODO: move this! This is generic code.
+        # TODO: Make handlers for ModelFactoryEvent from within the GUI obj
+        model = self.tree_model
+        try:
+            iter = model.get_iter((0,))
+        except ValueError:
+            # no data
+            pass
+        else:
+            if model.iter_has_child(iter):
+                iter = model.iter_children(iter)
+                while iter:
+                    e = model.get_value(iter, 0)
+                    if isinstance(e, UML.Diagram):
+                        self.show_diagram(e)
+                    iter = model.iter_next(iter)
+    
-    @component.adapter(FileManagerStateChanged)
-    def _action_executed(self, event):
@@ -379 +407 @@
-            gtk.main_quit()
-        Application.unregister_handler(self._action_executed)
+        Application.unregister_handler(self._new_model_content)
-
-    def _on_tab_destroy(self, widget):
@@ -472 +501 @@
-        self._tree_view.get_model().close()
-        Application.unregister_handler(self._action_executed)
+        Application.unregister_handler(self._new_model_content)
-
-    @action(name='tree-view-open', label='_Open')