done some restyling

diff --git a/applet/data/icons/livewp.26.png b/applet/data/icons/livewp.26.png
index 427ae05..60d7b69 100644 (file)
Binary files a/applet/data/icons/livewp.26.png and b/applet/data/icons/livewp.26.png differ

diff --git a/applet/data/icons/livewp.40.png b/applet/data/icons/livewp.40.png
index d01ad07..2882ca0 100644 (file)
Binary files a/applet/data/icons/livewp.40.png and b/applet/data/icons/livewp.40.png differ

diff --git a/applet/data/icons/livewp.64.png b/applet/data/icons/livewp.64.png
index c9fa596..910a18c 100644 (file)
Binary files a/applet/data/icons/livewp.64.png and b/applet/data/icons/livewp.64.png differ

diff --git a/applet/data/theme/Accel/icon.png b/applet/data/theme/Accel/icon.png
index 6921b14..797f23d 100644 (file)
Binary files a/applet/data/theme/Accel/icon.png and b/applet/data/theme/Accel/icon.png differ

diff --git a/applet/data/theme/Accel/icond.png b/applet/data/theme/Accel/icond.png
index 0ccc3ab..9b0ebc9 100644 (file)
Binary files a/applet/data/theme/Accel/icond.png and b/applet/data/theme/Accel/icond.png differ

diff --git a/applet/data/theme/Berlin/icon.png b/applet/data/theme/Berlin/icon.png
index 898b422..d1d30f2 100644 (file)
Binary files a/applet/data/theme/Berlin/icon.png and b/applet/data/theme/Berlin/icon.png differ

diff --git a/applet/data/theme/Berlin/icond.png b/applet/data/theme/Berlin/icond.png
index 9c815b0..c695a95 100644 (file)
Binary files a/applet/data/theme/Berlin/icond.png and b/applet/data/theme/Berlin/icond.png differ

diff --git a/applet/data/theme/Matrix/icon.png b/applet/data/theme/Matrix/icon.png
index 02dc478..d1e7624 100644 (file)
Binary files a/applet/data/theme/Matrix/icon.png and b/applet/data/theme/Matrix/icon.png differ

diff --git a/applet/data/theme/Matrix/icond.png b/applet/data/theme/Matrix/icond.png
index 1c5b214..f3521ea 100644 (file)
Binary files a/applet/data/theme/Matrix/icond.png and b/applet/data/theme/Matrix/icond.png differ

diff --git a/applet/data/theme/Modern/icon.png b/applet/data/theme/Modern/icon.png
index f04517a..c048d09 100644 (file)
Binary files a/applet/data/theme/Modern/icon.png and b/applet/data/theme/Modern/icon.png differ

diff --git a/applet/data/theme/Modern/icond.png b/applet/data/theme/Modern/icond.png
index e482add..d1a98ce 100644 (file)
Binary files a/applet/data/theme/Modern/icond.png and b/applet/data/theme/Modern/icond.png differ

diff --git a/applet/data/theme/Video/icon.png b/applet/data/theme/Video/icon.png
index 2f1f063..d339b78 100644 (file)
Binary files a/applet/data/theme/Video/icon.png and b/applet/data/theme/Video/icon.png differ

diff --git a/applet/data/theme/Video/icond.png b/applet/data/theme/Video/icond.png
index 9ba392d..0803938 100644 (file)
Binary files a/applet/data/theme/Video/icond.png and b/applet/data/theme/Video/icond.png differ

diff --git a/applet/data/theme/Xsnow/icon.png b/applet/data/theme/Xsnow/icon.png
index ce076f9..a6f7022 100644 (file)
Binary files a/applet/data/theme/Xsnow/icon.png and b/applet/data/theme/Xsnow/icon.png differ

diff --git a/applet/data/theme/Xsnow/icond.png b/applet/data/theme/Xsnow/icond.png
index 0e824d4..5afe39d 100644 (file)
Binary files a/applet/data/theme/Xsnow/icond.png and b/applet/data/theme/Xsnow/icond.png differ

diff --git a/applet/debian/changelog b/applet/debian/changelog
index ae6831b..4d9442a 100644 (file)
--- a/applet/debian/changelog
+++ b/applet/debian/changelog
@@ -6,6 +6,7 @@ live-wallpaper (0.8.1) unstable; urgency=low
     Xscreensaver) 
   * Done native background in theme Accel
   * Added option 'Sound' for theme Video
