summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.in4
-rw-r--r--desktop-themes/Fog/index.theme.in2
-rw-r--r--desktop-themes/Glossy/index.theme.in8
-rw-r--r--desktop-themes/Makefile.am6
-rw-r--r--desktop-themes/Quid/index.theme.in4
-rw-r--r--desktop-themes/Shiny/Makefile.am (renamed from desktop-themes/Glossy/Makefile.am)2
-rw-r--r--desktop-themes/Shiny/index.theme.in8
-rw-r--r--desktop-themes/TraditionalOk/index.theme.in2
-rw-r--r--gtk-themes/Makefile.am4
-rw-r--r--gtk-themes/Shiny/Makefile.am (renamed from gtk-themes/Glossy/Makefile.am)2
-rw-r--r--gtk-themes/Shiny/gtkrc (renamed from gtk-themes/Glossy/gtkrc)2
-rw-r--r--marco-themes/Makefile.am2
-rw-r--r--marco-themes/Shiny/metacity-theme-1.xml (renamed from marco-themes/Glossy/metacity-theme-1.xml)4
13 files changed, 25 insertions, 25 deletions
diff --git a/configure.in b/configure.in
index b6cc9d7d..758a22a6 100644
--- a/configure.in
+++ b/configure.in
@@ -191,7 +191,7 @@ desktop-themes/Quid/Makefile
desktop-themes/TraditionalOk/Makefile
desktop-themes/TraditionalOkTest/Makefile
desktop-themes/Glider/Makefile
-desktop-themes/Glossy/Makefile
+desktop-themes/Shiny/Makefile
desktop-themes/HighContrast/Makefile
desktop-themes/HighContrastInverse/Makefile
desktop-themes/HighContrastLargePrint/Makefile
@@ -207,7 +207,7 @@ desktop-themes/Fog/Makefile
marco-themes/Makefile
gtk-themes/Makefile
gtk-themes/Glider/Makefile
-gtk-themes/Glossy/Makefile
+gtk-themes/Shiny/Makefile
gtk-themes/TraditionalOkClassic/Makefile
gtk-themes/TraditionalOkTest/Makefile
gtk-themes/HighContrast/Makefile
diff --git a/desktop-themes/Fog/index.theme.in b/desktop-themes/Fog/index.theme.in
index 0911068f..1858daeb 100644
--- a/desktop-themes/Fog/index.theme.in
+++ b/desktop-themes/Fog/index.theme.in
@@ -3,6 +3,6 @@ _Name=Fog
Type=X-GNOME-Metatheme
_Comment=A minimalistic appearance
Encoding=UTF-8
-GtkTheme=Fog
+GtkTheme=Mist
MetacityTheme=Fog
IconTheme=Fog
diff --git a/desktop-themes/Glossy/index.theme.in b/desktop-themes/Glossy/index.theme.in
deleted file mode 100644
index dd758cb1..00000000
--- a/desktop-themes/Glossy/index.theme.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[X-GNOME-Metatheme]
-_Name=Glossy
-Type=X-GNOME-Metatheme
-_Comment=A glossy looking theme
-Encoding=UTF-8
-GtkTheme=Glossy
-MetacityTheme=Glossy
-IconTheme=mate
diff --git a/desktop-themes/Makefile.am b/desktop-themes/Makefile.am
index 898108dd..e63fd2a1 100644
--- a/desktop-themes/Makefile.am
+++ b/desktop-themes/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = \
Quid \
TraditionalOk \
Glider \
- Glossy \
+ Shiny \
HighContrast \
HighContrastInverse \
HighContrastLargePrint \
@@ -11,7 +11,7 @@ SUBDIRS = \
LargePrint \
LowContrast \
LowContrastLargePrint \
- Mist \
+ Fog \
$(TEST_THEMES)
DIST_SUBDIRS = \
@@ -19,7 +19,7 @@ DIST_SUBDIRS = \
Quid \
TraditionalOk \
Glider \
- Glossy \
+ Shiny \
HighContrast \
HighContrastInverse \
HighContrastLargePrint \
diff --git a/desktop-themes/Quid/index.theme.in b/desktop-themes/Quid/index.theme.in
index aa022e62..98b364ba 100644
--- a/desktop-themes/Quid/index.theme.in
+++ b/desktop-themes/Quid/index.theme.in
@@ -3,6 +3,6 @@ _Name=Quid
Type=X-GNOME-Metatheme
_Comment=Smooth gradients with purple highlights
Encoding=UTF-8
-GtkTheme=Quid
-MetacityTheme=Quid
+GtkTheme=Crux
+MetacityTheme=Glider
IconTheme=Quid
diff --git a/desktop-themes/Glossy/Makefile.am b/desktop-themes/Shiny/Makefile.am
index 9797ac3a..e00c5fe2 100644
--- a/desktop-themes/Glossy/Makefile.am
+++ b/desktop-themes/Shiny/Makefile.am
@@ -1,4 +1,4 @@
-THEME_NAME=Glossy
+THEME_NAME=Shiny
THEME_IN_FILES=index.theme.in
%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
diff --git a/desktop-themes/Shiny/index.theme.in b/desktop-themes/Shiny/index.theme.in
new file mode 100644
index 00000000..ae6c1dce
--- /dev/null
+++ b/desktop-themes/Shiny/index.theme.in
@@ -0,0 +1,8 @@
+[X-GNOME-Metatheme]
+_Name=Shiny
+Type=X-GNOME-Metatheme
+_Comment=A Shiny looking theme
+Encoding=UTF-8
+GtkTheme=Shiny
+MetacityTheme=Shiny
+IconTheme=mate
diff --git a/desktop-themes/TraditionalOk/index.theme.in b/desktop-themes/TraditionalOk/index.theme.in
index 8b7e4108..1e1f5267 100644
--- a/desktop-themes/TraditionalOk/index.theme.in
+++ b/desktop-themes/TraditionalOk/index.theme.in
@@ -3,6 +3,6 @@ _Name=TraditionalOk
Type=X-GNOME-Metatheme
_Comment=Attractive Usability
Encoding=UTF-8
-GtkTheme=TraditionalOk
+GtkTheme=Clearlooks
MetacityTheme=TraditionalOk
IconTheme=mate
diff --git a/gtk-themes/Makefile.am b/gtk-themes/Makefile.am
index 12d8f165..5416524c 100644
--- a/gtk-themes/Makefile.am
+++ b/gtk-themes/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = \
Glider \
- Glossy \
+ Shiny \
TraditionalOkClassic \
Simple \
HighContrast \
@@ -15,7 +15,7 @@ SUBDIRS = \
DIST_SUBDIRS = \
Glider \
- Glossy \
+ Shiny \
TraditionalOkClassic \
Simple \
HighContrast \
diff --git a/gtk-themes/Glossy/Makefile.am b/gtk-themes/Shiny/Makefile.am
index ad2f7ee3..9ce2f398 100644
--- a/gtk-themes/Glossy/Makefile.am
+++ b/gtk-themes/Shiny/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Glossy/gtk-2.0
+themedir = $(datadir)/themes/Shiny/gtk-2.0
theme_DATA = gtkrc
diff --git a/gtk-themes/Glossy/gtkrc b/gtk-themes/Shiny/gtkrc
index ed83ebbb..31dd2d3f 100644
--- a/gtk-themes/Glossy/gtkrc
+++ b/gtk-themes/Shiny/gtkrc
@@ -77,7 +77,7 @@ style "default" {
toolbarstyle = 1
animation = FALSE
radius = 3.0
- style = GLOSSY
+ style = Shiny
# Set a hint to disable backward compatibility fallbacks.
hint = "use-hints"
diff --git a/marco-themes/Makefile.am b/marco-themes/Makefile.am
index a949e553..6e6d3816 100644
--- a/marco-themes/Makefile.am
+++ b/marco-themes/Makefile.am
@@ -2,7 +2,7 @@ THEMES = \
TraditionalOk \
TraditionalOkClassic \
Glider \
- Glossy \
+ Shiny \
Inverted \
Fog
diff --git a/marco-themes/Glossy/metacity-theme-1.xml b/marco-themes/Shiny/metacity-theme-1.xml
index bf9bd241..b4418f8f 100644
--- a/marco-themes/Glossy/metacity-theme-1.xml
+++ b/marco-themes/Shiny/metacity-theme-1.xml
@@ -2,11 +2,11 @@
<!-- $Id$ -->
<metacity_theme>
<info>
- <name>Glossy</name>
+ <name>Shiny</name>
<author>Daniel Borgmann &lt;[email protected]&gt;, Andrea Cimitan &lt;[email protected]&gt;</author>
<copyright>&#194; 2005-2007 Daniel Borgmann, Andrea Cimitan</copyright>
<date>Apr, 2007</date>
- <description>The Clearlooks "Glossy" Marco Theme</description>
+ <description>The Clearlooks "Shiny" Marco Theme</description>
</info>
<!-- ::: GEOMETRY ::: -->