GNOME.org
 

[the-board] [backgrounds] Add/replace background with something more real

commit 054ece6c99840027147d34175d14819275eb445b
Author: Lucas Rocha <lucasr gnome org>
Date:   Fri Jan 14 11:32:20 2011 +0000

    [backgrounds] Add/replace background with something more real
    
    For now, five backgrounds: cork, cardboard, green, paper, and fabric.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=637705

 data/backgrounds/Makefile.am                     |   27 +++++++++++++---------
 data/backgrounds/cardboard/bg.jpg                |  Bin 0 -> 66436 bytes
 data/backgrounds/checked/bg.jpg                  |  Bin 18785 -> 0 bytes
 data/backgrounds/cork/bg.jpg                     |  Bin 0 -> 156888 bytes
 data/backgrounds/fabric/bg.jpg                   |  Bin 0 -> 19755 bytes
 data/backgrounds/grass/bg.jpg                    |  Bin 262696 -> 0 bytes
 data/backgrounds/green/bg.jpg                    |  Bin 0 -> 173932 bytes
 data/backgrounds/paper/bg.jpg                    |  Bin 38546 -> 128636 bytes
 data/backgrounds/wood/bg.jpg                     |  Bin 20483 -> 0 bytes
 po/POTFILES.in                                   |    7 +++--
 src/Makefile-js.am                               |    9 ++++---
 src/js/ui/background.js                          |    2 +-
 src/js/ui/backgrounds/{grass.js => cardboard.js} |    4 +-
 src/js/ui/backgrounds/{wood.js => cork.js}       |    4 +-
 src/js/ui/backgrounds/{checked.js => fabric.js}  |    4 +-
 src/js/ui/backgrounds/{grass.js => green.js}     |    4 +-
 16 files changed, 34 insertions(+), 27 deletions(-)
---
diff --git a/data/backgrounds/Makefile.am b/data/backgrounds/Makefile.am
index 36f765b..9271616 100644
--- a/data/backgrounds/Makefile.am
+++ b/data/backgrounds/Makefile.am
@@ -1,23 +1,28 @@
 backgroundsdir = $(pkgdatadir)/backgrounds
 
-checkeddir = $(backgroundsdir)/checked
+cardboarddir = $(backgroundsdir)/cardboard
 
-dist_checked_DATA = \
-    checked/bg.jpg
+dist_cardboard_DATA = \
+    cardboard/bg.jpg
 
-grassdir = $(backgroundsdir)/grass
+corkdir = $(backgroundsdir)/cork
 
-dist_grass_DATA = \
-    grass/bg.jpg
+dist_cork_DATA = \
+    cork/bg.jpg
+
+fabricdir = $(backgroundsdir)/fabric
+
+dist_fabric_DATA = \
+    fabric/bg.jpg
+
+greendir = $(backgroundsdir)/green
+
+dist_green_DATA = \
+    green/bg.jpg
 
 paperdir = $(backgroundsdir)/paper
 
 dist_paper_DATA = \
     paper/bg.jpg
 
-wooddir = $(backgroundsdir)/wood
-
-dist_wood_DATA = \
-    wood/bg.jpg
-
 -include $(top_srcdir)/git.mk
diff --git a/data/backgrounds/cardboard/bg.jpg b/data/backgrounds/cardboard/bg.jpg
new file mode 100644
index 0000000..fd15d15
Binary files /dev/null and b/data/backgrounds/cardboard/bg.jpg differ
diff --git a/data/backgrounds/cork/bg.jpg b/data/backgrounds/cork/bg.jpg
new file mode 100644
index 0000000..c1f2abe
Binary files /dev/null and b/data/backgrounds/cork/bg.jpg differ
diff --git a/data/backgrounds/fabric/bg.jpg b/data/backgrounds/fabric/bg.jpg
new file mode 100644
index 0000000..2a78e9b
Binary files /dev/null and b/data/backgrounds/fabric/bg.jpg differ
diff --git a/data/backgrounds/green/bg.jpg b/data/backgrounds/green/bg.jpg
new file mode 100644
index 0000000..248fc2f
Binary files /dev/null and b/data/backgrounds/green/bg.jpg differ
diff --git a/data/backgrounds/paper/bg.jpg b/data/backgrounds/paper/bg.jpg
index 4b6462a..3689267 100644
Binary files a/data/backgrounds/paper/bg.jpg and b/data/backgrounds/paper/bg.jpg differ
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4011ac9..51d5d89 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,10 +2,11 @@
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
 data/the-board.desktop.in.in
-src/js/ui/backgrounds/checked.js
-src/js/ui/backgrounds/grass.js
+src/js/ui/backgrounds/cardboard.js
+src/js/ui/backgrounds/cork.js
+src/js/ui/backgrounds/fabric.js
+src/js/ui/backgrounds/green.js
 src/js/ui/backgrounds/paper.js
-src/js/ui/backgrounds/wood.js
 src/js/ui/things/label.js
 src/js/ui/things/note.js
 src/js/ui/things/photo.js
