Commit f47ba28f authored by Patrick Griffis's avatar Patrick Griffis

Support versioned Gtk3 themes

parent 1082bc88
...@@ -46,12 +46,17 @@ class GtkThemeSwitcher(GSettingsComboTweak): ...@@ -46,12 +46,17 @@ class GtkThemeSwitcher(GSettingsComboTweak):
def _get_valid_themes(self): def _get_valid_themes(self):
""" Only shows themes that have variations for gtk+-3 and gtk+-2 """ """ Only shows themes that have variations for gtk+-3 and gtk+-2 """
gtk_ver = Gtk.MINOR_VERSION
if gtk_ver % 2: # Want even number
gtk_ver += 1
dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), dirs = ( os.path.join(gtweak.DATA_DIR, "themes"),
os.path.join(GLib.get_user_data_dir(), "themes"), os.path.join(GLib.get_user_data_dir(), "themes"),
os.path.join(os.path.expanduser("~"), ".themes")) os.path.join(os.path.expanduser("~"), ".themes"))
valid = walk_directories(dirs, lambda d: valid = walk_directories(dirs, lambda d:
os.path.exists(os.path.join(d, "gtk-2.0")) and \ os.path.exists(os.path.join(d, "gtk-2.0")) and \
os.path.exists(os.path.join(d, "gtk-3.0"))) (os.path.exists(os.path.join(d, "gtk-3.0")) or \
os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver)))))
return valid return valid
class IconThemeSwitcher(GSettingsComboTweak): class IconThemeSwitcher(GSettingsComboTweak):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment