Ticket #4144: 0001-Palettes-adjust-to-the-new-API-SL-4144.patch

File 0001-Palettes-adjust-to-the-new-API-SL-4144.patch, 18.2 KB (added by manuq, 12 years ago)

New artwork patch.

  • extensions/deviceicon/battery.py 

    From 859abc56143dc15ee19eac1c20aa1ef661939483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Qui=C3=B1ones?= <manuq@laptop.org>
Date: Tue, 6 Nov 2012 15:44:30 -0300
Subject: [PATCH shell] Palettes: adjust to the new API - SL #4144
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Mail-Followup-To: <sugar-devel@lists.sugarlabs.org>

The API now allows to hide the implementation details using a
PaletteMenuBox as container.

Signed-off-by: Manuel Quiñones <manuq@laptop.org>
---
 extensions/deviceicon/battery.py    | 21 ++++++++++-------
 extensions/deviceicon/network.py    |  7 ++++--
 extensions/deviceicon/speaker.py    | 27 ++++++++++++----------
 extensions/deviceicon/speech.py     | 45 ++++++++++++++++++------------------
 extensions/deviceicon/volume.py     |  5 ++--
 src/jarabe/desktop/favoritesview.py |  5 ++--
 src/jarabe/desktop/networkviews.py  |  5 ++--
 src/jarabe/view/buddymenu.py        |  3 ++-
 src/jarabe/view/palettes.py         | 46 +++++++++++++++++++++----------------
 9 files changed, 93 insertions(+), 71 deletions(-)

diff --git a/extensions/deviceicon/battery.py b/extensions/deviceicon/battery.py
index 7fcca8d..0a1bf26 100644
    a b from sugar3.graphics import style 
    2727from sugar3.graphics.icon import get_icon_state
    2828from sugar3.graphics.tray import TrayIcon
    2929from sugar3.graphics.palette import Palette
     30from sugar3.graphics.palettemenu import PaletteMenuBox
    3031from sugar3.graphics.xocolor import XoColor
    3132
    3233from jarabe.frame.frameinvoker import FrameWidgetInvoker
    … … class BatteryPalette(Palette): 
    116117        self._level = 0
    117118        self._time = 0
    118119        self._status = _STATUS_NOT_PRESENT
     120
     121        self._progress_widget = PaletteMenuBox()
     122        self.set_content(self._progress_widget)
     123        self._progress_widget.show()
     124
     125        inner_box = Gtk.VBox()
     126        self._progress_widget.append_item(inner_box)
     127        inner_box.show()
     128
    119129        self._progress_bar = Gtk.ProgressBar()
    120130        self._progress_bar.set_size_request(
    121131            style.zoom(style.GRID_CELL_SIZE * 4), -1)
     132        inner_box.pack_start(self._progress_bar, True, True, 0)
    122133        self._progress_bar.show()
     134
    123135        self._status_label = Gtk.Label()
     136        inner_box.pack_start(self._status_label, True, True, 0)
    124137        self._status_label.show()
    125138
    126         vbox = Gtk.VBox()
    127         vbox.pack_start(self._progress_bar, True, True, 0)
    128         vbox.pack_start(self._status_label, True, True, 0)
    129         vbox.show()
    130 
    131         self._progress_widget = vbox
    132         self.set_content(self._progress_widget)
    133 
    134139    def set_info(self, percentage, seconds, status):
    135140        self._level = percentage
    136141        self._time = seconds

  • extensions/deviceicon/network.py 

    diff --git a/extensions/deviceicon/network.py b/extensions/deviceicon/network.py
index 3351281..fbd0ef4 100644
    a b import dbus 
    3434from sugar3.graphics.icon import get_icon_state
    3535from sugar3.graphics import style
    3636from sugar3.graphics.palette import Palette
    37 from sugar3.graphics.palettemenuitem import PaletteMenuItem
    38 from sugar3.graphics.palettemenuitem import PaletteMenuItemSeparator
     37from sugar3.graphics.palettemenu import PaletteMenuBox
     38from sugar3.graphics.palettemenu import PaletteMenuItem
     39from sugar3.graphics.palettemenu import PaletteMenuItemSeparator
    3940from sugar3.graphics.toolbutton import ToolButton
    4041from sugar3.graphics.tray import TrayIcon
    4142from sugar3.graphics.icon import Icon
    … … class WirelessPalette(Palette): 
    7475        self._channel_label.show()
    7576
    7677        self._ip_address_label = Gtk.Label()
     78        self._ip_address_label.props.xalign = 0.0
     79        self._ip_address_label.show()
    7780
    7881        self._info = Gtk.VBox()
    7982

  • extensions/deviceicon/speaker.py 

    diff --git a/extensions/deviceicon/speaker.py b/extensions/deviceicon/speaker.py
