From bc9e54632edcb47230e8eccf572d649f3cae0a85 Mon Sep 17 00:00:00 2001
From: Manuel Quiñones <manuq@laptop.org>
Date: Thu, 08 Nov 2012 19:37:36 +0000
Subject: Palettes: padding and spacing fixes - SL #4168

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>
Acked-by: Simon Schampijer <simon@laptop.org>
---
diff --git a/extensions/deviceicon/battery.py b/extensions/deviceicon/battery.py
index 0a1bf26..d95c057 100644
--- a/extensions/deviceicon/battery.py
+++ b/extensions/deviceicon/battery.py
@@ -123,7 +123,8 @@ class BatteryPalette(Palette):
         self._progress_widget.show()
 
         inner_box = Gtk.VBox()
-        self._progress_widget.append_item(inner_box)
+        inner_box.set_spacing(style.DEFAULT_PADDING)
+        self._progress_widget.append_item(inner_box, vertical_padding=0)
         inner_box.show()
 
         self._progress_bar = Gtk.ProgressBar()
diff --git a/extensions/deviceicon/speaker.py b/extensions/deviceicon/speaker.py
index 67c3f27..51efe1f 100644
--- a/extensions/deviceicon/speaker.py
+++ b/extensions/deviceicon/speaker.py
@@ -118,7 +118,7 @@ class SpeakerPalette(Palette):
         hscale.props.draw_value = False
         hscale.set_adjustment(self._adjustment)
         hscale.set_digits(0)
-        box.append_item(hscale)
+        box.append_item(hscale, vertical_padding=0)
         hscale.show()
 
         self._adjustment_handler_id = \
diff --git a/extensions/deviceicon/volume.py b/extensions/deviceicon/volume.py
index 76cb41b..c5ed78d 100644
--- a/extensions/deviceicon/volume.py
+++ b/extensions/deviceicon/volume.py
@@ -26,7 +26,6 @@ from sugar3.graphics.tray import TrayIcon
 from sugar3.graphics.xocolor import XoColor
 from sugar3.graphics.palettemenu import PaletteMenuBox
 from sugar3.graphics.palettemenu import PaletteMenuItem
-from sugar3.graphics.palettemenu import PaletteMenuItemSeparator
 from sugar3.graphics.icon import Icon
 
 from jarabe.journal import journalactivity
diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py
index 81b6c57..8e77ea3 100644
--- a/src/jarabe/view/palettes.py
+++ b/src/jarabe/view/palettes.py
@@ -191,7 +191,8 @@ class JournalPalette(BasePalette):
         separator.show()
 
         inner_box = Gtk.VBox()
-        box.append_item(inner_box)
+        inner_box.set_spacing(style.DEFAULT_PADDING)
+        box.append_item(inner_box, vertical_padding=0)
         inner_box.show()
 
         self._progress_bar = Gtk.ProgressBar()
@@ -246,13 +247,18 @@ class VolumePalette(Palette):
         self.content_box.append_item(separator)
         separator.show()
 
+        free_space_box = Gtk.VBox()
+        free_space_box.set_spacing(style.DEFAULT_PADDING)
+        self.content_box.append_item(free_space_box, vertical_padding=0)
+        free_space_box.show()
+
         self._progress_bar = Gtk.ProgressBar()
-        self.content_box.append_item(self._progress_bar)
+        free_space_box.pack_start(self._progress_bar, True, True, 0)
         self._progress_bar.show()
 
         self._free_space_label = Gtk.Label()
         self._free_space_label.set_alignment(0.5, 0.5)
-        self.content_box.append_item(self._free_space_label)
+        free_space_box.pack_start(self._free_space_label, True, True, 0)
         self._free_space_label.show()
 
         self.connect('popup', self.__popup_cb)
--
cgit v0.9.1