From 412c9b3be37b74a6f3889fb3e47f23bc71caab77 Mon Sep 17 00:00:00 2001 From: Stephen Boddy Date: Thu, 19 Feb 2015 15:28:59 +0100 Subject: [PATCH 1/3] Fix startup error (undefined variable) on non-composited displays. --- terminatorlib/window.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/terminatorlib/window.py b/terminatorlib/window.py index c247446e..3a7ccccd 100755 --- a/terminatorlib/window.py +++ b/terminatorlib/window.py @@ -378,9 +378,8 @@ class Window(Container, Gtk.Window): if value: dbg('setting rgba visual') visual = screen.get_rgba_visual() - - if visual: - self.set_visual(visual) + if visual: + self.set_visual(visual) def show(self, startup=False): """Undo the startup show request if started in hidden mode""" From e5a249a4984fa625aab7b461debac85b517a51fa Mon Sep 17 00:00:00 2001 From: Stephen Boddy Date: Thu, 19 Feb 2015 15:30:45 +0100 Subject: [PATCH 2/3] Fix titlebar label preventing scaling down titlebars by wrapping whole box in a viewport. --- terminatorlib/editablelabel.py | 2 +- terminatorlib/titlebar.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/terminatorlib/editablelabel.py b/terminatorlib/editablelabel.py index ef066fb2..7cdf7dd9 100644 --- a/terminatorlib/editablelabel.py +++ b/terminatorlib/editablelabel.py @@ -43,7 +43,7 @@ class EditableLabel(Gtk.EventBox): GObject.GObject.__init__(self) self._entry_handler_id = [] - self._label = Gtk.Label(label=text) + self._label = Gtk.Label(label=text, ellipsize='end') self._custom = False self.set_visible_window (False) self.add (self._label) diff --git a/terminatorlib/titlebar.py b/terminatorlib/titlebar.py index ef6d523f..6589ad7f 100755 --- a/terminatorlib/titlebar.py +++ b/terminatorlib/titlebar.py @@ -50,7 +50,7 @@ class Titlebar(Gtk.EventBox): self.label.connect('edit-done', self.on_edit_done) self.ebox = Gtk.EventBox() grouphbox = Gtk.HBox() - self.grouplabel = Gtk.Label() + self.grouplabel = Gtk.Label(ellipsize='end') self.groupicon = Gtk.Image() self.bellicon = Gtk.Image() self.bellicon.set_no_show_all(True) @@ -85,8 +85,10 @@ class Titlebar(Gtk.EventBox): hbox.pack_start(self.label, True, True, 0) hbox.pack_end(self.bellicon, False, False, 2) - self.add(hbox) - hbox.show_all() + viewport = Gtk.Viewport(hscroll_policy='natural') + viewport.add(hbox) + self.add (viewport) + viewport.show_all() self.set_no_show_all(True) self.show() From 02601c8663ac29fedf14acddbb9ac01c0f758269 Mon Sep 17 00:00:00 2001 From: Stephen Boddy Date: Mon, 23 Feb 2015 17:09:25 +0100 Subject: [PATCH 3/3] Add vertical scrollbars to the Profiles and Layouts tabs in Preferences --- terminatorlib/preferences.glade | 74 +++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/terminatorlib/preferences.glade b/terminatorlib/preferences.glade index f1a32013..5b520fe5 100644 --- a/terminatorlib/preferences.glade +++ b/terminatorlib/preferences.glade @@ -1209,26 +1209,32 @@ True False - + True - True - adjustment2 - adjustment3 - ProfilesListStore - False - 0 + never - - Profile - True + + True + True + adjustment2 + adjustment3 + ProfilesListStore + False + 0 - - + + Profile + True + + + + + + 1 + 0 + + - - 1 - 0 - @@ -3144,25 +3150,31 @@ True False - + True - True - adjustment5 - adjustment6 - LayoutListStore - 0 + never - - Layout - True + + True + True + adjustment5 + adjustment6 + LayoutListStore + 0 - - + + Layout + True + + + + + + 1 + 0 + + - - 1 - 0 -