[gnome-games] swell-foop: Make test theme use the same colors as the defaut, and rename to 'Colors'. Rename tango

[Robert Ancell <rancell src gnome org>]

commit 0f4e3a9b31c1e2beeeab174856b1ae847f2150b3
Author: Robert Ancell <robert ancell canonical com>
Date:   Sun May 1 22:01:34 2011 +1000

    swell-foop: Make test theme use the same colors as the defaut, and rename to 'Colors'.  Rename tango theme to 'Shapes and Colors'

 configure.in                                       |    4 ++--
 swell-foop/data/themes/Makefile.am                 |    2 +-
 .../data/themes/{tango => colors}/Makefile.am      |    2 +-
 swell-foop/data/themes/{tango => colors}/bkg.svg   |    0
 swell-foop/data/themes/{test => colors}/blue.svg   |    4 ++--
 swell-foop/data/themes/{test => colors}/green.svg  |    0
 swell-foop/data/themes/{test => colors}/red.svg    |    0
 swell-foop/data/themes/colors/theme.js             |   12 ++++++++++++
 swell-foop/data/themes/{test => colors}/yellow.svg |    0
 .../themes/{test => shapesandcolors}/Makefile.am   |    2 +-
 .../data/themes/{test => shapesandcolors}/bkg.svg  |    0
 .../themes/{tango => shapesandcolors}/blue.svg     |    0
 .../themes/{tango => shapesandcolors}/green.svg    |    0
 .../data/themes/{tango => shapesandcolors}/red.svg |    0
 swell-foop/data/themes/shapesandcolors/theme.js    |   12 ++++++++++++
 .../themes/{tango => shapesandcolors}/yellow.svg   |    0
 swell-foop/data/themes/tango/theme.js              |   12 ------------
 swell-foop/data/themes/test/theme.js               |   12 ------------
 swell-foop/swell-foop.schemas.in                   |    2 +-
 19 files changed, 32 insertions(+), 32 deletions(-)
---
diff --git a/configure.in b/configure.in
index 4bde6d5..349b084 100644
--- a/configure.in
+++ b/configure.in
@@ -921,8 +921,8 @@ gnome-sudoku/data/Makefile
 gnome-sudoku/images/Makefile
 gnome-sudoku/help/Makefile
 swell-foop/data/themes/Makefile
-swell-foop/data/themes/tango/Makefile
-swell-foop/data/themes/test/Makefile
+swell-foop/data/themes/colors/Makefile
+swell-foop/data/themes/shapesandcolors/Makefile
 swell-foop/swell-foop.desktop.in
 swell-foop/src/Makefile
 quadrapassel/quadrapassel.desktop.in
diff --git a/swell-foop/data/themes/Makefile.am b/swell-foop/data/themes/Makefile.am
index fed17a8..4409436 100644
--- a/swell-foop/data/themes/Makefile.am
+++ b/swell-foop/data/themes/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = tango test
+SUBDIRS = colors shapesandcolors
 
 -include $(top_srcdir)/git.mk
diff --git a/swell-foop/data/themes/tango/Makefile.am b/swell-foop/data/themes/colors/Makefile.am
similarity index 80%
rename from swell-foop/data/themes/tango/Makefile.am
rename to swell-foop/data/themes/colors/Makefile.am
index fa2d675..3a921f6 100644
--- a/swell-foop/data/themes/tango/Makefile.am
+++ b/swell-foop/data/themes/colors/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(pkgdatadir)/swell-foop/themes/tango
+themedir = $(pkgdatadir)/swell-foop/themes/colors
 theme_DATA = \
 	bkg.svg \
 	blue.svg \
diff --git a/swell-foop/data/themes/tango/bkg.svg b/swell-foop/data/themes/colors/bkg.svg
similarity index 100%
rename from swell-foop/data/themes/tango/bkg.svg
rename to swell-foop/data/themes/colors/bkg.svg
diff --git a/swell-foop/data/themes/test/blue.svg b/swell-foop/data/themes/colors/blue.svg
similarity index 95%
rename from swell-foop/data/themes/test/blue.svg
rename to swell-foop/data/themes/colors/blue.svg
index 871267e..570eaa4 100644
--- a/swell-foop/data/themes/test/blue.svg
+++ b/swell-foop/data/themes/colors/blue.svg
@@ -22,11 +22,11 @@
     <linearGradient
        id="linearGradient3179">
       <stop
-         style="stop-color:#aa669b;stop-opacity:0.96078432;"
+         style="stop-color:#35669b;stop-opacity:0.96078432;"
          offset="0"
          id="stop3181" />
       <stop
-         style="stop-color:#aa92c8;stop-opacity:0.96078432;"
+         style="stop-color:#5e92c8;stop-opacity:0.96078432;"
          offset="1"
          id="stop3183" />
     </linearGradient>