index 8260d49..67c3f27 100644
    a b from sugar3.graphics import style 
    2525from sugar3.graphics.icon import get_icon_state, Icon
    2626from sugar3.graphics.tray import TrayIcon
    2727from sugar3.graphics.palette import Palette
    28 from sugar3.graphics.palettemenuitem import PaletteMenuItem
    29 from sugar3.graphics.palettemenuitem import PaletteMenuItemSeparator
     28from sugar3.graphics.palettemenu import PaletteMenuBox
     29from sugar3.graphics.palettemenu import PaletteMenuItem
     30from sugar3.graphics.palettemenu import PaletteMenuItemSeparator
    3031from sugar3.graphics.xocolor import XoColor
    3132
    3233from jarabe.frame.frameinvoker import FrameWidgetInvoker
    … … class SpeakerPalette(Palette): 
    9091
    9192        self._model = model
    9293
    93         vbox = Gtk.VBox()
    94         self.set_content(vbox)
    95         vbox.show()
     94        box = PaletteMenuBox()
     95        self.set_content(box)
     96        box.show()
    9697
    9798        self._mute_item = PaletteMenuItem('')
    9899        self._mute_icon = Icon(icon_size=Gtk.IconSize.MENU)
    99100        self._mute_item.set_image(self._mute_icon)
    100         vbox.add(self._mute_item)
     101        box.append_item(self._mute_item)
    101102        self._mute_item.show()
    102103        self._mute_item.connect('activate', self.__mute_activate_cb)
    103104
    104105        separator = PaletteMenuItemSeparator()
    105         vbox.pack_start(separator, True, True, 0)
     106        box.append_item(separator)
    106107        separator.show()
    107108
    108109        vol_step = sound.VOLUME_STEP
    … … class SpeakerPalette(Palette): 
    112113                                          step_incr=vol_step,
    113114                                          page_incr=vol_step,
    114115                                          page_size=vol_step)
    115         self._hscale = Gtk.HScale()
    116         self._hscale.set_adjustment(self._adjustment)
    117         self._hscale.set_digits(0)
    118         vbox.add(self._hscale)
    119         self._hscale.show()
     116
     117        hscale = Gtk.HScale()
     118        hscale.props.draw_value = False
     119        hscale.set_adjustment(self._adjustment)
     120        hscale.set_digits(0)
     121        box.append_item(hscale)
     122        hscale.show()
    120123
    121124        self._adjustment_handler_id = \
    122125            self._adjustment.connect('value_changed',

  • extensions/deviceicon/speech.py 

    diff --git a/extensions/deviceicon/speech.py b/extensions/deviceicon/speech.py
index 1f7bf02..a0a2ad1 100644
    a b from gi.repository import GObject 
    2424from sugar3.graphics.icon import Icon
    2525from sugar3.graphics.tray import TrayIcon
    2626from sugar3.graphics.palette import Palette
    27 from sugar3.graphics.palettemenuitem import PaletteMenuItem
    28 from sugar3.graphics.palettemenuitem import PaletteMenuItemSeparator
     27from sugar3.graphics.palettemenu import PaletteMenuBox
     28from sugar3.graphics.palettemenu import PaletteMenuItem
     29from sugar3.graphics.palettemenu import PaletteMenuItemSeparator
    2930from sugar3.graphics.xocolor import XoColor
    3031from sugar3.graphics import style
    3132
    … … class SpeechPalette(Palette): 
    6667        self._manager.connect('stop', self._set_menu_state, 'stop')
    6768        self._manager.connect('pause', self._set_menu_state, 'pause')
    6869
    69         vbox = Gtk.VBox()
    70         self.set_content(vbox)
    71         vbox.show()
     70        box = PaletteMenuBox()
     71        self.set_content(box)
     72        box.show()
    7273
    7374        self._play_icon = Icon(icon_name='player_play')
    7475        self._pause_icon = Icon(icon_name='player_pause')
    … … class SpeechPalette(Palette): 
    7778            text_label=_('Say selected text'))
    7879        self._play_pause_menu.set_image(self._play_icon)
    7980        self._play_pause_menu.connect('activate', self.__play_activated_cb)
    80         vbox.pack_start(self._play_pause_menu, True, True, 0)
     81        box.append_item(self._play_pause_menu)
    8182        self._play_pause_menu.show()
    8283
    8384        self._stop_menu = PaletteMenuItem(icon_name='player_stop',
    8485                                          text_label=_('Stop playback'))
    8586        self._stop_menu.connect('activate', self.__stop_activated_cb)
    8687        self._stop_menu.set_sensitive(False)
    87         vbox.pack_start(self._stop_menu, True, True, 0)
    88         self._stop_menu.show()
     88        box.append_item(self._stop_menu)
    8989
    9090        separator = PaletteMenuItemSeparator()
    91         vbox.pack_start(separator, True, True, 0)
     91        box.append_item(separator)
    9292        separator.show()
    9393
    9494        pitch_label = Gtk.Label(_('Pitch'))
    95         vbox.pack_start(pitch_label, True, True, padding=style.DEFAULT_PADDING)
     95        box.append_item(pitch_label, vertical_padding=0)
    9696        pitch_label.show()
    9797
    9898        self._adj_pitch = Gtk.Adjustment(value=self._manager.get_pitch(),
    9999                                         lower=self._manager.MIN_PITCH,
    100100                                         upper=self._manager.MAX_PITCH)
    101         self._hscale_pitch = Gtk.HScale()
    102         self._hscale_pitch.set_adjustment(self._adj_pitch)
    103         self._hscale_pitch.set_draw_value(False)
    104101
    105         vbox.pack_start(self._hscale_pitch, True, True, 0)
    106         self._hscale_pitch.show()
     102        hscale_pitch = Gtk.HScale()
     103        hscale_pitch.set_adjustment(self._adj_pitch)
     104        hscale_pitch.set_draw_value(False)
     105
     106        box.append_item(hscale_pitch, vertical_padding=0)
     107        hscale_pitch.show()
    107108
    108109        rate_label = Gtk.Label(_('Rate'))
    109         vbox.pack_start(rate_label, True, True,
    110                         padding=style.DEFAULT_PADDING)
     110        box.append_item(rate_label, vertical_padding=0)
    111111        rate_label.show()
    112112
    113113        self._adj_rate = Gtk.Adjustment(value=self._manager.get_rate(),
    114114                                        lower=self._manager.MIN_RATE,
    115115                                        upper=self._manager.MAX_RATE)
    116         self._hscale_rate = Gtk.HScale()
    117         self._hscale_rate.set_adjustment(self._adj_rate)
    118         self._hscale_rate.set_draw_value(False)
    119116
    120         vbox.pack_start(self._hscale_rate, True, True, 0)
    121         self._hscale_rate.show()
     117        hscale_rate = Gtk.HScale()
     118        hscale_rate.set_adjustment(self._adj_rate)
     119        hscale_rate.set_draw_value(False)
     120
     121        box.append_item(hscale_rate, vertical_padding=0)
     122        hscale_rate.show()
    122123
    123124        self._adj_pitch.connect('value_changed', self.__adj_pitch_changed_cb)
    124125        self._adj_rate.connect('value_changed', self.__adj_rate_changed_cb)

  • extensions/deviceicon/volume.py 

    diff --git a/extensions/deviceicon/volume.py b/extensions/deviceicon/volume.py
