GNOME.org
 

[pitivi: 3/5] Move our pixmaps and icons into a data/ dir.

commit 0e397fadf8c206c716f3b31cd1145149d5b53f05
Author: Stéphane Maniaci <stephane maniaci gmail com>
Date:   Fri May 13 17:34:35 2011 -0700

    Move our pixmaps and icons into a data/ dir.
    
    And adapt/simplify configure.py.in appropriately

 Makefile.am                                        |   14 +---------
 configure.ac                                       |   19 +++++++------
 data/Makefile.am                                   |   12 +++++++++
 {icons => data/icons}/16x16/Makefile.am            |    0
 {icons => data/icons}/16x16/pitivi.png             |  Bin 836 -> 836 bytes
 {icons => data/icons}/16x16/pitivi.svg             |    0
 {icons => data/icons}/22x22/Makefile.am            |    0
 {icons => data/icons}/22x22/pitivi.png             |  Bin 1304 -> 1304 bytes
 {icons => data/icons}/22x22/pitivi.svg             |    0
 {icons => data/icons}/24x24/Makefile.am            |    0
 {icons => data/icons}/24x24/pitivi.png             |  Bin 1303 -> 1303 bytes
 {icons => data/icons}/32x32/Makefile.am            |    0
 {icons => data/icons}/32x32/pitivi.png             |  Bin 2066 -> 2066 bytes
 {icons => data/icons}/32x32/pitivi.svg             |    0
 {icons => data/icons}/48x48/Makefile.am            |    0
 {icons => data/icons}/48x48/pitivi.png             |  Bin 3798 -> 3798 bytes
 {icons => data/icons}/48x48/pitivi.svg             |    0
 {icons => data/icons}/Makefile.am                  |    0
 {icons => data/icons}/scalable/Makefile.am         |    0
 {icons => data/icons}/scalable/pitivi.svg          |    0
 pitivi.desktop.in.in => data/pitivi.desktop.in.in  |    0
 {pitivi => data}/pixmaps/.gitignore                |    0
 {pitivi => data}/pixmaps/Makefile.am               |    0
 {pitivi => data}/pixmaps/agingtv.png               |  Bin 13454 -> 13454 bytes
 {pitivi => data}/pixmaps/bulge.png                 |  Bin 13136 -> 13136 bytes
 {pitivi => data}/pixmaps/burn.png                  |  Bin 12215 -> 12215 bytes
 {pitivi => data}/pixmaps/busy.gif                  |  Bin 875 -> 875 bytes
 {pitivi => data}/pixmaps/chromium.png              |  Bin 13114 -> 13114 bytes
 {pitivi => data}/pixmaps/circle.png                |  Bin 10926 -> 10926 bytes
 {pitivi => data}/pixmaps/cogdownsample.png         |  Bin 12457 -> 12457 bytes
 {pitivi => data}/pixmaps/color-distance.png        |  Bin 8698 -> 8698 bytes
 {pitivi => data}/pixmaps/coloreffects.png          |  Bin 12939 -> 12939 bytes
 {pitivi => data}/pixmaps/defaultthumbnail.svg      |    0
 {pitivi => data}/pixmaps/dicetv.png                |  Bin 14380 -> 14380 bytes
 {pitivi => data}/pixmaps/diffuse.png               |  Bin 12401 -> 12401 bytes
 {pitivi => data}/pixmaps/dilate.png                |  Bin 12934 -> 12934 bytes
 {pitivi => data}/pixmaps/dodge.png                 |  Bin 12536 -> 12536 bytes
 {pitivi => data}/pixmaps/edgetv.png                |  Bin 11143 -> 11143 bytes
 {pitivi => data}/pixmaps/exclusion.png             |  Bin 11209 -> 11209 bytes
 {pitivi => data}/pixmaps/fisheye.png               |  Bin 14018 -> 14018 bytes
 .../pixmaps/frei0r-filter-3dflippo.png             |  Bin 10993 -> 10993 bytes
 .../pixmaps/frei0r-filter-brightness.png           |  Bin 12217 -> 12217 bytes
 {pitivi => data}/pixmaps/frei0r-filter-bw0r.png    |  Bin 5236 -> 5236 bytes
 {pitivi => data}/pixmaps/frei0r-filter-cartoon.png |  Bin 11763 -> 11763 bytes
 .../pixmaps/frei0r-filter-contrast0r.png           |  Bin 12262 -> 12262 bytes
 .../pixmaps/frei0r-filter-distort0r.png            |  Bin 11556 -> 11556 bytes
 .../pixmaps/frei0r-filter-edgeglow.png             |  Bin 13674 -> 13674 bytes
 .../pixmaps/frei0r-filter-equaliz0r.png            |  Bin 13771 -> 13771 bytes
 {pitivi => data}/pixmaps/frei0r-filter-flippo.png  |  Bin 12652 -> 12652 bytes
 {pitivi => data}/pixmaps/frei0r-filter-gamma.png   |  Bin 13339 -> 13339 bytes
 {pitivi => data}/pixmaps/frei0r-filter-glow.png    |  Bin 11912 -> 11912 bytes
 .../pixmaps/frei0r-filter-hueshift0r.png           |  Bin 12848 -> 12848 bytes
 .../pixmaps/frei0r-filter-invert0r.png             |  Bin 12957 -> 12957 bytes
 .../pixmaps/frei0r-filter-k-means-clustering.png   |  Bin 10424 -> 10424 bytes
 .../pixmaps/frei0r-filter-lens-correction.png      |  Bin 11046 -> 11046 bytes
 .../pixmaps/frei0r-filter-letterb0xed.png          |  Bin 9144 -> 9144 bytes
 .../pixmaps/frei0r-filter-nosync0r.png             |  Bin 12706 -> 12706 bytes
 .../pixmaps/frei0r-filter-perspective.png          |  Bin 12110 -> 12110 bytes
 .../pixmaps/frei0r-filter-pixeliz0r.png            |  Bin 7383 -> 7383 bytes
 .../pixmaps/frei0r-filter-rgb-parade.png           |  Bin 7161 -> 7161 bytes
 .../pixmaps/frei0r-filter-saturat0r.png            |  Bin 13759 -> 13759 bytes
 .../pixmaps/frei0r-filter-scale0tilt.png           |  Bin 12839 -> 12839 bytes
 .../pixmaps/frei0r-filter-scanline0r.png           |  Bin 8324 -> 8324 bytes
 {pitivi => data}/pixmaps/frei0r-filter-sobel.png   |  Bin 16591 -> 16591 bytes
 .../pixmaps/frei0r-filter-squareblur.png           |  Bin 9322 -> 9322 bytes
 .../pixmaps/frei0r-filter-tehroxx0r.png            |  Bin 8403 -> 8403 bytes
 .../pixmaps/frei0r-filter-twolay0r.png             |  Bin 2671 -> 2671 bytes
 .../pixmaps/frei0r-filter-vectorscope.png          |  Bin 5903 -> 5903 bytes
 {pitivi => data}/pixmaps/frei0r-filter-water.png   |  Bin 12920 -> 12920 bytes
 .../pixmaps/frei0r-filter-white-balance.png        |  Bin 12759 -> 12759 bytes
 {pitivi => data}/pixmaps/gamma-correction.png      |  Bin 13635 -> 13635 bytes
 {pitivi => data}/pixmaps/gaussianblur.png          |  Bin 12433 -> 12433 bytes
 {pitivi => data}/pixmaps/invisible.png             |  Bin 177 -> 177 bytes
 {pitivi => data}/pixmaps/kaleidoscope.png          |  Bin 14648 -> 14648 bytes
 {pitivi => data}/pixmaps/marble.png                |  Bin 12929 -> 12929 bytes
 {pitivi => data}/pixmaps/mirror.png                |  Bin 13678 -> 13678 bytes
 {pitivi => data}/pixmaps/optv.png                  |  Bin 7022 -> 7022 bytes
 {pitivi => data}/pixmaps/pinch.png                 |  Bin 12713 -> 12713 bytes
 {pitivi => data}/pixmaps/pitivi-advanced-16.png    |  Bin 367 -> 367 bytes
 {pitivi => data}/pixmaps/pitivi-advanced-22.png    |  Bin 409 -> 409 bytes
 {pitivi => data}/pixmaps/pitivi-advanced-24.png    |  Bin 400 -> 400 bytes
 {pitivi => data}/pixmaps/pitivi-group-24.svg       |    0
 {pitivi => data}/pixmaps/pitivi-group.svg          |    0
 {pitivi => data}/pixmaps/pitivi-keyframe-24.svg    |    0
 {pitivi => data}/pixmaps/pitivi-keyframe.svg       |    0
 {pitivi => data}/pixmaps/pitivi-relink-24.svg      |    0
 {pitivi => data}/pixmaps/pitivi-relink.svg         |    0
 {pitivi => data}/pixmaps/pitivi-render-16.png      |  Bin 912 -> 912 bytes
 {pitivi => data}/pixmaps/pitivi-render-22.png      |  Bin 1289 -> 1289 bytes
 {pitivi => data}/pixmaps/pitivi-render-24.png      |  Bin 1289 -> 1289 bytes
 {pitivi => data}/pixmaps/pitivi-sound.png          |  Bin 4655 -> 4655 bytes
 {pitivi => data}/pixmaps/pitivi-split-24.svg       |    0
 {pitivi => data}/pixmaps/pitivi-split.svg          |    0
 {pitivi => data}/pixmaps/pitivi-ungroup-24.svg     |    0
 {pitivi => data}/pixmaps/pitivi-ungroup.svg        |    0
 {pitivi => data}/pixmaps/pitivi-unlink-24.svg      |    0
 {pitivi => data}/pixmaps/pitivi-unlink.svg         |    0
 {pitivi => data}/pixmaps/pitivi-video.png          |  Bin 2747 -> 2747 bytes
 {pitivi => data}/pixmaps/processing-clip.png       |  Bin 3004 -> 3004 bytes
 {pitivi => data}/pixmaps/processing-clip.svg       |    0
 {pitivi => data}/pixmaps/radioactv.png             |  Bin 14529 -> 14529 bytes
 {pitivi => data}/pixmaps/revtv.png                 |  Bin 4679 -> 4679 bytes
 {pitivi => data}/pixmaps/shagadelictv.png          |  Bin 12272 -> 12272 bytes
 {pitivi => data}/pixmaps/solarize.png              |  Bin 16203 -> 16203 bytes
 {pitivi => data}/pixmaps/sphere.png                |  Bin 12965 -> 12965 bytes
 {pitivi => data}/pixmaps/square.png                |  Bin 12487 -> 12487 bytes
 {pitivi => data}/pixmaps/stretch.png               |  Bin 12846 -> 12846 bytes
 {pitivi => data}/pixmaps/threshold0r.png           |  Bin 10938 -> 10938 bytes
 {pitivi => data}/pixmaps/trimbar-focused.png       |  Bin 198 -> 198 bytes
 {pitivi => data}/pixmaps/trimbar-normal.png        |  Bin 198 -> 198 bytes
 {pitivi => data}/pixmaps/tunnel.png                |  Bin 12547 -> 12547 bytes
 {pitivi => data}/pixmaps/twirl.png                 |  Bin 13961 -> 13961 bytes
 {pitivi => data}/pixmaps/vertigotv.png             |  Bin 11030 -> 11030 bytes
 {pitivi => data}/pixmaps/videobalance.png          |  Bin 12903 -> 12903 bytes
 {pitivi => data}/pixmaps/videobox.png              |  Bin 13495 -> 13495 bytes
 {pitivi => data}/pixmaps/videocrop.png             |  Bin 11430 -> 11430 bytes
 {pitivi => data}/pixmaps/warptv.png                |  Bin 12781 -> 12781 bytes
 {pitivi => data}/pixmaps/waterripple.png           |  Bin 13874 -> 13874 bytes
 pitivi/Makefile.am                                 |    1 -
 pitivi/configure.py.in                             |   27 +++++++++-----------
 po/POTFILES.in                                     |    1 +
 121 files changed, 36 insertions(+), 38 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 97f074c..eb0db8a 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,6 @@
 AUTOMAKE_OPTIONS = dist-bzip2
 
