theme: redo theme settings

4 files changed, 70 insertions, 39 deletions

diff --git a/data/schemas/Makefile.am b/data/schemas/Makefile.am
index b3a48f45..a2f017fd 100644
--- a/data/schemas/Makefile.am
+++ b/data/schemas/Makefile.am
@@ -2,6 +2,8 @@ NULL =
 
 gsettings_SCHEMAS = \
 	org.gnome.metacity.gschema.xml \
+	org.gnome.metacity.keybindings.gschema.xml \
+	org.gnome.metacity.theme.gschema.xml \
 	$(NULL)
 
 @GSETTINGS_RULES@
diff --git a/data/schemas/org.gnome.metacity.gschema.xml b/data/schemas/org.gnome.metacity.gschema.xml
index 9f1952fe..1fc08f4d 100644
--- a/data/schemas/org.gnome.metacity.gschema.xml
+++ b/data/schemas/org.gnome.metacity.gschema.xml
@@ -1,5 +1,4 @@
 <schemalist gettext-domain="metacity">
-
   <enum id="org.gnome.metacity.MetaPlacementMode">
     <value nick="smart" value="0" />
     <value nick="cascade" value="1" />
@@ -10,25 +9,20 @@
 
   <schema id="org.gnome.metacity" path="/org/gnome/metacity/">
 
-    <key name="compositing-manager" type="b">
-      <default>true</default>
-      <summary>Compositing Manager</summary>
+    <key name="alt-tab-thumbnails" type="b">
+      <default>false</default>
+      <summary>Show window content thumbnail in Alt-Tab</summary>
       <description>
-        Determines whether Metacity is a compositing manager.
+        If set to true, Metacity will show window content thumbnails in the
+        Alt-Tab window instead of only icons.
       </description>
     </key>
 
-    <key name="reduced-resources" type="b">
-      <default>false</default>
-      <summary>If true, trade off usability for less resource usage</summary>
+    <key name="compositing-manager" type="b">
+      <default>true</default>
+      <summary>Compositing Manager</summary>
       <description>
-        If true, Metacity will give the user less feedback by using wireframes,
-        avoiding animations, or other means. This is a significant reduction
-        in usability for many users, but may allow legacy applications to
-        continue working, and may also be a useful tradeoff
-        for terminal servers.
-
-        However, the wireframe feature is disabled when accessibility is on.
+        Determines whether Metacity is a compositing manager.
       </description>
     </key>
 
@@ -58,36 +52,22 @@
       </description>
     </key>
 
-    <key name="alt-tab-thumbnails" type="b">
+    <key name="reduced-resources" type="b">
       <default>false</default>
-      <summary>Show window content thumbnail in Alt-Tab</summary>
+      <summary>If true, trade off usability for less resource usage</summary>
       <description>
-        If set to true, Metacity will show window content thumbnails in the
-        Alt-Tab window instead of only icons.
-      </description>
-    </key>
+        If true, Metacity will give the user less feedback by using wireframes,
+        avoiding animations, or other means. This is a significant reduction
+        in usability for many users, but may allow legacy applications to
+        continue working, and may also be a useful tradeoff
+        for terminal servers.
 
-    <key name="theme" type="s">
-      <default>'Adwaita'</default>
-      <summary>Current theme</summary>
-      <description>
-        The theme determines the appearance of window borders, titlebar,
-        and so forth.
+        However, the wireframe feature is disabled when accessibility is on.
       </description>
     </key>
 
-  </schema>
-
-  <schema id="org.gnome.metacity.keybindings" path="/org/gnome/metacity/keybindings/">
-
-    <key name="toggle-tiled-left" type="as">
-      <default><![CDATA[['<Super>Left']]]></default>
-    </key>
-
-    <key name="toggle-tiled-right" type="as">
-      <default><![CDATA[['<Super>Right']]]></default>
-    </key>
+    <child schema="org.gnome.metacity.keybindings" name="keybindings" />
+    <child schema="org.gnome.metacity.theme" name="theme" />
 
   </schema>
-
 </schemalist>
diff --git a/data/schemas/org.gnome.metacity.keybindings.gschema.xml b/data/schemas/org.gnome.metacity.keybindings.gschema.xml
new file mode 100644
index 00000000..63bfc707
--- /dev/null
+++ b/data/schemas/org.gnome.metacity.keybindings.gschema.xml
@@ -0,0 +1,13 @@
+<schemalist gettext-domain="metacity">
+  <schema id="org.gnome.metacity.keybindings" path="/org/gnome/metacity/keybindings/">
+
+    <key name="toggle-tiled-left" type="as">
+      <default><![CDATA[['<Super>Left']]]></default>
+    </key>
+
+    <key name="toggle-tiled-right" type="as">
+      <default><![CDATA[['<Super>Right']]]></default>
+    </key>
+
+  </schema>
+</schemalist>
diff --git a/data/schemas/org.gnome.metacity.theme.gschema.xml b/data/schemas/org.gnome.metacity.theme.gschema.xml
new file mode 100644
index 00000000..b248c47c
--- /dev/null
+++ b/data/schemas/org.gnome.metacity.theme.gschema.xml
@@ -0,0 +1,36 @@
+<schemalist gettext-domain="metacity">
+  <enum id="org.gnome.metacity.MetaThemeType">
+    <value nick="gtk" value="0" />
+    <value nick="metacity" value="1" />
+  </enum>
+
+  <schema id="org.gnome.metacity.theme" path="/org/gnome/metacity/theme/">
+
+    <key name="name" type="s">
+      <default>''</default>
+      <summary>Theme Name</summary>
+      <description>
+        This setting is only used if Metacity is selected as theme type. You
+        MUST provide valid Metacity theme name, otherwise Metacity will fall
+        back to default GTK+ theme - Adwaita.
+      </description>
+    </key>
+
+    <key name="type" enum="org.gnome.metacity.MetaThemeType">
+      <default>'gtk'</default>
+      <summary>Theme Type</summary>
+      <description>
+        Metacity supports two theme types - GTK+ (gtk.css) and Metacity
+        (metacity-theme-x.xml).
+
+        GTK+ theme: all data is loaded from CSS. This is same theme that is
+        used by mutter for server side decorations and by GTK+ for client side
+        decorations.
+
+        Metacity theme: data is loaded from metacity-theme-x.xml and css. Using
+        this theme type you MUST provide valid theme name.
+      </description>
+    </key>
+
+  </schema>
+</schemalist>