Ticket #4168: 0005-Palettes-padding-and-spacing-fixes-SL-4168.patch

File 0005-Palettes-padding-and-spacing-fixes-SL-4168.patch, 3.9 KB (added by manuq, 11 years ago)

Fixes for the Volume device palette, and other fixes.

  • extensions/deviceicon/battery.py 

    From 6af4ee250306f8383e8b7ee21ea2d1d902987bd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Qui=C3=B1ones?= <manuq@laptop.org>
Date: Thu, 8 Nov 2012 16:37:36 -0300
Subject: [PATCH shell 5/5] Palettes: padding and spacing fixes - SL #4168
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Mail-Followup-To: <sugar-devel@lists.sugarlabs.org>

More fixes for the Palettes styling, commit 798548f8 .

- set spacing between progress bar and label for Volumes device,
  Battery device, and Journal palette.

- remove padding from Speaker device palette.

- remove unneeded import in volume.py

Signed-off-by: Manuel Quiñones <manuq@laptop.org>
---
 extensions/deviceicon/battery.py |  3 ++-
 extensions/deviceicon/speaker.py |  2 +-
 extensions/deviceicon/volume.py  |  1 -
 src/jarabe/view/palettes.py      | 12 +++++++++---
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/extensions/deviceicon/battery.py b/extensions/deviceicon/battery.py
index 0a1bf26..d95c057 100644
    a b class BatteryPalette(Palette): 
    123123        self._progress_widget.show()
    124124
    125125        inner_box = Gtk.VBox()
    126         self._progress_widget.append_item(inner_box)
     126        inner_box.set_spacing(style.DEFAULT_PADDING)
     127        self._progress_widget.append_item(inner_box, vertical_padding=0)
    127128        inner_box.show()
    128129
    129130        self._progress_bar = Gtk.ProgressBar()

  • extensions/deviceicon/speaker.py 

    diff --git a/extensions/deviceicon/speaker.py b/extensions/deviceicon/speaker.py
index 67c3f27..51efe1f 100644
    a b class SpeakerPalette(Palette): 
    118118        hscale.props.draw_value = False
    119119        hscale.set_adjustment(self._adjustment)
    120120        hscale.set_digits(0)
    121         box.append_item(hscale)
     121        box.append_item(hscale, vertical_padding=0)
    122122        hscale.show()
    123123
    124124        self._adjustment_handler_id = \

  • extensions/deviceicon/volume.py 

    diff --git a/extensions/deviceicon/volume.py b/extensions/deviceicon/volume.py
index 76cb41b..c5ed78d 100644
    a b from sugar3.graphics.tray import TrayIcon 
    2626from sugar3.graphics.xocolor import XoColor
    2727from sugar3.graphics.palettemenu import PaletteMenuBox
    2828from sugar3.graphics.palettemenu import PaletteMenuItem
    29 from sugar3.graphics.palettemenu import PaletteMenuItemSeparator
    3029from sugar3.graphics.icon import Icon
    3130
    3231from jarabe.journal import journalactivity

  • src/jarabe/view/palettes.py 

    diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py
index 81b6c57..8e77ea3 100644
    a b class JournalPalette(BasePalette): 
    191191        separator.show()
    192192
    193193        inner_box = Gtk.VBox()
    194         box.append_item(inner_box)
     194        inner_box.set_spacing(style.DEFAULT_PADDING)
     195        box.append_item(inner_box, vertical_padding=0)
    195196        inner_box.show()
    196197
    197198        self._progress_bar = Gtk.ProgressBar()
    … … class VolumePalette(Palette): 
    246247        self.content_box.append_item(separator)
    247248        separator.show()
    248249
     250        free_space_box = Gtk.VBox()
     251        free_space_box.set_spacing(style.DEFAULT_PADDING)
     252        self.content_box.append_item(free_space_box, vertical_padding=0)
     253        free_space_box.show()
     254
    249255        self._progress_bar = Gtk.ProgressBar()
    250         self.content_box.append_item(self._progress_bar)
     256        free_space_box.pack_start(self._progress_bar, True, True, 0)
    251257        self._progress_bar.show()
    252258
    253259        self._free_space_label = Gtk.Label()
    254260        self._free_space_label.set_alignment(0.5, 0.5)
    255         self.content_box.append_item(self._free_space_label)
     261        free_space_box.pack_start(self._free_space_label, True, True, 0)
    256262        self._free_space_label.show()
    257263
    258264        self.connect('popup', self.__popup_cb)