index 6930811..76cb41b 100644
    a b from gi.repository import GConf 
    2424
    2525from sugar3.graphics.tray import TrayIcon
    2626from sugar3.graphics.xocolor import XoColor
    27 from sugar3.graphics.palettemenuitem import PaletteMenuItem
    28 from sugar3.graphics.palettemenuitem import PaletteMenuItemSeparator
     27from sugar3.graphics.palettemenu import PaletteMenuBox
     28from sugar3.graphics.palettemenu import PaletteMenuItem
     29from sugar3.graphics.palettemenu import PaletteMenuItemSeparator
    2930from sugar3.graphics.icon import Icon
    3031
    3132from jarabe.journal import journalactivity

  • src/jarabe/desktop/favoritesview.py 

    diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index 6e32363..152dd6e 100644
    a b from gi.repository import GdkPixbuf 
    2929from sugar3.graphics import style
    3030from sugar3.graphics.icon import Icon
    3131from sugar3.graphics.icon import CanvasIcon
    32 from sugar3.graphics.palettemenuitem import PaletteMenuItem
    33 from sugar3.graphics.palettemenuitem import PaletteMenuItemSeparator
     32from sugar3.graphics.palettemenu import PaletteMenuBox
     33from sugar3.graphics.palettemenu import PaletteMenuItem
     34from sugar3.graphics.palettemenu import PaletteMenuItemSeparator
    3435from sugar3.graphics.alert import Alert
    3536from sugar3.graphics.xocolor import XoColor
    3637from sugar3.activity import activityfactory

  • src/jarabe/desktop/networkviews.py 

    diff --git a/src/jarabe/desktop/networkviews.py b/src/jarabe/desktop/networkviews.py
