On Wed, Mar 26, 2008 at 12:23 AM, Marco Pesenti Gritti
<[EMAIL PROTECTED]> wrote:
> 2 Accell support.
First patch attached.
Thanks,
Tomeu
From 2b0f3000e3a91dc6f676743f7b038af785913fa5 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <[EMAIL PROTECTED]>
Date: Wed, 26 Mar 2008 11:50:46 +0100
Subject: [PATCH] Add support for accelerators to buttons and toolbars.
---
sugar/activity/activity.py | 13 ++++--
sugar/graphics/Makefile.am | 1 +
sugar/graphics/palette.py | 34 +++++++++++++----
sugar/graphics/radiotoolbutton.py | 76 ++++++++++++++++++++++++++++++++++--
sugar/graphics/toolbox.py | 59 +++++++++++++++++++++++++---
sugar/graphics/toolbutton.py | 64 ++++++++++++++++++++++++++++--
6 files changed, 218 insertions(+), 29 deletions(-)
diff --git a/sugar/activity/activity.py b/sugar/activity/activity.py
index 146d863..996de53 100644
--- a/sugar/activity/activity.py
+++ b/sugar/activity/activity.py
@@ -28,6 +28,7 @@ See the methods of the Activity class below for more information on what you
will need for a real activity.
"""
# Copyright (C) 2006-2007 Red Hat, Inc.
+# Copyright (C) 2007-2008 One Laptop Per Child
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -125,14 +126,14 @@ class ActivityToolbar(gtk.Toolbar):
self._update_share()
- self.keep = ToolButton('document-save')
- self.keep.set_tooltip(_('Keep'))
+ self.keep = ToolButton('document-save', label=_('Keep'))
+ self.keep.props.accelerator = _('<Ctrl>S')
self.keep.connect('clicked', self.__keep_clicked_cb)
self.insert(self.keep, -1)
self.keep.show()
- self.stop = ToolButton('activity-stop')
- self.stop.set_tooltip(_('Stop'))
+ self.stop = ToolButton('activity-stop', label=_('Stop'))
+ self.stop.props.accelerator = _('<Ctrl>Q')
self.stop.connect('clicked', self.__stop_clicked_cb)
self.insert(self.stop, -1)
self.stop.show()
@@ -291,7 +292,7 @@ class ActivityToolbox(Toolbox):
Toolbox.__init__(self)
self._activity_toolbar = ActivityToolbar(activity)
- self.add_toolbar(_('Activity'), self._activity_toolbar)
+ self.add_toolbar(_('Activity'), self._activity_toolbar, _('<Ctrl>1'))
self._activity_toolbar.show()
def get_activity_toolbar(self):
@@ -433,6 +434,8 @@ class Activity(Window, gtk.Container):
self._max_participants = 0
self._invites_queue = []
+ self.add_accel_group(gtk.AccelGroup())
+
self._bus = ActivityService(self)
self._owns_file = False
diff --git a/sugar/graphics/Makefile.am b/sugar/graphics/Makefile.am
index 0a3a846..57b19eb 100644
--- a/sugar/graphics/Makefile.am
+++ b/sugar/graphics/Makefile.am
@@ -1,6 +1,7 @@
sugardir = $(pythondir)/sugar/graphics
sugar_PYTHON = \
__init__.py \
+ accellabel.py \
alert.py \
animator.py \
combobox.py \
diff --git a/sugar/graphics/palette.py b/sugar/graphics/palette.py
index e84cc51..29cfb05 100644
--- a/sugar/graphics/palette.py
+++ b/sugar/graphics/palette.py
@@ -1,4 +1,5 @@
# Copyright (C) 2007, Eduardo Silva <[EMAIL PROTECTED]>
+# Copyright (C) 2008, One Laptop Per Child
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -26,6 +27,7 @@ import pango
from sugar.graphics import palettegroup
from sugar.graphics import animator
from sugar.graphics import style
+from sugar.graphics.accellabel import AccelLabel
from sugar import _sugarext
# Helper function to find the gap position and size of widget a
@@ -141,7 +143,7 @@ class Palette(gtk.Window):
gobject.TYPE_NONE, ([]))
}
- def __init__(self, label, accel_path=None, menu_after_content=False,
+ def __init__(self, label, accelerator=None, menu_after_content=False,
text_maxlen=0):
gtk.Window.__init__(self)
@@ -176,9 +178,13 @@ class Palette(gtk.Window):
vbox = gtk.VBox()
+ hbox = gtk.HBox()
+ hbox.set_size_request(-1, style.zoom(style.GRID_CELL_SIZE)
+ - 2 * self.get_border_width())
+ vbox.pack_start(hbox, expand=False)
+ hbox.show()
+
self._label = gtk.Label()
- self._label.set_size_request(-1, style.zoom(style.GRID_CELL_SIZE)
- - 2*self.get_border_width())
self._label.set_alignment(0, 0.5)
self._label.set_padding(style.DEFAULT_SPACING, 0)
@@ -186,7 +192,11 @@ class Palette(gtk.Window):
self._label.set_max_width_chars(text_maxlen)
self._label.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
- vbox.pack_start(self._label, False)
+ hbox.pack_start(self._label)
+
+ self._accel_label = AccelLabel()
+ self._accel_label.set_padding(style.DEFAULT_SPACING, 0)
+ hbox.pack_start(self._accel_label, expand=False)
self._secondary_box = gtk.VBox()
vbox.pack_start(self._secondary_box)
@@ -220,7 +230,7 @@ class Palette(gtk.Window):
self.connect('leave-notify-event',
self._leave_notify_event_cb)
- self.set_primary_text(label, accel_path)
+ self.set_primary_text(label, accelerator)
self.set_group_id('default')
self._mouse_detector = MouseSpeedDetector(self, 200, 5)
@@ -263,11 +273,19 @@ class Palette(gtk.Window):
return gtk.gdk.Rectangle(x, y, width, height)
- def set_primary_text(self, label, accel_path=None):
- if label is not None:
- self._label.set_markup("<b>"+label+"</b>")
+ def set_primary_text(self, label, accelerator=None):
+ if label is None:
+ self._label.hide()
+ else:
+ self._label.set_markup('<b>%s</b>' % label)
self._label.show()
+ if accelerator is None:
+ self._accel_label.hide()
+ else:
+ self._accel_label.props.accelerator = accelerator
+ self._accel_label.show()
+
def set_content(self, widget):
if len(self._content.get_children()) > 0:
self._content.remove(self._content.get_children()[0])
diff --git a/sugar/graphics/radiotoolbutton.py b/sugar/graphics/radiotoolbutton.py
index cb4ae25..04019e0 100644
--- a/sugar/graphics/radiotoolbutton.py
+++ b/sugar/graphics/radiotoolbutton.py
@@ -1,5 +1,5 @@
# Copyright (C) 2007, Red Hat, Inc.
-# Copyright (C) 2007, One Laptop Per Child
+# Copyright (C) 2007-2008, One Laptop Per Child
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -16,7 +16,10 @@
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
+import logging
+
import gtk
+import gobject
from sugar.graphics.icon import Icon
from sugar.graphics.palette import Palette, ToolInvoker
@@ -24,12 +27,71 @@ from sugar.graphics.palette import Palette, ToolInvoker
class RadioToolButton(gtk.RadioToolButton):
__gtype_name__ = "SugarRadioToolButton"
- def __init__(self, named_icon=None, group=None, xo_color=None):
- gtk.RadioToolButton.__init__(self, group=group)
+ __gsignals__ = {
+ 'accelerator-activated': (gobject.SIGNAL_RUN_FIRST | gobject.SIGNAL_ACTION,
+ gobject.TYPE_NONE, ([]))
+ }
+
+ def __init__(self, named_icon=None, xo_color=None, **kwargs):
+ self._accelerator = None
+ self._label = None
self._palette = None
+
+ gobject.GObject.__init__(self, **kwargs)
+
self._xo_color = xo_color
self.set_named_icon(named_icon)
+ self.connect('hierarchy-changed', self.__hierarchy_changed_cb)
+ self.connect('accelerator-activated', self.__accelerator_activated_cb)
+
+ def set_label(self, label):
+ if self._label != label:
+ self._label = label
+ if label and self.palette is None:
+ self.palette = Palette(label, self._accelerator)
+ elif self.palette:
+ self.palette.set_primary_text(label, self._accelerator)
+
+ # Set label, shows up when toolbar overflows
+ gtk.RadioToolButton.set_label(self, label)
+
+ def get_label(self):
+ return self._label
+
+ label = gobject.property(type=str, setter=set_label, getter=get_label)
+
+ def set_accelerator(self, accelerator):
+ if self._accelerator != accelerator:
+ self._accelerator = accelerator
+ self._set_accelerator(self._accelerator)
+ if self.palette and self._label:
+ self.palette.set_primary_text(self._label, self._accelerator)
+
+ def get_accelerator(self):
+ return self._accelerator
+
+ accelerator = gobject.property(type=str, setter=set_accelerator,
+ getter=get_accelerator)
+
+ def _set_accelerator(self, accelerator):
+ if not accelerator or not self.get_toplevel():
+ return
+
+ # TODO: should we remove the accelerator from the prev top level?
+ accel_groups = gtk.accel_groups_from_object(self.get_toplevel())
+ if accel_groups:
+ keyval, mask = gtk.accelerator_parse(accelerator)
+ self.add_accelerator('accelerator-activated', accel_groups[0],
+ keyval, mask, gtk.ACCEL_LOCKED | gtk.ACCEL_VISIBLE)
+
+ def __accelerator_activated_cb(self, button):
+ self.set_active(True)
+
+ def __hierarchy_changed_cb(self, button, previous_toplevel):
+ if self._accelerator:
+ self._set_accelerator(self._accelerator)
+
def set_named_icon(self, named_icon):
icon = Icon(icon_name=named_icon,
xo_color=self._xo_color,
@@ -46,9 +108,14 @@ class RadioToolButton(gtk.RadioToolButton):
self._palette = palette
self._palette.props.invoker = ToolInvoker(self)
+ palette = gobject.property(type=object, setter=set_palette, getter=get_palette)
+
def set_tooltip(self, text):
self.set_palette(Palette(text))
+ # Set label, shows up when toolbar overflows
+ self.set_label(text)
+
def do_expose_event(self, event):
if self._palette and self._palette.is_up():
invoker = self._palette.props.invoker
@@ -63,5 +130,4 @@ class RadioToolButton(gtk.RadioToolButton):
self.allocation.height)
gtk.RadioToolButton.do_expose_event(self, event)
-
- palette = property(get_palette, set_palette)
+
diff --git a/sugar/graphics/toolbox.py b/sugar/graphics/toolbox.py
index e5ae141..531ce30 100644
--- a/sugar/graphics/toolbox.py
+++ b/sugar/graphics/toolbox.py
@@ -1,4 +1,5 @@
# Copyright (C) 2007, Red Hat, Inc.
+# Copyright (C) 2008, One Laptop Per Child
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -19,7 +20,7 @@ import gtk
import gobject
import hippo
-from sugar.graphics.toolbutton import ToolButton
+from sugar.graphics.accellabel import AccelLabel
from sugar.graphics import style
class Toolbox(gtk.VBox):
@@ -58,12 +59,27 @@ class Toolbox(gtk.VBox):
def _notify_page_cb(self, notebook, pspec):
self.emit('current-toolbar-changed', notebook.props.page)
- def add_toolbar(self, name, toolbar):
+ def add_toolbar(self, name, toolbar, accelerator=None):
+ label_box = _LabelBox()
+
label = gtk.Label(name)
- width, height = label.size_request()
- label.set_size_request(max(width, style.TOOLBOX_TAB_LABEL_WIDTH), -1)
label.set_alignment(0.0, 0.5)
+ label_box.add(label)
+ label.show()
+
+ if accelerator is not None:
+ accel_label = AccelLabel(accelerator=accelerator)
+ accel_label.set_alignment(0.0, 0.5)
+ label_box.add(accel_label)
+ accel_label.show()
+ self._set_accelerator(label_box, accelerator)
+ label_box.connect('hierarchy-changed', self.__hierarchy_changed_cb,
+ accelerator)
+
+ width, height = label_box.size_request()
+ label_box.set_size_request(max(width, style.TOOLBOX_TAB_LABEL_WIDTH), -1)
+
event_box = gtk.EventBox()
alignment = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
@@ -75,12 +91,31 @@ class Toolbox(gtk.VBox):
alignment.show()
event_box.show()
- self._notebook.append_page(event_box, label)
+ position = self._notebook.append_page(event_box, label_box)
+ label_box.connect('accelerator-activated',
+ self.__label_box_accelerator_activated_cb, event_box)
if self._notebook.get_n_pages() > 1:
self._notebook.set_show_tabs(True)
self._separator.show()
-
+
+ def __label_box_accelerator_activated_cb(self, label_box, child):
+ self._notebook.set_current_page(self._notebook.page_num(child))
+
+ def _set_accelerator(self, label_box, accelerator):
+ if not accelerator or not label_box.get_toplevel():
+ return
+
+ # TODO: should we remove the accelerator from the prev top level?
+ accel_groups = gtk.accel_groups_from_object(label_box.get_toplevel())
+ if accel_groups:
+ keyval, mask = gtk.accelerator_parse(accelerator)
+ label_box.add_accelerator('accelerator-activated', accel_groups[0],
+ keyval, mask, gtk.ACCEL_LOCKED | gtk.ACCEL_VISIBLE)
+
+ def __hierarchy_changed_cb(self, label_box, previous_toplevel, accelerator):
+ self._set_accelerator(label_box, accelerator)
+
def remove_toolbar(self, index):
self._notebook.remove_page(index)
@@ -96,3 +131,15 @@ class Toolbox(gtk.VBox):
current_toolbar = property(get_current_toolbar, set_current_toolbar)
+class _LabelBox(gtk.HBox):
+ __gtype_name__ = 'SugarLabelBox'
+
+ __gsignals__ = {
+ 'accelerator-activated': (gobject.SIGNAL_RUN_FIRST | gobject.SIGNAL_ACTION,
+ gobject.TYPE_NONE,
+ ([]))
+ }
+
+ def __init__(self, **kwargs):
+ gobject.GObject.__init__(self, **kwargs)
+
diff --git a/sugar/graphics/toolbutton.py b/sugar/graphics/toolbutton.py
index 26acc83..476ccdc 100644
--- a/sugar/graphics/toolbutton.py
+++ b/sugar/graphics/toolbutton.py
@@ -1,4 +1,5 @@
# Copyright (C) 2007, Red Hat, Inc.
+# Copyright (C) 2008, One Laptop Per Child
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -15,6 +16,8 @@
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
+import logging
+
import gtk
import gobject
import time
@@ -25,12 +28,62 @@ from sugar.graphics.palette import Palette, ToolInvoker
class ToolButton(gtk.ToolButton):
__gtype_name__ = "SugarToolButton"
- def __init__(self, icon_name=None):
- gtk.ToolButton.__init__(self)
+ def __init__(self, icon_name=None, **kwargs):
+ self._accelerator = None
+ self._label = None
self._palette = None
+
+ gobject.GObject.__init__(self, **kwargs)
+
if icon_name:
self.set_icon(icon_name)
- self.connect('clicked', self._button_clicked_cb)
+
+ self.connect('clicked', self.__button_clicked_cb)
+ self.connect('hierarchy-changed', self.__hierarchy_changed_cb)
+
+ def set_label(self, label):
+ if self._label != label:
+ self._label = label
+ if label and self.palette is None:
+ self.palette = Palette(label, self._accelerator)
+ elif self.palette:
+ self.palette.set_primary_text(label, self._accelerator)
+
+ # Set label, shows up when toolbar overflows
+ gtk.ToolButton.set_label(self, label)
+
+ def get_label(self):
+ return self._label
+
+ label = gobject.property(type=str, setter=set_label, getter=get_label)
+
+ def set_accelerator(self, accelerator):
+ if self._accelerator != accelerator:
+ self._accelerator = accelerator
+ self._set_accelerator(self._accelerator)
+ if self.palette and self._label:
+ self.palette.set_primary_text(self._label, self._accelerator)
+
+ def get_accelerator(self):
+ return self._accelerator
+
+ accelerator = gobject.property(type=str, setter=set_accelerator,
+ getter=get_accelerator)
+
+ def _set_accelerator(self, accelerator):
+ if not accelerator or not self.get_toplevel():
+ return
+
+ # TODO: should we remove the accelerator from the prev top level?
+ accel_groups = gtk.accel_groups_from_object(self.get_toplevel())
+ if accel_groups:
+ keyval, mask = gtk.accelerator_parse(accelerator)
+ self.add_accelerator('clicked', accel_groups[0], keyval, mask,
+ gtk.ACCEL_LOCKED | gtk.ACCEL_VISIBLE)
+
+ def __hierarchy_changed_cb(self, button, previous_toplevel):
+ if self._accelerator:
+ self._set_accelerator(self._accelerator)
def set_icon(self, icon_name):
icon = Icon(icon_name=icon_name)
@@ -46,6 +99,8 @@ class ToolButton(gtk.ToolButton):
self._palette = palette
self._palette.props.invoker = ToolInvoker(self)
+ palette = gobject.property(type=object, setter=set_palette, getter=get_palette)
+
def set_tooltip(self, text):
self.set_palette(Palette(text))
@@ -67,8 +122,7 @@ class ToolButton(gtk.ToolButton):
gtk.ToolButton.do_expose_event(self, event)
- def _button_clicked_cb(self, widget):
+ def __button_clicked_cb(self, widget):
if self._palette:
self._palette.popdown(True)
- palette = property(get_palette, set_palette)
--
1.5.2.5
_______________________________________________
Sugar mailing list
[email protected]
http://lists.laptop.org/listinfo/sugar
