GNOME.org
 

[pitivi] Add New effects images from nekohayo (and optimizations)

commit 097d1820088a7b521940f27ac355076c382fda9b
Author: Thibault Saunier <tsaunier gnome org>
Date:   Wed Aug 25 23:43:00 2010 +0200

    Add New effects images from nekohayo (and optimizations)

 pitivi/effects.py                                  |    7 +--
 pitivi/pixmaps/Makefile.am                         |   66 +++++++++++++++++++-
 pitivi/pixmaps/agingtv.png                         |  Bin 0 -> 13454 bytes
 pitivi/pixmaps/bulge.png                           |  Bin 0 -> 13136 bytes
 pitivi/pixmaps/burn.png                            |  Bin 0 -> 12215 bytes
 pitivi/pixmaps/chromium.png                        |  Bin 0 -> 13114 bytes
 pitivi/pixmaps/circle.png                          |  Bin 0 -> 10926 bytes
 pitivi/pixmaps/cogdownsample.png                   |  Bin 0 -> 12457 bytes
 pitivi/pixmaps/color-distance.png                  |  Bin 0 -> 8698 bytes
 pitivi/pixmaps/coloreffects.png                    |  Bin 0 -> 12939 bytes
 pitivi/pixmaps/dicetv.png                          |  Bin 0 -> 14380 bytes
 pitivi/pixmaps/diffuse.png                         |  Bin 0 -> 12401 bytes
 pitivi/pixmaps/dilate.png                          |  Bin 0 -> 12934 bytes
 pitivi/pixmaps/dodge.png                           |  Bin 0 -> 12536 bytes
 pitivi/pixmaps/edgetv.png                          |  Bin 0 -> 11143 bytes
 pitivi/pixmaps/exclusion.png                       |  Bin 0 -> 11209 bytes
 pitivi/pixmaps/fisheye.png                         |  Bin 0 -> 14018 bytes
 pitivi/pixmaps/frei0r-filter-3dflippo.png          |  Bin 0 -> 10993 bytes
 pitivi/pixmaps/frei0r-filter-brightness.png        |  Bin 0 -> 12217 bytes
 pitivi/pixmaps/frei0r-filter-bw0r.png              |  Bin 0 -> 5236 bytes
 pitivi/pixmaps/frei0r-filter-cartoon.png           |  Bin 0 -> 11763 bytes
 pitivi/pixmaps/frei0r-filter-contrast0r.png        |  Bin 0 -> 12262 bytes
 pitivi/pixmaps/frei0r-filter-distort0r.png         |  Bin 0 -> 11556 bytes
 pitivi/pixmaps/frei0r-filter-edgeglow.png          |  Bin 0 -> 13674 bytes
 pitivi/pixmaps/frei0r-filter-equaliz0r.png         |  Bin 0 -> 13771 bytes
 pitivi/pixmaps/frei0r-filter-flippo.png            |  Bin 0 -> 12652 bytes
 pitivi/pixmaps/frei0r-filter-gamma.png             |  Bin 0 -> 13339 bytes
 pitivi/pixmaps/frei0r-filter-glow.png              |  Bin 0 -> 11912 bytes
 pitivi/pixmaps/frei0r-filter-hueshift0r.png        |  Bin 0 -> 12848 bytes
 pitivi/pixmaps/frei0r-filter-invert0r.png          |  Bin 0 -> 12957 bytes
 .../pixmaps/frei0r-filter-k-means-clustering.png   |  Bin 0 -> 10424 bytes
 pitivi/pixmaps/frei0r-filter-lens-correction.png   |  Bin 0 -> 11046 bytes
 pitivi/pixmaps/frei0r-filter-letterb0xed.png       |  Bin 0 -> 9144 bytes
 pitivi/pixmaps/frei0r-filter-nosync0r.png          |  Bin 0 -> 12706 bytes
 pitivi/pixmaps/frei0r-filter-perspective.png       |  Bin 0 -> 12110 bytes
 pitivi/pixmaps/frei0r-filter-pixeliz0r.png         |  Bin 0 -> 7383 bytes
 pitivi/pixmaps/frei0r-filter-rgb-parade.png        |  Bin 0 -> 7161 bytes
 pitivi/pixmaps/frei0r-filter-saturat0r.png         |  Bin 0 -> 13759 bytes
 pitivi/pixmaps/frei0r-filter-scale0tilt.png        |  Bin 0 -> 12839 bytes
 pitivi/pixmaps/frei0r-filter-scanline0r.png        |  Bin 0 -> 8324 bytes
 pitivi/pixmaps/frei0r-filter-sobel.png             |  Bin 0 -> 16591 bytes
 pitivi/pixmaps/frei0r-filter-squareblur.png        |  Bin 0 -> 9322 bytes
 pitivi/pixmaps/frei0r-filter-tehroxx0r.png         |  Bin 0 -> 8403 bytes
 pitivi/pixmaps/frei0r-filter-twolay0r.png          |  Bin 0 -> 2671 bytes
 pitivi/pixmaps/frei0r-filter-vectorscope.png       |  Bin 0 -> 5903 bytes
 pitivi/pixmaps/frei0r-filter-water.png             |  Bin 0 -> 12920 bytes
 pitivi/pixmaps/frei0r-filter-white-balance.png     |  Bin 0 -> 12759 bytes
 pitivi/pixmaps/gamma-correction.png                |  Bin 0 -> 13635 bytes
 pitivi/pixmaps/gaussianblur.png                    |  Bin 0 -> 12433 bytes
 pitivi/pixmaps/kaleidoscope.png                    |  Bin 0 -> 14648 bytes
 pitivi/pixmaps/marble.png                          |  Bin 0 -> 12929 bytes
 pitivi/pixmaps/mirror.png                          |  Bin 0 -> 13678 bytes
 pitivi/pixmaps/optv.png                            |  Bin 0 -> 7022 bytes
 pitivi/pixmaps/pinch.png                           |  Bin 0 -> 12713 bytes
 pitivi/pixmaps/radioactv.png                       |  Bin 0 -> 14529 bytes
 pitivi/pixmaps/revtv.png                           |  Bin 0 -> 4679 bytes
 pitivi/pixmaps/shagadelictv.png                    |  Bin 0 -> 12272 bytes
 pitivi/pixmaps/solarize.png                        |  Bin 0 -> 16203 bytes
 pitivi/pixmaps/sphere.png                          |  Bin 0 -> 12965 bytes
 pitivi/pixmaps/square.png                          |  Bin 0 -> 12487 bytes
 pitivi/pixmaps/stretch.png                         |  Bin 0 -> 12846 bytes
 pitivi/pixmaps/threshold0r.png                     |  Bin 0 -> 10938 bytes
 pitivi/pixmaps/tunnel.png                          |  Bin 0 -> 12547 bytes
 pitivi/pixmaps/twirl.png                           |  Bin 0 -> 13961 bytes
 pitivi/pixmaps/vertigotv.png                       |  Bin 0 -> 11030 bytes
 pitivi/pixmaps/videobalance.png                    |  Bin 0 -> 12903 bytes
 pitivi/pixmaps/videobox.png                        |  Bin 0 -> 13495 bytes
 pitivi/pixmaps/videocrop.png                       |  Bin 0 -> 11430 bytes
 pitivi/pixmaps/warptv.png                          |  Bin 0 -> 12781 bytes
 pitivi/pixmaps/waterripple.png                     |  Bin 0 -> 13874 bytes
 pitivi/ui/effectlist.py                            |   34 +++++++----
 71 files changed, 89 insertions(+), 18 deletions(-)
