Changeset 1276

Timestamp:

05/13/07 23:50:45 (2 years ago)

Author:

arj..@yirdis.nl

Message:

Added some actions to DiagramTab?

Files:

• gaphor/trunk/gaphor/application.py (modified) (1 diff)
• gaphor/trunk/gaphor/services/filemanager.py (modified) (1 diff)
• gaphor/trunk/gaphor/services/undomanager.py (modified) (1 diff)
• gaphor/trunk/gaphor/ui/diagramtab.py (modified) (6 diffs)
• gaphor/trunk/gaphor/ui/mainwindow.py (modified) (14 diffs)
• gaphor/trunk/gaphor/ui/tests/test_mainwindow.py (modified) (2 diffs)

gaphor/trunk/gaphor/application.py

@@ -64 +64 @@
-        else:
-            log.info('initializing service service.%s' % name)
-            # TODO: do init() before provideUtility!
-            srv.init(self)
-            component.provideUtility(srv, IService, name)

gaphor/trunk/gaphor/services/filemanager.py

@@ -44 +44 @@
-          <toolitem action="file-save" />
-          <toolitem action="file-save-as" />
+          <separator />
-        </toolbar>
-      </ui>

gaphor/trunk/gaphor/services/undomanager.py

@@ -94 +94 @@
-          </menu>
-        </menubar>
+        <toolbar action="mainwindow-toolbar">
+          <toolitem action="edit-undo" />
+          <toolitem action="edit-redo" />
+          <separator />
+        </toolbar>
-      </ui>
-    """

gaphor/trunk/gaphor/ui/diagramtab.py

@@ -5 +5 @@
-
-from gaphor import UML
-
-
+
-from gaphor.diagram.interfaces import IPopupMenu
-from gaphor.diagram import get_diagram_item
@@ -19 +18 @@
-    action_manager = inject('action_manager')
-
+    menu_xml = """
+      <ui>
+        <menubar action="mainwindow">
+          <menu name="diagram" action="diagram">
+            <menuitem action="diagram-zoom-in" />
+            <menuitem action="diagram-zoom-out" />
+            <menuitem action="diagram-zoom-100" />
+            <separator />
+            <menuitem action="diagram-close" />
+          </menu>
+        </menubar>
+        <toolbar name='mainwindow-toolbar'>
+          <separator />
+          <toolitem action="diagram-zoom-in" />
+          <toolitem action="diagram-zoom-out" />
+          <toolitem action="diagram-zoom-100" />
+        </toolbar>
+      </ui>
+    """
+
-    def __init__(self, owning_window):
-        self.diagram = None
-        #self.view = None
-        self.owning_window = owning_window
+        self.action_group = build_action_group(self)
+
+    title = property(lambda s: s.diagram and s.diagram.name or _('<None>'))
-
-    def get_diagram(self):
@@ -48 +70 @@
-
-    def construct(self):
-
+#
-
-        table = gtk.Table(2,2, False)
@@ -73 +95 @@
-                     gtk.FILL)
-
-        #view.connect('notify::tool', self._on_view_notify_tool)
-        view.connect('focus-changed', self._on_view_focus_changed)
-        view.connect('selection-changed', self._on_view_selection_changed)
-        #view.connect('unselect-item', self._on_view_selection_changed)
-        view.connect_after('key-press-event', self._on_key_press_event)
-        view.connect('drag-data-received', self._on_drag_data_received)
-
-        #item_tool = ItemTool(self.owning_window.get_action_pool())
-        #view.get_default_tool().set_item_tool(item_tool)
-        self.view = view
-
-        table.show_all()
-
-new_tab(self, table, 
+add_tab(self, table, self.
-
+    @action(name='diagram-close', stock_id='gtk-close')
-    def close(self):
-
+
+
-        be done if File->Close was pressed.
-        """
@@ -99 +119 @@
-        del self.view
-        del self.diagram
+
+    @action(name='diagram-zoom-in', stock_id='gtk-zoom-in')
+    def zoom_in(self):
+        self.view.zoom(1.2)
+
+    @action(name='diagram-zoom-out', stock_id='gtk-zoom-out')
+    def zoom_out(self):
+        self.view.zoom(1 / 1.2)
+
+    @action(name='diagram-zoom-100', stock_id='gtk-zoom-100')
+    def zoom_100(self):
+        zx = self.view.matrix[0]
+        self.view.zoom(1 / zx)
+
-
-    def _on_key_press_event(self, view, event):
@@ -112 +146 @@
-
-    def _on_view_focus_changed(self, view, focus_item):
-        self.action_manager.execute('ItemFocus')
-        component.handle(DiagramItemFocused(focus_item))
-
-    def _on_view_selection_changed(self, view, selection):
-        self.action_manager.execute('ItemSelect')
-
-    def _on_view_notify_tool(self, view, pspec):
-        self.action_manager.execute('ToolChange')
-
-    def _on_diagram_event(self, element, pspec):

