100 lines
4.3 KiB
Diff
100 lines
4.3 KiB
Diff
From 22b948c39b32fb45066c4f5a9f99082094fea3d1 Mon Sep 17 00:00:00 2001
|
|
From: Jascha Geerds <jascha@jgeerds.name>
|
|
Date: Sat, 1 Aug 2015 21:26:57 +0200
|
|
Subject: [PATCH 2/3] Don't show multiple entries for a single theme
|
|
|
|
---
|
|
gtweak/tweaks/tweak_group_interface.py | 8 ++++----
|
|
gtweak/tweaks/tweak_group_keymouse.py | 4 ++--
|
|
gtweak/utils.py | 16 ++++++++++++++++
|
|
3 files changed, 22 insertions(+), 6 deletions(-)
|
|
|
|
Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
|
|
===================================================================
|
|
--- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_interface.py
|
|
+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
|
|
@@ -26,7 +26,7 @@ from gi.repository import Gtk
|
|
from gi.repository import GLib
|
|
|
|
import gtweak
|
|
-from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs
|
|
+from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs, get_unique_resources
|
|
from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
|
|
from gtweak.gshellwrapper import GnomeShellFactory
|
|
from gtweak.gsettings import GSettingsSetting
|
|
@@ -54,7 +54,7 @@ class GtkThemeSwitcher(GSettingsComboTwe
|
|
os.path.exists(os.path.join(d, "gtk-2.0")) and \
|
|
(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 get_unique_resources(valid)
|
|
|
|
class IconThemeSwitcher(GSettingsComboTweak):
|
|
def __init__(self, **options):
|
|
@@ -69,7 +69,7 @@ class IconThemeSwitcher(GSettingsComboTw
|
|
valid = walk_directories(get_resource_dirs("icons"), lambda d:
|
|
os.path.isdir(d) and \
|
|
os.path.exists(os.path.join(d, "index.theme")))
|
|
- return valid
|
|
+ return get_unique_resources(valid)
|
|
|
|
class CursorThemeSwitcher(GSettingsComboTweak):
|
|
def __init__(self, **options):
|
|
@@ -84,7 +84,7 @@ class CursorThemeSwitcher(GSettingsCombo
|
|
valid = walk_directories(get_resource_dirs("icons"), lambda d:
|
|
os.path.isdir(d) and \
|
|
os.path.exists(os.path.join(d, "cursors")))
|
|
- return valid
|
|
+ return get_unique_resources(valid)
|
|
|
|
class ShellThemeTweak(Gtk.Box, Tweak):
|
|
|
|
Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
|
|
===================================================================
|
|
--- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_keymouse.py
|
|
+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
|
|
@@ -20,7 +20,7 @@ import os.path
|
|
from gi.repository import GLib
|
|
|
|
import gtweak
|
|
-from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs
|
|
+from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs, get_unique_resources
|
|
from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak
|
|
|
|
class PrimaryPasteTweak(GetterSetterSwitchTweak):
|
|
@@ -51,7 +51,7 @@ class KeyThemeSwitcher(GSettingsComboTwe
|
|
valid = walk_directories(get_resource_dirs("themes"), lambda d:
|
|
os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \
|
|
os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc")))
|
|
- return valid
|
|
+ return get_unique_resources(valid)
|
|
|
|
TWEAK_GROUPS = [
|
|
ListBoxTweakGroup(_("Keyboard and Mouse"),
|
|
Index: gnome-tweak-tool-3.20.1/gtweak/utils.py
|
|
===================================================================
|
|
--- gnome-tweak-tool-3.20.1.orig/gtweak/utils.py
|
|
+++ gnome-tweak-tool-3.20.1/gtweak/utils.py
|
|
@@ -133,6 +133,22 @@ def get_resource_dirs(resource):
|
|
|
|
return [dir for dir in dirs if os.path.isdir(dir)]
|
|
|
|
+def get_unique_resources(dirs):
|
|
+ """Filter out duplicated resources.
|
|
+
|
|
+ :param list dirs:
|
|
+ List of resource dirs (e.g. /usr/share/themes/Adwaita)
|
|
+ :return:
|
|
+ List of dirs without duplicated resources
|
|
+ """
|
|
+ unique_dirs = {}
|
|
+ for dir in dirs:
|
|
+ basename = os.path.basename(dir)
|
|
+ if basename not in unique_dirs:
|
|
+ unique_dirs[basename] = dir
|
|
+
|
|
+ return unique_dirs
|
|
+
|
|
@singleton
|
|
class AutostartManager:
|
|
|