From 45e7ba5ed6ed5bd2ea5505b64685bf851169a9ec Mon Sep 17 00:00:00 2001
From: Martin Abente Lahaye <tch@sugarlabs.org>
Date: Wed, 28 May 2014 14:51:05 -0400
Subject: [PATCH] Fix and clean Palette secondary label

Removes unnecessary code ie., changing label color.

Refactor label settings, to put all in the same place.

Fix changes to label_alignment that does not honor
original vertical padding settings.

Signed-off-by: Martin Abente Lahaye <tch@sugarlabs.org>
---
 src/sugar3/graphics/palette.py | 31 +++++++++----------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/sugar3/graphics/palette.py b/src/sugar3/graphics/palette.py
index c03a52f0..1fb7f756 100644
--- a/src/sugar3/graphics/palette.py
+++ b/src/sugar3/graphics/palette.py
@@ -147,11 +147,6 @@ class Palette(PaletteWindow):
 
         self._secondary_label = Gtk.Label()
         self._secondary_label.set_alignment(0, 0.5)
-
-        if text_maxlen > 0:
-            self._secondary_label.set_max_width_chars(text_maxlen)
-            self._secondary_label.set_ellipsize(Pango.EllipsizeMode.END)
-
         labels_box.pack_start(self._secondary_label, True, True, 0)
 
         self._secondary_box = Gtk.VBox()
@@ -278,19 +273,13 @@ class Palette(PaletteWindow):
             label = label.replace('\n', ' ')
             label = label.replace('\r', ' ')
 
-            self._secondary_label.modify_fg(Gtk.StateType.INSENSITIVE,
-                                            Gdk.color_parse('white'))
-            self._secondary_label.set_justify(Gtk.Justification.FILL)
-            self._secondary_label.set_alignment(0, 0)
-
-            # for Gtk >= 3.10
             if hasattr(self._secondary_label, 'set_lines'):
                 self._secondary_label.set_max_width_chars(
                     style.MENU_WIDTH_CHARS)
                 self._secondary_label.set_line_wrap(True)
-                self._secondary_label.set_ellipsize(
-                    Pango.EllipsizeMode.END)
-                self._secondary_label.set_lines(3)
+                self._secondary_label.set_ellipsize(Pango.EllipsizeMode.END)
+                self._secondary_label.set_lines(NO_OF_LINES)
+                self._secondary_label.set_justify(Gtk.Justification.FILL)
             else:
                 # FIXME: fallback for Gtk < 3.10
                 body_width = NO_OF_LINES * style.MENU_WIDTH_CHARS
@@ -299,11 +288,6 @@ class Palette(PaletteWindow):
                     label = ' '.join(label[:body_width].split()[:-1]) + '...'
                 label = textwrap.fill(label, width=style.MENU_WIDTH_CHARS)
 
-            if len(label) > style.MENU_WIDTH_CHARS:
-                self._label_alignment.set_padding(
-                    style.DEFAULT_SPACING, style.DEFAULT_SPACING,
-                    0, style.DEFAULT_SPACING)
-
             self._secondary_text = label
             self._secondary_label.set_text(label)
             self._secondary_label.show()
@@ -315,13 +299,16 @@ class Palette(PaletteWindow):
                                       setter=set_secondary_text)
 
     def _show_icon(self):
-        self._label_alignment.set_padding(0, 0, 0, style.DEFAULT_SPACING)
+        self._label_alignment.set_padding(
+            style.DEFAULT_SPACING, style.DEFAULT_SPACING,
+            0, style.DEFAULT_SPACING)
         self._icon_box.show()
 
     def _hide_icon(self):
         self._icon_box.hide()
-        self._label_alignment.set_padding(0, 0, style.DEFAULT_SPACING,
-                                          style.DEFAULT_SPACING)
+        self._label_alignment.set_padding(
+            style.DEFAULT_SPACING, style.DEFAULT_SPACING,
+            style.DEFAULT_SPACING, style.DEFAULT_SPACING)
 
     def set_icon(self, icon):
         if icon is None: