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

[From: subversion at stage.maemo.org]

Author: yangli
Date: 2008-10-01 11:13:44 +0300 (Wed, 01 Oct 2008)
New Revision: 16304

Modified:
   projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c
Log:
cancel button is removed

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-30 20:00:24 UTC (rev 16303)
+++ projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-chooser-dialog.c	2008-10-01 08:13:44 UTC (rev 16304)
@@ -143,7 +143,7 @@
 
     GtkWidget *action_button;
     GtkWidget *folder_button;
-    GtkWidget *cancel_button;
+    //GtkWidget *cancel_button;
     HildonFileSelection *filetree;
     HildonFileSystemModel *model;
     GtkSizeGroup *caption_size_group;
@@ -1148,8 +1148,13 @@
         gtk_window_set_title(GTK_WINDOW(self), _("ckdg_ti_open_file"));
         gtk_button_set_label(GTK_BUTTON(priv->action_button),
                              _("ckdg_bd_select_object_ok_open"));
+	gtk_widget_set_size_request(GTK_WIDGET(priv->action_button),
+                                    HILDON_SIZE_AUTO_WIDTH,
+				    HILDON_SIZE_FINGER_HEIGHT);
+	/*
         gtk_button_set_label(GTK_BUTTON(priv->cancel_button),
-                             "C");
+                             _("ckdg_bd_save_object_dialog_cancel"));
+	*/
         hildon_helper_set_insensitive_message (priv->action_button,
                                                _("sfil_ib_select_file"));
         break;
@@ -1184,10 +1189,15 @@
         gtk_window_set_title(GTK_WINDOW(self), _("sfil_ti_save_file"));
         gtk_button_set_label(GTK_BUTTON(priv->action_button),
                              _("ckdg_bd_save_object_dialog_ok"));
+	gtk_widget_set_size_request(GTK_WIDGET(priv->action_button),
+                                    HILDON_SIZE_AUTO_WIDTH,
+				    HILDON_SIZE_FINGER_HEIGHT);
         gtk_button_set_label(GTK_BUTTON(priv->folder_button),
 	                     _("sfil_bd_save_object_dialog_change_folder"));
+        /*
         gtk_button_set_label(GTK_BUTTON(priv->cancel_button),
-			     /* _("ckdg_bd_save_object_dialog_cancel")*/"C");
+			     _("ckdg_bd_save_object_dialog_cancel"));
+	*/
         gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(self),
                                           _("ckdg_va_save_object_name_stub_default"));
         hildon_helper_set_insensitive_message (priv->action_button,
@@ -1216,10 +1226,15 @@
         gtk_window_set_title(GTK_WINDOW(self), _("ckdg_ti_change_folder"));
         gtk_button_set_label(GTK_BUTTON(priv->action_button),
                              _("ckdg_bd_change_folder_ok"));
+	gtk_widget_set_size_request(GTK_WIDGET(priv->action_button),
+                                    HILDON_SIZE_AUTO_WIDTH,
+				    HILDON_SIZE_FINGER_HEIGHT);
         gtk_button_set_label(GTK_BUTTON(priv->folder_button),
                              _("ckdg_bd_change_folder_new_folder"));
+	/*
         gtk_button_set_label(GTK_BUTTON(priv->cancel_button),
-                             /*_("ckdg_bd_change_folder_cancel")*/"C");
+                             _("ckdg_bd_change_folder_cancel"));
+	*/
         hildon_helper_set_insensitive_message (priv->action_button,
                                                _("sfil_ib_select_file"));
         break;
@@ -1238,8 +1253,13 @@
                                           _("ckdg_va_new_folder_name_stub"));
         gtk_button_set_label(GTK_BUTTON(priv->action_button),
                              _("ckdg_bd_new_folder_dialog_ok"));
+	gtk_widget_set_size_request(GTK_WIDGET(priv->action_button),
+                                    HILDON_SIZE_AUTO_WIDTH,
+				    HILDON_SIZE_FINGER_HEIGHT);
+	/*
         gtk_button_set_label(GTK_BUTTON(priv->cancel_button),
-			     /* _("ckdg_bd_new_folder_dialog_cancel")*/"C");
+			      _("ckdg_bd_new_folder_dialog_cancel"));
+	*/
         hildon_helper_set_insensitive_message (priv->action_button,
                                                HCS("ckdg_ib_enter_name"));
         break;
@@ -2262,14 +2282,19 @@
         gtk_dialog_add_button(GTK_DIALOG(self),
                               _("ckdg_bd_select_object_ok_open"),
                               GTK_RESPONSE_OK);
+    gtk_widget_set_size_request(GTK_WIDGET(priv->action_button),
+				HILDON_SIZE_AUTO_WIDTH,
+				HILDON_SIZE_FINGER_HEIGHT);
     priv->folder_button =
         gtk_dialog_add_button(GTK_DIALOG(self),
                               _("ckdg_bd_change_folder_new_folder"),
                               HILDON_RESPONSE_FOLDER_BUTTON);
+    /*
     priv->cancel_button =
         gtk_dialog_add_button(GTK_DIALOG(self),
                               "C",
                               GTK_RESPONSE_CANCEL);
+    */
     priv->entry_name = gtk_entry_new();
 
     priv->caption_control_name =