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

Ellipses defaulted to end of long activity titles;fixes 1429

Browse Source
This commit is contained in:
Goutam 2014-12-17 03:39:50 +04:00 committed by Gonzalo Odiard
parent cef1ad7590
commit b5cae5fb56
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sugar3/graphics/menuitem.py
View File

@ -41,7 +41,7 @@ class MenuItem(Gtk.ImageMenuItem):
label.set_alignment(0.0, 0.5) label.set_alignment(0.0, 0.5)
label.set_accel_widget(self) label.set_accel_widget(self)
if text_maxlen > 0: if text_maxlen > 0:
label.set_ellipsize(Pango.EllipsizeMode.MIDDLE) label.set_ellipsize(style.ELLIPSIZE_MODE_DEFAULT)
label.set_max_width_chars(text_maxlen) label.set_max_width_chars(text_maxlen)
self.add(label) self.add(label)
label.show() label.show()

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

@ -140,7 +140,7 @@ class Palette(PaletteWindow):
if text_maxlen > 0: if text_maxlen > 0:
self._label.set_max_width_chars(text_maxlen) self._label.set_max_width_chars(text_maxlen)
self._label.set_ellipsize(Pango.EllipsizeMode.MIDDLE) self._label.set_ellipsize(style.ELLIPSIZE_MODE_DEFAULT)
labels_box.pack_start(self._label, True, True, 0) labels_box.pack_start(self._label, True, True, 0)
self._primary_event_box.connect('button-release-event', self._primary_event_box.connect('button-release-event',
self.__button_release_event_cb) self.__button_release_event_cb)
@ -278,7 +278,7 @@ class Palette(PaletteWindow):
self._secondary_label.set_max_width_chars( self._secondary_label.set_max_width_chars(
style.MENU_WIDTH_CHARS) style.MENU_WIDTH_CHARS)
self._secondary_label.set_line_wrap(True) self._secondary_label.set_line_wrap(True)
self._secondary_label.set_ellipsize(Pango.EllipsizeMode.END) self._secondary_label.set_ellipsize(style.ELLIPSIZE_MODE_DEFAULT)
self._secondary_label.set_lines(NO_OF_LINES) self._secondary_label.set_lines(NO_OF_LINES)
self._secondary_label.set_justify(Gtk.Justification.FILL) self._secondary_label.set_justify(Gtk.Justification.FILL)
else: else:

2
src/sugar3/graphics/palettemenu.py
View File

@ -139,7 +139,7 @@ class PaletteMenuItem(Gtk.EventBox):
self.label = Gtk.Label(text_label) self.label = Gtk.Label(text_label)
if text_maxlen > 0: if text_maxlen > 0:
self.label.set_max_width_chars(text_maxlen) self.label.set_max_width_chars(text_maxlen)
self.label.set_ellipsize(Pango.EllipsizeMode.MIDDLE) self.label.set_ellipsize(style.ELLIPSIZE_MODE_DEFAULT)
align.add(self.label) align.add(self.label)
self._hbox.pack_start(align, expand=True, fill=True, self._hbox.pack_start(align, expand=True, fill=True,
padding=style.DEFAULT_PADDING) padding=style.DEFAULT_PADDING)

1
src/sugar3/graphics/style.py
View File

@ -32,6 +32,7 @@ from gi.repository import Gio
FOCUS_LINE_WIDTH = 2 FOCUS_LINE_WIDTH = 2
_TAB_CURVATURE = 1 _TAB_CURVATURE = 1
ELLIPSIZE_MODE_DEFAULT = Pango.EllipsizeMode.END
def _compute_zoom_factor(): def _compute_zoom_factor():