index f72b2d2..29dc131 100644
    a b from sugar3.graphics import xocolor 
    3232from sugar3.graphics import style
    3333from sugar3.graphics.icon import get_icon_state
    3434from sugar3.graphics import palette
    35 from sugar3.graphics.palettemenuitem import PaletteMenuItem
    36 from sugar3.graphics.palettemenuitem import PaletteMenuItemSeparator
     35from sugar3.graphics.palettemenu import PaletteMenuBox
     36from sugar3.graphics.palettemenu import PaletteMenuItem
     37from sugar3.graphics.palettemenu import PaletteMenuItemSeparator
    3738from sugar3 import profile
    3839
    3940from jarabe.view.pulsingicon import EventPulsingIcon

  • src/jarabe/view/buddymenu.py 

    diff --git a/src/jarabe/view/buddymenu.py b/src/jarabe/view/buddymenu.py
index 2579d96..9015fbe 100644
    a b import glib 
    2424import dbus
    2525
    2626from sugar3.graphics.palette import Palette
    27 from sugar3.graphics.palettemenuitem import PaletteMenuItem
     27from sugar3.graphics.palettemenu import PaletteMenuBox
     28from sugar3.graphics.palettemenu import PaletteMenuItem
    2829from sugar3.graphics.icon import Icon
    2930
    3031from jarabe.model import shell

  • src/jarabe/view/palettes.py 

    diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py
