sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix and clean Palette secondary label

Browse Source 
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>
This commit is contained in:
Martin Abente Lahaye 2014-05-28 14:51:05 -04:00 committed by Gonzalo Odiard
parent b9d6b628a9
commit 45e7ba5ed6
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/sugar3/graphics/palette.py
View File

@ -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: