[maemo-commits] [maemo-commits] r16198 - projects/haf/branches/hildon-fm/fremantle/hildon-fm

[From: subversion at stage.maemo.org]

Author: yangli
Date: 2008-09-24 10:16:16 +0300 (Wed, 24 Sep 2008)
New Revision: 16198

Modified:
   projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c
Log:
change on size of the picker button, path button and file selection are aligned

Modified: projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c
===================================================================
--- projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c	2008-09-23 17:08:56 UTC (rev 16197)
+++ projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c	2008-09-24 07:16:16 UTC (rev 16198)
@@ -2157,7 +2157,6 @@
     }
     if(priv->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER){
       hildon_button_set_text(HILDON_BUTTON(priv->path_button), path_string, NULL);
-      gtk_button_set_alignment(GTK_BUTTON(priv->path_button), 0.0, 0.5);
     }
     else if(priv->action == GTK_FILE_CHOOSER_ACTION_OPEN) {
       gtk_label_set_text(GTK_LABEL(priv->path_label), path_string);
@@ -2242,6 +2241,7 @@
     priv->up_button = hildon_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH, 
 					HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
     hildon_button_set_image(HILDON_BUTTON(priv->up_button), image);
+    gtk_button_set_alignment(GTK_BUTTON(priv->up_button), 0.0, 0.5);
     g_signal_connect (G_OBJECT (priv->up_button), "clicked",
 		      G_CALLBACK (hildon_response_up_button_clicked), self);
     gtk_widget_show(priv->up_button);
@@ -2249,6 +2249,7 @@
     priv->path_button = hildon_button_new(HILDON_SIZE_FINGER_HEIGHT |
 					  HILDON_SIZE_AUTO_WIDTH, 
 					  HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
+    gtk_button_set_alignment(GTK_BUTTON(priv->path_button), 0.0, 0.5);
     g_signal_connect (G_OBJECT (priv->path_button), "clicked",
 		      G_CALLBACK (hildon_response_path_button_clicked), self);
     gtk_widget_show(priv->path_button);
@@ -2315,9 +2316,9 @@
     gtk_box_pack_start(GTK_BOX(priv->hbox_address), priv->up_button,
                        FALSE, TRUE, 0);
     gtk_box_pack_start(GTK_BOX(priv->hbox_address), priv->path_button,
-		       TRUE, TRUE, 0);
+		       TRUE, TRUE, HILDON_MARGIN_DEFAULT);
     gtk_box_pack_start(GTK_BOX(priv->hbox_address), priv->path_label,
-		       TRUE, TRUE, 0);
+		       TRUE, TRUE, HILDON_MARGIN_DEFAULT);
     priv->caption_control_location =
       hildon_caption_new(size_group, _("sfil_fi_save_objects_items"),
 			 eventbox, NULL,
@@ -2374,10 +2375,12 @@
     gtk_widget_show_all(priv->popup);
 
     box = GTK_BOX(GTK_DIALOG(self)->vbox);
-    gtk_box_pack_start(box, priv->caption_control_name, FALSE, TRUE, 0);
-    gtk_box_pack_start(box, priv->hbox_items, FALSE, TRUE, 0);
+    gtk_box_pack_start(box, priv->caption_control_name, FALSE, TRUE, 
+		       HILDON_MARGIN_DEFAULT);
+    gtk_box_pack_start(box, priv->hbox_items, FALSE, TRUE, 
+		       HILDON_MARGIN_DEFAULT);
     gtk_box_pack_start(box, priv->caption_control_location, FALSE, TRUE,
-                       0);
+                       HILDON_MARGIN_DEFAULT);
 
     g_signal_connect(self, "response", G_CALLBACK(response_handler), NULL);
     g_signal_connect(priv->mode_list, "toggled",
@@ -2669,7 +2672,8 @@
 
   g_return_val_if_fail (self->priv->extensions_combo == NULL, NULL);
     
-  button = hildon_picker_button_new(HILDON_SIZE_AUTO, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
+  button = hildon_picker_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH, 
+				    HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
   selector = hildon_touch_selector_new_text();
 
   self->priv->extensions_combo = button;