---
diff --git a/pitivi/effects.py b/pitivi/effects.py
index e5bc055..6a04d3a 100644
--- a/pitivi/effects.py
+++ b/pitivi/effects.py
@@ -133,8 +133,7 @@ class EffectsHandler(object):
                 effect = EffectFactory(name, name,
                                    self._getEffectCategories(name),
                                    self._getEffectName(element_factory),
-                                   self._getEffectDescripton(element_factory),
-                                   self._getEffectIcon(name))
+                                   self._getEffectDescripton(element_factory))
                 added = self.addStreams(element_factory, effect)
 
                 if added is True:
@@ -286,9 +285,7 @@ class EffectsHandler(object):
         effects_categories = []
         return effects_categories.extended(self.video_categories).extended(self.audio_categories)
 
-    def _getEffectIcon(self, effect_name):
-        #TODO, create icons for effects
-        #Shouldn't we use pyxdg to make things cleaner and more optimized?
+    def getEffectIcon(self, effect_name):
         icontheme = gtk.icon_theme_get_default()
         pixdir = get_pixmap_dir()
         icon = None
diff --git a/pitivi/pixmaps/Makefile.am b/pitivi/pixmaps/Makefile.am
index 59643fc..8750f2e 100644
--- a/pitivi/pixmaps/Makefile.am
+++ b/pitivi/pixmaps/Makefile.am
@@ -25,7 +25,71 @@ pixmap_DATA = \
 	processing-clip.png	\
 	processing-clip.svg	\
 	trimbar-focused.png	\
-	trimbar-normal.png
+	trimbar-normal.png \
+    agingtv.png \
+    bulge.png \
+    burn.png \
+    chromium.png \
+    circle.png \
+    cogdownsample.png \
+    color-distance.png \
+    coloreffects.png \
+    dicetv.png \
+    diffuse.png \
+    dilate.png \
+    dodge.png \
+    edgetv.png \
+    exclusion.png \
+    fisheye.png \
+    frei0r-filter-3dflippo.png \
+    frei0r-filter-brightness.png \
+    frei0r-filter-bw0r.png \
+    frei0r-filter-cartoon.png \
+    frei0r-filter-contrast0r.png \
+    frei0r-filter-distort0r.png \
+    frei0r-filter-edgeglow.png \
+    frei0r-filter-equaliz0r.png \
+    frei0r-filter-flippo.png \
+    frei0r-filter-gamma.png \
+    frei0r-filter-glow.png \
+    frei0r-filter-hueshift0r.png \
+    frei0r-filter-invert0r.png \
+    frei0r-filter-k-means-clustering.png \
+    frei0r-filter-lens-correction.png \
+    frei0r-filter-letterb0xed.png \
+    frei0r-filter-nosync0r.png \
+    frei0r-filter-perspective.png \
+    frei0r-filter-pixeliz0r.png \
+    frei0r-filter-rgb-parade.png \
+    frei0r-filter-saturat0r.png \
+    frei0r-filter-scale0tilt.png \
+    frei0r-filter-scanline0r.png \
+    frei0r-filter-sobel.png \
+    frei0r-filter-squareblur.png \
+    frei0r-filter-tehroxx0r.png \
+    frei0r-filter-twolay0r.png \
+    frei0r-filter-vectorscope.png \
+    frei0r-filter-water.png \
+    frei0r-filter-white-balance.png \
+    gamma-correction.png \
+    gaussianblur.png \
+    invisible.png \
+    kaleidoscope.png \
+    marble.png \
+    mirror.png \
+    optv.png \
+    pinch.png \
+    radioactv.png \
+    revtv.png \
+    shagadelictv.png \
+    solarize.png \
+    sphere.png \
+    square.png \
+    stretch.png \
+    threshold0r.png \
+    tunnel.png \
+    twirl.png
+
 
 EXTRA_DIST = \
 	$(pixmap_DATA)
