summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rules/gtk-engine-experience.in2
-rw-r--r--rules/gtk-theme-experience.in36
-rw-r--r--rules/gtk.in26
3 files changed, 27 insertions, 37 deletions
diff --git a/rules/gtk-engine-experience.in b/rules/gtk-engine-experience.in
index 74abb7bf2..6e723a7a9 100644
--- a/rules/gtk-engine-experience.in
+++ b/rules/gtk-engine-experience.in
@@ -5,5 +5,3 @@ config GTK_ENGINE_EXPERIENCE
help
A pixmap engine that is somewhat like XP, but way better...
-source "rules/gtk-theme-experience.in"
-
diff --git a/rules/gtk-theme-experience.in b/rules/gtk-theme-experience.in
index 54581b6ae..26db9273b 100644
--- a/rules/gtk-theme-experience.in
+++ b/rules/gtk-theme-experience.in
@@ -1,30 +1,46 @@
+menuconfig GTK_THEME_EXPERIENCE
+ tristate
+ select GTK_ENGINE_EXPERIENCE
+ prompt "experience theme "
-config GTK_THEME_EXPERIENCE
- bool
- depends on GTK_ENGINE_EXPERIENCE
- default y if GTK_ENGINE_EXPERIENCE
+if GTK_THEME_EXPERIENCE
config GTK_THEME_EXPERIENCE_PLAIN
bool
- depends on GTK_ENGINE_EXPERIENCE
- depends on GTK_THEME_EXPERIENCE
prompt "eXperience theme with plain coloring"
help
Plain eXperience theme.
config GTK_THEME_EXPERIENCE_ICE
bool
- depends on GTK_ENGINE_EXPERIENCE
- depends on GTK_THEME_EXPERIENCE
prompt "eXperience theme with ice coloring"
help
eXperience "ice" theme.
config GTK_THEME_EXPERIENCE_OLIVE
bool
- depends on GTK_ENGINE_EXPERIENCE
- depends on GTK_THEME_EXPERIENCE
prompt "eXperience theme with olive coloring"
help
eXperience "olive" theme.
+choice
+ prompt "default theme"
+
+ config GTK_DEFAULT_NONE
+ bool "none "
+
+ config GTK_DEFAULT_THEME_EXPERIENCE_PLAIN
+ bool "eXperience (plain)"
+ depends on GTK_THEME_EXPERIENCE_PLAIN
+
+ config GTK_DEFAULT_THEME_EXPERIENCE_ICE
+ bool "eXperience (ice)"
+ depends on GTK_THEME_EXPERIENCE_ICE
+
+ config GTK_DEFAULT_THEME_EXPERIENCE_OLIVE
+ bool "eXperience (olive)"
+ depends on GTK_THEME_EXPERIENCE_OLIVE
+endchoice
+
+endif
+
diff --git a/rules/gtk.in b/rules/gtk.in
index a6e200e41..1a1ff6151 100644
--- a/rules/gtk.in
+++ b/rules/gtk.in
@@ -121,31 +121,7 @@ config GTK_DEMO
prompt "gtkdemo"
-menuconfig GTK_ENGINES
- bool
- prompt "gtk engines "
-
-if GTK_ENGINES
source "rules/gtk-engine-experience.in"
-endif
-
-choice
- prompt "default theme"
-
- config GTK_DEFAULT_NONE
- bool "none "
-
- config GTK_DEFAULT_THEME_EXPERIENCE_PLAIN
- bool "eXperience (plain)"
- depends on GTK_THEME_EXPERIENCE_PLAIN
-
- config GTK_DEFAULT_THEME_EXPERIENCE_ICE
- bool "eXperience (ice)"
- depends on GTK_THEME_EXPERIENCE_ICE
-
- config GTK_DEFAULT_THEME_EXPERIENCE_OLIVE
- bool "eXperience (olive)"
- depends on GTK_THEME_EXPERIENCE_OLIVE
-endchoice
+source "rules/gtk-theme-experience.in"
endmenu