index 5448bde..e3a53ad 100644
    a b from gi.repository import Gtk 
    2525
    2626from sugar3 import env
    2727from sugar3.graphics.palette import Palette
    28 from sugar3.graphics.palettemenuitem import PaletteMenuItem
    29 from sugar3.graphics.palettemenuitem import PaletteMenuItemSeparator
     28from sugar3.graphics.palettemenu import PaletteMenuBox
     29from sugar3.graphics.palettemenu import PaletteMenuItem
     30from sugar3.graphics.palettemenu import PaletteMenuItemSeparator
    3031from sugar3.graphics.menuitem import MenuItem
    3132from sugar3.graphics.icon import Icon
    3233from sugar3.graphics import style
    … … class CurrentActivityPalette(BasePalette): 
    8384        if title and title != activity_name:
    8485            self.props.secondary_text = glib.markup_escape_text(title)
    8586
    86         self.menu_box = Gtk.VBox()
     87        self.menu_box = PaletteMenuBox()
    8788
    8889        menu_item = PaletteMenuItem(_('Resume'), 'activity-start')
    8990        menu_item.connect('activate', self.__resume_activate_cb)
    90         self.menu_box.pack_start(menu_item, True, True, 0)
     91        self.menu_box.append_item(menu_item)
    9192
    9293        # TODO: share-with, keep
    9394
    9495        menu_item = PaletteMenuItem(_('View Source'), 'view-source')
    9596        menu_item.connect('activate', self.__view_source__cb)
    96         self.menu_box.pack_start(menu_item, True, True, 0)
     97        self.menu_box.append_item(menu_item)
    9798
    9899        separator = PaletteMenuItemSeparator()
    99         self.menu_box.pack_start(menu_item, True, True, 0)
     100        self.menu_box.append_item(menu_item)
    100101        separator.show()
    101102
    102103        menu_item = PaletteMenuItem(_('Stop'), 'activity-stop')
    103104        menu_item.connect('activate', self.__stop_activate_cb)
    104         self.menu_box.pack_start(menu_item, True, True, 0)
     105        self.menu_box.append_item(menu_item)
    105106
    106107        self.set_content(self.menu_box)
    107108        self.menu_box.show_all()
    … … class ActivityPalette(Palette): 
    141142
    142143        xo_color = XoColor('%s,%s' % (style.COLOR_WHITE.get_svg(),
    143144                                      style.COLOR_TRANSPARENT.get_svg()))
    144         self.menu_box = Gtk.VBox()
     145        self.menu_box = PaletteMenuBox()
    145146        menu_item = PaletteMenuItem(text_label=_('Start new'),
    146147                                    file_name=activity_info.get_icon(),
    147148                                    xo_color=xo_color)
    148149        menu_item.connect('activate', self.__start_activate_cb)
    149150        self.menu_box.pack_end(menu_item, True, True, 0)
     151        menu_item.show()
    150152        self.set_content(self.menu_box)
    151153        self.menu_box.show_all()
    152154
    … … class JournalPalette(BasePalette): 
    169171        title = self._home_activity.get_title()
    170172        self.set_primary_text(glib.markup_escape_text(title))
    171173
    172         vbox = Gtk.VBox()
    173         self.set_content(vbox)
    174         vbox.show()
     174        box = PaletteMenuBox()
     175        self.set_content(box)
     176        box.show()
    175177
    176178        menu_item = PaletteMenuItem(_('Show contents'))
    177179        icon = Icon(file=self._home_activity.get_icon_path(),
    … … class JournalPalette(BasePalette): 
    181183        icon.show()
    182184
    183185        menu_item.connect('activate', self.__open_activate_cb)
    184         vbox.add(menu_item)
     186        box.append_item(menu_item)
    185187        menu_item.show()
    186188
    187189        separator = PaletteMenuItemSeparator()
    188         vbox.pack_start(separator, True, True, 0)
     190        box.append_item(separator)
    189191        separator.show()
    190192
     193        inner_box = Gtk.VBox()
     194        box.append_item(inner_box)
     195        inner_box.show()
     196
    191197        self._progress_bar = Gtk.ProgressBar()
    192         vbox.add(self._progress_bar)
     198        inner_box.add(self._progress_bar)
    193199        self._progress_bar.show()
    194200
    195201        self._free_space_label = Gtk.Label()
    196202        self._free_space_label.set_alignment(0.5, 0.5)
    197         vbox.add(self._free_space_label)
     203        inner_box.add(self._free_space_label)
    198204        self._free_space_label.show()
    199205
    200206        self.connect('popup', self.__popup_cb)
    … … class VolumePalette(Palette): 
    222228        path = mount.get_root().get_path()
    223229        self.props.secondary_text = glib.markup_escape_text(path)
    224230
    225         self.content_box = Gtk.VBox()
     231        self.content_box = PaletteMenuBox()
    226232        self.set_content(self.content_box)
    227233        self.content_box.show()
    228234
    … … class VolumePalette(Palette): 
    233239        icon.show()
    234240
    235241        menu_item.connect('activate', self.__unmount_activate_cb)
    236         self.content_box.pack_start(menu_item, True, True, 0)
     242        self.content_box.append_item(menu_item)
    237243        menu_item.show()
    238244
    239245        separator = PaletteMenuItemSeparator()
    240         self.content_box.pack_start(separator, True, True, 0)
     246        self.content_box.append_item(separator)
    241247        separator.show()
    242248
    243249        self._progress_bar = Gtk.ProgressBar()
    244         self.content_box.pack_start(self._progress_bar, True, True, 0)
     250        self.content_box.append_item(self._progress_bar)
    245251        self._progress_bar.show()
    246252
    247253        self._free_space_label = Gtk.Label()
    248254        self._free_space_label.set_alignment(0.5, 0.5)
    249         self.content_box.pack_start(self._free_space_label, True, True, 0)
     255        self.content_box.append_item(self._free_space_label)
    250256        self._free_space_label.show()
    251257
    252258        self.connect('popup', self.__popup_cb)