added settings dialog in application

diff --git a/applet/po/ru_RU.po b/applet/po/ru_RU.po
index bc75e85..e1b5370 100644 (file)
--- a/applet/po/ru_RU.po
+++ b/applet/po/ru_RU.po
@@ -69,3 +69,7 @@ msgstr "Сохранить"
 #: src/livewp-settings.c:71
 msgid "Theme"
 msgstr "Тема"
+
+#: src/livewp-main.c:67
+msgid "Settings"
+msgstr "Настройки"

diff --git a/applet/src/livewp-main.c b/applet/src/livewp-main.c
index 05b55f5..0b2332b 100644 (file)
--- a/applet/src/livewp-main.c
+++ b/applet/src/livewp-main.c
@@ -26,12 +26,22 @@
 #include "livewp-settings.h"
 /*******************************************************************************/
 
+void 
+btn_setting_clicked(HildonButton *btn, gpointer data)
+{
+    Animation_WallpaperPrivate *priv = data;
+    // open settings dialog
+    fprintf(stderr, "btn setting clicked, %s\n", priv->theme);
+    lw_settings(priv->desktop_plugin, priv);
+    fprintf(stderr, "btn setting clicked, %s\n", priv->theme);
+}
+
 int
 main(int argc, char *argv[])
 {
     GtkWidget *main_widget = NULL;
     GtkWidget *window;
-    GtkWidget *button, *vbox;
+    GtkWidget *btn_setting, *vbox;
     gint result;
     HildonProgram       *app;
     osso_context_t  *osso_context=NULL;
@@ -62,62 +72,18 @@ main(int argc, char *argv[])
     gtk_window_set_title(GTK_WINDOW(main_widget), PACKAGE);
 
     vbox = gtk_vbox_new(FALSE, 5);
-    button = hildon_button_new(HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT,
+    btn_setting = hildon_button_new(HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT,
                                HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
-    hildon_button_set_text(HILDON_BUTTON(button), "кнопка", "");
+    hildon_button_set_text(HILDON_BUTTON(btn_setting), _("Settings"), "");
+    g_signal_connect(btn_setting, "clicked", G_CALLBACK(btn_setting_clicked), priv);
     //gtk_container_add(GTK_CONTAINER(main_widget), button);
-    gtk_box_pack_start(vbox, button, FALSE, FALSE, 0);
+    gtk_box_pack_start(vbox, btn_setting, FALSE, FALSE, 0);
     gtk_container_add(GTK_CONTAINER(main_widget), vbox);
 
+    g_signal_connect(main_widget, "destroy", G_CALLBACK(gtk_main_quit), NULL);
     hildon_program_add_window(app, HILDON_WINDOW(main_widget));
 
     gtk_widget_show_all(GTK_WIDGET(main_widget));
-#if 0
-    window = create_settings();
-    if (window){
-        //gtk_widget_show_all(window);
-        
-        result = gtk_dialog_run(GTK_DIALOG(window));
-
-    switch(result){
-        case GTK_RESPONSE_YES:
-            #if 0
-            if (hildon_button_get_value(HILDON_BUTTON (theme_button))){
-                if (priv->theme)
-                    g_free(priv->theme);
-                if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Berlin")))
-                    priv->theme = g_strdup("Berlin");
-                if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Modern")))
-                    priv->theme = g_strdup("Modern");
-                if (!strcmp(hildon_button_get_value(HILDON_BUTTON (theme_button)), _("Matrix")))
-                    priv->theme = g_strdup("Matrix");
-                if (hildon_check_button_get_active (rich_animation_button))
-                    priv->rich_animation = TRUE;
-                else
-                    priv->rich_animation = FALSE;
-            }
-            save_config(priv);
-            reload_scene(priv->desktop_plugin);
-            #endif
-            //fprintf(stderr, "click save %s\n", hildon_button_get_value(HILDON_BUTTON(theme_button)));
-            fprintf(stderr, "click save \n");
-        break;
-        default:
-        case GTK_RESPONSE_OK:
-        break;
-        case GTK_RESPONSE_NO:
-            fprintf(stderr, "click about\n");
-            gtk_widget_destroy(window);
-            window = NULL;
-            //lw_about();
-        break;
-    }
-    //if (window)
-      //  gtk_widget_destroy(window);
-    //}
-    }
-#endif
-    fprintf(stderr,"start fdf\n");
-        gtk_main();
+    gtk_main();
     return 0;
 }

diff --git a/applet/src/livewp-settings.c b/applet/src/livewp-settings.c
index be92f13..3da521c 100644 (file)
--- a/applet/src/livewp-settings.c
+++ b/applet/src/livewp-settings.c
@@ -146,7 +146,7 @@ lw_settings(GtkWidget *widget, Animation_WallpaperPrivate *priv){
                     priv->rich_animation = FALSE;
             }
             save_config(priv);
-            reload_scene(priv->desktop_plugin);
+            //reload_scene(priv->desktop_plugin);
         break;
         default:
         case GTK_RESPONSE_OK: