From 445e0dc2611a6d430edf4310d560b84c85f750b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Qui=C3=B1ones?= <manuq@laptop.org>
Date: Mon, 17 Dec 2012 15:31:10 -0300
Subject: [PATCH shell] clipboard palette port
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Mail-Followup-To: <sugar-devel@lists.sugarlabs.org>
Signed-off-by: Manuel Quiñones <manuq@laptop.org>
---
src/jarabe/frame/clipboardmenu.py | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/jarabe/frame/clipboardmenu.py b/src/jarabe/frame/clipboardmenu.py
index bef007b..8ee2766 100644
a
|
b
|
from gi.repository import GLib |
25 | 25 | from gi.repository import Gtk |
26 | 26 | |
27 | 27 | from sugar3.graphics.palette import Palette |
28 | | from sugar3.graphics.menuitem import MenuItem |
| 28 | from sugar3.graphics.palettemenu import PaletteMenuBox |
| 29 | from sugar3.graphics.palettemenu import PaletteMenuItem |
29 | 30 | from sugar3.graphics.icon import Icon |
30 | 31 | from sugar3.graphics.xocolor import XoColor |
31 | 32 | from sugar3.datastore import datastore |
… |
… |
class ClipboardMenu(Palette): |
53 | 54 | |
54 | 55 | self._progress_bar = None |
55 | 56 | |
56 | | self._remove_item = MenuItem(pgettext('Clipboard', 'Remove'), |
57 | | 'list-remove') |
| 57 | menu_box = PaletteMenuBox() |
| 58 | self.set_content(menu_box) |
| 59 | menu_box.show() |
| 60 | |
| 61 | self._remove_item = PaletteMenuItem(pgettext('Clipboard', 'Remove')) |
| 62 | icon = Icon(icon_size=Gtk.IconSize.MENU, icon_name='list-remove') |
| 63 | self._remove_item.set_image(icon) |
| 64 | |
58 | 65 | self._remove_item.connect('activate', self._remove_item_activate_cb) |
59 | | self.menu.append(self._remove_item) |
| 66 | menu_box.append_item(self._remove_item) |
60 | 67 | self._remove_item.show() |
61 | 68 | |
62 | | self._open_item = MenuItem(_('Open'), 'zoom-activity') |
| 69 | self._open_item = PaletteMenuItem(_('Open')) |
| 70 | icon = Icon(icon_size=Gtk.IconSize.MENU, icon_name='zoom-activity') |
63 | 71 | self._open_item.connect('activate', self._open_item_activate_cb) |
64 | | self.menu.append(self._open_item) |
| 72 | self._open_item.set_image(icon) |
| 73 | menu_box.append_item(self._open_item) |
65 | 74 | self._open_item.show() |
66 | 75 | |
67 | | self._journal_item = MenuItem(_('Keep')) |
| 76 | self._journal_item = PaletteMenuItem(_('Keep')) |
68 | 77 | client = GConf.Client.get_default() |
69 | 78 | color = XoColor(client.get_string('/desktop/sugar/user/color')) |
70 | 79 | icon = Icon(icon_name='document-save', icon_size=Gtk.IconSize.MENU, |
… |
… |
class ClipboardMenu(Palette): |
72 | 81 | self._journal_item.set_image(icon) |
73 | 82 | |
74 | 83 | self._journal_item.connect('activate', self._journal_item_activate_cb) |
75 | | self.menu.append(self._journal_item) |
| 84 | menu_box.append_item(self._journal_item) |
76 | 85 | self._journal_item.show() |
77 | 86 | |
78 | 87 | self._update() |
… |
… |
class ClipboardMenu(Palette): |
80 | 89 | def _update_open_submenu(self): |
81 | 90 | activities = self._get_activities() |
82 | 91 | logging.debug('_update_open_submenu: %r', activities) |
83 | | child = self._open_item.get_child() |
84 | 92 | if activities is None or len(activities) <= 1: |
85 | | child.set_text(_('Open')) |
| 93 | self._open_item.set_label(_('Open')) |
86 | 94 | if self._open_item.get_submenu() is not None: |
87 | 95 | self._open_item.set_submenu(None) |
88 | 96 | return |
89 | 97 | |
90 | | child.set_text(_('Open with')) |
| 98 | self._open_item.set_label(_('Open with')) |
91 | 99 | submenu = self._open_item.get_submenu() |
92 | 100 | if submenu is None: |
93 | 101 | submenu = Gtk.Menu() |