diff --git a/swell-foop/data/themes/test/green.svg b/swell-foop/data/themes/colors/green.svg
similarity index 100%
rename from swell-foop/data/themes/test/green.svg
rename to swell-foop/data/themes/colors/green.svg
diff --git a/swell-foop/data/themes/test/red.svg b/swell-foop/data/themes/colors/red.svg
similarity index 100%
rename from swell-foop/data/themes/test/red.svg
rename to swell-foop/data/themes/colors/red.svg
diff --git a/swell-foop/data/themes/colors/theme.js b/swell-foop/data/themes/colors/theme.js
new file mode 100644
index 0000000..f099aad
--- /dev/null
+++ b/swell-foop/data/themes/colors/theme.js
@@ -0,0 +1,12 @@
+ThemeLoader = imports.ThemeLoader;
+
+var name = "Colors";
+
+var colors = [ ThemeLoader.load_svg("colors", "blue.svg"),
+               ThemeLoader.load_svg("colors", "green.svg"),
+               ThemeLoader.load_svg("colors", "yellow.svg"),
+               ThemeLoader.load_svg("colors", "red.svg") ];
+
+var loaded = false;
+var textures = [colors[0], colors[1], colors[2], colors[3]];
+
diff --git a/swell-foop/data/themes/test/yellow.svg b/swell-foop/data/themes/colors/yellow.svg
similarity index 100%
rename from swell-foop/data/themes/test/yellow.svg
rename to swell-foop/data/themes/colors/yellow.svg
diff --git a/swell-foop/data/themes/test/Makefile.am b/swell-foop/data/themes/shapesandcolors/Makefile.am
similarity index 77%
rename from swell-foop/data/themes/test/Makefile.am
rename to swell-foop/data/themes/shapesandcolors/Makefile.am
index 1c6f08f..2d9272b 100644
--- a/swell-foop/data/themes/test/Makefile.am
+++ b/swell-foop/data/themes/shapesandcolors/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(pkgdatadir)/swell-foop/themes/test
+themedir = $(pkgdatadir)/swell-foop/themes/shapesandcolors
 theme_DATA = \
 	bkg.svg \
 	blue.svg \
diff --git a/swell-foop/data/themes/test/bkg.svg b/swell-foop/data/themes/shapesandcolors/bkg.svg
similarity index 100%
rename from swell-foop/data/themes/test/bkg.svg
rename to swell-foop/data/themes/shapesandcolors/bkg.svg
diff --git a/swell-foop/data/themes/tango/blue.svg b/swell-foop/data/themes/shapesandcolors/blue.svg
similarity index 100%
rename from swell-foop/data/themes/tango/blue.svg
rename to swell-foop/data/themes/shapesandcolors/blue.svg
diff --git a/swell-foop/data/themes/tango/green.svg b/swell-foop/data/themes/shapesandcolors/green.svg
similarity index 100%
rename from swell-foop/data/themes/tango/green.svg
rename to swell-foop/data/themes/shapesandcolors/green.svg
diff --git a/swell-foop/data/themes/tango/red.svg b/swell-foop/data/themes/shapesandcolors/red.svg
similarity index 100%
rename from swell-foop/data/themes/tango/red.svg
rename to swell-foop/data/themes/shapesandcolors/red.svg
diff --git a/swell-foop/data/themes/shapesandcolors/theme.js b/swell-foop/data/themes/shapesandcolors/theme.js
new file mode 100644
index 0000000..df2d702
--- /dev/null
+++ b/swell-foop/data/themes/shapesandcolors/theme.js
@@ -0,0 +1,12 @@
+ThemeLoader = imports.ThemeLoader;
+
+var name = "Shapes and Colors";
+
+var colors = [ ThemeLoader.load_svg("shapesandcolors", "blue.svg"),
+               ThemeLoader.load_svg("shapesandcolors", "green.svg"),
+	           ThemeLoader.load_svg("shapesandcolors", "yellow.svg"),
+               ThemeLoader.load_svg("shapesandcolors", "red.svg")];
+
+var loaded = false;
+var textures = [colors[0], colors[1], colors[2], colors[3]];
+
diff --git a/swell-foop/data/themes/tango/yellow.svg b/swell-foop/data/themes/shapesandcolors/yellow.svg
similarity index 100%
rename from swell-foop/data/themes/tango/yellow.svg
rename to swell-foop/data/themes/shapesandcolors/yellow.svg
diff --git a/swell-foop/swell-foop.schemas.in b/swell-foop/swell-foop.schemas.in
index d9ec2ae..f096ced 100644
--- a/swell-foop/swell-foop.schemas.in
+++ b/swell-foop/swell-foop.schemas.in
@@ -6,7 +6,7 @@
         <applyto>/apps/swell-foop/theme</applyto>
         <owner>swell-foop</owner>
         <type>string</type>
-        <default>Tango</default>
+        <default>Shapes and Colors</default>
         <locale name="C">
           <short>The theme to use</short>
           <long>The title of the tile theme to use.</long>