prepared to release 0.6 version
authortanya <tanyshk@gmail.com>
Tue, 20 Jul 2010 07:48:13 +0000 (10:48 +0300)
committertanya <tanyshk@gmail.com>
Tue, 20 Jul 2010 07:48:13 +0000 (10:48 +0300)
12 files changed:
applet/gen_locale_files.sh
applet/po/LINGUAS
applet/po/es_ES.po
applet/po/es_MX.po
applet/po/fi_FI.po
applet/po/ru_RU.po
applet/src/livewp-common.h
applet/src/livewp-config.c
applet/src/livewp-config.h
applet/src/livewp-dbus.c
applet/src/livewp-home-widget.c
applet/src/livewp-settings.c

index 799bd69..b78e7d2 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ALL_LANGUAGES="ru_RU fi_FI es_ES es_MX"
+ALL_LANGUAGES="ru_RU fi_FI es_ES es_MX pl_PL"
 
 xgettext --from-code=UTF-8 --keyword=_ --keyword=Q_ -f po/POTFILES.in -s -C -o po/livewp.pot
 cd po
index 49d3ede..8340757 100644 (file)
@@ -3,3 +3,4 @@ es_ES
 es_MX
 fi_FI
 ru_RU
+pl_PL
index e9535bd..f97a288 100644 (file)
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-10 09:19+0300\n"
+"POT-Creation-Date: 2010-07-20 09:37+0300\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Alejandro López <alejandro.lopez@free.fr>\n"
 "Language-Team: \n"
@@ -10,31 +10,29 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/livewp-settings.c:33
-#: src/livewp-settings.c:155
+#: src/livewp-settings.c:33 src/livewp-settings.c:214
 msgid "About"
 msgstr "Acerca de"
 
-#: src/livewp-settings.c:63
-#: src/livewp-settings.c:83
-#: src/livewp-settings.c:165
+#: src/livewp-settings.c:62 src/livewp-settings.c:134
+#: src/livewp-settings.c:271
 msgid "Berlin"
 msgstr "Berlín"
 
-#: src/livewp-settings.c:114
+#: src/livewp-settings.c:165
 msgid "Enable"
 msgstr "Activar"
 
-#: src/livewp-config.c:36
-#: src/livewp-config.c:64
+#: src/livewp-config.c:38 src/livewp-config.c:92
 #, c-format
 msgid "Failed to initialize GConf. Quitting.\n"
 msgstr "Falló la inicialización de GConf. Terminando.\n"
 
 #: src/livewp-settings.c:37
+#, fuzzy
 msgid ""
 "Live Wallpaper\n"
-" Version 0.5 \n"
+" Version 0.6 \n"
 " Copyright(c) 2010\n"
 " Tanya Makova\n"
 " Vlad Vasiliev\n"
@@ -59,31 +57,33 @@ msgstr ""
 " Ruso - Tanya Makova \n"
 "        Vlad Vasiliev\n"
 
-#: src/livewp-settings.c:136
+#: src/livewp-settings.c:188
 msgid "Live Wallpaper Settings"
 msgstr "Configuración de Live Wallpaper"
 
-#: src/livewp-settings.c:65
-#: src/livewp-settings.c:91
-#: src/livewp-settings.c:169
+#: src/livewp-settings.c:64 src/livewp-settings.c:142
+#: src/livewp-settings.c:275
 msgid "Matrix"
 msgstr "Matrix"
 
-#: src/livewp-settings.c:64
-#: src/livewp-settings.c:87
-#: src/livewp-settings.c:167
+#: src/livewp-settings.c:63 src/livewp-settings.c:138
+#: src/livewp-settings.c:273
 msgid "Modern"
 msgstr "Moderno"
 
-#: src/livewp-settings.c:104
+#: src/livewp-settings.c:155
 msgid "Rich Animation"
 msgstr "Animación rica"
 
-#: src/livewp-settings.c:156
+#: src/livewp-settings.c:261
 msgid "Save"
 msgstr "Guardar"
 
-#: src/livewp-settings.c:77
+#: src/livewp-settings.c:128
 msgid "Theme"
 msgstr "Tema"
 
+#: src/livewp-settings.c:242
+#, fuzzy
+msgid "View Settings"
+msgstr "Configuración de Live Wallpaper"
index e9535bd..f97a288 100644 (file)
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-10 09:19+0300\n"
+"POT-Creation-Date: 2010-07-20 09:37+0300\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Alejandro López <alejandro.lopez@free.fr>\n"
 "Language-Team: \n"
