Changeset 1272

Timestamp:

05/11/07 15:31:49 (2 years ago)

Author:

arj..@yirdis.nl

Message:

Fixed accelerators

Files:

• gaphor/trunk/gaphor/action.py (modified) (5 diffs)
• gaphor/trunk/gaphor/services/actionmanager.py (modified) (1 diff)
• gaphor/trunk/gaphor/services/undomanager.py (modified) (2 diffs)
• gaphor/trunk/gaphor/ui/mainwindow.py (modified) (6 diffs)
• gaphor/trunk/gaphor/ui/toplevelwindow.py (modified) (2 diffs)

gaphor/trunk/gaphor/action.py

@@ -29 +29 @@
-    """
-
-
+accel=None, 
-        self.name = name
-        self.label = label
-        self.tooltip = tooltip
-        self.stock_id = stock_id
+        self.accel = accel
-        self.__dict__.update(kwargs)
-
@@ -48 +49 @@
-    An extra 'active' attribute is provided than gives the initial status.
-    """
-
-
+cel=None, ac
+cel=accel, ac
-
-
@@ -59 +60 @@
-    given the index number of the activated radio button action.
-    """
-
-labels, active=active, names=names, labels=labels
+cels=None, ac
+names=names, labels=labels, tooltips=tooltips, stock_ids=stock_ids, accels=accels, active=active
-
-
@@ -104 +105 @@
-        if isinstance(act, radio_action):
-            actgroup = None
+            if not act.labels: act.labels = [None] * len(act.names)
+            if not act.tooltips: act.tooltips = [None] * len(act.names)
+            if not act.stock_ids: act.stock_ids = [None] * len(act.names)
+            if not act.accels: act.accels = [None] * len(act.names)
+            assert len(act.names) == len(act.labels)
+            assert len(act.names) == len(act.tooltips)
+            assert len(act.names) == len(act.stock_ids)
+            assert len(act.names) == len(act.accels)
-            for i, n in enumerate(act.names):
-
+
+
+
-                if act.active == i:
-                    gtkact.props.active = True
@@ -114 +125 @@
-                else:
-                    gtkact.props.group = actgroup
-(gtkact
+_with_accel(gtkact, act.accels[i]
-        elif isinstance(act, toggle_action):
-            gtkact = gtk.ToggleAction(act.name, act.label, act.tooltip, act.stock_id)
-            gtkact.set_property('active', act.active)
-            gtkact.connect('activate', _toggle_action_activate, obj, attrname)
-(gtkact
+_with_accel(gtkact, act.accel
-        elif isinstance(act, action):
-            gtkact = gtk.Action(act.name, act.label, act.tooltip, act.stock_id)
-            gtkact.connect('activate', _action_activate, obj, attrname)
-(gtkact
+_with_accel(gtkact, act.accel
-        elif act is not None:
-            raise TypeError, 'Invalid action type: %s' % action

gaphor/trunk/gaphor/services/actionmanager.py

@@ -62 +62 @@
-                        self.ui_manager.add_ui_from_string(action_provider.menu_xml)
-                log.debug('Added menu xml %d' % action_provider.__ui_merge_id)
-            self.update_actions()
-
-    @component.adapter(ServiceInitializedEvent)

gaphor/trunk/gaphor/services/undomanager.py

@@ -190 +190 @@
-        component.handle(UndoManagerStateChanged(self))
-
-
+, accel='<Control>z'
-    def undo_transaction(self):
-        if not self._undo_stack:
@@ -211 +211 @@
-        component.handle(UndoManagerStateChanged(self))
-
-
+, accel='<Control>y'
-    def redo_transaction(self):
-        if not self._redo_stack:

gaphor/trunk/gaphor/ui/mainwindow.py

@@ -429 +429 @@
-        super(MainWindow, self).construct()
-
-        # Add accelerators from ui manager:
-
-        # Does not work:
-        # ./gaphor/ui/mainwindow.py:437: GtkWarning: _gtk_accel_group_attach: assertion `g_slist_find (accel_group->acceleratables, object) == NULL' failed
-        #  self.window.add_accel_group(self.ui_manager.get_accel_group())
-
-        self.window.add_accel_group(self.ui_manager.get_accel_group())
-
-        self.window.connect('delete-event', self._on_window_delete)
-
@@ -466 +458 @@
-        self.notebook.set_current_page(page_num)
-        self.notebook_map[contents] = window
-
+#
-        return page_num
-
@@ -508 +500 @@
-                self.notebook.remove_page(num)
-                del self.notebook_map[p]
-
+#
-                return
-
@@ -548 +540 @@
-        # handle mouse button 3:
-        if event.type == gtk.gdk.BUTTON_PRESS and event.button == 3:
-
+
+
+
-
-    def on_view_row_activated(self, view, path, column):
@@ -569 +563 @@
-        A dummy action is executed.
-        """
-
+
+
-
-    def on_window_size_allocate(self, window, allocation):
@@ -591 +586 @@
-    def quit(self):
-        self.ask_to_close() and gtk.main_quit()
+
+    @action(name='tree-view-open', label='_Open')
+    def open_selected_element(self):
+        element = self._view.get_selected_element()
+        if isinstance(element, UML.Diagram):
+            self.show_diagram(element)
+        else:
+            log.debug('No action defined for element %s' % type(element).__name__)
+
-
-gtk.accel_map_add_filter('gaphor')

gaphor/trunk/gaphor/ui/toplevelwindow.py

@@ -25 +25 @@
-        self.window.set_resizable(True)
-
+        self.window.add_accel_group(self.ui_manager.get_accel_group())
+
-        vbox = gtk.VBox()
-        self.window.add(vbox)
@@ -32 +34 @@
-        #self.ui_manager.add_ui_from_string(self.menu_xml)
-
-        self.window.add_accel_group(self.ui_manager.get_accel_group())
-
-        menubar = self.ui_manager.get_widget(self.menubar_path)
-
+
+
-        
-        if self.toolbar_path:
-            toolbar = self.ui_manager.get_widget(self.toolbar_path)
-
+
+
-
-        vbox.pack_end(self.ui_component(), expand=True)