[gnome-tweak-tool] Rename Interface panel to Themes and move Shell theme to it

[John Stowers <jstowers src gnome org>]

commit 3199f59575c6d2b97e82c434d671054d92de00ed
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Sat Aug 20 14:37:30 2011 -0400

    Rename Interface panel to Themes and move Shell theme to it
    
    This puts the final theme option on the same panel. "Theme" is more
    understandable than "Interface"
    
    https://bugzilla.gnome.org/show_bug.cgi?id=647686

 gtweak/tweakmodel.py             |    2 +-
 gtweak/tweaks/tweak_interface.py |   14 +++++++-------
 gtweak/tweaks/tweak_shell.py     |    9 ++++++---
 gtweak/tweaks/tweak_windows.py   |    4 ++--
 4 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/gtweak/tweakmodel.py b/gtweak/tweakmodel.py
index a0bb2eb..f7d1dbe 100644
--- a/gtweak/tweakmodel.py
+++ b/gtweak/tweakmodel.py
@@ -24,7 +24,7 @@ import gtweak
 from gi.repository import Gtk
 
 TWEAK_GROUP_FONTS = _("Fonts")
-TWEAK_GROUP_INTERFACE = _("Interface")
+TWEAK_GROUP_THEME = _("Theme")
 TWEAK_GROUP_DESKTOP = _("Desktop")
 TWEAK_GROUP_WINDOWS = _("Windows")
 
diff --git a/gtweak/tweaks/tweak_interface.py b/gtweak/tweaks/tweak_interface.py
index aa64d73..f6c7672 100644
--- a/gtweak/tweaks/tweak_interface.py
+++ b/gtweak/tweaks/tweak_interface.py
@@ -21,7 +21,7 @@ from gi.repository import Gtk
 
 import gtweak
 from gtweak.utils import walk_directories, make_combo_list_with_default
-from gtweak.tweakmodel import TWEAK_GROUP_INTERFACE
+from gtweak.tweakmodel import TWEAK_GROUP_THEME
 from gtweak.widgets import GSettingsSwitchTweak, GSettingsComboTweak
 
 class GtkThemeSwitcher(GSettingsComboTweak):
@@ -96,10 +96,10 @@ class KeyThemeSwitcher(GSettingsComboTweak):
         return valid
 
 TWEAKS = (
-    GSettingsSwitchTweak("org.gnome.desktop.interface", "menus-have-icons", group_name=TWEAK_GROUP_INTERFACE),
-    GSettingsSwitchTweak("org.gnome.desktop.interface", "buttons-have-icons", group_name=TWEAK_GROUP_INTERFACE),
-    CursorThemeSwitcher(group_name=TWEAK_GROUP_INTERFACE),
-    KeyThemeSwitcher(group_name=TWEAK_GROUP_INTERFACE),
-    IconThemeSwitcher(group_name=TWEAK_GROUP_INTERFACE),
-    GtkThemeSwitcher(group_name=TWEAK_GROUP_INTERFACE),
+    GSettingsSwitchTweak("org.gnome.desktop.interface", "menus-have-icons", group_name=TWEAK_GROUP_THEME),
+    GSettingsSwitchTweak("org.gnome.desktop.interface", "buttons-have-icons", group_name=TWEAK_GROUP_THEME),
+    CursorThemeSwitcher(group_name=TWEAK_GROUP_THEME),
+    KeyThemeSwitcher(group_name=TWEAK_GROUP_THEME),
+    IconThemeSwitcher(group_name=TWEAK_GROUP_THEME),
+    GtkThemeSwitcher(group_name=TWEAK_GROUP_THEME),
 )
diff --git a/gtweak/tweaks/tweak_shell.py b/gtweak/tweaks/tweak_shell.py
index 7fcdb97..f85086b 100644
--- a/gtweak/tweaks/tweak_shell.py
+++ b/gtweak/tweaks/tweak_shell.py
@@ -27,7 +27,7 @@ from gi.repository import GLib
 from gtweak.utils import walk_directories, extract_zip_file, make_combo_list_with_default
 from gtweak.gsettings import GSettingsSetting
 from gtweak.gshellwrapper import GnomeShell
-from gtweak.tweakmodel import Tweak, TweakGroup
+from gtweak.tweakmodel import Tweak, TweakGroup, TWEAK_GROUP_THEME
 from gtweak.widgets import ZipFileChooserButton, GConfComboTweak, GSettingsComboEnumTweak, GSettingsSwitchTweak, build_label_beside_widget, build_horizontal_sizegroup, build_combo_box_text
 
 class ShowWindowButtons(GConfComboTweak):
@@ -49,7 +49,7 @@ class ShellThemeTweak(Tweak):
     THEME_DIR = os.path.join(GLib.get_home_dir(), ".themes")
 
     def __init__(self, **options):
-        Tweak.__init__(self, "Shell Theme", "Install custom or user themes for gnome-shell", **options)
+        Tweak.__init__(self, "Shell theme", "Install custom or user themes for gnome-shell", **options)
 
         #check the shell is running and the usertheme extension is present
         error = _("Unknown error")
@@ -197,6 +197,10 @@ class ShellThemeTweak(Tweak):
 
 sg = build_horizontal_sizegroup()
 
+TWEAKS = (
+    ShellThemeTweak(group_name=TWEAK_GROUP_THEME),
+)
+
 TWEAK_GROUPS = (
         TweakGroup(
             _("Shell"),
@@ -204,7 +208,6 @@ TWEAK_GROUPS = (
             GSettingsSwitchTweak("org.gnome.shell.clock", "show-seconds", schema_filename="org.gnome.shell.gschema.xml"),
             GSettingsSwitchTweak("org.gnome.shell.calendar", "show-weekdate", schema_filename="org.gnome.shell.gschema.xml"),
             ShowWindowButtons(size_group=sg),
-            ShellThemeTweak(size_group=sg),
             GSettingsComboEnumTweak("org.gnome.settings-daemon.plugins.power", "lid-close-battery-action", size_group=sg),
             GSettingsComboEnumTweak("org.gnome.settings-daemon.plugins.power", "lid-close-ac-action", size_group=sg)),
 )
diff --git a/gtweak/tweaks/tweak_windows.py b/gtweak/tweaks/tweak_windows.py
index 0a63ccd..bab2808 100644
--- a/gtweak/tweaks/tweak_windows.py
+++ b/gtweak/tweaks/tweak_windows.py
@@ -19,7 +19,7 @@ import os.path
 
 import gtweak
 from gtweak.utils import walk_directories, make_combo_list_with_default
-from gtweak.tweakmodel import TWEAK_GROUP_WINDOWS, TWEAK_GROUP_INTERFACE
+from gtweak.tweakmodel import TWEAK_GROUP_WINDOWS, TWEAK_GROUP_THEME
 from gtweak.widgets import GConfComboTweak
 from gtweak.gconf import GConfSetting
 
@@ -73,7 +73,7 @@ class WindowThemeSwitcher(GConfComboTweak):
             self.gconf_metacity.set_value(value)
 
 TWEAKS = (
-    WindowThemeSwitcher(group_name=TWEAK_GROUP_INTERFACE),
+    WindowThemeSwitcher(group_name=TWEAK_GROUP_THEME),
     ActionClickTitlebarTweak("/apps/metacity/general/action_double_click_titlebar", group_name=TWEAK_GROUP_WINDOWS),
     ActionClickTitlebarTweak("/apps/metacity/general/action_middle_click_titlebar", group_name=TWEAK_GROUP_WINDOWS),
     ActionClickTitlebarTweak("/apps/metacity/general/action_right_click_titlebar", group_name=TWEAK_GROUP_WINDOWS),