Changeset 5159

Timestamp:

Feb 28, 2008, 2:48:23 PM (14 years ago)

Author:

charles

Message:

(gtk) #742: gtk dialog buttons need to support `alternative button order' for KDE users

Location:

trunk/gtk

Files:

• dialogs.c (modified) (4 diffs)
• msgwin.c (modified) (1 diff)
• open-dialog.c (modified) (1 diff)

trunk/gtk/dialogs.c

@@ -140 +140 @@
                                          GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
                                          NULL );
+    gtk_dialog_set_alternative_button_order( GTK_DIALOG( wind ),
+                                             GTK_RESPONSE_ACCEPT,
+                                             GTK_RESPONSE_CANCEL,
+                                             -1 );
     gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( wind ), TRUE );
     gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( wind ), FALSE );
@@ -260 +264 @@
                                               _("This will close all active torrents."));
     gtk_dialog_add_buttons( GTK_DIALOG(wind),
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                             GTK_STOCK_QUIT, GTK_RESPONSE_ACCEPT,
                             NULL );
     gtk_dialog_set_default_response( GTK_DIALOG( wind ),
                                      GTK_RESPONSE_ACCEPT );
+    gtk_dialog_set_alternative_button_order( GTK_DIALOG( wind ),
+                                     GTK_RESPONSE_ACCEPT,
+                                     GTK_RESPONSE_CANCEL );
 
     dontask = gtk_check_button_new_with_mnemonic( _("_Don't Ask Me This Again") );
@@ -303 +310 @@
 {
     struct DeleteData * data = gdata;
-    const int del = response == GTK_RESPONSE_YES;
+    const int del = response == GTK_RESPONSE_ACCEPT;
     const int deleteFiles = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( data->delete_files_tb ) );
     GList * l;
@@ -340 +347 @@
                                      parent,
                                      GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_NO_SEPARATOR,
-                                     GTK_STOCK_NO, GTK_RESPONSE_NO,
-                                     GTK_STOCK_YES, GTK_RESPONSE_YES,
+                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                     GTK_STOCK_REMOVE, GTK_RESPONSE_ACCEPT,
                                      NULL );
+    gtk_dialog_set_alternative_button_order( GTK_DIALOG( d ),
+                                             GTK_RESPONSE_ACCEPT,
+                                             GTK_RESPONSE_CANCEL,
+                                             -1 );
     g_signal_connect( d, "response", G_CALLBACK( deleteResponse ), dd );
 

trunk/gtk/msgwin.c

@@ -194 +194 @@
                                                GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
                                                NULL );
+  gtk_dialog_set_alternative_button_order( GTK_DIALOG( d ),
+                                           GTK_RESPONSE_ACCEPT,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1 );
   g_signal_connect( d, "response",
                     G_CALLBACK( save_dialog_response_cb ), textbuf );

trunk/gtk/open-dialog.c

@@ -149 +149 @@
             GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
             NULL );
+    gtk_dialog_set_default_response( GTK_DIALOG( d ),
+                                     GTK_RESPONSE_ACCEPT );
+    gtk_dialog_set_alternative_button_order( GTK_DIALOG( d ),
+                                             GTK_RESPONSE_ACCEPT,
+                                             GTK_RESPONSE_CANCEL,
+                                             -1 );
 
     if( tr_ctorGetDestination( ctor, TR_FORCE, &str ) )