added icons to theme colorflood and Conky

diff --git a/applet/data/Makefile.am b/applet/data/Makefile.am
index 47ebcbe..e7fd8a7 100644 (file)
--- a/applet/data/Makefile.am
+++ b/applet/data/Makefile.am
@@ -37,6 +37,12 @@ videotheme_DATA = theme/Video/*
 xsnowthemedir = $(datadir)/livewp/theme/Xsnow
 xsnowtheme_DATA = theme/Xsnow/* 
 
+colorfloodthemedir = $(datadir)/livewp/theme/Colorflood
+colorfloodtheme_DATA = theme/Colorflood/* 
+
+conkythemedir = $(datadir)/livewp/theme/Conky
+conkytheme_DATA = theme/Conky/* 
+
 externalthemedir = $(datadir)/livewp/external_themes
 externaltheme_DATA = external_themes/* 
 
@@ -74,6 +80,8 @@ EXTRA_DIST = $(berlintheme_DATA) \
             $(acceltheme_DATA) \
             $(videotheme_DATA) \
             $(xshowtheme_DATA) \
+            $(conkytheme_DATA) \
+            $(colorfloodtheme_DATA) \
             $(externaltheme_DATA) \
             $(dbus_service_DATA)
 

diff --git a/applet/data/external_themes/colorflood.xml b/applet/data/external_themes/colorflood.xml
index 59b30f7..df71946 100644 (file)
--- a/applet/data/external_themes/colorflood.xml
+++ b/applet/data/external_themes/colorflood.xml
@@ -3,6 +3,6 @@
  <exec_path>/usr/bin/colorflood --livewallpaper</exec_path>
  <window_name>colorflood</window_name>
  <category>Unknown</category>
- <icon_on>/usr/share/livewp/external_icons/xscreensaver.png</icon_on>
+ <icon_on>/usr/share/livewp/theme/Colorflood/icon.png</icon_on>
  <icon_off>/usr/share/livewp/external_icons/xscreensaverd.png</icon_off>
 </theme>

diff --git a/applet/data/external_themes/conky.xml b/applet/data/external_themes/conky.xml
index f3606ea..dce4b76 100644 (file)
--- a/applet/data/external_themes/conky.xml
+++ b/applet/data/external_themes/conky.xml
@@ -2,7 +2,7 @@
     <name>Conky</name>
     <exec_path>/usr/bin/conky -c /tmp/conky.conf</exec_path>
     <category>Unknown</category>
-    <icon_on>/usr/share/livewp/theme/Xsnow/icon.png</icon_on>       
-    <icon_off>/usr/share/livewp/theme/Xsnow/icond.png</icon_off>       
+    <icon_on>/usr/share/livewp/theme/Conky/icon.png</icon_on>       
+    <icon_off>/usr/share/livewp/theme/Conky/icond.png</icon_off>       
     <window_id>-w</window_id>                                                                               
 </theme>

diff --git a/applet/data/theme/Colorflood/icon.png b/applet/data/theme/Colorflood/icon.png
new file mode 100644 (file)
index 0000000..729c0bf
Binary files /dev/null and b/applet/data/theme/Colorflood/icon.png differ

diff --git a/applet/data/theme/Conky/icon.png b/applet/data/theme/Conky/icon.png
new file mode 100644 (file)
index 0000000..fb7e455
Binary files /dev/null and b/applet/data/theme/Conky/icon.png differ