-SUBDIRS	= bin pitivi common po tests icons
-
-desktopdir = $(datadir)/applications
-desktop_in_files = pitivi.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- INTLTOOL_DESKTOP_RULE@
+SUBDIRS	= bin pitivi common po tests data
 
 mimedir = $(datadir)/mime/packages
 mime_DATA = pitivi.xml
@@ -29,19 +24,12 @@ DISTCLEANFILES =                \
         intltool-merge          \
         intltool-update
 
-
-CLEANFILES =                    \
-        $(desktop_DATA)
-
-
 EXTRA_DIST +=                   \
         intltool-extract.in     \
         intltool-merge.in       \
         intltool-update.in      \
-        $(desktop_in_files)     \
         $(man_MANS)
 
-
 locale-uninstalled:
 	if test -d po; then \
 	    $(MAKE) -C po datadir=../$(top_builddir) install; \
diff --git a/configure.ac b/configure.ac
index 0cc91a0..b7b5de6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,17 +86,18 @@ pitivi/elements/Makefile
 pitivi/factories/Makefile
 pitivi/log/Makefile
 pitivi/formatters/Makefile
-pitivi/pixmaps/Makefile
 pitivi/timeline/Makefile
 pitivi.spec
-pitivi.desktop.in
 po/Makefile.in
 tests/Makefile