diff --git a/pitivi/pixmaps/agingtv.png b/pitivi/pixmaps/agingtv.png
new file mode 100644
index 0000000..33b1a03
Binary files /dev/null and b/pitivi/pixmaps/agingtv.png differ
diff --git a/pitivi/pixmaps/bulge.png b/pitivi/pixmaps/bulge.png
new file mode 100644
index 0000000..3d96c46
Binary files /dev/null and b/pitivi/pixmaps/bulge.png differ
diff --git a/pitivi/pixmaps/burn.png b/pitivi/pixmaps/burn.png
new file mode 100644
index 0000000..8ffafde
Binary files /dev/null and b/pitivi/pixmaps/burn.png differ
diff --git a/pitivi/pixmaps/chromium.png b/pitivi/pixmaps/chromium.png
new file mode 100644
index 0000000..3445678
Binary files /dev/null and b/pitivi/pixmaps/chromium.png differ
diff --git a/pitivi/pixmaps/circle.png b/pitivi/pixmaps/circle.png
new file mode 100644
index 0000000..8a14fe9
Binary files /dev/null and b/pitivi/pixmaps/circle.png differ
diff --git a/pitivi/pixmaps/cogdownsample.png b/pitivi/pixmaps/cogdownsample.png
new file mode 100644
index 0000000..ff072bd
Binary files /dev/null and b/pitivi/pixmaps/cogdownsample.png differ
diff --git a/pitivi/pixmaps/color-distance.png b/pitivi/pixmaps/color-distance.png
new file mode 100644
index 0000000..a6efe6d
Binary files /dev/null and b/pitivi/pixmaps/color-distance.png differ
diff --git a/pitivi/pixmaps/coloreffects.png b/pitivi/pixmaps/coloreffects.png
new file mode 100644
index 0000000..584d26a
Binary files /dev/null and b/pitivi/pixmaps/coloreffects.png differ
diff --git a/pitivi/pixmaps/dicetv.png b/pitivi/pixmaps/dicetv.png
new file mode 100644
index 0000000..db491b7
Binary files /dev/null and b/pitivi/pixmaps/dicetv.png differ
diff --git a/pitivi/pixmaps/diffuse.png b/pitivi/pixmaps/diffuse.png
new file mode 100644
index 0000000..4481c63
Binary files /dev/null and b/pitivi/pixmaps/diffuse.png differ
diff --git a/pitivi/pixmaps/dilate.png b/pitivi/pixmaps/dilate.png
new file mode 100644
index 0000000..81bcd0a
Binary files /dev/null and b/pitivi/pixmaps/dilate.png differ
diff --git a/pitivi/pixmaps/dodge.png b/pitivi/pixmaps/dodge.png
new file mode 100644
index 0000000..ffefc64
Binary files /dev/null and b/pitivi/pixmaps/dodge.png differ
diff --git a/pitivi/pixmaps/edgetv.png b/pitivi/pixmaps/edgetv.png
new file mode 100644
index 0000000..bf6ed4b
Binary files /dev/null and b/pitivi/pixmaps/edgetv.png differ
diff --git a/pitivi/pixmaps/exclusion.png b/pitivi/pixmaps/exclusion.png
new file mode 100644
index 0000000..feef5ff
Binary files /dev/null and b/pitivi/pixmaps/exclusion.png differ
diff --git a/pitivi/pixmaps/fisheye.png b/pitivi/pixmaps/fisheye.png
new file mode 100644
index 0000000..0f27a87
Binary files /dev/null and b/pitivi/pixmaps/fisheye.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-3dflippo.png b/pitivi/pixmaps/frei0r-filter-3dflippo.png
new file mode 100644
index 0000000..d1eef03
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-3dflippo.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-brightness.png b/pitivi/pixmaps/frei0r-filter-brightness.png
new file mode 100644
index 0000000..db97518
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-brightness.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-bw0r.png b/pitivi/pixmaps/frei0r-filter-bw0r.png
new file mode 100644
index 0000000..165dfaa
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-bw0r.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-cartoon.png b/pitivi/pixmaps/frei0r-filter-cartoon.png
new file mode 100644
index 0000000..24ed11d
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-cartoon.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-contrast0r.png b/pitivi/pixmaps/frei0r-filter-contrast0r.png
new file mode 100644
index 0000000..ca4c2c4
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-contrast0r.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-distort0r.png b/pitivi/pixmaps/frei0r-filter-distort0r.png
new file mode 100644
index 0000000..389ccf8
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-distort0r.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-edgeglow.png b/pitivi/pixmaps/frei0r-filter-edgeglow.png
new file mode 100644
index 0000000..f34941c
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-edgeglow.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-equaliz0r.png b/pitivi/pixmaps/frei0r-filter-equaliz0r.png
new file mode 100644
index 0000000..d0f36df
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-equaliz0r.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-flippo.png b/pitivi/pixmaps/frei0r-filter-flippo.png
new file mode 100644
index 0000000..6c37744
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-flippo.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-gamma.png b/pitivi/pixmaps/frei0r-filter-gamma.png
new file mode 100644
index 0000000..7ecaa4f
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-gamma.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-glow.png b/pitivi/pixmaps/frei0r-filter-glow.png
new file mode 100644
index 0000000..e255ddd
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-glow.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-hueshift0r.png b/pitivi/pixmaps/frei0r-filter-hueshift0r.png
new file mode 100644
index 0000000..fbe5340
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-hueshift0r.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-invert0r.png b/pitivi/pixmaps/frei0r-filter-invert0r.png
new file mode 100644
index 0000000..62af91c
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-invert0r.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-k-means-clustering.png b/pitivi/pixmaps/frei0r-filter-k-means-clustering.png
new file mode 100644
index 0000000..fec339b
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-k-means-clustering.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-lens-correction.png b/pitivi/pixmaps/frei0r-filter-lens-correction.png
new file mode 100644
index 0000000..427c321
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-lens-correction.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-letterb0xed.png b/pitivi/pixmaps/frei0r-filter-letterb0xed.png
new file mode 100644
index 0000000..431ca02
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-letterb0xed.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-nosync0r.png b/pitivi/pixmaps/frei0r-filter-nosync0r.png
new file mode 100644
index 0000000..5e41907
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-nosync0r.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-perspective.png b/pitivi/pixmaps/frei0r-filter-perspective.png
new file mode 100644
index 0000000..5970dfd
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-perspective.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-pixeliz0r.png b/pitivi/pixmaps/frei0r-filter-pixeliz0r.png
new file mode 100644
index 0000000..99a04d6
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-pixeliz0r.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-rgb-parade.png b/pitivi/pixmaps/frei0r-filter-rgb-parade.png
new file mode 100644
index 0000000..acb0581
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-rgb-parade.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-saturat0r.png b/pitivi/pixmaps/frei0r-filter-saturat0r.png
new file mode 100644
index 0000000..63a3740
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-saturat0r.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-scale0tilt.png b/pitivi/pixmaps/frei0r-filter-scale0tilt.png
new file mode 100644
index 0000000..0f70b3a
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-scale0tilt.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-scanline0r.png b/pitivi/pixmaps/frei0r-filter-scanline0r.png
new file mode 100644
index 0000000..35d2ebf
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-scanline0r.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-sobel.png b/pitivi/pixmaps/frei0r-filter-sobel.png
new file mode 100644
index 0000000..a9a393c
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-sobel.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-squareblur.png b/pitivi/pixmaps/frei0r-filter-squareblur.png
new file mode 100644
index 0000000..d1d03d2
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-squareblur.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-tehroxx0r.png b/pitivi/pixmaps/frei0r-filter-tehroxx0r.png
new file mode 100644
index 0000000..108575d
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-tehroxx0r.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-twolay0r.png b/pitivi/pixmaps/frei0r-filter-twolay0r.png
new file mode 100644
index 0000000..5add7b9
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-twolay0r.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-vectorscope.png b/pitivi/pixmaps/frei0r-filter-vectorscope.png
new file mode 100644
index 0000000..a43cf04
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-vectorscope.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-water.png b/pitivi/pixmaps/frei0r-filter-water.png
new file mode 100644
index 0000000..bc0e628
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-water.png differ
diff --git a/pitivi/pixmaps/frei0r-filter-white-balance.png b/pitivi/pixmaps/frei0r-filter-white-balance.png
new file mode 100644
index 0000000..9c3a90c
Binary files /dev/null and b/pitivi/pixmaps/frei0r-filter-white-balance.png differ
diff --git a/pitivi/pixmaps/gamma-correction.png b/pitivi/pixmaps/gamma-correction.png
new file mode 100644
index 0000000..2230d8f
Binary files /dev/null and b/pitivi/pixmaps/gamma-correction.png differ
diff --git a/pitivi/pixmaps/gaussianblur.png b/pitivi/pixmaps/gaussianblur.png
new file mode 100644
index 0000000..757e03b
Binary files /dev/null and b/pitivi/pixmaps/gaussianblur.png differ
diff --git a/pitivi/pixmaps/kaleidoscope.png b/pitivi/pixmaps/kaleidoscope.png
new file mode 100644
index 0000000..f7fde6c
Binary files /dev/null and b/pitivi/pixmaps/kaleidoscope.png differ
diff --git a/pitivi/pixmaps/marble.png b/pitivi/pixmaps/marble.png
new file mode 100644
index 0000000..47d372e
Binary files /dev/null and b/pitivi/pixmaps/marble.png differ
diff --git a/pitivi/pixmaps/mirror.png b/pitivi/pixmaps/mirror.png
new file mode 100644
index 0000000..5cfeead
Binary files /dev/null and b/pitivi/pixmaps/mirror.png differ
diff --git a/pitivi/pixmaps/optv.png b/pitivi/pixmaps/optv.png
new file mode 100644
index 0000000..ae7ba76
Binary files /dev/null and b/pitivi/pixmaps/optv.png differ
diff --git a/pitivi/pixmaps/pinch.png b/pitivi/pixmaps/pinch.png
new file mode 100644
index 0000000..c538efe
Binary files /dev/null and b/pitivi/pixmaps/pinch.png differ
diff --git a/pitivi/pixmaps/radioactv.png b/pitivi/pixmaps/radioactv.png
new file mode 100644
index 0000000..cce8b06
Binary files /dev/null and b/pitivi/pixmaps/radioactv.png differ
diff --git a/pitivi/pixmaps/revtv.png b/pitivi/pixmaps/revtv.png
new file mode 100644
index 0000000..342ce0a
Binary files /dev/null and b/pitivi/pixmaps/revtv.png differ
diff --git a/pitivi/pixmaps/shagadelictv.png b/pitivi/pixmaps/shagadelictv.png
new file mode 100644
index 0000000..326d74d
Binary files /dev/null and b/pitivi/pixmaps/shagadelictv.png differ
diff --git a/pitivi/pixmaps/solarize.png b/pitivi/pixmaps/solarize.png
new file mode 100644
index 0000000..51bf56b
Binary files /dev/null and b/pitivi/pixmaps/solarize.png differ
diff --git a/pitivi/pixmaps/sphere.png b/pitivi/pixmaps/sphere.png
new file mode 100644
index 0000000..07003bd
Binary files /dev/null and b/pitivi/pixmaps/sphere.png differ
diff --git a/pitivi/pixmaps/square.png b/pitivi/pixmaps/square.png
new file mode 100644
index 0000000..d09382e
Binary files /dev/null and b/pitivi/pixmaps/square.png differ
diff --git a/pitivi/pixmaps/stretch.png b/pitivi/pixmaps/stretch.png
new file mode 100644
index 0000000..49c8149
Binary files /dev/null and b/pitivi/pixmaps/stretch.png differ
diff --git a/pitivi/pixmaps/threshold0r.png b/pitivi/pixmaps/threshold0r.png
new file mode 100644
index 0000000..55047ed
Binary files /dev/null and b/pitivi/pixmaps/threshold0r.png differ
diff --git a/pitivi/pixmaps/tunnel.png b/pitivi/pixmaps/tunnel.png
new file mode 100644
index 0000000..3589f3a
Binary files /dev/null and b/pitivi/pixmaps/tunnel.png differ
diff --git a/pitivi/pixmaps/twirl.png b/pitivi/pixmaps/twirl.png
new file mode 100644
index 0000000..0ae3098
Binary files /dev/null and b/pitivi/pixmaps/twirl.png differ
diff --git a/pitivi/pixmaps/vertigotv.png b/pitivi/pixmaps/vertigotv.png
new file mode 100644
index 0000000..f481585
Binary files /dev/null and b/pitivi/pixmaps/vertigotv.png differ
diff --git a/pitivi/pixmaps/videobalance.png b/pitivi/pixmaps/videobalance.png
new file mode 100644
index 0000000..0d793bd
Binary files /dev/null and b/pitivi/pixmaps/videobalance.png differ
diff --git a/pitivi/pixmaps/videobox.png b/pitivi/pixmaps/videobox.png
new file mode 100644
index 0000000..66432b7
Binary files /dev/null and b/pitivi/pixmaps/videobox.png differ
diff --git a/pitivi/pixmaps/videocrop.png b/pitivi/pixmaps/videocrop.png
new file mode 100644
index 0000000..97e4244
Binary files /dev/null and b/pitivi/pixmaps/videocrop.png differ
diff --git a/pitivi/pixmaps/warptv.png b/pitivi/pixmaps/warptv.png
new file mode 100644
index 0000000..caf70c4
Binary files /dev/null and b/pitivi/pixmaps/warptv.png differ
diff --git a/pitivi/pixmaps/waterripple.png b/pitivi/pixmaps/waterripple.png
new file mode 100644
index 0000000..2e3457f
Binary files /dev/null and b/pitivi/pixmaps/waterripple.png differ
diff --git a/pitivi/ui/effectlist.py b/pitivi/ui/effectlist.py
index 01c2370..1371d33 100644
--- a/pitivi/ui/effectlist.py
+++ b/pitivi/ui/effectlist.py
@@ -34,13 +34,12 @@ from pitivi.log.loggable import Loggable
 from pitivi.effects import AUDIO_EFFECT, VIDEO_EFFECT
 from pitivi.ui.common import SPACING, PADDING
 