@@ -10,31 +10,29 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/livewp-settings.c:33
-#: src/livewp-settings.c:155
+#: src/livewp-settings.c:33 src/livewp-settings.c:214
 msgid "About"
 msgstr "Acerca de"
 
-#: src/livewp-settings.c:63
-#: src/livewp-settings.c:83
-#: src/livewp-settings.c:165
+#: src/livewp-settings.c:62 src/livewp-settings.c:134
+#: src/livewp-settings.c:271
 msgid "Berlin"
 msgstr "Berlín"
 
-#: src/livewp-settings.c:114
+#: src/livewp-settings.c:165
 msgid "Enable"
 msgstr "Activar"
 
-#: src/livewp-config.c:36
-#: src/livewp-config.c:64
+#: src/livewp-config.c:38 src/livewp-config.c:92
 #, c-format
 msgid "Failed to initialize GConf. Quitting.\n"
 msgstr "Falló la inicialización de GConf. Terminando.\n"
 
 #: src/livewp-settings.c:37
+#, fuzzy
 msgid ""
 "Live Wallpaper\n"
-" Version 0.5 \n"
+" Version 0.6 \n"
 " Copyright(c) 2010\n"
 " Tanya Makova\n"
 " Vlad Vasiliev\n"
@@ -59,31 +57,33 @@ msgstr ""
 " Ruso - Tanya Makova \n"
 "        Vlad Vasiliev\n"
 
-#: src/livewp-settings.c:136
+#: src/livewp-settings.c:188
 msgid "Live Wallpaper Settings"
 msgstr "Configuración de Live Wallpaper"
 
-#: src/livewp-settings.c:65
-#: src/livewp-settings.c:91
-#: src/livewp-settings.c:169
+#: src/livewp-settings.c:64 src/livewp-settings.c:142
+#: src/livewp-settings.c:275
 msgid "Matrix"
 msgstr "Matrix"
 
-#: src/livewp-settings.c:64
-#: src/livewp-settings.c:87
-#: src/livewp-settings.c:167
+#: src/livewp-settings.c:63 src/livewp-settings.c:138
+#: src/livewp-settings.c:273
 msgid "Modern"
 msgstr "Moderno"
 
-#: src/livewp-settings.c:104
+#: src/livewp-settings.c:155
 msgid "Rich Animation"
 msgstr "Animación rica"
 
-#: src/livewp-settings.c:156
+#: src/livewp-settings.c:261
 msgid "Save"
 msgstr "Guardar"
 
-#: src/livewp-settings.c:77
+#: src/livewp-settings.c:128
 msgid "Theme"
 msgstr "Tema"
 
+#: src/livewp-settings.c:242
+#, fuzzy
+msgid "View Settings"
+msgstr "Configuración de Live Wallpaper"
index 51cd77d..543a61f 100644 (file)
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-10 09:19+0300\n"
+"POT-Creation-Date: 2010-07-20 09:37+0300\n"
 "PO-Revision-Date: 2010-06-10 16:50+0200\n"
 "Last-Translator: Marko Vertainen <marko.vertainen@iki.fi>\n"
 "Language-Team: fi_FI <LL@li.org>\n"
@@ -15,31 +15,29 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/livewp-settings.c:33
-#: src/livewp-settings.c:155
+#: src/livewp-settings.c:33 src/livewp-settings.c:214
 msgid "About"
 msgstr "Tietoja"
 
-#: src/livewp-settings.c:63
-#: src/livewp-settings.c:83
-#: src/livewp-settings.c:165
+#: src/livewp-settings.c:62 src/livewp-settings.c:134
+#: src/livewp-settings.c:271
 msgid "Berlin"
 msgstr "Berliini"
 
-#: src/livewp-settings.c:114
+#: src/livewp-settings.c:165
 msgid "Enable"
 msgstr "Käytä"
 
-#: src/livewp-config.c:36
-#: src/livewp-config.c:64
+#: src/livewp-config.c:38 src/livewp-config.c:92
 #, c-format
 msgid "Failed to initialize GConf. Quitting.\n"
 msgstr "GConf asetus epäonnistui. Lopetetaan.\n"
 
 #: src/livewp-settings.c:37
+#, fuzzy
 msgid ""
 "Live Wallpaper\n"
-" Version 0.5 \n"
+" Version 0.6 \n"
 " Copyright(c) 2010\n"
 " Tanya Makova\n"
 " Vlad Vasiliev\n"
@@ -64,34 +62,33 @@ msgstr ""
 " Venäjä - Tanya Makova \n"
 "          Vlad Vasiliev\n"
 
-#: src/livewp-settings.c:136
+#: src/livewp-settings.c:188
 msgid "Live Wallpaper Settings"
 msgstr "Elävän taustakuvan asetukset"
 
-#: src/livewp-settings.c:65
-#: src/livewp-settings.c:91
-#: src/livewp-settings.c:169
+#: src/livewp-settings.c:64 src/livewp-settings.c:142
+#: src/livewp-settings.c:275
 msgid "Matrix"
 msgstr "Matrix"
 
-#: src/livewp-settings.c:64
-#: src/livewp-settings.c:87
-#: src/livewp-settings.c:167
+#: src/livewp-settings.c:63 src/livewp-settings.c:138
+#: src/livewp-settings.c:273
 msgid "Modern"
 msgstr "Moderni"
 
-#: src/livewp-settings.c:104
+#: src/livewp-settings.c:155
 msgid "Rich Animation"
 msgstr "Rikas animaatio"
 
-#: src/livewp-settings.c:156
+#: src/livewp-settings.c:261
 msgid "Save"
 msgstr "Tallenna"
 
-#: src/livewp-settings.c:77
+#: src/livewp-settings.c:128
 msgid "Theme"
 msgstr "Teema"
 
-#~ msgid "Settings"
-#~ msgstr "Asetukset"
-
+#: src/livewp-settings.c:242
+#, fuzzy
+msgid "View Settings"
+msgstr "Asetukset"
index 3f00877..70b7382 100644 (file)
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-10 09:19+0300\n"
+"POT-Creation-Date: 2010-07-20 09:37+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"
@@ -15,19 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/livewp-settings.c:33 src/livewp-settings.c:155
+#: src/livewp-settings.c:33 src/livewp-settings.c:214
 msgid "About"
 msgstr "О программе"
 
-#: src/livewp-settings.c:63 src/livewp-settings.c:83 src/livewp-settings.c:165
+#: src/livewp-settings.c:62 src/livewp-settings.c:134
+#: src/livewp-settings.c:271
 msgid "Berlin"
 msgstr "Берлин"
 
-#: src/livewp-settings.c:114
+#: src/livewp-settings.c:165
 msgid "Enable"
 msgstr "Включить"
 
-#: src/livewp-config.c:36 src/livewp-config.c:64
+#: src/livewp-config.c:38 src/livewp-config.c:92
 #, c-format
 msgid "Failed to initialize GConf. Quitting.\n"
 msgstr ""
@@ -35,7 +36,7 @@ msgstr ""
 #: src/livewp-settings.c:37
 msgid ""
 "Live Wallpaper\n"
-" Version 0.5 \n"
+" Version 0.6 \n"
 " Copyright(c) 2010\n"
 " Tanya Makova\n"
 " Vlad Vasiliev\n"
@@ -48,7 +49,7 @@ msgid ""
 "           Vlad Vasiliev\n"
 msgstr ""
 "Живые обои\n"
-"Версия 0.4.2 \n"
+"Версия 0.6 \n"
 " Copyright(c) 2010\n"
 " Татьяна Макова\n"
 " Влад Васильев\n"
@@ -60,30 +61,36 @@ msgstr ""
 " Русский - Таня Макова \n"
 "           Влад Васильев\n"
 
-#: src/livewp-settings.c:136
+#: src/livewp-settings.c:188
 msgid "Live Wallpaper Settings"
 msgstr "Настройка Live Wallpaper"
 
-#: src/livewp-settings.c:65 src/livewp-settings.c:91 src/livewp-settings.c:169
+#: src/livewp-settings.c:64 src/livewp-settings.c:142
+#: src/livewp-settings.c:275
 msgid "Matrix"
 msgstr "Матрица"
 
-#: src/livewp-settings.c:64 src/livewp-settings.c:87 src/livewp-settings.c:167
+#: src/livewp-settings.c:63 src/livewp-settings.c:138
+#: src/livewp-settings.c:273
 msgid "Modern"
 msgstr "Модерн"
 
-#: src/livewp-settings.c:104
+#: src/livewp-settings.c:155
 msgid "Rich Animation"
 msgstr "Полная Анимация"
 
-#: src/livewp-settings.c:156
+#: src/livewp-settings.c:261
 msgid "Save"
 msgstr "Сохранить"
 
-#: src/livewp-settings.c:77
+#: src/livewp-settings.c:128
 msgid "Theme"
 msgstr "Тема"
 
+#: src/livewp-settings.c:242
+msgid "View Settings"
+msgstr "Настройки вида"
+
 #~ msgid "Missed calls"
 #~ msgstr "Пропущенные вызовы"
 
