[gnome-tweak-tool] appearance: Implement mockup from Design Team

[Jeremy Bicha <jbicha src gnome org>]

commit f16dc6c27dae44080f22bca4cc80bc7f673ad0d0
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Sun May 28 11:45:03 2017 -0400

    appearance: Implement mockup from Design Team
    
    https://raw.githubusercontent.com/gnome-design-team/gnome-mockups/master/tweak-tool/tweak-tool-wires.png
    
    https://bugzilla.gnome.org/show_bug.cgi?id=783176

 gtweak/tweaks/tweak_group_interface.py |   10 +++++-----
 gtweak/widgets.py                      |    5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py
index 97751ed..16fda81 100644
--- a/gtweak/tweaks/tweak_group_interface.py
+++ b/gtweak/tweaks/tweak_group_interface.py
@@ -38,7 +38,7 @@ _shell_loaded = _shell is not None
 class GtkThemeSwitcher(GSettingsComboTweak):
     def __init__(self, **options):
         GSettingsComboTweak.__init__(self,
-                       "GTK+",
+                       _("Applications"),
             "org.gnome.desktop.interface",
             "gtk-theme",
             make_combo_list_with_default(self._get_valid_themes(), "Adwaita"),
@@ -107,7 +107,7 @@ class ShellThemeTweak(Gtk.Box, Tweak):
 
     def __init__(self, **options):
         Gtk.Box.__init__(self, orientation=Gtk.Orientation.HORIZONTAL)
-        Tweak.__init__(self, _("Shell theme"), _("Install custom or user themes for gnome-shell"), **options)
+        Tweak.__init__(self, _("Shell"), _("Install custom or user themes for gnome-shell"), **options)
 
         #check the shell is running and the usertheme extension is present
         error = _("Unknown error")
@@ -258,11 +258,11 @@ TWEAK_GROUPS = [
         DarkThemeSwitcher(),
         #GSettingsSwitchTweak("Buttons Icons","org.gnome.desktop.interface", "buttons-have-icons"),
         #GSettingsSwitchTweak("Menu Icons","org.gnome.desktop.interface", "menus-have-icons"),
-        Title(_("Theme"), "", uid="title-theme"),
+        GSettingsSwitchTweak(_("Animations"), "org.gnome.desktop.interface", "enable-animations"),
+        Title(_("Themes"), "", uid="title-theme"),
         GtkThemeSwitcher(),
-        IconThemeSwitcher(),
         CursorThemeSwitcher(),
+        IconThemeSwitcher(),
         ShellThemeTweak(loaded=_shell_loaded),
-        GSettingsSwitchTweak(_("Enable animations"), "org.gnome.desktop.interface", "enable-animations"),
     ),
 ]
diff --git a/gtweak/widgets.py b/gtweak/widgets.py
index 3c8b6a3..4dbc27b 100644
--- a/gtweak/widgets.py
+++ b/gtweak/widgets.py
@@ -483,7 +483,7 @@ class DarkThemeSwitcher(Gtk.Box, Tweak):
         w.set_active(self._gtksettings.get_integer("gtk-application-prefer-dark-theme"))
                
         title = _("Global Dark Theme")
-        description = _("Applications need to be restarted for change to take effect")
+        description = _("Applications need to be restarted for this change to take place.")
         w.connect("notify::active", self._on_switch_changed)
         
         hbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
@@ -496,7 +496,8 @@ class DarkThemeSwitcher(Gtk.Box, Tweak):
         
         lbl_des = Gtk.Label()
         lbl_des.props.xalign = 0.0
-        lbl_des.set_markup("<span size='x-small'>"+GLib.markup_escape_text(description)+"</span>")
+        lbl_des.get_style_context().add_class("dim-label")
+        lbl_des.set_markup("<span size='small'>"+GLib.markup_escape_text(description)+"</span>")
         
         self.pack_start(hbox, False, False, 0)
         self.pack_start(lbl_des, False, False,0)