[gnome-shell/shell-toolkit: 13/32] Fix installation and distribution of stylesheet data
- From: Owen Taylor <otaylor src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-shell/shell-toolkit: 13/32] Fix installation and distribution of stylesheet data
- Date: Wed, 30 Sep 2009 00:02:11 +0000 (UTC)
commit 789e2682649899af6f46320fe8e49b535b49bc1f
Author: Owen W. Taylor <otaylor fishsoup net>
Date: Fri Sep 18 16:29:28 2009 -0400
Fix installation and distribution of stylesheet data
Install and distribute gnome-shell.css and theme images. They are moved
down from $datadir to $datadir/theme to avoid a weirdness where we have
images in $datadir and then also in $datadir/images.
(Also moved in the source tree to avoid adding another difference between
installed and uninstalled operation.)
https://bugzilla.gnome.org/show_bug.cgi?id=595989
data/Makefile.am | 28 ++++++++++++++++---------
data/{ => theme}/gnome-shell.css | 0
data/{ => theme}/scroll-button-down-hover.png | Bin 225 -> 225 bytes
data/{ => theme}/scroll-button-down.png | Bin 225 -> 225 bytes
data/{ => theme}/scroll-button-up-hover.png | Bin 211 -> 211 bytes
data/{ => theme}/scroll-button-up.png | Bin 211 -> 211 bytes
data/{ => theme}/scroll-vhandle.png | Bin 323 -> 323 bytes
js/ui/main.js | 2 +-
tests/testcommon/test.css | 2 +-
9 files changed, 20 insertions(+), 12 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 50270a3..06827d0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,18 +12,26 @@ gnome-shell.desktop.in: gnome-shell.desktop.in.in
gnome-shell.desktop: gnome-shell.desktop.in
$(AM_V_GEN) sed s/^_// < $< > $@ || rm $@
-imagedir = $(pkgdatadir)/images
-
-dist_image_DATA = \
- add-workspace.svg \
- app-well-glow.png \
- back.svg \
- close.svg \
- close-black.svg \
- info.svg \
- magnifier.svg \
+imagesdir = $(pkgdatadir)/images
+dist_images_DATA = \
+ add-workspace.svg \
+ app-well-glow.png \
+ back.svg \
+ close.svg \
+ close-black.svg \
+ info.svg \
+ magnifier.svg \
remove-workspace.svg
+themedir = $(pkgdatadir)/theme
+dist_theme_DATA = \
+ theme/gnome-shell.css \
+ theme/scroll-button-down.png \
+ theme/scroll-button-down-hover.png \
+ theme/scroll-button-up.png \
+ theme/scroll-button-up-hover.png \
+ theme/scroll-vhandle.png
+
schemadir = @GCONF_SCHEMA_FILE_DIR@
schema_DATA = gnome-shell.schemas
diff --git a/data/gnome-shell.css b/data/theme/gnome-shell.css
similarity index 100%
rename from data/gnome-shell.css
rename to data/theme/gnome-shell.css
diff --git a/data/scroll-button-down-hover.png b/data/theme/scroll-button-down-hover.png
similarity index 100%
rename from data/scroll-button-down-hover.png
rename to data/theme/scroll-button-down-hover.png
diff --git a/data/scroll-button-down.png b/data/theme/scroll-button-down.png
similarity index 100%
rename from data/scroll-button-down.png
rename to data/theme/scroll-button-down.png
diff --git a/data/scroll-button-up-hover.png b/data/theme/scroll-button-up-hover.png
similarity index 100%
rename from data/scroll-button-up-hover.png
rename to data/theme/scroll-button-up-hover.png
diff --git a/data/scroll-button-up.png b/data/theme/scroll-button-up.png
similarity index 100%
rename from data/scroll-button-up.png
rename to data/theme/scroll-button-up.png
diff --git a/data/scroll-vhandle.png b/data/theme/scroll-vhandle.png
similarity index 100%
rename from data/scroll-vhandle.png
rename to data/theme/scroll-vhandle.png
diff --git a/js/ui/main.js b/js/ui/main.js
index f400f9c..fd577fb 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -77,7 +77,7 @@ function start() {
children[i].destroy();
let style = St.Style.get_default();
- let stylesheetPath = global.datadir + "/gnome-shell.css";
+ let stylesheetPath = global.datadir + "/theme/gnome-shell.css";
style.load_from_file(stylesheetPath);
global.connect('panel-run-dialog', function(panel) {
diff --git a/tests/testcommon/test.css b/tests/testcommon/test.css
index f816791..0e1b3ac 100644
--- a/tests/testcommon/test.css
+++ b/tests/testcommon/test.css
@@ -1,4 +1,4 @@
- import "../../data/gnome-shell.css";
+ import "../../data/theme/gnome-shell.css";
*.red {
background-color: red;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]