gaphor/trunk/gaphor/ui/mainwindow.py

@@ -255 +255 @@
-        ToplevelWindow.__init__(self)
-        self._filename = None
+        # Map tab contents to DiagramTab
-        self.notebook_map = {}
-        # Tree view:
-
-
+
-
-        self.action_group = build_action_group(self)
@@ -269 +269 @@
-            a.set_property('is-important', True)
-            self.action_group.add_action(a)
+        self._tab_ui_settings = None
-
-    def get_model(self):
@@ -275 +276 @@
-        (shown on the left side in a TreeView).
-        """
-model
-
-_model
+tree_view.get_model()
+
+tree_view.get_model()
-
-    def get_tree_view(self):
@@ -284 +285 @@
-        See also get_model().
-        """
-
-
-
+tree_
+
+tree_
-
-    def set_filename(self, filename):
@@ -372 +373 @@
-        scrolled_window.add(view)
-        
-
-
-view.connect_after('cursor-changed', self.
+_
+_
+#view.connect_after('cursor-changed', self._
-
-        vbox = gtk.VBox()
@@ -389 +390 @@
-        #notebook.set_size_request(-1, 10000)
-
-
+_
-
-        self.objectInspector = ObjectInspector()
@@ -408 +409 @@
-
-        second_paned.connect('notify::position',
-
+_
-
-        self.notebook = notebook
-
-
+
-
-        vbox.set_border_width(3)
@@ -432 +432 @@
-        # We want to store the window size, so it can be reloaded on startup
-        self.window.set_property('allow-shrink', True)
-
-
+_
+_
-
-        # TODO: add action_groups and menu_xml from NamespaceView
@@ -447 +447 @@
-    # Notebook methods:
-
-new_tab(self, window
+add_tab(self, tab_id
-        """
-        Create a new tab on the notebook with window as its contents.
-        Returns: The page number of the tab.
-        """
+        self.notebook_map[contents] = tab_id
-        l = gtk.Label(label)
+        # Note: append_page() emits switch-page event
-        self.notebook.append_page(contents, l)
-        page_num = self.notebook.page_num(contents)
-
-
-
+
-        return page_num
-
@@ -499 +499 @@
-                self.notebook.remove_page(num)
-                del self.notebook_map[p]
-
+
+
+
+
-                return
-
@@ -525 +528 @@
-        Window is destroyed... Quit the application.
-        """
-
-
+
-        self.window = None
-        gtk.main_quit()
@@ -533 +535 @@
-        return not self.ask_to_close()
-
-
+_
-        """
-        Show a popup menu if button3 was pressed on the TreeView.
@@ -543 +545 @@
-
-
-
+_
-        """
-        Double click on an element in the tree view.
-        """
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        """
-        Another page (tab) is put on the front of the diagram notebook.
-        A dummy action is executed.
-        """
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        self.properties.set('ui.window-size', (allocation.width, allocation.height))
-
-
+_
-        self.quit()
-
-
+_
-        self.properties.set('ui.object-inspector-position',
-                     paned.get_position())
@@ -590 +599 @@
-    @action(name='tree-view-open', label='_Open')
-    def tree_view_open_selected(self):
-
+tree_
-        if isinstance(element, UML.Diagram):
-            self.show_diagram(element)

gaphor/trunk/gaphor/ui/tests/test_mainwindow.py

@@ -3 +3 @@
-import unittest
-
+from gaphor.application import restart, Application
-from gaphor.ui.mainwindow import MainWindow
-
+
-
-class MainWindowTestCase(unittest.TestCase):
-
-    def setUp(self):
-        from gaphor.application import restart, Application
-        restart()
-        Application.init(services=['element_factory', 'properties', 'action_manager'])
@@ -22 +22 @@
-
-
+    def test_show_diagram(self):
+        main_w = MainWindow()
+        element_factory = Application.get_service('element_factory')
+        diagram = element_factory.create(UML.Diagram)
+        ui_manager = gtk.UIManager()
+        main_w.ui_manager = ui_manager
+        main_w.construct()
+        self.assertEqual(main_w.get_current_diagram(), None)
+
+        main_w.show_diagram(diagram)
+        
-# vim:sw=4:et:ai