-(COL_ICON,
- COL_NAME_TEXT,
+(COL_NAME_TEXT,
  COL_DESC_TEXT,
  COL_EFFECT_TYPE,
  COL_EFFECT_CATEGORIES,
  COL_FACTORY,
- COL_ELEMENT_NAME) = range(7)
+ COL_ELEMENT_NAME) = range(6)
 
 INVISIBLE = gtk.gdk.pixbuf_new_from_file(os.path.join(get_pixmap_dir(),
     "invisible.png"))
@@ -62,6 +61,10 @@ class EffectList(gtk.VBox, Loggable):
         self._dragX = 0
         self._dragY = 0
 
+        #Tooltip handling
+        self._current_effect_name = None
+        self._current_tooltip_icon = None
+
         self.set_spacing(SPACING)
 
         #Searchbox and combobox
@@ -87,8 +90,7 @@ class EffectList(gtk.VBox, Loggable):
         Hsearch.pack_end(self.searchEntry, expand=True)
 
         # Store
-        # icon, icon, infotext, objectfactory
-        self.storemodel = gtk.ListStore(gtk.gdk.Pixbuf, str, str, int, object, object, str)
+        self.storemodel = gtk.ListStore(str, str, int, object, object, str)
 
         # Scrolled Windows
         self.treeview_scrollwin = gtk.ScrolledWindow()