+  * Restyling 
 
  -- Vlad Vasiliev <vlad@gas.by>  Mon, 16 Aug 2010 12:39:10 +0200
 

diff --git a/applet/debian/control b/applet/debian/control
index 2d663ab..11d0ab5 100644 (file)
--- a/applet/debian/control
+++ b/applet/debian/control
@@ -14,85 +14,59 @@ XB-Description-fi_FI: Näyttää ajankohdan mukaan muuttuvan taustakuvan
 XB-Maemo-Display-Name: Live Wallpaper
 Xsbc-Bugtracker: https://garage.maemo.org/tracker/?atid=5336&group_id=1471&func=browse
 XB-Maemo-Icon-26:
- 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
- HAQ05xi7MCqlwO+FXFzuZUGOA7th+w6443HY839S9JwBln4HzwAAAABJRU5ErkJggg==
+ iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAIAAAAlC+aJAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
+ bWFnZVJlYWR5ccllPAAAAyBpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdp
+ bj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6
+ eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEz
+ NDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJo
+ dHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlw
+ dGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAv
+ IiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RS
+ ZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpD
+ cmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBXaW5kb3dzIiB4bXBNTTpJbnN0YW5jZUlE
+ PSJ4bXAuaWlkOjAxMkZFODIzQUJBMzExREZCNDg1RTc0MzM5MTQzMUM0IiB4bXBNTTpEb2N1bWVu
+ dElEPSJ4bXAuZGlkOjAxMkZFODI0QUJBMzExREZCNDg1RTc0MzM5MTQzMUM0Ij4gPHhtcE1NOkRl
+ cml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDEyRkU4MjFBQkEzMTFERkI0ODVF
+ NzQzMzkxNDMxQzQiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MDEyRkU4MjJBQkEzMTFERkI0
+ ODVFNzQzMzkxNDMxQzQiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1l
+ 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
+ fwswABRFcTX3Fz3EAAAAAElFTkSuQmCC
+ 
 

