[dia] l10n: stop using GTK_STOCK in dialogs



commit f8d58600aa1fa609ad3456b6aa84e26c18575276
Author: Zander Brown <zbrown gnome org>
Date:   Sat Nov 30 16:19:30 2019 +0000

    l10n: stop using GTK_STOCK in dialogs
    
    Part 1 of fixing https://gitlab.gnome.org/GNOME/dia/issues/431

 app/app_procs.c                      |  4 ++--
 app/defaults.c                       | 19 +++++++++---------
 app/display.c                        |  4 ++--
 app/filedlg.c                        | 37 ++++++++++++++++++------------------
 app/find-and-replace.c               | 28 +++++++++++++--------------
 app/interface.c                      |  3 +--
 app/pagesetup.c                      | 19 +++++++++---------
 app/plugin-manager.c                 | 11 +++++------
 app/preferences.c                    | 17 ++++++++---------
 app/properties-dialog.c              | 15 +++++++--------
 lib/diaarrowchooser.c                | 29 ++++++++++++++--------------
 lib/dialinechooser.c                 | 22 ++++++++++-----------
 lib/widgets.c                        | 17 +++++++++--------
 objects/AADL/edit_port_declaration.c |  2 +-
 14 files changed, 110 insertions(+), 117 deletions(-)
---
diff --git a/app/app_procs.c b/app/app_procs.c
index 342583a9..8842b88c 100644
--- a/app/app_procs.c
+++ b/app/app_procs.c
@@ -968,12 +968,12 @@ app_exit (void)
 
       gtk_window_set_title (GTK_WINDOW (dialog), _("Quit Dia"));
 
-      button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
+      button = gtk_button_new_with_mnemonic (_("_Cancel"));
       gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_CANCEL);
       gtk_widget_set_can_default (GTK_WIDGET (button), TRUE);
       gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
 
-      button = gtk_button_new_from_stock (GTK_STOCK_QUIT);
+      button = gtk_button_new_with_mnemonic (_("_Quit"));
       gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_OK);
 
       gtk_widget_show_all (dialog);
diff --git a/app/defaults.c b/app/defaults.c
index 9800831e..c7d6fc94 100644
--- a/app/defaults.c
+++ b/app/defaults.c
@@ -40,18 +40,17 @@ static gint defaults_respond(GtkWidget *widget, gint response_id, gpointer data)
 
 static void create_dialog()
 {
-  dialog = gtk_dialog_new_with_buttons(
-             _("Object defaults"),
-             NULL, 0,
-             GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
-             GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
-             GTK_STOCK_OK, GTK_RESPONSE_OK,
-             NULL);
+  dialog = gtk_dialog_new_with_buttons(_("Object defaults"),
+                                       NULL, 0,
+                                       _("_Close"), GTK_RESPONSE_CLOSE,
+                                       _("_Apply"), GTK_RESPONSE_APPLY,
+                                       _("_OK"), GTK_RESPONSE_OK,
+                                       NULL);
 
   gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_OK);
 
   dialog_vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-  
+
   gtk_window_set_role (GTK_WINDOW (dialog), "defaults_window");
 
   g_signal_connect(G_OBJECT (dialog), "response",
@@ -112,12 +111,12 @@ defaults_show(DiaObjectType *objtype, gpointer user_data)
   } else {
     defaults = NULL;
   }
-  
+
   if (dialog == NULL)
     create_dialog();
   g_assert(dialog != NULL); /* valid by create_dialog() */
 
-  if ((objtype==NULL) || (defaults == NULL)) { 
+  if ((objtype==NULL) || (defaults == NULL)) {
     /* No defaults or no object */
     defaults = no_defaults_dialog;
     objtype = NULL;
diff --git a/app/display.c b/app/display.c
index 6fa5df61..989ee408 100644
--- a/app/display.c
+++ b/app/display.c
@@ -1144,14 +1144,14 @@ ddisplay_close (DDisplay *ddisp)
       "has not been saved. Save changes now?"), fname);
   gtk_window_set_title (GTK_WINDOW(dialog), _("Close Diagram"));
 
-  button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
+  button = gtk_button_new_with_mnemonic (_("_Cancel"));
   gtk_dialog_add_action_widget (GTK_DIALOG(dialog), button, GTK_RESPONSE_CANCEL);
 
   button = gtk_button_new_with_mnemonic (_("_Discard Changes"));
   gtk_dialog_add_action_widget (GTK_DIALOG(dialog), button, GTK_RESPONSE_NO);
 
   /* button = gtk_button_new_with_label (_("Save and Close")); */
-  button = gtk_button_new_from_stock (GTK_STOCK_SAVE);
+  button = gtk_button_new_with_mnemonic (_("_Save"));
   gtk_dialog_add_action_widget (GTK_DIALOG(dialog), button, GTK_RESPONSE_YES);
   gtk_widget_set_can_default (GTK_WIDGET (button), TRUE);
   gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_YES);
diff --git a/app/filedlg.c b/app/filedlg.c
index 9646cd6d..cefa6c8d 100644
--- a/app/filedlg.c
+++ b/app/filedlg.c
@@ -278,11 +278,12 @@ file_open_callback(GtkAction *action)
       parent_window = GTK_WINDOW(interface_get_toolbox_shell());
     }
     persistence_register_integer ("import-filter", 0);
-    opendlg = gtk_file_chooser_dialog_new(_("Open Diagram"), parent_window,
-                                         GTK_FILE_CHOOSER_ACTION_OPEN,
-                                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                         GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-                                         NULL);
+    opendlg = gtk_file_chooser_dialog_new (_("Open Diagram"),
+                                           parent_window,
+                                           GTK_FILE_CHOOSER_ACTION_OPEN,
+                                           _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                           _("_Open"), GTK_RESPONSE_ACCEPT,
+                                           NULL);
     /* is activating gvfs really that easy - at least it works for samba shares*/
     gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER(opendlg), FALSE);
     gtk_dialog_set_default_response(GTK_DIALOG(opendlg), GTK_RESPONSE_ACCEPT);
@@ -480,15 +481,15 @@ file_save_as_dialog_prepare (Diagram *dia, DDisplay *ddisp)
   if (!savedlg) {
     GtkWidget *compressbutton;
 
-    savedlg = gtk_file_chooser_dialog_new(_("Save Diagram"),
-                                         GTK_WINDOW(ddisp->shell),
-                                         GTK_FILE_CHOOSER_ACTION_SAVE,
-                                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                         GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
-                                         NULL);
+    savedlg = gtk_file_chooser_dialog_new (_("Save Diagram"),
+                                           GTK_WINDOW (ddisp->shell),
+                                           GTK_FILE_CHOOSER_ACTION_SAVE,
+                                           _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                           _("_Save"), GTK_RESPONSE_ACCEPT,
+                                           NULL);
     /* vfs saving is as easy - if you see 'bad file descriptor' there is
      * something wrong with the permissions of the share ;) */
-    gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER(savedlg), FALSE);
+    gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (savedlg), FALSE);
 
     gtk_dialog_set_default_response(GTK_DIALOG(savedlg), GTK_RESPONSE_ACCEPT);
     gtk_window_set_role(GTK_WINDOW(savedlg), "save_diagram");
@@ -751,12 +752,12 @@ file_export_callback(GtkAction *action)
 
   if (!exportdlg) {
     persistence_register_integer ("export-filter", 0);
-    exportdlg = gtk_file_chooser_dialog_new(_("Export Diagram"),
-                                           GTK_WINDOW(ddisp->shell),
-                                           GTK_FILE_CHOOSER_ACTION_SAVE,
-                                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                           GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
-                                           NULL);
+    exportdlg = gtk_file_chooser_dialog_new (_("Export Diagram"),
+                                             GTK_WINDOW (ddisp->shell),
+                                             GTK_FILE_CHOOSER_ACTION_SAVE,
+                                             _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                             _("_Save"), GTK_RESPONSE_ACCEPT,
+                                             NULL);
     /* export via vfs gives: Permission denied - but only if you do not
      * have write permissions ;) */
     gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER(exportdlg), FALSE);