-icons/Makefile
-icons/16x16/Makefile
-icons/22x22/Makefile
-icons/24x24/Makefile
-icons/32x32/Makefile
-icons/48x48/Makefile
-icons/scalable/Makefile
+data/Makefile
+data/pitivi.desktop.in
+data/icons/Makefile
+data/icons/16x16/Makefile
+data/icons/22x22/Makefile
+data/icons/24x24/Makefile
+data/icons/32x32/Makefile
+data/icons/48x48/Makefile
+data/icons/scalable/Makefile
+data/pixmaps/Makefile
 )
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..0d7ca33
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,12 @@
+SUBDIRS=icons pixmaps
+
+desktopdir = $(datadir)/applications
+desktop_in_files = pitivi.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ INTLTOOL_DESKTOP_RULE@
+
+CLEANFILES =  \
+        $(desktop_DATA)
+
+EXTRA_DIST = \
+        $(desktop_in_files)
diff --git a/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
similarity index 100%
rename from icons/16x16/Makefile.am
rename to data/icons/16x16/Makefile.am
diff --git a/icons/16x16/pitivi.png b/data/icons/16x16/pitivi.png
similarity index 100%
rename from icons/16x16/pitivi.png
rename to data/icons/16x16/pitivi.png
diff --git a/icons/16x16/pitivi.svg b/data/icons/16x16/pitivi.svg
similarity index 100%
rename from icons/16x16/pitivi.svg
rename to data/icons/16x16/pitivi.svg
diff --git a/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
similarity index 100%
rename from icons/22x22/Makefile.am
rename to data/icons/22x22/Makefile.am
diff --git a/icons/22x22/pitivi.png b/data/icons/22x22/pitivi.png
similarity index 100%
rename from icons/22x22/pitivi.png
rename to data/icons/22x22/pitivi.png
diff --git a/icons/22x22/pitivi.svg b/data/icons/22x22/pitivi.svg
similarity index 100%
rename from icons/22x22/pitivi.svg
rename to data/icons/22x22/pitivi.svg
diff --git a/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
similarity index 100%
rename from icons/24x24/Makefile.am
rename to data/icons/24x24/Makefile.am
diff --git a/icons/24x24/pitivi.png b/data/icons/24x24/pitivi.png
similarity index 100%
rename from icons/24x24/pitivi.png
rename to data/icons/24x24/pitivi.png
diff --git a/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
similarity index 100%
rename from icons/32x32/Makefile.am
rename to data/icons/32x32/Makefile.am
diff --git a/icons/32x32/pitivi.png b/data/icons/32x32/pitivi.png
similarity index 100%
rename from icons/32x32/pitivi.png
rename to data/icons/32x32/pitivi.png
diff --git a/icons/32x32/pitivi.svg b/data/icons/32x32/pitivi.svg
similarity index 100%
rename from icons/32x32/pitivi.svg
rename to data/icons/32x32/pitivi.svg
diff --git a/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
similarity index 100%
rename from icons/48x48/Makefile.am
rename to data/icons/48x48/Makefile.am
diff --git a/icons/48x48/pitivi.png b/data/icons/48x48/pitivi.png
similarity index 100%
rename from icons/48x48/pitivi.png
rename to data/icons/48x48/pitivi.png
diff --git a/icons/48x48/pitivi.svg b/data/icons/48x48/pitivi.svg
similarity index 100%
rename from icons/48x48/pitivi.svg
rename to data/icons/48x48/pitivi.svg
diff --git a/icons/Makefile.am b/data/icons/Makefile.am
similarity index 100%
rename from icons/Makefile.am
rename to data/icons/Makefile.am
diff --git a/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
similarity index 100%
rename from icons/scalable/Makefile.am
rename to data/icons/scalable/Makefile.am
diff --git a/icons/scalable/pitivi.svg b/data/icons/scalable/pitivi.svg
similarity index 100%
rename from icons/scalable/pitivi.svg
rename to data/icons/scalable/pitivi.svg
diff --git a/pitivi.desktop.in.in b/data/pitivi.desktop.in.in
similarity index 100%
rename from pitivi.desktop.in.in
rename to data/pitivi.desktop.in.in
diff --git a/pitivi/pixmaps/.gitignore b/data/pixmaps/.gitignore
similarity index 100%
rename from pitivi/pixmaps/.gitignore
rename to data/pixmaps/.gitignore
diff --git a/pitivi/pixmaps/Makefile.am b/data/pixmaps/Makefile.am
similarity index 100%
rename from pitivi/pixmaps/Makefile.am
rename to data/pixmaps/Makefile.am
diff --git a/pitivi/pixmaps/agingtv.png b/data/pixmaps/agingtv.png
similarity index 100%
rename from pitivi/pixmaps/agingtv.png
rename to data/pixmaps/agingtv.png
diff --git a/pitivi/pixmaps/bulge.png b/data/pixmaps/bulge.png
similarity index 100%
rename from pitivi/pixmaps/bulge.png
rename to data/pixmaps/bulge.png
diff --git a/pitivi/pixmaps/burn.png b/data/pixmaps/burn.png
similarity index 100%
rename from pitivi/pixmaps/burn.png
rename to data/pixmaps/burn.png
diff --git a/pitivi/pixmaps/busy.gif b/data/pixmaps/busy.gif
similarity index 100%
rename from pitivi/pixmaps/busy.gif
rename to data/pixmaps/busy.gif
diff --git a/pitivi/pixmaps/chromium.png b/data/pixmaps/chromium.png
similarity index 100%
rename from pitivi/pixmaps/chromium.png
rename to data/pixmaps/chromium.png
diff --git a/pitivi/pixmaps/circle.png b/data/pixmaps/circle.png
similarity index 100%
rename from pitivi/pixmaps/circle.png
rename to data/pixmaps/circle.png
diff --git a/pitivi/pixmaps/cogdownsample.png b/data/pixmaps/cogdownsample.png
similarity index 100%
rename from pitivi/pixmaps/cogdownsample.png
rename to data/pixmaps/cogdownsample.png
diff --git a/pitivi/pixmaps/color-distance.png b/data/pixmaps/color-distance.png
similarity index 100%
rename from pitivi/pixmaps/color-distance.png
rename to data/pixmaps/color-distance.png
diff --git a/pitivi/pixmaps/coloreffects.png b/data/pixmaps/coloreffects.png
similarity index 100%
rename from pitivi/pixmaps/coloreffects.png
rename to data/pixmaps/coloreffects.png
diff --git a/pitivi/pixmaps/defaultthumbnail.svg b/data/pixmaps/defaultthumbnail.svg
similarity index 100%
rename from pitivi/pixmaps/defaultthumbnail.svg
rename to data/pixmaps/defaultthumbnail.svg
diff --git a/pitivi/pixmaps/dicetv.png b/data/pixmaps/dicetv.png
similarity index 100%
rename from pitivi/pixmaps/dicetv.png
rename to data/pixmaps/dicetv.png
diff --git a/pitivi/pixmaps/diffuse.png b/data/pixmaps/diffuse.png
similarity index 100%
rename from pitivi/pixmaps/diffuse.png
rename to data/pixmaps/diffuse.png
diff --git a/pitivi/pixmaps/dilate.png b/data/pixmaps/dilate.png
similarity index 100%
rename from pitivi/pixmaps/dilate.png
rename to data/pixmaps/dilate.png
diff --git a/pitivi/pixmaps/dodge.png b/data/pixmaps/dodge.png
similarity index 100%
rename from pitivi/pixmaps/dodge.png
rename to data/pixmaps/dodge.png
diff --git a/pitivi/pixmaps/edgetv.png b/data/pixmaps/edgetv.png
similarity index 100%
rename from pitivi/pixmaps/edgetv.png
rename to data/pixmaps/edgetv.png
diff --git a/pitivi/pixmaps/exclusion.png b/data/pixmaps/exclusion.png
similarity index 100%
rename from pitivi/pixmaps/exclusion.png
rename to data/pixmaps/exclusion.png
diff --git a/pitivi/pixmaps/fisheye.png b/data/pixmaps/fisheye.png
similarity index 100%
rename from pitivi/pixmaps/fisheye.png
rename to data/pixmaps/fisheye.png
diff --git a/pitivi/pixmaps/frei0r-filter-3dflippo.png b/data/pixmaps/frei0r-filter-3dflippo.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-3dflippo.png
rename to data/pixmaps/frei0r-filter-3dflippo.png
diff --git a/pitivi/pixmaps/frei0r-filter-brightness.png b/data/pixmaps/frei0r-filter-brightness.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-brightness.png
rename to data/pixmaps/frei0r-filter-brightness.png
diff --git a/pitivi/pixmaps/frei0r-filter-bw0r.png b/data/pixmaps/frei0r-filter-bw0r.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-bw0r.png
rename to data/pixmaps/frei0r-filter-bw0r.png
diff --git a/pitivi/pixmaps/frei0r-filter-cartoon.png b/data/pixmaps/frei0r-filter-cartoon.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-cartoon.png
rename to data/pixmaps/frei0r-filter-cartoon.png
diff --git a/pitivi/pixmaps/frei0r-filter-contrast0r.png b/data/pixmaps/frei0r-filter-contrast0r.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-contrast0r.png
rename to data/pixmaps/frei0r-filter-contrast0r.png
diff --git a/pitivi/pixmaps/frei0r-filter-distort0r.png b/data/pixmaps/frei0r-filter-distort0r.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-distort0r.png
rename to data/pixmaps/frei0r-filter-distort0r.png
diff --git a/pitivi/pixmaps/frei0r-filter-edgeglow.png b/data/pixmaps/frei0r-filter-edgeglow.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-edgeglow.png
rename to data/pixmaps/frei0r-filter-edgeglow.png
diff --git a/pitivi/pixmaps/frei0r-filter-equaliz0r.png b/data/pixmaps/frei0r-filter-equaliz0r.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-equaliz0r.png
rename to data/pixmaps/frei0r-filter-equaliz0r.png
diff --git a/pitivi/pixmaps/frei0r-filter-flippo.png b/data/pixmaps/frei0r-filter-flippo.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-flippo.png
rename to data/pixmaps/frei0r-filter-flippo.png
diff --git a/pitivi/pixmaps/frei0r-filter-gamma.png b/data/pixmaps/frei0r-filter-gamma.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-gamma.png
rename to data/pixmaps/frei0r-filter-gamma.png
diff --git a/pitivi/pixmaps/frei0r-filter-glow.png b/data/pixmaps/frei0r-filter-glow.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-glow.png
rename to data/pixmaps/frei0r-filter-glow.png
diff --git a/pitivi/pixmaps/frei0r-filter-hueshift0r.png b/data/pixmaps/frei0r-filter-hueshift0r.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-hueshift0r.png
rename to data/pixmaps/frei0r-filter-hueshift0r.png
diff --git a/pitivi/pixmaps/frei0r-filter-invert0r.png b/data/pixmaps/frei0r-filter-invert0r.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-invert0r.png
rename to data/pixmaps/frei0r-filter-invert0r.png
diff --git a/pitivi/pixmaps/frei0r-filter-k-means-clustering.png b/data/pixmaps/frei0r-filter-k-means-clustering.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-k-means-clustering.png
rename to data/pixmaps/frei0r-filter-k-means-clustering.png
diff --git a/pitivi/pixmaps/frei0r-filter-lens-correction.png b/data/pixmaps/frei0r-filter-lens-correction.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-lens-correction.png
rename to data/pixmaps/frei0r-filter-lens-correction.png
diff --git a/pitivi/pixmaps/frei0r-filter-letterb0xed.png b/data/pixmaps/frei0r-filter-letterb0xed.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-letterb0xed.png
rename to data/pixmaps/frei0r-filter-letterb0xed.png
diff --git a/pitivi/pixmaps/frei0r-filter-nosync0r.png b/data/pixmaps/frei0r-filter-nosync0r.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-nosync0r.png
rename to data/pixmaps/frei0r-filter-nosync0r.png
diff --git a/pitivi/pixmaps/frei0r-filter-perspective.png b/data/pixmaps/frei0r-filter-perspective.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-perspective.png
rename to data/pixmaps/frei0r-filter-perspective.png
diff --git a/pitivi/pixmaps/frei0r-filter-pixeliz0r.png b/data/pixmaps/frei0r-filter-pixeliz0r.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-pixeliz0r.png
rename to data/pixmaps/frei0r-filter-pixeliz0r.png
diff --git a/pitivi/pixmaps/frei0r-filter-rgb-parade.png b/data/pixmaps/frei0r-filter-rgb-parade.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-rgb-parade.png
rename to data/pixmaps/frei0r-filter-rgb-parade.png
diff --git a/pitivi/pixmaps/frei0r-filter-saturat0r.png b/data/pixmaps/frei0r-filter-saturat0r.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-saturat0r.png
rename to data/pixmaps/frei0r-filter-saturat0r.png
diff --git a/pitivi/pixmaps/frei0r-filter-scale0tilt.png b/data/pixmaps/frei0r-filter-scale0tilt.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-scale0tilt.png
rename to data/pixmaps/frei0r-filter-scale0tilt.png
diff --git a/pitivi/pixmaps/frei0r-filter-scanline0r.png b/data/pixmaps/frei0r-filter-scanline0r.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-scanline0r.png
rename to data/pixmaps/frei0r-filter-scanline0r.png
diff --git a/pitivi/pixmaps/frei0r-filter-sobel.png b/data/pixmaps/frei0r-filter-sobel.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-sobel.png
rename to data/pixmaps/frei0r-filter-sobel.png
diff --git a/pitivi/pixmaps/frei0r-filter-squareblur.png b/data/pixmaps/frei0r-filter-squareblur.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-squareblur.png
rename to data/pixmaps/frei0r-filter-squareblur.png
diff --git a/pitivi/pixmaps/frei0r-filter-tehroxx0r.png b/data/pixmaps/frei0r-filter-tehroxx0r.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-tehroxx0r.png
rename to data/pixmaps/frei0r-filter-tehroxx0r.png
diff --git a/pitivi/pixmaps/frei0r-filter-twolay0r.png b/data/pixmaps/frei0r-filter-twolay0r.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-twolay0r.png
rename to data/pixmaps/frei0r-filter-twolay0r.png
diff --git a/pitivi/pixmaps/frei0r-filter-vectorscope.png b/data/pixmaps/frei0r-filter-vectorscope.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-vectorscope.png
rename to data/pixmaps/frei0r-filter-vectorscope.png
diff --git a/pitivi/pixmaps/frei0r-filter-water.png b/data/pixmaps/frei0r-filter-water.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-water.png
rename to data/pixmaps/frei0r-filter-water.png
diff --git a/pitivi/pixmaps/frei0r-filter-white-balance.png b/data/pixmaps/frei0r-filter-white-balance.png
similarity index 100%
rename from pitivi/pixmaps/frei0r-filter-white-balance.png
rename to data/pixmaps/frei0r-filter-white-balance.png
diff --git a/pitivi/pixmaps/gamma-correction.png b/data/pixmaps/gamma-correction.png
similarity index 100%
rename from pitivi/pixmaps/gamma-correction.png
rename to data/pixmaps/gamma-correction.png
diff --git a/pitivi/pixmaps/gaussianblur.png b/data/pixmaps/gaussianblur.png
similarity index 100%
rename from pitivi/pixmaps/gaussianblur.png
rename to data/pixmaps/gaussianblur.png
diff --git a/pitivi/pixmaps/invisible.png b/data/pixmaps/invisible.png
similarity index 100%
rename from pitivi/pixmaps/invisible.png
rename to data/pixmaps/invisible.png
diff --git a/pitivi/pixmaps/kaleidoscope.png b/data/pixmaps/kaleidoscope.png
similarity index 100%
rename from pitivi/pixmaps/kaleidoscope.png
rename to data/pixmaps/kaleidoscope.png
diff --git a/pitivi/pixmaps/marble.png b/data/pixmaps/marble.png
similarity index 100%
rename from pitivi/pixmaps/marble.png
rename to data/pixmaps/marble.png
diff --git a/pitivi/pixmaps/mirror.png b/data/pixmaps/mirror.png
similarity index 100%
rename from pitivi/pixmaps/mirror.png
rename to data/pixmaps/mirror.png
diff --git a/pitivi/pixmaps/optv.png b/data/pixmaps/optv.png
similarity index 100%
rename from pitivi/pixmaps/optv.png
rename to data/pixmaps/optv.png
diff --git a/pitivi/pixmaps/pinch.png b/data/pixmaps/pinch.png
similarity index 100%
rename from pitivi/pixmaps/pinch.png
rename to data/pixmaps/pinch.png
diff --git a/pitivi/pixmaps/pitivi-advanced-16.png b/data/pixmaps/pitivi-advanced-16.png
similarity index 100%
rename from pitivi/pixmaps/pitivi-advanced-16.png
rename to data/pixmaps/pitivi-advanced-16.png
diff --git a/pitivi/pixmaps/pitivi-advanced-22.png b/data/pixmaps/pitivi-advanced-22.png
similarity index 100%
rename from pitivi/pixmaps/pitivi-advanced-22.png
rename to data/pixmaps/pitivi-advanced-22.png
diff --git a/pitivi/pixmaps/pitivi-advanced-24.png b/data/pixmaps/pitivi-advanced-24.png
similarity index 100%
rename from pitivi/pixmaps/pitivi-advanced-24.png
rename to data/pixmaps/pitivi-advanced-24.png
diff --git a/pitivi/pixmaps/pitivi-group-24.svg b/data/pixmaps/pitivi-group-24.svg
similarity index 100%
rename from pitivi/pixmaps/pitivi-group-24.svg
rename to data/pixmaps/pitivi-group-24.svg
diff --git a/pitivi/pixmaps/pitivi-group.svg b/data/pixmaps/pitivi-group.svg
similarity index 100%
rename from pitivi/pixmaps/pitivi-group.svg
rename to data/pixmaps/pitivi-group.svg
diff --git a/pitivi/pixmaps/pitivi-keyframe-24.svg b/data/pixmaps/pitivi-keyframe-24.svg
similarity index 100%
rename from pitivi/pixmaps/pitivi-keyframe-24.svg
rename to data/pixmaps/pitivi-keyframe-24.svg
diff --git a/pitivi/pixmaps/pitivi-keyframe.svg b/data/pixmaps/pitivi-keyframe.svg
similarity index 100%
rename from pitivi/pixmaps/pitivi-keyframe.svg
rename to data/pixmaps/pitivi-keyframe.svg
diff --git a/pitivi/pixmaps/pitivi-relink-24.svg b/data/pixmaps/pitivi-relink-24.svg
similarity index 100%
rename from pitivi/pixmaps/pitivi-relink-24.svg
rename to data/pixmaps/pitivi-relink-24.svg
diff --git a/pitivi/pixmaps/pitivi-relink.svg b/data/pixmaps/pitivi-relink.svg
similarity index 100%
rename from pitivi/pixmaps/pitivi-relink.svg
rename to data/pixmaps/pitivi-relink.svg
diff --git a/pitivi/pixmaps/pitivi-render-16.png b/data/pixmaps/pitivi-render-16.png
similarity index 100%
rename from pitivi/pixmaps/pitivi-render-16.png
rename to data/pixmaps/pitivi-render-16.png
diff --git a/pitivi/pixmaps/pitivi-render-22.png b/data/pixmaps/pitivi-render-22.png
similarity index 100%
rename from pitivi/pixmaps/pitivi-render-22.png
rename to data/pixmaps/pitivi-render-22.png
diff --git a/pitivi/pixmaps/pitivi-render-24.png b/data/pixmaps/pitivi-render-24.png
similarity index 100%
rename from pitivi/pixmaps/pitivi-render-24.png
rename to data/pixmaps/pitivi-render-24.png
diff --git a/pitivi/pixmaps/pitivi-sound.png b/data/pixmaps/pitivi-sound.png
similarity index 100%
rename from pitivi/pixmaps/pitivi-sound.png
rename to data/pixmaps/pitivi-sound.png
diff --git a/pitivi/pixmaps/pitivi-split-24.svg b/data/pixmaps/pitivi-split-24.svg
similarity index 100%
rename from pitivi/pixmaps/pitivi-split-24.svg
rename to data/pixmaps/pitivi-split-24.svg
diff --git a/pitivi/pixmaps/pitivi-split.svg b/data/pixmaps/pitivi-split.svg
similarity index 100%
rename from pitivi/pixmaps/pitivi-split.svg
rename to data/pixmaps/pitivi-split.svg
diff --git a/pitivi/pixmaps/pitivi-ungroup-24.svg b/data/pixmaps/pitivi-ungroup-24.svg
similarity index 100%
rename from pitivi/pixmaps/pitivi-ungroup-24.svg
rename to data/pixmaps/pitivi-ungroup-24.svg
diff --git a/pitivi/pixmaps/pitivi-ungroup.svg b/data/pixmaps/pitivi-ungroup.svg
similarity index 100%
rename from pitivi/pixmaps/pitivi-ungroup.svg
rename to data/pixmaps/pitivi-ungroup.svg
diff --git a/pitivi/pixmaps/pitivi-unlink-24.svg b/data/pixmaps/pitivi-unlink-24.svg
similarity index 100%
rename from pitivi/pixmaps/pitivi-unlink-24.svg
rename to data/pixmaps/pitivi-unlink-24.svg
diff --git a/pitivi/pixmaps/pitivi-unlink.svg b/data/pixmaps/pitivi-unlink.svg
similarity index 100%
rename from pitivi/pixmaps/pitivi-unlink.svg
rename to data/pixmaps/pitivi-unlink.svg
diff --git a/pitivi/pixmaps/pitivi-video.png b/data/pixmaps/pitivi-video.png
similarity index 100%
rename from pitivi/pixmaps/pitivi-video.png
rename to data/pixmaps/pitivi-video.png
diff --git a/pitivi/pixmaps/processing-clip.png b/data/pixmaps/processing-clip.png
similarity index 100%
rename from pitivi/pixmaps/processing-clip.png
rename to data/pixmaps/processing-clip.png
diff --git a/pitivi/pixmaps/processing-clip.svg b/data/pixmaps/processing-clip.svg
similarity index 100%
rename from pitivi/pixmaps/processing-clip.svg
rename to data/pixmaps/processing-clip.svg
diff --git a/pitivi/pixmaps/radioactv.png b/data/pixmaps/radioactv.png
similarity index 100%
rename from pitivi/pixmaps/radioactv.png
rename to data/pixmaps/radioactv.png
diff --git a/pitivi/pixmaps/revtv.png b/data/pixmaps/revtv.png
similarity index 100%
rename from pitivi/pixmaps/revtv.png
rename to data/pixmaps/revtv.png
diff --git a/pitivi/pixmaps/shagadelictv.png b/data/pixmaps/shagadelictv.png
similarity index 100%
rename from pitivi/pixmaps/shagadelictv.png
rename to data/pixmaps/shagadelictv.png
diff --git a/pitivi/pixmaps/solarize.png b/data/pixmaps/solarize.png
similarity index 100%
rename from pitivi/pixmaps/solarize.png
rename to data/pixmaps/solarize.png
diff --git a/pitivi/pixmaps/sphere.png b/data/pixmaps/sphere.png
similarity index 100%
rename from pitivi/pixmaps/sphere.png
rename to data/pixmaps/sphere.png
diff --git a/pitivi/pixmaps/square.png b/data/pixmaps/square.png
similarity index 100%
rename from pitivi/pixmaps/square.png
rename to data/pixmaps/square.png
diff --git a/pitivi/pixmaps/stretch.png b/data/pixmaps/stretch.png
similarity index 100%
rename from pitivi/pixmaps/stretch.png
rename to data/pixmaps/stretch.png
diff --git a/pitivi/pixmaps/threshold0r.png b/data/pixmaps/threshold0r.png
similarity index 100%
rename from pitivi/pixmaps/threshold0r.png
rename to data/pixmaps/threshold0r.png
diff --git a/pitivi/pixmaps/trimbar-focused.png b/data/pixmaps/trimbar-focused.png
similarity index 100%
rename from pitivi/pixmaps/trimbar-focused.png
rename to data/pixmaps/trimbar-focused.png
diff --git a/pitivi/pixmaps/trimbar-normal.png b/data/pixmaps/trimbar-normal.png
similarity index 100%
rename from pitivi/pixmaps/trimbar-normal.png
rename to data/pixmaps/trimbar-normal.png
diff --git a/pitivi/pixmaps/tunnel.png b/data/pixmaps/tunnel.png
similarity index 100%
rename from pitivi/pixmaps/tunnel.png
rename to data/pixmaps/tunnel.png
diff --git a/pitivi/pixmaps/twirl.png b/data/pixmaps/twirl.png
similarity index 100%
rename from pitivi/pixmaps/twirl.png
rename to data/pixmaps/twirl.png
diff --git a/pitivi/pixmaps/vertigotv.png b/data/pixmaps/vertigotv.png
similarity index 100%
rename from pitivi/pixmaps/vertigotv.png
rename to data/pixmaps/vertigotv.png
diff --git a/pitivi/pixmaps/videobalance.png b/data/pixmaps/videobalance.png
similarity index 100%
rename from pitivi/pixmaps/videobalance.png
rename to data/pixmaps/videobalance.png
diff --git a/pitivi/pixmaps/videobox.png b/data/pixmaps/videobox.png
similarity index 100%
rename from pitivi/pixmaps/videobox.png
rename to data/pixmaps/videobox.png
diff --git a/pitivi/pixmaps/videocrop.png b/data/pixmaps/videocrop.png
similarity index 100%
rename from pitivi/pixmaps/videocrop.png
rename to data/pixmaps/videocrop.png
diff --git a/pitivi/pixmaps/warptv.png b/data/pixmaps/warptv.png
similarity index 100%
rename from pitivi/pixmaps/warptv.png
rename to data/pixmaps/warptv.png
diff --git a/pitivi/pixmaps/waterripple.png b/data/pixmaps/waterripple.png
similarity index 100%
rename from pitivi/pixmaps/waterripple.png
rename to data/pixmaps/waterripple.png
diff --git a/pitivi/Makefile.am b/pitivi/Makefile.am
index 9144bae..321cc14 100644
--- a/pitivi/Makefile.am
+++ b/pitivi/Makefile.am
@@ -3,7 +3,6 @@ SUBDIRS = \
 	elements 	\
 	factories	\
 	formatters	\