@@ -96,9 +103,6 @@ msgstr "Тема"
 #~ msgid "Missed mail"
 #~ msgstr "Пропущенная почта"
 
-#~ msgid "Settings"
-#~ msgstr "Настройки"
-
 #~ msgid "Start"
 #~ msgstr "Старт"
 
index a50aeab..0b0acf6 100644 (file)
@@ -76,7 +76,6 @@ struct _Animation_WallpaperPrivate
     gchar *theme;
     gboolean visible;
     gboolean rich_animation;
-    gboolean enable;
     GtkWidget *main_widget;
     GtkWidget *right_corner;
     AWallpaperPlugin *desktop_plugin;
index bef00a1..bd49225 100644 (file)
@@ -33,7 +33,6 @@ read_config(Animation_WallpaperPrivate *priv) {
     gint id = priv->view;
     gchar * str = NULL;
 
-    fprintf(stderr,"read_config\n");
     gconf_client = gconf_client_get_default();
     if (!gconf_client) {
         fprintf(stderr, _("Failed to initialize GConf. Quitting.\n"));
@@ -64,19 +63,6 @@ read_config(Animation_WallpaperPrivate *priv) {
     } else
         priv->rich_animation = TRUE;
     
-    str = g_strdup_printf("%s%i", GCONF_KEY_ENABLE, id);
-    value = gconf_client_get(gconf_client, str, NULL);
-    if (str){ 
-        g_free(str);
-        str = NULL;
-    } 
-    if (value) {
-        fprintf(stderr, "aaaaaaa\n");
-        priv->enable = gconf_value_get_bool(value);
-        gconf_value_free(value);
-    } else
-        priv->enable = FALSE;
-
 
     return 0;
 }
@@ -118,16 +104,4 @@ save_config(Animation_WallpaperPrivate *priv) {
         str = NULL;
     }
     
-    str = g_strdup_printf("%s%i", GCONF_KEY_ENABLE, id);
-    if (priv->enable)
-        gconf_client_set_bool(gconf_client,
-                              str, TRUE, NULL);
-    else
-        gconf_client_set_bool(gconf_client,
-                              str, FALSE, NULL);
-    if (str){
-        g_free(str);
-        str = NULL;
-    }
-
 }
index 06c8411..54082cb 100644 (file)
@@ -31,7 +31,6 @@
 #define GCONF_KEY_PREFIX                            "/apps/maemo/livewp"
 #define GCONF_KEY_THEME                             GCONF_KEY_PREFIX"/theme"
 #define GCONF_KEY_RANIMATION                        GCONF_KEY_PREFIX"/rich_animation"
-#define GCONF_KEY_ENABLE                            GCONF_KEY_PREFIX"/enable"
 gint read_config(Animation_WallpaperPrivate *priv); 
 void save_config(Animation_WallpaperPrivate *priv); 
 #endif