diff --git a/app/find-and-replace.c b/app/find-and-replace.c
index b96d5470..760327a3 100644
--- a/app/find-and-replace.c
+++ b/app/find-and-replace.c
@@ -533,12 +533,12 @@ edit_find_callback(GtkAction *action)
   /* no static var, instead we are attaching the dialog to the diplay shell */
   dialog = g_object_get_data (G_OBJECT (ddisp->shell), "edit-find-dialog");
   if (!dialog) {
-    dialog = gtk_dialog_new_with_buttons (
-               _("Find"),
-               GTK_WINDOW (ddisp->shell), GTK_DIALOG_DESTROY_WITH_PARENT,
-               GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
-               GTK_STOCK_FIND, RESPONSE_FIND,
-               NULL);
+    dialog = gtk_dialog_new_with_buttons (_("Find"),
+                                          GTK_WINDOW (ddisp->shell),
+                                          GTK_DIALOG_DESTROY_WITH_PARENT,
+                                          _("_Close"), GTK_RESPONSE_CLOSE,
+                                          _("_Find"), RESPONSE_FIND,
+                                          NULL);
 
     fnr_dialog_setup_common (dialog, FALSE, ddisp);
   }
@@ -563,20 +563,20 @@ edit_replace_callback(GtkAction *action)
   dialog = g_object_get_data (G_OBJECT (ddisp->shell), "edit-replace-dialog");
   if (!dialog) {
     GtkWidget *button;
-    dialog = gtk_dialog_new_with_buttons (
-               _("Replace"),
-               GTK_WINDOW (ddisp->shell), GTK_DIALOG_DESTROY_WITH_PARENT,
-               GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
-               _("Replace _All"), RESPONSE_REPLACE_ALL,
-               NULL);
+    dialog = gtk_dialog_new_with_buttons (_("Replace"),
+                                          GTK_WINDOW (ddisp->shell),
+                                          GTK_DIALOG_DESTROY_WITH_PARENT,
+                                          _("_Close"), GTK_RESPONSE_CLOSE,
+                                          _("Replace _All"), RESPONSE_REPLACE_ALL,
+                                          NULL);
     /* not adding the button in the list above to modify it's text;
      * the default "Find and Replace" is just too long for my taste ;)
      */
     button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Replace"), RESPONSE_REPLACE);
     gtk_button_set_image (GTK_BUTTON (button),
-                          gtk_image_new_from_stock (GTK_STOCK_FIND_AND_REPLACE, GTK_ICON_SIZE_BUTTON));
+                          gtk_image_new_from_stock (_("Find and _Replace"), GTK_ICON_SIZE_BUTTON));
 
-    gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_FIND, RESPONSE_FIND);
+    gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Find"), RESPONSE_FIND);
 
     fnr_dialog_setup_common (dialog, TRUE, ddisp);
   }
diff --git a/app/interface.c b/app/interface.c
index 18f33a59..f4d6bed7 100644
--- a/app/interface.c
+++ b/app/interface.c
@@ -678,8 +678,7 @@ use_integrated_ui_for_display_shell(DDisplay *ddisp, char *title)
   gtk_widget_modify_style (close_button, rcstyle);
   g_object_unref (rcstyle),
 