diff --git a/src/Makefile-js.am b/src/Makefile-js.am
index 6cde938..cc2da65 100644
--- a/src/Makefile-js.am
+++ b/src/Makefile-js.am
@@ -23,11 +23,12 @@ dist_jsui_DATA = \
 jsuibackgroundsdir = $(pkgdatadir)/js/ui/backgrounds
 
 dist_jsuibackgrounds_DATA = \
-    js/ui/backgrounds/checked.js \
-    js/ui/backgrounds/grass.js \
+    js/ui/backgrounds/cardboard.js \
+    js/ui/backgrounds/cork.js \
+    js/ui/backgrounds/fabric.js \
+    js/ui/backgrounds/green.js \
     js/ui/backgrounds/paper.js \
-    js/ui/backgrounds/tiled.js \
-    js/ui/backgrounds/wood.js
+    js/ui/backgrounds/tiled.js
 
 jsuithingsdir = $(pkgdatadir)/js/ui/things
 
diff --git a/src/js/ui/background.js b/src/js/ui/background.js
index 051ca87..f125873 100644
--- a/src/js/ui/background.js
+++ b/src/js/ui/background.js
@@ -72,7 +72,7 @@ Background.prototype = {
 
 function createBackgroundFromId(backgroundId) {
     if (!backgroundId) {
-        backgroundId = 'wood';
+        backgroundId = 'cork';
     }
 
     let constructorModule = imports.ui.backgrounds[backgroundId];
diff --git a/src/js/ui/backgrounds/grass.js b/src/js/ui/backgrounds/cardboard.js
similarity index 80%
copy from src/js/ui/backgrounds/grass.js
copy to src/js/ui/backgrounds/cardboard.js
index 3af240e..50b631e 100644
--- a/src/js/ui/backgrounds/grass.js
+++ b/src/js/ui/backgrounds/cardboard.js
@@ -8,13 +8,13 @@ const Tiled = imports.ui.backgrounds.tiled;
 // util imports
 const Path = imports.util.path;
 
-const NAME = Gettext.gettext("Grass");
+const NAME = Gettext.gettext("Cardboard");
 
 function create(args) {
     args = args || {};
 
     args.bgFilename = Path.BACKGROUNDS_DATA_DIR +
-                      "grass/bg.jpg";
+                      "cardboard/bg.jpg";
 
     return new Tiled.TiledBackground(args);
 }
diff --git a/src/js/ui/backgrounds/wood.js b/src/js/ui/backgrounds/cork.js
similarity index 82%
rename from src/js/ui/backgrounds/wood.js
rename to src/js/ui/backgrounds/cork.js
index 37dda64..8bb26e8 100644
--- a/src/js/ui/backgrounds/wood.js
+++ b/src/js/ui/backgrounds/cork.js
@@ -8,13 +8,13 @@ const Tiled = imports.ui.backgrounds.tiled;
 // util imports
 const Path = imports.util.path;
 
-const NAME = Gettext.gettext("Wood");
+const NAME = Gettext.gettext("Cork");
 
 function create(args) {
     args = args || {};
 
     args.bgFilename = Path.BACKGROUNDS_DATA_DIR +
-                      "wood/bg.jpg";
+                      "cork/bg.jpg";
 
     return new Tiled.TiledBackground(args);
 }
diff --git a/src/js/ui/backgrounds/checked.js b/src/js/ui/backgrounds/fabric.js
similarity index 81%
rename from src/js/ui/backgrounds/checked.js
rename to src/js/ui/backgrounds/fabric.js
index 739d494..e75c2d0 100644
--- a/src/js/ui/backgrounds/checked.js
+++ b/src/js/ui/backgrounds/fabric.js
@@ -8,13 +8,13 @@ const Tiled = imports.ui.backgrounds.tiled;
 // util imports
 const Path = imports.util.path;
 
-const NAME = Gettext.gettext("Checked");
+const NAME = Gettext.gettext("Fabric");
 
 function create(args) {
     args = args || {};
 
     args.bgFilename = Path.BACKGROUNDS_DATA_DIR +
-                      "checked/bg.jpg";
+                      "fabric/bg.jpg";
 
     return new Tiled.TiledBackground(args);
 }
diff --git a/src/js/ui/backgrounds/grass.js b/src/js/ui/backgrounds/green.js
similarity index 82%
rename from src/js/ui/backgrounds/grass.js
rename to src/js/ui/backgrounds/green.js
index 3af240e..b7ab861 100644
--- a/src/js/ui/backgrounds/grass.js
+++ b/src/js/ui/backgrounds/green.js
@@ -8,13 +8,13 @@ const Tiled = imports.ui.backgrounds.tiled;
 // util imports
 const Path = imports.util.path;
 
-const NAME = Gettext.gettext("Grass");
+const NAME = Gettext.gettext("Green");
 
 function create(args) {
     args = args || {};
 
     args.bgFilename = Path.BACKGROUNDS_DATA_DIR +
-                      "grass/bg.jpg";
+                      "green/bg.jpg";
 
     return new Tiled.TiledBackground(args);
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]