itdominator
/
terminator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do a reconfigure when the gtk-theme-name property changes, avoiding issues with styled themes.

This commit is contained in:
Stephen Boddy 2016-12-11 23:50:42 +01:00
parent 4e78c447e4
commit 2186f93fee
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
terminatorlib/terminator.py
View File

@ -60,6 +60,9 @@ class Terminator(Borg):
groupsend = None groupsend = None
groupsend_type = {'all':0, 'group':1, 'off':2} groupsend_type = {'all':0, 'group':1, 'off':2}
cur_gtk_theme_name = None
gtk_settings = None
def __init__(self): def __init__(self):
"""Class initialiser""" """Class initialiser"""
@ -92,6 +95,13 @@ class Terminator(Borg):
self.pid_cwd = get_pid_cwd() self.pid_cwd = get_pid_cwd()
if self.gnome_client is None: if self.gnome_client is None:
self.attempt_gnome_client() self.attempt_gnome_client()
self.connect_signals()
def connect_signals(self):
"""Connect all the gtk signals"""
self.gtk_settings=Gtk.Settings().get_default()
self.gtk_settings.connect('notify::gtk-theme-name', self.on_gtk_theme_name_notify)
self.cur_gtk_theme_name = self.gtk_settings.get_property('gtk-theme-name')
def set_origcwd(self, cwd): def set_origcwd(self, cwd):
"""Store the original cwd our process inherits""" """Store the original cwd our process inherits"""
@ -370,6 +380,13 @@ class Terminator(Borg):
if window.uuid == self.last_active_window: if window.uuid == self.last_active_window:
window.show() window.show()
def on_gtk_theme_name_notify(self, settings, prop):
"""Reconfigure if the gtk theme name changes"""
new_gtk_theme_name = settings.get_property(prop.name)
if new_gtk_theme_name != self.cur_gtk_theme_name:
self.cur_gtk_theme_name = new_gtk_theme_name
self.reconfigure()
def reconfigure(self): def reconfigure(self):
"""Update configuration for the whole application""" """Update configuration for the whole application"""
@ -447,8 +464,7 @@ class Terminator(Borg):
(head, _tail) = os.path.split(borg.__file__) (head, _tail) = os.path.split(borg.__file__)
app_theme_dir = os.path.join(head, 'themes') app_theme_dir = os.path.join(head, 'themes')
settings=Gtk.Settings().get_default() theme_name = self.gtk_settings.get_property('gtk-theme-name')
theme_name = settings.get_property('gtk-theme_name')
theme_part_list = ['terminator.css'] theme_part_list = ['terminator.css']
if 1: # checkbox_style - needs adding to prefs if 1: # checkbox_style - needs adding to prefs