@@ -165,10 +167,11 @@ class EffectList(gtk.VBox, Loggable):
 
     def _addFactories(self, elements, effectType):
         for element in elements:
-            effect = self.app.effects.getFactoryFromName(element.get_name())
-            self.storemodel.append ([effect.icon, effect.getHumanName(),\
-                                    effect.getDescription(), effectType, effect.getCategories(),\
-                                    effect, element.get_name()])
+            name =element.get_name()
+            effect = self.app.effects.getFactoryFromName(name)
+            self.storemodel.append([ effect.getHumanName(),
+                                     effect.getDescription(), effectType, effect.getCategories(),\
+                                     effect, element.get_name()])
 
             self.storemodel.set_sort_column_id(COL_NAME_TEXT, gtk.SORT_ASCENDING)
 
@@ -193,8 +196,9 @@ class EffectList(gtk.VBox, Loggable):
             context.drag_abort(int(time.time()))
         else:
             row = self.storemodel[path[0]]
-            if row[COL_ICON]:
-                context.set_icon_pixbuf(row[COL_ICON], 0, 0)
+            #FIXME
+            #if row[COL_ICON]:
+                #context.set_icon_pixbuf(row[COL_ICON], 0, 0)
 
     def _rowUnderMouseSelected(self, view, event):
         result = view.get_path_at_pos(int(event.x), int(event.y))
@@ -274,7 +278,13 @@ class EffectList(gtk.VBox, Loggable):
             return False
 
         treeview.set_tooltip_row (tooltip, context[1][0])
-        tooltip.set_icon(self.modelFilter.get_value(context[2], COL_ICON))
+        name = self.modelFilter.get_value(context[2], COL_ELEMENT_NAME)
+        if self._current_effect_name != name: 
+            self._current_effect_name = name
+            icon = self.app.effects.getEffectIcon(name)
+            self._current_tooltip_icon = icon
+
+        tooltip.set_icon(self._current_tooltip_icon)
         tooltip.set_text(self.modelFilter.get_value(context[2], COL_DESC_TEXT))
 
         return True
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]