-	pixmaps		\
 	timeline	\
 	log
 
diff --git a/pitivi/configure.py.in b/pitivi/configure.py.in
index e50b850..b39998c 100644
--- a/pitivi/configure.py.in
+++ b/pitivi/configure.py.in
@@ -27,7 +27,6 @@ import os.path
 
 LIBDIR = '@LIBDIR@'
 PKGDATADIR = '@DATADIR@/@PACKAGE@'
-PIXMAPDIR = '@DATADIR@/pixmaps'
 pitivi_version = '@VERSION@'
 APPNAME = '@PACKAGE_NAME@'
 APPURL = 'http://www.pitivi.org/'
@@ -45,22 +44,20 @@ def _in_devel():
     rd = _get_root_dir()
     return os.path.exists(os.path.join(rd, '.git'))
 
-def get_pixmap_dir():
-    """ Returns the directory for program-only pixmaps """
-    _dir = os.path.dirname(os.path.abspath(__file__))
+def get_data_dir():
     if _in_devel():
-        root = _dir
+        datadir = os.path.join(_get_root_dir(), "data")
     elif os.getenv("PITIVI_TOP_LEVEL_DIR"):
         top_level = os.getenv("PITIVI_TOP_LEVEL_DIR")
-        root = os.path.abspath(os.path.join(top_level, "pitivi"))
+        datadir = os.path.join(top_level, "data")
     else:
-        root = PKGDATADIR
-    return os.path.join(root, 'pixmaps')
+        datadir = PKGDATADIR
+    return os.path.abspath(datadir)
 
-def get_global_pixmap_dir():
-    """ Returns the directory for global pixmaps (ex : application icon) """
-    if _in_devel():
-        root = _get_root_dir()
-    else:
-        root = PIXMAPDIR
-    return root
+def get_pixmap_dir():
+    """ Returns the directory for program-only pixmaps """
+    return os.path.join(get_data_dir(), 'pixmaps')
+
+def get_ui_dir():
+    """ Returns the directory for GtkBuilder/Glade files """
+    return os.path.join(get_data_dir(), 'ui')
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 34ff262..5760265 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,7 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 # [encoding: UTF-8]
+data/pitivi.desktop.in.in
 pitivi/application.py
 pitivi/check.py
 pitivi.desktop.in.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]