index 6b7b049..6ba5c96 100644 (file)
@@ -141,7 +141,7 @@ get_livewp_signal_cb(DBusConnection *conn, DBusMessage *msg, Animation_Wallpaper
     START_FUNCTION;
 #endif
 
-    fprintf (stderr, "PATH11111111111111111111 %s %s %s\n",   dbus_message_get_path(msg),   dbus_message_get_interface (msg), dbus_message_get_member (msg));
+    /*fprintf (stderr, "PATH11111111111111111111 %s %s %s\n",   dbus_message_get_path(msg),   dbus_message_get_interface (msg), dbus_message_get_member (msg));*/
     if (dbus_message_is_signal(msg, LIVEWP_SIGNAL_INTERFACE, LIVEWP_RELOAD_CONFIG)){
         if(read_config(priv)){
                 fprintf(stderr, "\nCan not read config file.\n");
index 356f69b..1a95083 100644 (file)
@@ -46,7 +46,6 @@ lw_applet_realize (GtkWidget *widget)
     gint id; 
     AWallpaperPlugin *desktop_plugin = widget;
 
-    fprintf(stderr,"ddddddddddddd %s\n", hd_plugin_item_get_plugin_id (HD_PLUGIN_ITEM (widget)));
     strid = g_strdup(hd_plugin_item_get_plugin_id (HD_PLUGIN_ITEM (widget)));
     id = strid[strlen(strid)-1] - '0';
     desktop_plugin->priv->view = id;
index 7ecc049..e7d6b06 100644 (file)
@@ -34,7 +34,7 @@ void lw_about(void){
     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\n Version 0.5 \n Copyright(c) 2010\n \
+    label_about = gtk_label_new (_("Live Wallpaper\n Version 0.6 \n Copyright(c) 2010\n \
 Tanya Makova\n Vlad Vasiliev\n \
 Copyright(c) 2010 for design themes Berlin and Modern Vasya Bobrikov\n \
 Copyright(c) 2010 for design theme Matrix Andrew Zhilin\n \
@@ -82,7 +82,6 @@ set_button_image(GtkWidget * button, gchar *theme, gboolean enable){
     else 
         str = g_strdup_printf( "%s/%s/%s", THEME_PATH, 
                         theme, "icond.png");
-    fprintf(stderr, "set image %s\n", str);
     pixbuf = gdk_pixbuf_new_from_file_at_size (str, 
                                              100, 
                                              60, 
@@ -104,7 +103,6 @@ create_image_button (gint view, DBusConnection *conn_sess){
     gchar * str;
     GdkPixbuf * pixbuf;
     
-    fprintf(stderr,"create_image_button\n");
     Animation_WallpaperPrivate *priv = g_new0(Animation_WallpaperPrivate, 1);
     priv->view = view;
     priv->dbus_conn_session = conn_sess;
@@ -112,7 +110,7 @@ create_image_button (gint view, DBusConnection *conn_sess){
     button = hildon_button_new(HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT,
                                     HILDON_BUTTON_ARRANGEMENT_VERTICAL);
     g_object_set_data(G_OBJECT(button), "view", GINT_TO_POINTER(view));
-    set_button_image(button, priv->theme, priv->enable);
+    set_button_image(button, priv->theme, check_applet_state(view));
     g_signal_connect(button, "clicked", G_CALLBACK(theme_button_clicked), priv);
     hildon_button_set_image_position (HILDON_BUTTON (button), GTK_POS_RIGHT);
     return button;
@@ -185,7 +183,6 @@ lw_main_settings(Animation_WallpaperPrivate *priv, gpointer data){
     GtkWidget *theme_button4;
     GtkWidget *hbox;
 
-    fprintf(stderr,"lw_main_settings\n");
     window = gtk_dialog_new();
 
     gtk_window_set_title(GTK_WINDOW(window), _("Live Wallpaper Settings"));
@@ -240,10 +237,9 @@ lw_theme_settings(Animation_WallpaperPrivate *priv, GtkWidget *button){
     GtkWidget *rich_animation_button;
     gint view = priv->view;
 
-    fprintf(stderr,"lw_theme_settings\n");
     window = gtk_dialog_new();
 
-    gtk_window_set_title(GTK_WINDOW(window), _("Live Wallpaper Settings"));
+    gtk_window_set_title(GTK_WINDOW(window), _("View Settings"));
     gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
     gtk_window_set_modal(GTK_WINDOW(window), TRUE);
     /* Create Enable button */
@@ -262,7 +258,6 @@ lw_theme_settings(Animation_WallpaperPrivate *priv, GtkWidget *button){
     gtk_widget_show (theme_button);
     gtk_widget_show (rich_animation_button);
     gtk_widget_show (window);
-    gtk_dialog_add_button(GTK_DIALOG(window), _("About"), GTK_RESPONSE_NO);
     save_button = gtk_dialog_add_button(GTK_DIALOG(window), _("Save"), GTK_RESPONSE_YES);
 
     result = gtk_dialog_run(GTK_DIALOG(window));
@@ -285,14 +280,8 @@ lw_theme_settings(Animation_WallpaperPrivate *priv, GtkWidget *button){
                 priv->rich_animation = TRUE;
             else
                 priv->rich_animation = FALSE;
-            if (hildon_check_button_get_active (HILDON_CHECK_BUTTON(enable_button)))
-                priv->enable = TRUE;
-            else
-                priv->enable = FALSE;
-
-            /* Save config */
+                        /* Save config */
             save_config(priv);
-            set_button_image(button, priv->theme, priv->enable);
             /* action with applet */
             if (hildon_check_button_get_active (HILDON_CHECK_BUTTON(enable_button))){
                     if (!check_applet_state(view)){
@@ -307,6 +296,7 @@ lw_theme_settings(Animation_WallpaperPrivate *priv, GtkWidget *button){
                     if (check_applet_state(view))
                         stop_applet(view);
 
+            set_button_image(button, priv->theme, check_applet_state(view));
             break;
         default:
         case GTK_RESPONSE_OK:
@@ -328,7 +318,6 @@ check_applet_state(gint number){
     GKeyFile *gkey_file = NULL;
     gchar *str = NULL;
     gboolean result = FALSE;
-fprintf(stderr,"check_applet_state\n");
     if (number > 3 || number < 0)
         return FALSE;