AC_INIT([livewp], [0.4])
AC_CONFIG_SRCDIR([src/livewp-home-widget.c])
AC_CONFIG_HEADER([src/config.h:src/config.h.in])
-AM_INIT_AUTOMAKE(livewp, 0.7)
+AM_INIT_AUTOMAKE(livewp, 0.9)
AC_PROG_LIBTOOL
AC_PROG_INTLTOOL([0.23])
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/*
$(fifteentheme_DATA) \
$(videotheme_DATA) \
$(xshowtheme_DATA) \
+ $(conkytheme_DATA) \
+ $(colorfloodtheme_DATA) \
$(externaltheme_DATA) \
$(dbus_service_DATA)
+++ /dev/null
-<theme>
-<name>Battery Eye</name>
- <exec_path>python /opt/battery-eye/beye.py</exec_path>
- <window_name>beye.py</window_name>
- <category>Unknown</category>
- <icon_on>/usr/share/livewp/external_icons/xscreensaver.png</icon_on>
- <icon_off>/usr/share/livewp/external_icons/xscreensaverd.png</icon_off>
-</theme>
--- /dev/null
+<theme>
+<name>Colorflood</name>
+ <exec_path>/usr/bin/colorflood --livewallpaper</exec_path>
+ <window_name>colorflood</window_name>
+ <category>Game</category>
+ <icon_on>/usr/share/livewp/theme/Colorflood/icon.png</icon_on>
+ <icon_off>/usr/share/livewp/external_icons/xscreensaverd.png</icon_off>
+</theme>
<theme>
<name>Conky</name>
- <exec_path>/usr/bin/conky</exec_path>
+ <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>
--- /dev/null
+<theme>
+ <name>CrazyChickens</name>
+ <exec_path>/usr/bin/crazychickens</exec_path>
+ <window_name>crazychickens</window_name>
+ <category>Game</category>
+ <icon_on>/usr/share/livewp/theme/Xsnow/icon.png</icon_on>
+ <icon_off>/usr/share/livewp/theme/Xsnow/icond.png</icon_off>
+ <view>--livewallpaper</view>
+</theme>
--- /dev/null
+<theme>
+<name>Liqflow</name>
+ <exec_path>/usr/share/liqbase/liqflow/liqflow</exec_path>
+ <window_name>liqflow</window_name>
+ <category>Unknown</category>
+ <icon_on>/usr/share/livewp/external_icons/xscreensaver.png</icon_on>
+ <icon_off>/usr/share/livewp/external_icons/xscreensaverd.png</icon_off>
+</theme>
Description: Animation wallpaper shows the picture varying during the day.
XB-Description-ru_RU: Анимационные обои, меняющие свой вид в зависимости от времени суток
XB-Description-fi_FI: Näyttää ajankohdan mukaan muuttuvan taustakuvan
+XB-Description-it_IT: Sfondi animati che variano durante la giornata
XB-Maemo-Display-Name: Live Wallpaper
Xsbc-Bugtracker: https://garage.maemo.org/tracker/?atid=5336&group_id=1471&func=browse
XB-Maemo-Icon-26:
es_ES
es_MX
fi_FI
+it_IT
ru_RU
pl_PL
src/livewp-multiactor.c
src/livewp-rules.c
src/livewp-settings.c
+src/livewp-main.c
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-27 07:54+0300\n"
+"POT-Creation-Date: 2010-09-01 13:08+0300\n"
"PO-Revision-Date: \n"
"Last-Translator: Alejandro López <alejandro.lopez@free.fr>\n"
"Language-Team: \n"
"Content-Transfer-Encoding: 8bit\n"
"Language: \n"
-#: src/livewp-settings.c:33 src/livewp-settings.c:468
+#: src/livewp-settings.c:34 src/livewp-settings.c:471
msgid "About"
msgstr "Acerca de"
-#: src/livewp-settings.c:221 src/livewp-settings.c:275
-#: src/livewp-settings.c:293 src/livewp-settings.c:707
+#: src/livewp-settings.c:224 src/livewp-settings.c:278
+#: src/livewp-settings.c:296 src/livewp-settings.c:710
msgid "Accel"
-msgstr "Acel"
+msgstr "Accel"
-#: src/livewp-settings.c:211 src/livewp-settings.c:272
-#: src/livewp-settings.c:281 src/livewp-settings.c:701
+#: src/livewp-settings.c:214 src/livewp-settings.c:275
+#: src/livewp-settings.c:284 src/livewp-settings.c:704
msgid "Berlin"
msgstr "Berlín"
-#: src/livewp-settings.c:357
+#: src/livewp-settings.c:360
msgid "Category"
msgstr "Categoría"
-#: src/livewp-settings.c:418
+#: src/livewp-settings.c:421
msgid "Enable"
msgstr "Activar"
-#: src/livewp-config.c:34 src/livewp-config.c:91 src/livewp-config.c:156
+#: src/livewp-config.c:34 src/livewp-config.c:90 src/livewp-config.c:155
#, c-format
msgid "Failed to initialize GConf. Quitting.\n"
msgstr "Falló la inicialización de GConf. Terminando.\n"
-#: src/livewp-settings.c:442
+#: src/livewp-settings.c:445
msgid "Live Wallpaper Settings"
msgstr "Configuración de Live Wallpaper"
-#: src/livewp-settings.c:37
-#, fuzzy
+#: src/livewp-settings.c:38
+#, c-format
msgid ""
-"Live Wallpaper Version 0.9 \n"
+"Live Wallpaper Version %s \n"
" Copyright(c) 2010\n"
" Tanya Makova\n"
" Vlad Vasiliev\n"
" Russian - Tanya Makova \n"
" Vlad Vasiliev\n"
msgstr ""
-"Live Wallpaper Versión 0.8 \n"
+"Live Wallpaper Versión %s \n"
" Copyright(c) 2010\n"
" Tanya Makova\n"
" Vlad Vasiliev\n"
-" Copyright(c) 2010 del diseño de los temas Berlín, Moderno y Acel, Vasya "
+" Copyright(c) 2010 del diseño de los temas Berlín, Moderno y Accel, Vasya "
"Bobrikov\n"
" Copyright(c) 2010 del diseño del tema Matrix, Andrew Zhilin\n"
" Traductores:\n"
" Ruso - Tanya Makova \n"
" Vlad Vasiliev\n"
-#: src/livewp-settings.c:556
+#: src/livewp-main.c:291
+msgid "Loading Livewallpaper scene ..."
+msgstr ""
+
+#: src/livewp-settings.c:559
msgid "Loop"
msgstr "Bucle"
-#: src/livewp-settings.c:217 src/livewp-settings.c:274
-#: src/livewp-settings.c:289 src/livewp-settings.c:705
+#: src/livewp-settings.c:220 src/livewp-settings.c:277
+#: src/livewp-settings.c:292 src/livewp-settings.c:708
msgid "Matrix"
msgstr "Matrix"
-#: src/livewp-settings.c:214 src/livewp-settings.c:273
-#: src/livewp-settings.c:285 src/livewp-settings.c:703
+#: src/livewp-settings.c:217 src/livewp-settings.c:276
+#: src/livewp-settings.c:288 src/livewp-settings.c:706
msgid "Modern"
msgstr "Moderno"
-#: src/livewp-settings.c:545 src/livewp-settings.c:548
+#: src/livewp-settings.c:548 src/livewp-settings.c:551
msgid "Play file"
msgstr "Ejecutar fichero"
-#: src/livewp-settings.c:530
+#: src/livewp-settings.c:533
msgid "Rich Animation"
msgstr "Animación rica"
-#: src/livewp-settings.c:649
+#: src/livewp-settings.c:652
msgid "Save"
msgstr "Guardar"
-#: src/livewp-settings.c:564
+#: src/livewp-settings.c:567
msgid "Sound"
-msgstr ""
+msgstr "Sonido"
-#: src/livewp-settings.c:339
+#: src/livewp-settings.c:342
msgid "Theme"
msgstr "Tema"
-#: src/livewp-settings.c:224 src/livewp-settings.c:276
-#: src/livewp-settings.c:297 src/livewp-settings.c:709
+#: src/livewp-settings.c:227 src/livewp-settings.c:279
+#: src/livewp-settings.c:300 src/livewp-settings.c:712
msgid "Video"
msgstr "Video"
-#: src/livewp-settings.c:601
+#: src/livewp-settings.c:604
msgid "View Settings"
msgstr "Configuración de Vista"
# Is this a package name?
-#: src/livewp-settings.c:659
+#: src/livewp-settings.c:662
msgid "Xsnow"
msgstr "Xsnow"
-#: src/livewp-settings.c:578
-#, fuzzy, c-format
+#: src/livewp-settings.c:581
+#, c-format
msgid ""
"You haven't got the installed package %s. Please install it via using "
"Application Manager"
msgstr ""
-"No tiene instalado el paquete Xsnow. Por favor utiliza el Administrador de "
+"No tienes instalado el paquete %s. Por favor utiliza el Administrador de "
"Aplicaciones para instarlo."
#, fuzzy
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-27 07:54+0300\n"
+"POT-Creation-Date: 2010-09-01 13:08+0300\n"
"PO-Revision-Date: \n"
"Last-Translator: Alejandro López <alejandro.lopez@free.fr>\n"
"Language-Team: \n"
"Content-Transfer-Encoding: 8bit\n"
"Language: \n"
-#: src/livewp-settings.c:33 src/livewp-settings.c:468
+#: src/livewp-settings.c:34 src/livewp-settings.c:471
msgid "About"
msgstr "Acerca de"
-#: src/livewp-settings.c:221 src/livewp-settings.c:275
-#: src/livewp-settings.c:293 src/livewp-settings.c:707
+#: src/livewp-settings.c:224 src/livewp-settings.c:278
+#: src/livewp-settings.c:296 src/livewp-settings.c:710
msgid "Accel"
-msgstr "Acel"
+msgstr "Accel"
-#: src/livewp-settings.c:211 src/livewp-settings.c:272
-#: src/livewp-settings.c:281 src/livewp-settings.c:701
+#: src/livewp-settings.c:214 src/livewp-settings.c:275
+#: src/livewp-settings.c:284 src/livewp-settings.c:704
msgid "Berlin"
msgstr "Berlín"
-#: src/livewp-settings.c:357
+#: src/livewp-settings.c:360
msgid "Category"
msgstr "Categoría"
-#: src/livewp-settings.c:418
+#: src/livewp-settings.c:421
msgid "Enable"
msgstr "Activar"
-#: src/livewp-config.c:34 src/livewp-config.c:91 src/livewp-config.c:156
+#: src/livewp-config.c:34 src/livewp-config.c:90 src/livewp-config.c:155
#, c-format
msgid "Failed to initialize GConf. Quitting.\n"
msgstr "Falló la inicialización de GConf. Terminando.\n"
-#: src/livewp-settings.c:442
+#: src/livewp-settings.c:445
msgid "Live Wallpaper Settings"
msgstr "Configuración de Live Wallpaper"
-#: src/livewp-settings.c:37
-#, fuzzy
+#: src/livewp-settings.c:38
+#, c-format
msgid ""
-"Live Wallpaper Version 0.9 \n"
+"Live Wallpaper Version %s \n"
" Copyright(c) 2010\n"
" Tanya Makova\n"
" Vlad Vasiliev\n"
" Russian - Tanya Makova \n"
" Vlad Vasiliev\n"
msgstr ""
-"Live Wallpaper Versión 0.8 \n"
+"Live Wallpaper Versión %s \n"
" Copyright(c) 2010\n"
" Tanya Makova\n"
" Vlad Vasiliev\n"
-" Copyright(c) 2010 del diseño de los temas Berlín, Moderno y Acel, Vasya "
+" Copyright(c) 2010 del diseño de los temas Berlín, Moderno y Accel, Vasya "
"Bobrikov\n"
" Copyright(c) 2010 del diseño del tema Matrix, Andrew Zhilin\n"
" Traductores:\n"
" Ruso - Tanya Makova \n"
" Vlad Vasiliev\n"
-#: src/livewp-settings.c:556
+#: src/livewp-main.c:291
+msgid "Loading Livewallpaper scene ..."
+msgstr ""
+
+#: src/livewp-settings.c:559
msgid "Loop"
msgstr "Bucle"
-#: src/livewp-settings.c:217 src/livewp-settings.c:274
-#: src/livewp-settings.c:289 src/livewp-settings.c:705
+#: src/livewp-settings.c:220 src/livewp-settings.c:277
+#: src/livewp-settings.c:292 src/livewp-settings.c:708
msgid "Matrix"
msgstr "Matrix"
-#: src/livewp-settings.c:214 src/livewp-settings.c:273
-#: src/livewp-settings.c:285 src/livewp-settings.c:703
+#: src/livewp-settings.c:217 src/livewp-settings.c:276
+#: src/livewp-settings.c:288 src/livewp-settings.c:706
msgid "Modern"
msgstr "Moderno"
-#: src/livewp-settings.c:545 src/livewp-settings.c:548
+#: src/livewp-settings.c:548 src/livewp-settings.c:551
msgid "Play file"
msgstr "Ejecutar fichero"
-#: src/livewp-settings.c:530
+#: src/livewp-settings.c:533
msgid "Rich Animation"
msgstr "Animación rica"
-#: src/livewp-settings.c:649
+#: src/livewp-settings.c:652
msgid "Save"
msgstr "Guardar"
-#: src/livewp-settings.c:564
+#: src/livewp-settings.c:567
msgid "Sound"
-msgstr ""
+msgstr "Sonido"
-#: src/livewp-settings.c:339
+#: src/livewp-settings.c:342
msgid "Theme"
msgstr "Tema"
-#: src/livewp-settings.c:224 src/livewp-settings.c:276
-#: src/livewp-settings.c:297 src/livewp-settings.c:709
+#: src/livewp-settings.c:227 src/livewp-settings.c:279
+#: src/livewp-settings.c:300 src/livewp-settings.c:712
msgid "Video"
msgstr "Video"
-#: src/livewp-settings.c:601
+#: src/livewp-settings.c:604
msgid "View Settings"
msgstr "Configuración de Vista"
# Is this a package name?
-#: src/livewp-settings.c:659
+#: src/livewp-settings.c:662
msgid "Xsnow"
msgstr "Xsnow"
-#: src/livewp-settings.c:578
-#, fuzzy, c-format
+#: src/livewp-settings.c:581
+#, c-format
msgid ""
"You haven't got the installed package %s. Please install it via using "
"Application Manager"
msgstr ""
-"No tiene instalado el paquete Xsnow. Por favor utilice el Administrador de "
+"No tiene instalado el paquete %s. Por favor utilice el Administrador de "
"Aplicaciones para instarlo."
#, fuzzy
msgstr ""
"Project-Id-Version: 0.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-27 07:54+0300\n"
+"POT-Creation-Date: 2010-09-01 13:08+0300\n"
"PO-Revision-Date: 2010-08-21 09:12+0200\n"
"Last-Translator: Marko Vertainen <marko.vertainen@iki.fi>\n"
"Language-Team: fi_FI <LL@li.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: \n"
-#: src/livewp-settings.c:33 src/livewp-settings.c:468
+#: src/livewp-settings.c:34 src/livewp-settings.c:471
msgid "About"
msgstr "Tietoja"
-#: src/livewp-settings.c:221 src/livewp-settings.c:275
-#: src/livewp-settings.c:293 src/livewp-settings.c:707
+#: src/livewp-settings.c:224 src/livewp-settings.c:278
+#: src/livewp-settings.c:296 src/livewp-settings.c:710
msgid "Accel"
msgstr "Kiihtyvyys"
-#: src/livewp-settings.c:211 src/livewp-settings.c:272
-#: src/livewp-settings.c:281 src/livewp-settings.c:701
+#: src/livewp-settings.c:214 src/livewp-settings.c:275
+#: src/livewp-settings.c:284 src/livewp-settings.c:704
msgid "Berlin"
msgstr "Berliini"
-#: src/livewp-settings.c:357
+#: src/livewp-settings.c:360
msgid "Category"
msgstr "Kategoria"
-#: src/livewp-settings.c:418
+#: src/livewp-settings.c:421
msgid "Enable"
msgstr "Ota käyttöön"
-#: src/livewp-config.c:34 src/livewp-config.c:91 src/livewp-config.c:156
+#: src/livewp-config.c:34 src/livewp-config.c:90 src/livewp-config.c:155
#, c-format
msgid "Failed to initialize GConf. Quitting.\n"
msgstr "GConf asetus epäonnistui. Lopetetaan.\n"
-#: src/livewp-settings.c:442
+#: src/livewp-settings.c:445
msgid "Live Wallpaper Settings"
msgstr "Elävän taustakuvan asetukset"
-#: src/livewp-settings.c:37
-#, fuzzy
+#: src/livewp-settings.c:38
+#, c-format
msgid ""
-"Live Wallpaper Version 0.9 \n"
+"Live Wallpaper Version %s \n"
" Copyright(c) 2010\n"
" Tanya Makova\n"
" Vlad Vasiliev\n"
" Russian - Tanya Makova \n"
" Vlad Vasiliev\n"
msgstr ""
-"Live Wallpaper Versio 0.8.5 \n"
+"Live Wallpaper Versio %s \n"
" Copyright(c) 2010\n"
" Tanya Makova\n"
" Vlad Vasiliev\n"
" Venäjä - Tanya Makova \n"
" Vlad Vasiliev\n"
-#: src/livewp-settings.c:556
+#: src/livewp-main.c:291
+msgid "Loading Livewallpaper scene ..."
+msgstr ""
+
+#: src/livewp-settings.c:559
msgid "Loop"
msgstr "Uudelleen toisto"
-#: src/livewp-settings.c:217 src/livewp-settings.c:274
-#: src/livewp-settings.c:289 src/livewp-settings.c:705
+#: src/livewp-settings.c:220 src/livewp-settings.c:277
+#: src/livewp-settings.c:292 src/livewp-settings.c:708
msgid "Matrix"
msgstr "Matrix"
-#: src/livewp-settings.c:214 src/livewp-settings.c:273
-#: src/livewp-settings.c:285 src/livewp-settings.c:703
+#: src/livewp-settings.c:217 src/livewp-settings.c:276
+#: src/livewp-settings.c:288 src/livewp-settings.c:706
msgid "Modern"
msgstr "Moderni"
-#: src/livewp-settings.c:545 src/livewp-settings.c:548
+#: src/livewp-settings.c:548 src/livewp-settings.c:551
msgid "Play file"
msgstr "Valitse videoleike"
-#: src/livewp-settings.c:530
+#: src/livewp-settings.c:533
msgid "Rich Animation"
msgstr "Rikas animaatio"
-#: src/livewp-settings.c:649
+#: src/livewp-settings.c:652
msgid "Save"
msgstr "Tallenna"
-#: src/livewp-settings.c:564
+#: src/livewp-settings.c:567
msgid "Sound"
msgstr "Ääni"
-#: src/livewp-settings.c:339
+#: src/livewp-settings.c:342
msgid "Theme"
msgstr "Teema"
-#: src/livewp-settings.c:224 src/livewp-settings.c:276
-#: src/livewp-settings.c:297 src/livewp-settings.c:709
+#: src/livewp-settings.c:227 src/livewp-settings.c:279
+#: src/livewp-settings.c:300 src/livewp-settings.c:712
msgid "Video"
msgstr "Video"
-#: src/livewp-settings.c:601
+#: src/livewp-settings.c:604
msgid "View Settings"
msgstr "Näkymän asetukset"
-#: src/livewp-settings.c:659
+#: src/livewp-settings.c:662
msgid "Xsnow"
msgstr "Xsnow"
-#: src/livewp-settings.c:578
+#: src/livewp-settings.c:581
#, fuzzy, c-format
msgid ""
"You haven't got the installed package %s. Please install it via using "
msgstr ""
"Project-Id-Version: o.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-27 07:54+0300\n"
+"POT-Creation-Date: 2010-09-01 13:08+0300\n"
"PO-Revision-Date: 2010-08-27 09:30+0100\n"
"Last-Translator: Emanuele Cassioli <emanuele.cassioli@gmail.com>\n"
"Language-Team: \n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/livewp-settings.c:33 src/livewp-settings.c:468
+#: src/livewp-settings.c:34 src/livewp-settings.c:471
msgid "About"
msgstr "About"
-#: src/livewp-settings.c:221 src/livewp-settings.c:275
-#: src/livewp-settings.c:293 src/livewp-settings.c:707
+#: src/livewp-settings.c:224 src/livewp-settings.c:278
+#: src/livewp-settings.c:296 src/livewp-settings.c:710
msgid "Accel"
msgstr "Accel"
-#: src/livewp-settings.c:211 src/livewp-settings.c:272
-#: src/livewp-settings.c:281 src/livewp-settings.c:701
+#: src/livewp-settings.c:214 src/livewp-settings.c:275
+#: src/livewp-settings.c:284 src/livewp-settings.c:704
msgid "Berlin"
msgstr "Berlin"
-#: src/livewp-settings.c:357
+#: src/livewp-settings.c:360
msgid "Category"
msgstr "Categoria"
-#: src/livewp-settings.c:418
+#: src/livewp-settings.c:421
msgid "Enable"
msgstr "Attivo"
-#: src/livewp-config.c:34 src/livewp-config.c:91 src/livewp-config.c:156
+#: src/livewp-config.c:34 src/livewp-config.c:90 src/livewp-config.c:155
#, c-format
msgid "Failed to initialize GConf. Quitting.\n"
-msgstr "Avvio di GConf non riuscito. Chiusura in corso."
+msgstr "Avvio di GConf non riuscito. Chiusura in corso.\n"
-#: src/livewp-settings.c:442
+#: src/livewp-settings.c:445
msgid "Live Wallpaper Settings"
msgstr "Impostazioni di Live Wallpaper"
-#: src/livewp-settings.c:37
+#: src/livewp-settings.c:38
+#, c-format
msgid ""
-"Live Wallpaper Version 0.9 \n"
+"Live Wallpaper Version %s \n"
" Copyright(c) 2010\n"
" Tanya Makova\n"
" Vlad Vasiliev\n"
" Russian - Tanya Makova \n"
" Vlad Vasiliev\n"
msgstr ""
-"Live Wallpaper Versione 0.9 \n"
+"Live Wallpaper Versione %s \n"
" Copyright(c) 2010\n"
" Tanya Makova\n"
" Vlad Vasiliev\n"
-" Copyright(c) 2010 per il design di Berlin, Modern and Accel Vasya "
-"Bobrikov\n"
+" Copyright(c) 2010 per il design di Berlin, Modern and Accel Vasya Bobrikov\n"
" Copyright(c) 2010 per il design di Matrix e per le icone Andrew Zhilin\n"
" Traduttori:\n"
" Finlandese - Marko Vertainen\n"
" Russo - Tanya Makova \n"
" Vlad Vasiliev\n"
-#: src/livewp-settings.c:556
+#: src/livewp-main.c:291
+msgid "Loading Livewallpaper scene ..."
+msgstr ""
+
+#: src/livewp-settings.c:559
msgid "Loop"
msgstr "Ripeti"
-#: src/livewp-settings.c:217 src/livewp-settings.c:274
-#: src/livewp-settings.c:289 src/livewp-settings.c:705
+#: src/livewp-settings.c:220 src/livewp-settings.c:277
+#: src/livewp-settings.c:292 src/livewp-settings.c:708
msgid "Matrix"
msgstr "Matrix"
-#: src/livewp-settings.c:214 src/livewp-settings.c:273
-#: src/livewp-settings.c:285 src/livewp-settings.c:703
+#: src/livewp-settings.c:217 src/livewp-settings.c:276
+#: src/livewp-settings.c:288 src/livewp-settings.c:706
msgid "Modern"
msgstr "Modern"
-#: src/livewp-settings.c:545 src/livewp-settings.c:548
+#: src/livewp-settings.c:548 src/livewp-settings.c:551
msgid "Play file"
msgstr "File da riprodurre"
-#: src/livewp-settings.c:530
+#: src/livewp-settings.c:533
msgid "Rich Animation"
msgstr "Animazione dettagliata"
-#: src/livewp-settings.c:649
+#: src/livewp-settings.c:652
msgid "Save"
msgstr "Salva"
-#: src/livewp-settings.c:564
+#: src/livewp-settings.c:567
msgid "Sound"
msgstr "Suono"
-#: src/livewp-settings.c:339
+#: src/livewp-settings.c:342
msgid "Theme"
msgstr "Tema"
-#: src/livewp-settings.c:224 src/livewp-settings.c:276
-#: src/livewp-settings.c:297 src/livewp-settings.c:709
+#: src/livewp-settings.c:227 src/livewp-settings.c:279
+#: src/livewp-settings.c:300 src/livewp-settings.c:712
msgid "Video"
msgstr "Video"
-#: src/livewp-settings.c:601
+#: src/livewp-settings.c:604
msgid "View Settings"
msgstr "Modifica impostazioni"
-#: src/livewp-settings.c:659
+#: src/livewp-settings.c:662
msgid "Xsnow"
msgstr "Xsnow"
-#: src/livewp-settings.c:578
+#: src/livewp-settings.c:581
#, c-format
msgid ""
"You haven't got the installed package %s. Please install it via using "
"Application Manager"
-msgstr "Pacchetto applicazione %s non trovato. Installarlo utilizzando "
-"Gestione Applicazioni"
+msgstr ""
+"Pacchetto applicazione %s non trovato. Installarlo utilizzando Gestione "
+"Applicazioni"
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-27 07:54+0300\n"
+"POT-Creation-Date: 2010-09-01 13:08+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: \n"
-#: src/livewp-settings.c:33 src/livewp-settings.c:468
+#: src/livewp-settings.c:34 src/livewp-settings.c:471
msgid "About"
msgstr ""
-#: src/livewp-settings.c:221 src/livewp-settings.c:275
-#: src/livewp-settings.c:293 src/livewp-settings.c:707
+#: src/livewp-settings.c:224 src/livewp-settings.c:278
+#: src/livewp-settings.c:296 src/livewp-settings.c:710
msgid "Accel"
msgstr ""
-#: src/livewp-settings.c:211 src/livewp-settings.c:272
-#: src/livewp-settings.c:281 src/livewp-settings.c:701
+#: src/livewp-settings.c:214 src/livewp-settings.c:275
+#: src/livewp-settings.c:284 src/livewp-settings.c:704
msgid "Berlin"
msgstr ""
-#: src/livewp-settings.c:357
+#: src/livewp-settings.c:360
msgid "Category"
msgstr ""
-#: src/livewp-settings.c:418
+#: src/livewp-settings.c:421
msgid "Enable"
msgstr ""
-#: src/livewp-config.c:34 src/livewp-config.c:91 src/livewp-config.c:156
+#: src/livewp-config.c:34 src/livewp-config.c:90 src/livewp-config.c:155
#, c-format
msgid "Failed to initialize GConf. Quitting.\n"
msgstr ""
-#: src/livewp-settings.c:442
+#: src/livewp-settings.c:445
msgid "Live Wallpaper Settings"
msgstr ""
-#: src/livewp-settings.c:37
+#: src/livewp-settings.c:38
+#, c-format
msgid ""
-"Live Wallpaper Version 0.9 \n"
+"Live Wallpaper Version %s \n"
" Copyright(c) 2010\n"
" Tanya Makova\n"
" Vlad Vasiliev\n"
" Vlad Vasiliev\n"
msgstr ""
-#: src/livewp-settings.c:556
+#: src/livewp-main.c:291
+msgid "Loading Livewallpaper scene ..."
+msgstr ""
+
+#: src/livewp-settings.c:559
msgid "Loop"
msgstr ""
-#: src/livewp-settings.c:217 src/livewp-settings.c:274
-#: src/livewp-settings.c:289 src/livewp-settings.c:705
+#: src/livewp-settings.c:220 src/livewp-settings.c:277
+#: src/livewp-settings.c:292 src/livewp-settings.c:708
msgid "Matrix"
msgstr ""
-#: src/livewp-settings.c:214 src/livewp-settings.c:273
-#: src/livewp-settings.c:285 src/livewp-settings.c:703
+#: src/livewp-settings.c:217 src/livewp-settings.c:276
+#: src/livewp-settings.c:288 src/livewp-settings.c:706
msgid "Modern"
msgstr ""
-#: src/livewp-settings.c:545 src/livewp-settings.c:548
+#: src/livewp-settings.c:548 src/livewp-settings.c:551
msgid "Play file"
msgstr ""
-#: src/livewp-settings.c:530
+#: src/livewp-settings.c:533
msgid "Rich Animation"
msgstr ""
-#: src/livewp-settings.c:649
+#: src/livewp-settings.c:652
msgid "Save"
msgstr ""
-#: src/livewp-settings.c:564
+#: src/livewp-settings.c:567
msgid "Sound"
msgstr ""
-#: src/livewp-settings.c:339
+#: src/livewp-settings.c:342
msgid "Theme"
msgstr ""
-#: src/livewp-settings.c:224 src/livewp-settings.c:276
-#: src/livewp-settings.c:297 src/livewp-settings.c:709
+#: src/livewp-settings.c:227 src/livewp-settings.c:279
+#: src/livewp-settings.c:300 src/livewp-settings.c:712
msgid "Video"
msgstr ""
-#: src/livewp-settings.c:601
+#: src/livewp-settings.c:604
msgid "View Settings"
msgstr ""
-#: src/livewp-settings.c:659
+#: src/livewp-settings.c:662
msgid "Xsnow"
msgstr ""
-#: src/livewp-settings.c:578
+#: src/livewp-settings.c:581
#, c-format
msgid ""
"You haven't got the installed package %s. Please install it via using "
msgstr ""
"Project-Id-Version: 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-27 07:54+0300\n"
+"POT-Creation-Date: 2010-09-01 13:08+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Vlad Vasiliev <vlad@gas.by>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: \n"
-#: src/livewp-settings.c:33 src/livewp-settings.c:468
+#: src/livewp-settings.c:34 src/livewp-settings.c:471
msgid "About"
msgstr "О программе"
-#: src/livewp-settings.c:221 src/livewp-settings.c:275
-#: src/livewp-settings.c:293 src/livewp-settings.c:707
+#: src/livewp-settings.c:224 src/livewp-settings.c:278
+#: src/livewp-settings.c:296 src/livewp-settings.c:710
msgid "Accel"
msgstr "Акселерометр"
-#: src/livewp-settings.c:211 src/livewp-settings.c:272
-#: src/livewp-settings.c:281 src/livewp-settings.c:701
+#: src/livewp-settings.c:214 src/livewp-settings.c:275
+#: src/livewp-settings.c:284 src/livewp-settings.c:704
msgid "Berlin"
msgstr "Берлин"
-#: src/livewp-settings.c:357
+#: src/livewp-settings.c:360
msgid "Category"
msgstr "Категория"
-#: src/livewp-settings.c:418
+#: src/livewp-settings.c:421
msgid "Enable"
msgstr "Включить"
-#: src/livewp-config.c:34 src/livewp-config.c:91 src/livewp-config.c:156
+#: src/livewp-config.c:34 src/livewp-config.c:90 src/livewp-config.c:155
#, c-format
msgid "Failed to initialize GConf. Quitting.\n"
msgstr ""
-#: src/livewp-settings.c:442
+#: src/livewp-settings.c:445
msgid "Live Wallpaper Settings"
msgstr "Настройка Live Wallpaper"
-#: src/livewp-settings.c:37
-#, fuzzy
+#: src/livewp-settings.c:38
+#, c-format
msgid ""
-"Live Wallpaper Version 0.9 \n"
+"Live Wallpaper Version %s \n"
" Copyright(c) 2010\n"
" Tanya Makova\n"
" Vlad Vasiliev\n"
" Russian - Tanya Makova \n"
" Vlad Vasiliev\n"
msgstr ""
-"Живые обои Версия 0.8.5 \n"
+"Живые обои Версия %s \n"
" Copyright(c) 2010\n"
" Татьяна Макова\n"
" Влад Васильев\n"
" Русский - Таня Макова \n"
" Влад Васильев\n"
-#: src/livewp-settings.c:556
+#: src/livewp-main.c:291
+msgid "Loading Livewallpaper scene ..."
+msgstr "Идет загрузка сцены 'Живых обой'"
+
+#: src/livewp-settings.c:559
msgid "Loop"
msgstr "По кругу"
-#: src/livewp-settings.c:217 src/livewp-settings.c:274
-#: src/livewp-settings.c:289 src/livewp-settings.c:705
+#: src/livewp-settings.c:220 src/livewp-settings.c:277
+#: src/livewp-settings.c:292 src/livewp-settings.c:708
msgid "Matrix"
msgstr "Матрица"
-#: src/livewp-settings.c:214 src/livewp-settings.c:273
-#: src/livewp-settings.c:285 src/livewp-settings.c:703
+#: src/livewp-settings.c:217 src/livewp-settings.c:276
+#: src/livewp-settings.c:288 src/livewp-settings.c:706
msgid "Modern"
msgstr "Модерн"
-#: src/livewp-settings.c:545 src/livewp-settings.c:548
+#: src/livewp-settings.c:548 src/livewp-settings.c:551
msgid "Play file"
msgstr "Играть файл"
-#: src/livewp-settings.c:530
+#: src/livewp-settings.c:533
msgid "Rich Animation"
msgstr "Полная Анимация"
-#: src/livewp-settings.c:649
+#: src/livewp-settings.c:652
msgid "Save"
msgstr "Сохранить"
-#: src/livewp-settings.c:564
+#: src/livewp-settings.c:567
msgid "Sound"
msgstr ""
-#: src/livewp-settings.c:339
+#: src/livewp-settings.c:342
msgid "Theme"
msgstr "Тема"
-#: src/livewp-settings.c:224 src/livewp-settings.c:276
-#: src/livewp-settings.c:297 src/livewp-settings.c:709
+#: src/livewp-settings.c:227 src/livewp-settings.c:279
+#: src/livewp-settings.c:300 src/livewp-settings.c:712
msgid "Video"
msgstr "Видео"
-#: src/livewp-settings.c:601
+#: src/livewp-settings.c:604
msgid "View Settings"
msgstr "Настройки вида"
-#: src/livewp-settings.c:659
+#: src/livewp-settings.c:662
msgid "Xsnow"
msgstr "Снег"
-#: src/livewp-settings.c:578
-#, fuzzy, c-format
+#: src/livewp-settings.c:581
+#, c-format
msgid ""
"You haven't got the installed package %s. Please install it via using "
"Application Manager"
msgstr ""
-"У Вас не установлен пакет Xsnow. Пожалуйста установите его используя "
-"Диспетчер Приложений"
+"У Вас не установлен пакет %s. Пожалуйста установите его используя Диспетчер "
+"Приложений"
#~ msgid ""
#~ "You haven't got the installed package 'Sherman's Aquarium'. Please "
gchar *theme;
gboolean visible;
gboolean rich_animation;
+ gboolean one_in_all_view;
GtkWidget *main_widget;
GtkWidget *window;
GtkWidget *right_corner;
GSList *store = priv->extheme_list;
while (store){
if (!strcmp(priv->theme, g_hash_table_lookup(store->data, "name"))){
- if (!strcmp(priv->theme, "Conky"))
- priv->scene_func = (gpointer)&init_scene_Conky;
-
/* Default function for external themes init_scene_External */
if (priv->scene_func)
priv->scene_func = (gpointer)&init_scene_External;
+ if (!strcmp(priv->theme, "Conky"))
+ priv->scene_func = (gpointer)&init_scene_Conky;
priv->hash_theme = store->data;
break;
}
priv->theme_string_parametr1 = g_strdup(gconf_value_get_string(value));
gconf_value_free(value);
}
+ /* get parameter one theme in all view */
+ value = gconf_client_get(gconf_client, GCONF_KEY_ONE_IN_ALL_VIEW, NULL);
+ if (value) {
+ priv->one_in_all_view = gconf_value_get_bool(value);
+ gconf_value_free(value);
+ } else
+ priv->one_in_all_view = FALSE;
return 0;
}
/*******************************************************************************/
void
+save_one_in_all_views_to_config(gboolean one_in_all_views){
+ GConfClient *gconf_client;
+
+ gconf_client = gconf_client_get_default();
+ if (!gconf_client) {
+ fprintf(stderr, _("Failed to initialize GConf. Quitting.\n"));
+ return;
+ }
+
+ if (one_in_all_views)
+ gconf_client_set_bool(gconf_client,
+ GCONF_KEY_ONE_IN_ALL_VIEW, TRUE, NULL);
+ else
+ gconf_client_set_bool(gconf_client,
+ GCONF_KEY_ONE_IN_ALL_VIEW, FALSE, NULL);
+
+}
+/*******************************************************************************/
+void
save_config(Animation_WallpaperPrivate *priv) {
GConfClient *gconf_client;
str = NULL;
}
}
-
-
}
#define GCONF_KEY_PREFIX "/apps/maemo/livewp"
#define GCONF_KEY_THEME GCONF_KEY_PREFIX"/theme"
+#define GCONF_KEY_ONE_IN_ALL_VIEW GCONF_KEY_PREFIX"/one_in_all_view"
#define GCONF_KEY_RANIMATION GCONF_KEY_PREFIX"/rich_animation"
-#define GCONF_KEY_ADDITIONAL_STRING_1 GCONF_KEY_PREFIX"/additional_string_1"
-#define GCONF_KEY_ADDITIONAL_BOOL_1 GCONF_KEY_PREFIX"/additional_bool_1"
+#define GCONF_KEY_ADDITIONAL_STRING_1 GCONF_KEY_PREFIX"/additional_string_1"
+#define GCONF_KEY_ADDITIONAL_BOOL_1 GCONF_KEY_PREFIX"/additional_bool_1"
void init_scene_Modern(AWallpaperPlugin *desktop_plugin);
void init_scene_Berlin(AWallpaperPlugin *desktop_plugin);
void init_scene_Matrix(AWallpaperPlugin *desktop_plugin);
void fill_priv(Animation_WallpaperPrivate *priv);
gint current_active_view(void);
GSList * get_list_exthemes(void);
+void save_one_in_all_views_to_config(gboolean one_in_all_views);
+
#endif
*/
/*******************************************************************************/
#include "livewp-conky.h"
+void create_config(gboolean sleep){
+ FILE *file_in;
+ FILE *file_out;
+ gchar buffer[2048];
+
+ file_in = fopen("/etc/conky/conky.conf","r");
+ file_out = fopen("/tmp/conky.conf","w");
+ if (file_in && file_out){
+ while (!feof(file_in)) {
+ memset(buffer, 0, sizeof(buffer));
+ fgets(buffer, sizeof(buffer) - 1, file_in);
+ if (!strcmp(buffer, "own_window yes\n")){
+ fputs("own_window no\n", file_out);
+ continue;
+ }
+ if (!strcmp(buffer, "$alignc $nodename - $sysname $kernel on $machine ${color yellow}Uptime:$color $uptime\n")){
+ fputs("$alignr $nodename\n$alignr $sysname $kernel on $machine\n", file_out);
+ fputs("$alignr ${color yellow}Uptime:$color $uptime\n", file_out);
+ continue;
+ }
+ if (!strcmp(buffer, "gap_y 60\n")){
+ fputs("gap_y 0\n", file_out);
+ continue;
+ }
+ if (!strcmp(buffer, "gap_x 20\n")){
+ fputs("gap_x 5\n", file_out);
+ continue;
+ }
+ if (!strcmp(buffer, "update_interval 3.0\n") && sleep){
+ fputs("update_interval 20.0\n", file_out);
+ continue;
+ }
+ if (!strcmp(buffer, "${color #24ff00} ${top name 4} ${top pid 4} ${top cpu 4} ${top mem 4}")){
+ fputs(buffer, file_out);
+ fputs("\n${color #20ff00} ${top name 5} ${top pid 5} ${top cpu 5} ${top mem 5}\n", file_out);
+ fputs("${color #16ff00} ${top name 6} ${top pid 6} ${top cpu 6} ${top mem 6}\n", file_out);
+ continue;
+ }
+
+ fputs(buffer, file_out);
+ }
+ fclose(file_out);
+ fclose(file_in);
+ }
+
+}
void
init_scene_Conky(AWallpaperPlugin *desktop_plugin){
+ create_config(False);
init_scene_External(desktop_plugin);
}
-
+void
+conky_visible(AWallpaperPlugin *desktop_plugin){
+ if (desktop_plugin->priv->visible)
+ create_config(FALSE);
+ else
+ create_config(TRUE);
+ kill (desktop_plugin->priv->podpid, SIGHUP);
+}
#include "livewp-common.h"
void init_scene_Conky(AWallpaperPlugin *desktop_plugin);
void init_scene_External(AWallpaperPlugin *desktop_plugin);
+void conky_visible(AWallpaperPlugin *desktop_plugin);
Animation_WallpaperPrivate* animation_wallpaper_plugin_new (void);
G_END_DECLS
void lw_settings(gpointer user_data, gpointer data);
-gint read_config(Animation_WallpaperPrivate *priv);
-void save_config(Animation_WallpaperPrivate *priv);
//void run_long_timeout(AWallpaperPlugin *desktop_plugin);
void get_sun_screen_pos(double alt, double azm, gint * x, gint * y);
void show_settings(GtkWidget *widget, Animation_WallpaperPrivate *priv);
static gboolean short_timeout (AWallpaperPlugin *desktop_plugin);
void run_long_timeout(AWallpaperPlugin *desktop_plugin);
gboolean long_timeout (AWallpaperPlugin *desktop_plugin);
+void conky_visible(AWallpaperPlugin *desktop_plugin);
void
set_live_bg (Display *display, Window xwindow, int mode)
{
- Atom atom;
+ Atom atom;
- atom = XInternAtom (display, "_HILDON_LIVE_DESKTOP_BACKGROUND", False);
- fprintf (stderr, "XID: 0x%x\n", (unsigned)xwindow);
+ atom = XInternAtom (display, "_HILDON_LIVE_DESKTOP_BACKGROUND", False);
+ fprintf (stderr, "XID: 0x%x\n", (unsigned)xwindow);
- XChangeProperty (display,
- xwindow,
- atom,
- XA_INTEGER, 32, PropModeReplace,
- (unsigned char *) &mode, 1);
+ XChangeProperty (display,
+ xwindow,
+ atom,
+ XA_INTEGER, 32, PropModeReplace,
+ (unsigned char *) &mode, 1);
}
/*******************************************************************************/
view_state_changed (Animation_WallpaperPrivate *priv)
{
fprintf(stderr," VIew %i State %i\n", priv->view, priv->visible);
- if (priv->visible){
+ if (priv->visible){
+ /* ToDo make undependent function */
+ /* For Video */
if (!strcmp(priv->theme,"Video")){
if (priv->pipeline){
gst_element_set_state (priv->pipeline, GST_STATE_PLAYING);
init_scene_Video(priv->desktop_plugin);
}
}
+ /* For Conky */
+ if (!strcmp(priv->theme,"Conky")&& priv->running){
+ conky_visible(priv->desktop_plugin);
+ return;
+ }
+
if (!priv->running){
if (g_hash_table_lookup(priv->hash_theme, "exec_path")){
init_scene_External(priv->desktop_plugin);
run_long_timeout(priv->desktop_plugin);
}
}else{
+ /* For Video */
if (priv->pipeline){
gst_element_set_state (priv->pipeline, GST_STATE_PAUSED);
return;
}
+ /* For Conky */
+ if (!strcmp(priv->theme,"Conky")){
+ conky_visible(priv->desktop_plugin);
+ return;
+ }
if (priv->long_timer != 0 ){
g_source_remove(priv->long_timer);
priv->long_timer = 0;
}else
return TRUE; /* keep running this event */
}
-
+/*******************************************************************************/
void
run_long_timeout(AWallpaperPlugin *desktop_plugin)
{
}
}
-
+/*******************************************************************************/
gboolean
long_timeout (AWallpaperPlugin *desktop_plugin)
{
run_long_timeout(desktop_plugin);
return TRUE; /* keep running this event */
}
-
/*******************************************************************************/
void
create_xwindow (Animation_WallpaperPrivate *priv){
GtkWidget *main_widget = NULL;
+ GtkWidget *label = NULL;
/* Create Main GUI */
main_widget = hildon_window_new ();
priv->window = main_widget;
gtk_window_set_title(GTK_WINDOW(main_widget), PACKAGE);
gtk_window_fullscreen(GTK_WINDOW(main_widget));
+ label = gtk_label_new(_("Loading Livewallpaper scene ..."));
+ gtk_container_add (GTK_CONTAINER (main_widget), label);
gtk_widget_show_all(GTK_WIDGET(main_widget));
- set_live_bg(GDK_WINDOW_XDISPLAY (main_widget->window), GDK_WINDOW_XID (main_widget->window), priv->view);
+ if (priv->one_in_all_view)
+ set_live_bg(GDK_WINDOW_XDISPLAY (main_widget->window), GDK_WINDOW_XID (main_widget->window), -1);
+ else
+ set_live_bg(GDK_WINDOW_XDISPLAY (main_widget->window), GDK_WINDOW_XID (main_widget->window), priv->view);
}
/*******************************************************************************/
int
Animation_WallpaperPrivate *priv = g_new0 (Animation_WallpaperPrivate, 1);
desktop_plugin->priv = priv;
- gst_init (NULL, NULL);
/* Ininitializing */
hildon_gtk_init (&argc, &argv);
priv->running = FALSE;
/* fprintf(stderr,"XWINDOW %i\n",GDK_WINDOW_XID (main_widget->window)); */
priv->desktop_plugin = desktop_plugin;
+
+
priv->view = view;
+ fill_priv(priv);
+ fprintf(stderr,"THEME %s\n", priv->theme);
+
+ /* Check activity of opition "One theme in all views" */
+ if (priv->one_in_all_view && view >1)
+ return -1;
+
- if (current_active_view() == view)
+ if (current_active_view() == view || priv->one_in_all_view)
priv->visible = TRUE;
else
priv->visible = FALSE;
- fill_priv(priv);
-
+
create_xwindow(priv);
/* Initialize DBUS */
livewp_initialize_dbus(priv);
(GConfClientNotifyFunc)view_changed, priv, NULL, NULL);
/* Set start position of Video to zero */
- if (!strcmp(priv->theme,"Video"))
+ if (!strcmp(priv->theme,"Video")){
+ gst_init (NULL, NULL);
priv->theme_int_parametr1 = 0;
-
+ }
init_scene_theme(desktop_plugin);
fprintf(stderr,"Reload scene %s\n", desktop_plugin->priv->theme);
destroy_scene(desktop_plugin);
fill_priv(desktop_plugin->priv);
- gtk_widget_destroy(desktop_plugin->priv->window);
+ gtk_widget_destroy(desktop_plugin->priv->window);
+ if (desktop_plugin->priv->one_in_all_view && desktop_plugin->priv->view >1)
+ exit(-1);
create_xwindow(desktop_plugin->priv);
init_scene_theme(desktop_plugin);
}
#include "livewp-settings.h"
/*******************************************************************************/
void lw_about(void){
-
+
+ gchar *about_string;
GtkWidget *window = NULL,
*vbox = NULL,
*label_about = NULL;
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
gtk_window_set_modal(GTK_WINDOW(window), TRUE);
vbox = gtk_vbox_new (FALSE, 5);
- label_about = gtk_label_new (_("Live Wallpaper Version 0.9 \n Copyright(c) 2010\n \
+ about_string = g_strdup_printf(_("Live Wallpaper Version %s \n Copyright(c) 2010\n \
Tanya Makova\n Vlad Vasiliev\n \
Copyright(c) 2010 for design themes Berlin, Modern and Accel Vasya Bobrikov\n \
Copyright(c) 2010 for design theme Matrix and icons Andrew Zhilin\n \
Spain - Alejandro López\n \
Italian - Emanuele Cassioli\n \
Russian - Tanya Makova \n \
- Vlad Vasiliev\n"));
+ Vlad Vasiliev\n"), VERSION);
+
+ label_about = gtk_label_new (about_string);
gtk_box_pack_start (GTK_BOX (vbox), label_about, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox),
vbox, TRUE, TRUE, 0);
}
/********************************************************************************/
void
+changed_value_one_in_all_cb (GtkWidget *toggle, Animation_WallpaperPrivate *priv)
+{
+ priv->one_in_all_view = hildon_check_button_get_active((HildonCheckButton *)toggle);
+ create_themes_buttons_hbox(priv);
+ fprintf(stderr, "changed_value_one_in_all_cb\n");
+}
+/********************************************************************************/
+void
changed_value_theme_cb (HildonPickerButton *picker, Animation_WallpaperPrivate *priv)
{
const gchar *choice = hildon_button_get_value(HILDON_BUTTON (picker));
create_bool_button (gboolean active, gchar *name)
{
GtkWidget *button;
- button = hildon_check_button_new (HILDON_SIZE_AUTO);
+ button = hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT);
gtk_button_set_label (GTK_BUTTON (button), name);
hildon_check_button_set_active(HILDON_CHECK_BUTTON(button), active);
return button;
lw_main_settings(priv, NULL);
}
/*******************************************************************************/
-void
-lw_main_settings(Animation_WallpaperPrivate *priv, gpointer data){
- gint result;
- GtkWidget *window = NULL;
+create_themes_buttons_hbox(Animation_WallpaperPrivate *priv){
+ GtkWidget *hbox = NULL;
+ GtkWidget *area_hbox = NULL;
GtkWidget *theme_button1;
GtkWidget *theme_button2;
GtkWidget *theme_button3;
- GtkWidget *theme_button4;
- GtkWidget *hbox;
- Animation_WallpaperPrivate *priv_temp = NULL;
-
- window = gtk_dialog_new();
+ GtkWidget *theme_button4;
- gtk_window_set_title(GTK_WINDOW(window), _("Live Wallpaper Settings"));
- gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
- gtk_window_set_modal(GTK_WINDOW(window), TRUE);
- /* Create Theme button */
+
+ area_hbox = g_object_get_data(G_OBJECT(priv->window), "area_hbox");
+ if (!area_hbox)
+ return;
+ hbox = g_object_get_data(G_OBJECT(priv->window), "custom_hbox");
+ if (hbox){
+ gtk_widget_destroy(hbox);
+ }
hbox = gtk_hbox_new(FALSE, 0);
+ g_object_set_data(G_OBJECT(priv->window), "custom_hbox", hbox);
+ gtk_box_pack_start(GTK_BOX(area_hbox),
+ hbox, FALSE, FALSE, 5);
+ /* Create Theme buttons */
theme_button1 = create_image_button(1, priv->dbus_conn_session);
gtk_box_pack_start(GTK_BOX(hbox),
theme_button1, TRUE, TRUE, 0);
+ gtk_widget_show (theme_button1);
+ gtk_widget_show (hbox);
+ if (priv->one_in_all_view)
+ return;
theme_button2 = create_image_button(2, priv->dbus_conn_session);
gtk_box_pack_start(GTK_BOX(hbox),
theme_button2, TRUE, TRUE, 0);
+ gtk_widget_show (theme_button2);
theme_button3 = create_image_button(3, priv->dbus_conn_session);
gtk_box_pack_start(GTK_BOX(hbox),
theme_button3, TRUE, TRUE, 0);
+ gtk_widget_show (theme_button3);
theme_button4 = create_image_button(4, priv->dbus_conn_session);
gtk_box_pack_start(GTK_BOX(hbox),
theme_button4, TRUE, TRUE, 0);
+ gtk_widget_show (theme_button4);
+
+}
+/*******************************************************************************/
+void
+lw_main_settings(Animation_WallpaperPrivate *priv, gpointer data){
+ gint result;
+ GtkWidget *window = NULL;
+ GtkWidget *area_hbox;
+ GtkWidget *one_in_all_view_button;
+ gboolean one_in_all_view;
+ Animation_WallpaperPrivate *priv_temp = NULL;
+
+ window = gtk_dialog_new();
+ priv->window = window;
+
+ one_in_all_view_button = priv->one_in_all_view;
+ gtk_window_set_title(GTK_WINDOW(window), _("Live Wallpaper Settings"));
+ gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+ gtk_window_set_modal(GTK_WINDOW(window), TRUE);
+ one_in_all_view_button = create_bool_button(priv->one_in_all_view, _("One theme in all views"));
+ g_signal_connect (G_OBJECT (one_in_all_view_button), "toggled", G_CALLBACK (changed_value_one_in_all_cb), priv);
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox), one_in_all_view_button, TRUE, TRUE, 5);
+ area_hbox = gtk_vbox_new(FALSE, 2);
+ g_object_set_data(G_OBJECT(window), "area_hbox", area_hbox);
+ create_themes_buttons_hbox(priv);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox),
- hbox, TRUE, TRUE, 5);
+ area_hbox, TRUE, TRUE, 0);
- gtk_widget_show (theme_button1);
- gtk_widget_show (theme_button2);
- gtk_widget_show (theme_button3);
- gtk_widget_show (theme_button4);
- gtk_widget_show_all (hbox);
+ gtk_widget_show (one_in_all_view_button);
+ gtk_widget_show_all (area_hbox);
gtk_widget_show (window);
gtk_dialog_add_button(GTK_DIALOG(window), _("About"), GTK_RESPONSE_NO);
result = gtk_dialog_run(GTK_DIALOG(window));
-
+/*
priv_temp = g_object_get_data(G_OBJECT(theme_button1), "priv");
if (priv_temp){
g_free(priv_temp);
g_free(priv_temp);
priv_temp =NULL;
}
-
+*/
switch(result){
case GTK_RESPONSE_NO:
break;
}
-
+ if (hildon_check_button_get_active (HILDON_CHECK_BUTTON(one_in_all_view_button)) != one_in_all_view){
+ save_one_in_all_views_to_config(hildon_check_button_get_active (HILDON_CHECK_BUTTON(one_in_all_view_button)));
+ if (hildon_check_button_get_active (HILDON_CHECK_BUTTON(one_in_all_view_button))){
+ stop_applet(2);
+ stop_applet(3);
+ stop_applet(4);
+ }
+ send_dbus_signal (priv, LIVEWP_SIGNAL_INTERFACE, LIVEWP_SIGNAL_PATH, LIVEWP_RELOAD_CONFIG);
+ }
if (window)
gtk_widget_destroy(window);
}
break;
}
}
- /* Check Battery Eye program */
- if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), "Battery Eye")){
- if (access("/opt/battery-eye/beye", F_OK) != 0){
- show_problem_package(button,"'Battery Eye'");
- /* if not scuccess exit from wthout saving */
- break;
- }
- }
/* Check Orrery program */
if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), "Orrery")){
if (access("/opt/maemo/usr/bin/orrery", F_OK) != 0){
break;
}
}
+ /* Check Colorflood program */
+ if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), "Colorflood")){
+ if (access("/usr/bin/colorflood", F_OK) != 0){
+ show_problem_package(button,"'Colorflood'");
+ /* if not scuccess exit from wthout saving */
+ break;
+ }
+ }
if (priv->theme)
g_free(priv->theme);
void additional_parametr_for_theme_video(GtkWidget *vbox, Animation_WallpaperPrivate *priv);
GSList * get_list_exthemes(void);
void show_problem_package (GtkWidget *widget, gchar *package_name);
+void changed_value_one_in_all_cb (GtkWidget *toggle, Animation_WallpaperPrivate *priv);
+void save_one_in_all_views_to_config(gboolean one_in_all_views);
projects / livewp / commitdiff