diff --git a/applet/src/livewp-settings.c b/applet/src/livewp-settings.c
index af7aa68..409da26 100644 (file)
--- a/applet/src/livewp-settings.c
+++ b/applet/src/livewp-settings.c
@@ -37,7 +37,7 @@ void lw_about(void){
     label_about = gtk_label_new (_("Live Wallpaper Version 0.8.1 \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 Andrew Zhilin\n \
+Copyright(c) 2010 for design theme Matrix and icons Andrew Zhilin\n \
 Translators:\n \
 Finnish - Marko Vertainen\n \
 Spain  - Alejandro López\n \
@@ -81,9 +81,10 @@ create_category_selector (Animation_WallpaperPrivate *priv){
 
 /*******************************************************************************/
 void
-theme_button_clicked(GtkButton *button, Animation_WallpaperPrivate *priv){
+theme_button_clicked(GtkWidget *button, GdkEventButton *event, Animation_WallpaperPrivate *priv){
 
     lw_theme_settings(GTK_WIDGET(button), priv);
+    return TRUE;
 }
 /********************************************************************************/
 void
@@ -94,6 +95,7 @@ set_button_image(GtkWidget * button, Animation_WallpaperPrivate *priv, gboolean
     gchar *icon_on = NULL;
     gchar *icon_off = NULL;
     GSList *store = priv->extheme_list;
+
     while (store){
         if (!strcmp(priv->theme, g_hash_table_lookup(store->data, "name"))){
             icon_on = g_strdup(g_hash_table_lookup(store->data, "icon_on"));
@@ -116,8 +118,8 @@ set_button_image(GtkWidget * button, Animation_WallpaperPrivate *priv, gboolean
                             priv->theme, "icond.png");
     }
     pixbuf = gdk_pixbuf_new_from_file_at_size (str, 
-                                                 100, 
-                                                 60, 
+                                                 124, 
+                                                 79, 
                                                  NULL);
     if (str)
         g_free(str);
@@ -130,13 +132,22 @@ set_button_image(GtkWidget * button, Animation_WallpaperPrivate *priv, gboolean
         g_object_unref(G_OBJECT(pixbuf));
     }
 
-   hildon_button_set_image (HILDON_BUTTON (button), image);
+    //hildon_button_set_image (HILDON_BUTTON (button), image);
+    GList *list = gtk_container_get_children(GTK_CONTAINER (button));
+    if (list){
+        gtk_container_remove(GTK_CONTAINER (button), list->data);
+    }
+    gtk_container_add(GTK_CONTAINER (button), image);
+    gtk_widget_show(image);
+    gtk_widget_show(button);
+
 }
 /********************************************************************************/
 GtkWidget *
 create_image_button (gint view, DBusConnection *conn_sess){
     GtkWidget *button;
-    
+    GtkWidget *event_box;
+
     Animation_WallpaperPrivate *priv = g_new0(Animation_WallpaperPrivate, 1);
     /* Add external themes to priv */
     priv->extheme_list = get_list_exthemes();
@@ -145,6 +156,14 @@ create_image_button (gint view, DBusConnection *conn_sess){
     priv->theme_string_parametr1 = NULL;
     priv->dbus_conn_session = conn_sess;
     read_config(priv);
+
+    event_box = gtk_event_box_new();
+    g_object_set_data(G_OBJECT(event_box), "view", GINT_TO_POINTER(view));
+    g_object_set_data(G_OBJECT(event_box), "priv", priv);
+    set_button_image(event_box, priv, check_applet_state(view));
+    g_signal_connect(G_OBJECT (event_box), "button_press_event", G_CALLBACK(theme_button_clicked), priv);
+    return event_box;
+#if 0
     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));
@@ -153,7 +172,7 @@ create_image_button (gint view, DBusConnection *conn_sess){
     g_signal_connect(button, "clicked", G_CALLBACK(theme_button_clicked), priv);
     hildon_button_set_image_position (HILDON_BUTTON (button), GTK_POS_RIGHT);
     return button;
-
+#endif
 }
 /********************************************************************************/
 void
@@ -387,19 +406,19 @@ lw_main_settings(Animation_WallpaperPrivate *priv, gpointer data){
     gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
     gtk_window_set_modal(GTK_WINDOW(window), TRUE);
     /* Create Theme button */
-    hbox = gtk_hbox_new(FALSE, 5);
+    hbox = gtk_hbox_new(FALSE, 0);
     theme_button1 = create_image_button(1, priv->dbus_conn_session);
     gtk_box_pack_start(GTK_BOX(hbox),
-                                   theme_button1, TRUE, TRUE, 5);
+                                   theme_button1, TRUE, TRUE, 0);
     theme_button2 = create_image_button(2, priv->dbus_conn_session);
     gtk_box_pack_start(GTK_BOX(hbox),
-                                   theme_button2, TRUE, TRUE, 5);
+                                   theme_button2, TRUE, TRUE, 0);
     theme_button3 = create_image_button(3, priv->dbus_conn_session);
     gtk_box_pack_start(GTK_BOX(hbox),
-                                   theme_button3, TRUE, TRUE, 5);
+                                   theme_button3, TRUE, TRUE, 0);
     theme_button4 = create_image_button(4, priv->dbus_conn_session);
     gtk_box_pack_start(GTK_BOX(hbox),
-                                   theme_button4, TRUE, TRUE, 5);
+                                   theme_button4, TRUE, TRUE, 0);
     gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox),
                                    hbox, TRUE, TRUE, 5);
 

diff --git a/applet/src/livewp-settings.h b/applet/src/livewp-settings.h
index 2f92c46..df26288 100644 (file)
--- a/applet/src/livewp-settings.h
+++ b/applet/src/livewp-settings.h
@@ -39,7 +39,7 @@ void send_dbus_signal (Animation_WallpaperPrivate *priv, const gchar *interface,
                   const gchar *path, const gchar *member);
 gint read_config(Animation_WallpaperPrivate *priv);
 void lw_theme_settings(GtkWidget *button, Animation_WallpaperPrivate *priv); 
-void theme_button_clicked(GtkButton *button, Animation_WallpaperPrivate *priv);
+void theme_button_clicked(GtkWidget *button, GdkEventButton *event, Animation_WallpaperPrivate *priv);
 void rich_animation_additional_parametr(GtkWidget *vbox, Animation_WallpaperPrivate *priv);
 void additional_parametr_for_theme_video(GtkWidget *vbox, Animation_WallpaperPrivate *priv);
 GSList * get_list_exthemes(void);