-  image = gtk_image_new_from_stock (GTK_STOCK_CLOSE,
-                                    GTK_ICON_SIZE_MENU);
+  image = gtk_image_new_from_stock (_("_Close"), GTK_ICON_SIZE_MENU);
 
   gtk_container_add (GTK_CONTAINER(close_button), image);
   g_signal_connect (G_OBJECT (close_button), "clicked",
diff --git a/app/pagesetup.c b/app/pagesetup.c
index a76ebaf7..20e20cd1 100644
--- a/app/pagesetup.c
+++ b/app/pagesetup.c
@@ -71,17 +71,16 @@ create_page_setup_dlg(Diagram *dia)
   ps = g_new(PageSetup, 1);
   ps->dia = dia;
   g_object_ref(ps->dia);
-  ps->window = gtk_dialog_new_with_buttons(
-                       _("Page Setup"),
-                       GTK_WINDOW (ddisplay_active()->shell),
-                       GTK_DIALOG_DESTROY_WITH_PARENT,
-                       GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
-                       GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
-                       GTK_STOCK_OK, GTK_RESPONSE_OK,
-                       NULL);
+  ps->window = gtk_dialog_new_with_buttons (_("Page Setup"),
+                                            GTK_WINDOW (ddisplay_active()->shell),
+                                            GTK_DIALOG_DESTROY_WITH_PARENT,
+                                            _("_Close"), GTK_RESPONSE_CLOSE,
+                                            _("_Apply"), GTK_RESPONSE_APPLY,
+                                            _("_OK"), GTK_RESPONSE_OK,
+                                            NULL);
   gtk_dialog_set_default_response (GTK_DIALOG(ps->window), GTK_RESPONSE_OK);
-  vbox = gtk_dialog_get_content_area(GTK_DIALOG(ps->window));
-  gtk_dialog_set_response_sensitive(GTK_DIALOG(ps->window), GTK_RESPONSE_APPLY, FALSE);
+  vbox = gtk_dialog_get_content_area (GTK_DIALOG(ps->window));
+  gtk_dialog_set_response_sensitive (GTK_DIALOG(ps->window), GTK_RESPONSE_APPLY, FALSE);
   ps->changed = FALSE;
 
   g_signal_connect(G_OBJECT (ps->window), "response",
diff --git a/app/plugin-manager.c b/app/plugin-manager.c
index 0de8fdab..4242c233 100644
--- a/app/plugin-manager.c
+++ b/app/plugin-manager.c
@@ -202,13 +202,12 @@ get_plugin_manager(void)
     return dialog;
 
   /* build up the user interface */
-  dialog = gtk_dialog_new_with_buttons(
-               _("Plugins"),
-               NULL, 0,
-               GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
-               NULL);
+  dialog = gtk_dialog_new_with_buttons (_("Plugins"),
+                                        NULL, 0,
+                                        _("_Close"), GTK_RESPONSE_CLOSE,
+                                        NULL);
 
-  gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
 
   vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
diff --git a/app/preferences.c b/app/preferences.c
index 191edf97..2c59b32a 100644
--- a/app/preferences.c
+++ b/app/preferences.c
@@ -582,15 +582,14 @@ prefs_create_dialog(void)
   if (prefs_dialog != NULL)
     return;
 
-  prefs_dialog = gtk_dialog_new_with_buttons(
-                       _("Preferences"),
-                       GTK_WINDOW(interface_get_toolbox_shell()),
-                       GTK_DIALOG_DESTROY_WITH_PARENT,
-                       GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
-                       GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
-                       GTK_STOCK_OK, GTK_RESPONSE_OK,
-                       NULL);
-  gtk_dialog_set_default_response (GTK_DIALOG(prefs_dialog), GTK_RESPONSE_OK);
+  prefs_dialog = gtk_dialog_new_with_buttons (_("Preferences"),
+                                              GTK_WINDOW (interface_get_toolbox_shell ()),
+                                              GTK_DIALOG_DESTROY_WITH_PARENT,
+                                              _("_Close"), GTK_RESPONSE_CLOSE,
+                                              _("_Apply"), GTK_RESPONSE_APPLY,
+                                              _("_OK"), GTK_RESPONSE_OK,
+                                              NULL);
+  gtk_dialog_set_default_response (GTK_DIALOG (prefs_dialog), GTK_RESPONSE_OK);
   gtk_window_set_resizable (GTK_WINDOW (prefs_dialog), TRUE);
 
   dialog_vbox = gtk_dialog_get_content_area (GTK_DIALOG (prefs_dialog));
diff --git a/app/properties-dialog.c b/app/properties-dialog.c
index 09736c7e..a1fd87b2 100644
--- a/app/properties-dialog.c
+++ b/app/properties-dialog.c
@@ -54,14 +54,13 @@ create_dialog(GtkWidget *parent)
 /*   GtkWidget *actionbox; */
 /*   GList *buttons; */
 
-  dialog = gtk_dialog_new_with_buttons(
-             _("Object properties"),
-             parent ? GTK_WINDOW (parent) : NULL,
-             GTK_DIALOG_DESTROY_WITH_PARENT,
-             GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
-             GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
-             GTK_STOCK_OK, GTK_RESPONSE_OK,
-             NULL);
+  dialog = gtk_dialog_new_with_buttons (_("Object properties"),
+                                        parent ? GTK_WINDOW (parent) : NULL,
+                                        GTK_DIALOG_DESTROY_WITH_PARENT,
+                                        _("_Close"), GTK_RESPONSE_CLOSE,
+                                        _("_Apply"), GTK_RESPONSE_APPLY,
+                                        _("_OK"), GTK_RESPONSE_OK,
+                                        NULL);
 
   gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_OK);
 
diff --git a/lib/diaarrowchooser.c b/lib/diaarrowchooser.c
index 58246d4d..fb6d56af 100644
--- a/lib/diaarrowchooser.c
+++ b/lib/diaarrowchooser.c
@@ -353,29 +353,28 @@ dia_arrow_chooser_dialog_response(GtkWidget *dialog,
   gtk_widget_hide(chooser->dialog);
 }
 
+
 /** Create a new arrow chooser dialog.
  * @param chooser The widget to attach a dialog to.  The dialog will be placed
  * in chooser->dialog.
  */
 static void
-dia_arrow_chooser_dialog_new(DiaArrowChooser *chooser)
+dia_arrow_chooser_dialog_new (DiaArrowChooser *chooser)
 {
   GtkWidget *wid;
 
-  chooser->dialog = gtk_dialog_new_with_buttons(_("Arrow Properties"),
-                                                NULL,
-                                                GTK_DIALOG_NO_SEPARATOR,
-                                                GTK_STOCK_CANCEL,
-                                                GTK_RESPONSE_CANCEL,
-                                                GTK_STOCK_OK,
-                                                GTK_RESPONSE_OK,
-                                                NULL);
-  gtk_dialog_set_default_response(GTK_DIALOG(chooser->dialog),
-                                  GTK_RESPONSE_OK);
-  g_signal_connect(G_OBJECT(chooser->dialog), "response",
-                   G_CALLBACK(dia_arrow_chooser_dialog_response), chooser);
-  g_signal_connect(G_OBJECT(chooser->dialog), "destroy",
-                   G_CALLBACK(gtk_widget_destroyed), &chooser->dialog);
+  chooser->dialog = gtk_dialog_new_with_buttons (_("Arrow Properties"),
+                                                 NULL,
+                                                 GTK_DIALOG_NO_SEPARATOR,
+                                                 _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                                 _("_OK"), GTK_RESPONSE_OK,
+                                                 NULL);
+  gtk_dialog_set_default_response (GTK_DIALOG (chooser->dialog),
+                                   GTK_RESPONSE_OK);
+  g_signal_connect (G_OBJECT (chooser->dialog), "response",
+                    G_CALLBACK (dia_arrow_chooser_dialog_response), chooser);
+  g_signal_connect (G_OBJECT (chooser->dialog), "destroy",
+                    G_CALLBACK (gtk_widget_destroyed), &chooser->dialog);
 
   wid = dia_arrow_selector_new();
   gtk_container_set_border_width(GTK_CONTAINER(wid), 5);
diff --git a/lib/dialinechooser.c b/lib/dialinechooser.c
index a9aeb40b..c27b6c0a 100644
--- a/lib/dialinechooser.c
+++ b/lib/dialinechooser.c
@@ -298,18 +298,16 @@ dia_line_chooser_init (DiaLineChooser *lchooser)
   gtk_widget_show(wid);
   lchooser->preview = DIA_LINE_PREVIEW(wid);
 
-  lchooser->dialog = gtk_dialog_new_with_buttons(_("Line Style Properties"),
-                                                 NULL,
-                                                 GTK_DIALOG_NO_SEPARATOR,
-                                                 GTK_STOCK_CANCEL,
-                                                 GTK_RESPONSE_CANCEL,
-                                                 GTK_STOCK_OK,
-                                                 GTK_RESPONSE_OK,
-                                                 NULL);
-  gtk_dialog_set_default_response(GTK_DIALOG(lchooser->dialog),
-                                  GTK_RESPONSE_OK);
-  g_signal_connect(G_OBJECT(lchooser->dialog), "response",
-                   G_CALLBACK(dia_line_chooser_dialog_response), lchooser);
+  lchooser->dialog = gtk_dialog_new_with_buttons (_("Line Style Properties"),
+                                                  NULL,
+                                                  GTK_DIALOG_NO_SEPARATOR,
+                                                  _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                                  _("_OK"), GTK_RESPONSE_OK,
+                                                  NULL);
+  gtk_dialog_set_default_response (GTK_DIALOG (lchooser->dialog),
+                                   GTK_RESPONSE_OK);
+  g_signal_connect (G_OBJECT (lchooser->dialog), "response",
+                    G_CALLBACK (dia_line_chooser_dialog_response), lchooser);
 
   wid = dia_line_style_selector_new();
   gtk_container_set_border_width(GTK_CONTAINER(wid), 5);
diff --git a/lib/widgets.c b/lib/widgets.c
index 4c2e50b6..5a5bfe05 100644
--- a/lib/widgets.c
+++ b/lib/widgets.c
@@ -390,16 +390,17 @@ dia_file_selector_browse_pressed(GtkWidget *widget, gpointer data)
     GtkFileFilter *filter;
 
     dialog = fs->dialog =
-      gtk_file_chooser_dialog_new (_("Select image file"), toplevel ? GTK_WINDOW(toplevel) : NULL,
+      gtk_file_chooser_dialog_new (_("Select image file"),
+                                   toplevel ? GTK_WINDOW (toplevel) : NULL,
                                    GTK_FILE_CHOOSER_ACTION_OPEN,
-                                   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                  GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-                                  NULL);
-    gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
-    g_signal_connect(G_OBJECT(dialog), "response",
-                    G_CALLBACK(file_open_response_callback), NULL);
+                                   _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                   _("_Open"), GTK_RESPONSE_ACCEPT,
+                                   NULL);
+    gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
+    g_signal_connect (G_OBJECT (dialog), "response",
+                      G_CALLBACK (file_open_response_callback), NULL);
     g_signal_connect (G_OBJECT (fs->dialog), "destroy",
-                     G_CALLBACK (gtk_widget_destroyed), &fs->dialog);
+                      G_CALLBACK (gtk_widget_destroyed), &fs->dialog);
 
     filter = gtk_file_filter_new ();
     gtk_file_filter_set_name (filter, _("Supported Formats"));
diff --git a/objects/AADL/edit_port_declaration.c b/objects/AADL/edit_port_declaration.c
index e4ec7d36..d9f596aa 100644
--- a/objects/AADL/edit_port_declaration.c
+++ b/objects/AADL/edit_port_declaration.c
@@ -152,7 +152,7 @@ ObjectChange *edit_port_declaration_callback (DiaObject *obj,
   gtk_box_pack_start (GTK_BOX (vbox), entry, TRUE, TRUE, 0);
   gtk_widget_show(entry);
 
-  button = gtk_button_new_from_stock (GTK_STOCK_OK);
+  button = gtk_button_new_with_mnemonic (_("_OK"));
   gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
   gtk_widget_set_can_default (GTK_WIDGET (button), TRUE);
   gtk_widget_grab_default (button);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]