[dia/dia-next: 29/59] Stop using GTK_STOCK use our own strings instead
- From: Zander <zbrown src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia/dia-next: 29/59] Stop using GTK_STOCK use our own strings instead
- Date: Wed, 9 Jan 2019 18:36:44 +0000 (UTC)
commit aebe6d6712d2ba40b6fbb772214d5b3f54d1bbf2
Author: Zander Brown <zbrown gnome org>
Date: Thu Dec 27 02:16:07 2018 +0000
Stop using GTK_STOCK use our own strings instead
Makes more work for translators and (tmp) breaks the toolbar but it's another set of warnings fixed
app/app_procs.c | 4 +-
app/defaults.c | 6 +-
app/dia-canvas.c | 2 +-
app/dia-props.c | 6 +-
app/display.c | 4 +-
app/filedlg.c | 12 +--
app/find-and-replace.c | 10 +--
app/interface.c | 4 +-
app/layer_dialog.c | 45 ++++------
app/linewidth_area.c | 4 +-
app/menus.c | 149 ++++++++++------------------------
app/pagesetup.c | 6 +-
app/plugin-manager.c | 2 +-
app/preferences.c | 6 +-
app/properties-dialog.c | 6 +-
lib/dialinechooser.c | 4 +-
lib/prop_sdarray_widget.c | 10 +--
lib/widgets.c | 6 +-
objects/AADL/edit_port_declaration.c | 2 +-
objects/UML/class_attributes_dialog.c | 8 +-
objects/UML/class_operations_dialog.c | 16 ++--
objects/UML/class_templates_dialog.c | 8 +-
plug-ins/xslt/xsltdialog.c | 4 +-
23 files changed, 121 insertions(+), 203 deletions(-)
---
diff --git a/app/app_procs.c b/app/app_procs.c
index d22c0596..bf469b93 100644
--- a/app/app_procs.c
+++ b/app/app_procs.c
@@ -981,12 +981,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_label (_("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_label (_("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..d994572f 100644
--- a/app/defaults.c
+++ b/app/defaults.c
@@ -43,9 +43,9 @@ 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,
+ _("Close"), GTK_RESPONSE_CLOSE,
+ _("Apply"), GTK_RESPONSE_APPLY,
+ _("Okay"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_OK);
diff --git a/app/dia-canvas.c b/app/dia-canvas.c
index 664eb3ff..0b1975be 100644
--- a/app/dia-canvas.c
+++ b/app/dia-canvas.c
@@ -115,7 +115,7 @@ dia_canvas_size_allocate (GtkWidget *self,
/* Only do this when size is really changing */
if (width != alloc->width || height != alloc->height) {
- g_message ("Canvas size change...\n");
+ g_message ("Canvas size change...");
ddisplay_resize_canvas (ddisp, alloc->width, alloc->height);
ddisplay_update_scrollbars(ddisp);
}
diff --git a/app/dia-props.c b/app/dia-props.c
index 320a7875..d95c5cab 100644
--- a/app/dia-props.c
+++ b/app/dia-props.c
@@ -86,9 +86,9 @@ create_diagram_properties_dialog(Diagram *dia)
_("Diagram Properties"),
GTK_WINDOW(ddisplay_active()->shell),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL,
- GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("Close"), GTK_RESPONSE_CANCEL,
+ _("Apply"), GTK_RESPONSE_APPLY,
+ _("Okay"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_OK);
diff --git a/app/display.c b/app/display.c
index 888fd7de..6339f612 100644
--- a/app/display.c
+++ b/app/display.c
@@ -1146,14 +1146,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_label (_("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_label (_("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 2f21e5fa..8f6c373f 100644
--- a/app/filedlg.c
+++ b/app/filedlg.c
@@ -280,8 +280,8 @@ file_open_callback(GtkAction *action)
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,
+ _("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);
@@ -477,8 +477,8 @@ file_save_as_dialog_prepare (Diagram *dia, DDisplay *ddisp)
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,
+ _("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 ;) */
@@ -748,8 +748,8 @@ file_export_callback(GtkAction *action)
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,
+ _("Cancel"), GTK_RESPONSE_CANCEL,
+ _("Save"), GTK_RESPONSE_ACCEPT,
NULL);
/* export via vfs gives: Permission denied - but only if you do not
* have write permissions ;) */
diff --git a/app/find-and-replace.c b/app/find-and-replace.c
index 07b6c273..b545af7c 100644
--- a/app/find-and-replace.c
+++ b/app/find-and-replace.c
@@ -536,8 +536,8 @@ edit_find_callback(GtkAction *action)
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,
+ _("Close"), GTK_RESPONSE_CLOSE,
+ _("Find"), RESPONSE_FIND,
NULL);
fnr_dialog_setup_common (dialog, FALSE, ddisp);
@@ -566,17 +566,15 @@ edit_replace_callback(GtkAction *action)
dialog = gtk_dialog_new_with_buttons (
_("Replace"),
GTK_WINDOW (ddisp->shell), GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ _("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_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 fabeb48c..02af1ff2 100644
--- a/app/interface.c
+++ b/app/interface.c
@@ -415,8 +415,8 @@ 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_icon_name ("window-close-symbolic",
+ GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER(close_button), image);
g_signal_connect (G_OBJECT (close_button), "clicked",
diff --git a/app/layer_dialog.c b/app/layer_dialog.c
index c06f5ea3..9d0da605 100644
--- a/app/layer_dialog.c
+++ b/app/layer_dialog.c
@@ -161,11 +161,11 @@ static void layer_dialog_delete_callback(GtkWidget *widget, gpointer gdata);
static void layer_dialog_edit_layer(DiaLayerWidget *layer_widget, Diagram *dia, Layer *layer);
static ButtonData buttons[] = {
- { GTK_STOCK_ADD, layer_dialog_new_callback, N_("New Layer") },
- { GTK_STOCK_EDIT, layer_dialog_rename_callback, N_("Rename Layer") },
- { GTK_STOCK_GO_UP, layer_dialog_raise_callback, N_("Raise Layer") },
- { GTK_STOCK_GO_DOWN, layer_dialog_lower_callback, N_("Lower Layer") },
- { GTK_STOCK_DELETE, layer_dialog_delete_callback, N_("Delete Layer") },
+ { "list-add-symbolic", layer_dialog_new_callback, N_("New Layer") },
+ { "document-edit-symbolic", layer_dialog_rename_callback, N_("Rename Layer") },
+ { "go-up-symbolic", layer_dialog_raise_callback, N_("Raise Layer") },
+ { "go-down-symbolic", layer_dialog_lower_callback, N_("Lower Layer") },
+ { "list-remove-symbolic", layer_dialog_delete_callback, N_("Delete Layer") },
};
enum {
@@ -185,7 +185,7 @@ static int num_buttons = sizeof(buttons)/sizeof(ButtonData);
#define INSENSITIVE 2
static GtkWidget *
-create_button_box(GtkWidget *parent, gboolean show_labels)
+create_button_box(GtkWidget *parent)
{
GtkWidget *button;
GtkWidget *button_box;
@@ -195,22 +195,9 @@ create_button_box(GtkWidget *parent, gboolean show_labels)
gtk_box_set_homogeneous (GTK_BOX (button_box), TRUE);
for (i=0;i<num_buttons;i++) {
- if (show_labels == TRUE)
- {
- button = gtk_button_new_from_stock(buttons[i].stock_name);
- }
- else
- {
- GtkWidget * image;
-
- button = gtk_button_new ();
-
- image = gtk_image_new_from_stock (buttons[i].stock_name,
- GTK_ICON_SIZE_BUTTON);
-
- gtk_button_set_image (GTK_BUTTON (button), image);
- }
-
+ button = gtk_button_new_from_icon_name (buttons[i].stock_name,
+ GTK_ICON_SIZE_BUTTON);
+
g_signal_connect_swapped (G_OBJECT (button), "clicked",
G_CALLBACK(buttons[i].callback),
G_OBJECT (parent));
@@ -318,8 +305,8 @@ GtkWidget * create_layer_view_widget (void)
gtk_widget_modify_style (hide_button, rcstyle);
g_object_unref (rcstyle);
- image = gtk_image_new_from_stock (GTK_STOCK_CLOSE,
- GTK_ICON_SIZE_MENU);
+ image = gtk_image_new_from_icon_name ("window-close-symbolic",
+ GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER(hide_button), image);
g_signal_connect (G_OBJECT (hide_button), "clicked",
@@ -330,7 +317,7 @@ GtkWidget * create_layer_view_widget (void)
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 2);
gtk_widget_show_all (hbox);
- button_box = create_button_box(vbox, FALSE);
+ button_box = create_button_box(vbox);
gtk_box_pack_start (GTK_BOX (vbox), button_box, FALSE, FALSE, 2);
gtk_widget_show (button_box);
@@ -423,7 +410,7 @@ layer_dialog_create(void)
g_signal_connect (G_OBJECT (list), "event",
G_CALLBACK (layer_list_events), NULL);
- button_box = create_button_box(dialog, TRUE);
+ button_box = create_button_box(dialog);
gtk_box_pack_start (GTK_BOX (vbox), button_box, FALSE, FALSE, 2);
gtk_widget_show (button_box);
@@ -432,7 +419,7 @@ layer_dialog_create(void)
gtk_dialog_get_action_area (GTK_DIALOG(dialog))),
2);
- button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
+ button = gtk_button_new_with_label (_("Close"));
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG(dialog))),
button, TRUE, TRUE, 0);
g_signal_connect_swapped(G_OBJECT (button), "clicked",
@@ -1177,7 +1164,7 @@ layer_dialog_edit_layer (DiaLayerWidget *layer_widget, Diagram *dia, Layer *laye
gtk_widget_show (dialog->name_entry);
gtk_widget_show (hbox);
- button = gtk_button_new_from_stock (GTK_STOCK_OK);
+ button = gtk_button_new_with_label (_("Okay"));
gtk_widget_set_can_default (GTK_WIDGET (button), TRUE);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog->dialog))),
button, TRUE, TRUE, 0);
@@ -1194,7 +1181,7 @@ layer_dialog_edit_layer (DiaLayerWidget *layer_widget, Diagram *dia, Layer *laye
gtk_widget_grab_default (button);
gtk_widget_show (button);
- button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
+ button = gtk_button_new_with_label (_("Cancel"));
gtk_widget_set_can_default (GTK_WIDGET (button), TRUE);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog->dialog))),
button, TRUE, TRUE, 0);
diff --git a/app/linewidth_area.c b/app/linewidth_area.c
index cb95bc54..7d50d057 100644
--- a/app/linewidth_area.c
+++ b/app/linewidth_area.c
@@ -224,8 +224,8 @@ linewidth_create_dialog(GtkWindow *toplevel)
linewidth_dialog = gtk_dialog_new_with_buttons(
_("Line width"), toplevel,
0,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("Cancel"), GTK_RESPONSE_CANCEL,
+ _("Okay"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG(linewidth_dialog), GTK_RESPONSE_OK);
diff --git a/app/menus.c b/app/menus.c
index ef9d8126..01d1eb0b 100644
--- a/app/menus.c
+++ b/app/menus.c
@@ -46,16 +46,6 @@
#include "toolbox.h"
#include "diagram_tree.h"
-#define DIA_STOCK_GROUP "dia-stock-group"
-#define DIA_STOCK_UNGROUP "dia-stock-ungroup"
-#define DIA_STOCK_LAYER_ADD "dia-stock-layer-add"
-#define DIA_STOCK_LAYER_RENAME "dia-stock-layer-rename"
-#define DIA_STOCK_OBJECTS_LAYER_ABOVE "dia-stock-objects-layer-above"
-#define DIA_STOCK_OBJECTS_LAYER_BELOW "dia-stock-objects-layer-below"
-#define DIA_STOCK_LAYERS "dia-stock-layers"
-
-#define DIA_SHOW_TEAROFFS FALSE
-
/* Integrated UI Toolbar Constants */
#define DIA_INTEGRATED_TOOLBAR_ZOOM_COMBO "dia-integrated-toolbar-zoom-combo_entry"
#define DIA_INTEGRATED_TOOLBAR_SNAP_GRID "dia-integrated-toolbar-snap-grid"
@@ -89,19 +79,19 @@ gchar *build_ui_filename (const gchar* name);
static const GtkActionEntry common_entries[] =
{
{ "File", NULL, N_("_File"), NULL, NULL, NULL },
- { "FileNew", GTK_STOCK_NEW, NULL, FIRST_MODIFIER "N", N_("Create a new diagram"), G_CALLBACK
(file_new_callback) },
- { "FileOpen", GTK_STOCK_OPEN, N_("_Open\342\200\246"),FIRST_MODIFIER "O", N_("Open a diagram file"),
G_CALLBACK (file_open_callback) },
- { "FileQuit", GTK_STOCK_QUIT, NULL, FIRST_MODIFIER "Q", N_("Quit Dia"), G_CALLBACK (file_quit_callback)
},
+ { "FileNew", NULL, N_("New"), FIRST_MODIFIER "N", N_("Create a new diagram"), G_CALLBACK
(file_new_callback) },
+ { "FileOpen", NULL, N_("_Open\342\200\246"),FIRST_MODIFIER "O", N_("Open a diagram file"), G_CALLBACK
(file_open_callback) },
+ { "FileQuit", NULL, N_("Quit"), FIRST_MODIFIER "Q", N_("Quit Dia"), G_CALLBACK (file_quit_callback) },
{ "Help", NULL, N_("_Help"), NULL, NULL, NULL },
- { "HelpContents", GTK_STOCK_HELP, NULL, "F1", N_("Dia help"), G_CALLBACK (help_manual_callback) },
- { "HelpAbout", GTK_STOCK_ABOUT, NULL, NULL, N_("Dia version, authors, license"), G_CALLBACK
(help_about_callback) }
+ { "HelpContents", NULL, N_("Help"), "F1", N_("Dia help"), G_CALLBACK (help_manual_callback) },
+ { "HelpAbout", NULL, N_("About Dia"), NULL, N_("Dia version, authors, license"), G_CALLBACK
(help_about_callback) }
};
/* Actions for toolbox menu */
static const GtkActionEntry toolbox_entries[] =
{
{ "FileSheets", NULL, N_("Sheets and Objects\342\200\246"), "F9", N_("Manage sheets and their objects"),
G_CALLBACK (sheets_dialog_show_callback) },
- { "FilePrefs", GTK_STOCK_PREFERENCES, NULL, NULL, N_("Dia preferences"), G_CALLBACK
(file_preferences_callback) },
+ { "FilePrefs", NULL, N_("Preferences"), NULL, N_("Dia preferences"), G_CALLBACK
(file_preferences_callback) },
{ "FilePlugins", NULL, N_("Plugins\342\200\246"), NULL, N_("Manage plug-ins"), G_CALLBACK
(file_plugins_callback) },
{ "FileTree", NULL, N_("_Diagram Tree"), "F8", N_("Tree representation of diagrams"), G_CALLBACK
(diagram_tree_show) }
};
@@ -116,26 +106,26 @@ static const GtkToggleActionEntry integrated_ui_view_toggle_entries[] =
/* Actions for diagram window */
static const GtkActionEntry display_entries[] =
{
- { "FileSave", GTK_STOCK_SAVE, NULL, FIRST_MODIFIER "S", N_("Save the diagram"), G_CALLBACK
(file_save_callback) },
- { "FileSaveas", GTK_STOCK_SAVE_AS, N_("Save _As\342\200\246"), FIRST_MODIFIER "<shift>S", N_("Save the
diagram with a new name"), G_CALLBACK (file_save_as_callback) },
- { "FileExport", GTK_STOCK_CONVERT, N_("_Export\342\200\246"), NULL, N_("Export the diagram"), G_CALLBACK
(file_export_callback) },
- { "DiagramProperties", GTK_STOCK_PROPERTIES, N_("_Diagram Properties"), "<shift><alt>Return", N_("Modify
diagram properties (grid, background)"), G_CALLBACK (view_diagram_properties_callback) },
+ { "FileSave", NULL, N_("Save"), FIRST_MODIFIER "S", N_("Save the diagram"), G_CALLBACK
(file_save_callback) },
+ { "FileSaveas", NULL, N_("Save _As\342\200\246"), FIRST_MODIFIER "<shift>S", N_("Save the diagram with a
new name"), G_CALLBACK (file_save_as_callback) },
+ { "FileExport", NULL, N_("_Export\342\200\246"), NULL, N_("Export the diagram"), G_CALLBACK
(file_export_callback) },
+ { "DiagramProperties", NULL, N_("_Diagram Properties"), "<shift><alt>Return", N_("Modify diagram
properties (grid, background)"), G_CALLBACK (view_diagram_properties_callback) },
{ "FilePagesetup", NULL, N_("Page Set_up\342\200\246"), NULL, N_("Modify the diagram pagination"),
G_CALLBACK (file_pagesetup_callback) },
- { "FilePrint", GTK_STOCK_PRINT, N_("_Print\342\200\246"), FIRST_MODIFIER "P", N_("Print the diagram"),
G_CALLBACK (file_print_callback) },
- { "FileClose", GTK_STOCK_CLOSE, NULL, FIRST_MODIFIER "W", N_("Close the diagram"), G_CALLBACK
(file_close_callback) },
+ { "FilePrint", NULL, N_("_Print\342\200\246"), FIRST_MODIFIER "P", N_("Print the diagram"), G_CALLBACK
(file_print_callback) },
+ { "FileClose", NULL, N_("Close"), FIRST_MODIFIER "W", N_("Close the diagram"), G_CALLBACK
(file_close_callback) },
{ "Edit", NULL, N_("_Edit"), NULL, NULL, NULL },
- { "EditUndo", GTK_STOCK_UNDO, NULL, FIRST_MODIFIER "Z", N_("Undo"), G_CALLBACK (edit_undo_callback) },
- { "EditRedo", GTK_STOCK_REDO, NULL, FIRST_MODIFIER "<shift>Z", N_("Redo"), G_CALLBACK
(edit_redo_callback) },
+ { "EditUndo", NULL, N_("Undo"), FIRST_MODIFIER "Z", N_("Undo"), G_CALLBACK (edit_undo_callback) },
+ { "EditRedo", NULL, N_("Redo"), FIRST_MODIFIER "<shift>Z", N_("Redo"), G_CALLBACK (edit_redo_callback) },
- { "EditCopy", GTK_STOCK_COPY, NULL, FIRST_MODIFIER "C", N_("Copy selection"), G_CALLBACK
(edit_copy_callback) },
- { "EditCut", GTK_STOCK_CUT, NULL, FIRST_MODIFIER "X", N_("Cut selection"), G_CALLBACK
(edit_cut_callback) },
- { "EditPaste", GTK_STOCK_PASTE, NULL, FIRST_MODIFIER "V", N_("Paste selection"), G_CALLBACK
(edit_paste_callback) },
+ { "EditCopy", NULL, N_("Copy"), FIRST_MODIFIER "C", N_("Copy selection"), G_CALLBACK
(edit_copy_callback) },
+ { "EditCut", NULL, N_("Cut"), FIRST_MODIFIER "X", N_("Cut selection"), G_CALLBACK (edit_cut_callback) },
+ { "EditPaste", NULL, N_("Paste"), FIRST_MODIFIER "V", N_("Paste selection"), G_CALLBACK
(edit_paste_callback) },
{ "EditDuplicate", NULL, N_("_Duplicate"), FIRST_MODIFIER "D", N_("Duplicate selection"), G_CALLBACK
(edit_duplicate_callback) },
- { "EditDelete", GTK_STOCK_DELETE, NULL, "Delete", N_("Delete selection"), G_CALLBACK
(edit_delete_callback) },
+ { "EditDelete", NULL, N_("Delete"), "Delete", N_("Delete selection"), G_CALLBACK (edit_delete_callback)
},
- { "EditFind", GTK_STOCK_FIND, N_("_Find\342\200\246"), FIRST_MODIFIER "F", N_("Search for text"),
G_CALLBACK (edit_find_callback) },
- { "EditReplace", GTK_STOCK_FIND_AND_REPLACE, N_("_Replace\342\200\246"), FIRST_MODIFIER "H", N_("Search
and replace text"), G_CALLBACK (edit_replace_callback) },
+ { "EditFind", NULL, N_("_Find\342\200\246"), FIRST_MODIFIER "F", N_("Search for text"), G_CALLBACK
(edit_find_callback) },
+ { "EditReplace", NULL, N_("_Replace\342\200\246"), FIRST_MODIFIER "H", N_("Search and replace text"),
G_CALLBACK (edit_replace_callback) },
/* the following used to bind to <control><shift>C which collides with Unicode input.
* <control><alt> doesn't work either */
@@ -146,14 +136,14 @@ static const GtkActionEntry display_entries[] =
{ "EditPasteImage", NULL, N_("Paste _Image"), FIRST_MODIFIER "<alt>V", N_("Insert image from
clipboard"), G_CALLBACK (edit_paste_image_callback) },
{ "Layers", NULL, N_("_Layers"), NULL, NULL, NULL },
- { "LayerAdd", DIA_STOCK_LAYER_ADD, N_("Add Layer\342\200\246"), NULL, NULL, G_CALLBACK
(layers_add_layer_callback) },
- { "LayerRename", DIA_STOCK_LAYER_RENAME, N_("Rename Layer\342\200\246"), NULL, NULL, G_CALLBACK
(layers_rename_layer_callback) },
- { "ObjectsLayerAbove", DIA_STOCK_OBJECTS_LAYER_ABOVE, N_("Move Selection to Layer above"), NULL, NULL,
G_CALLBACK (objects_move_up_layer) },
- { "ObjectsLayerBelow", DIA_STOCK_OBJECTS_LAYER_BELOW, N_("Move Selection to Layer below"), NULL, NULL,
G_CALLBACK (objects_move_down_layer) },
- { "DiagramLayers", DIA_STOCK_LAYERS, N_("_Layers\342\200\246"), FIRST_MODIFIER "L", NULL, G_CALLBACK
(dialogs_layers_callback) },
+ { "LayerAdd", NULL, N_("Add Layer\342\200\246"), NULL, NULL, G_CALLBACK (layers_add_layer_callback) },
+ { "LayerRename", NULL, N_("Rename Layer\342\200\246"), NULL, NULL, G_CALLBACK
(layers_rename_layer_callback) },
+ { "ObjectsLayerAbove", NULL, N_("Move Selection to Layer above"), NULL, NULL, G_CALLBACK
(objects_move_up_layer) },
+ { "ObjectsLayerBelow", NULL, N_("Move Selection to Layer below"), NULL, NULL, G_CALLBACK
(objects_move_down_layer) },
+ { "DiagramLayers", NULL, N_("_Layers\342\200\246"), FIRST_MODIFIER "L", NULL, G_CALLBACK
(dialogs_layers_callback) },
{ "View", NULL, N_("_View"), NULL, NULL, NULL },
- { "ViewZoomin", GTK_STOCK_ZOOM_IN, NULL, FIRST_MODIFIER "plus", N_("Zoom in"), G_CALLBACK
(view_zoom_in_callback) },
- { "ViewZoomout", GTK_STOCK_ZOOM_OUT, NULL, FIRST_MODIFIER "minus", N_("Zoom out"), G_CALLBACK
(view_zoom_out_callback) },
+ { "ViewZoomin", NULL, N_("Zoom In"), FIRST_MODIFIER "plus", N_("Zoom in"), G_CALLBACK
(view_zoom_in_callback) },
+ { "ViewZoomout", NULL, N_("Zoom Out"), FIRST_MODIFIER "minus", N_("Zoom out"), G_CALLBACK
(view_zoom_out_callback) },
{ "ViewZoom", NULL, N_("_Zoom"), NULL, NULL, NULL },
{ "ViewZoom16000", NULL, N_("1600%"), NULL, NULL, G_CALLBACK (view_zoom_set_callback) },
{ "ViewZoom8000", NULL, N_("800%"), NULL, NULL, G_CALLBACK (view_zoom_set_callback) },
@@ -161,39 +151,39 @@ static const GtkActionEntry display_entries[] =
{ "ViewZoom2830", NULL, N_("283"), NULL, NULL, G_CALLBACK (view_zoom_set_callback) },
{ "ViewZoom2000", NULL, N_("200"), "<alt>2", NULL, G_CALLBACK (view_zoom_set_callback) },
{ "ViewZoom1410", NULL, N_("141"), NULL, NULL, G_CALLBACK (view_zoom_set_callback) },
- { "ViewZoom1000", GTK_STOCK_ZOOM_100, NULL, "<alt>1", NULL, G_CALLBACK (view_zoom_set_callback) },
+ { "ViewZoom1000", NULL, N_("Normal Size"), "<alt>1", NULL, G_CALLBACK (view_zoom_set_callback) },
{ "ViewZoom850", NULL, N_("85"), NULL, NULL, G_CALLBACK (view_zoom_set_callback) },
{ "ViewZoom707", NULL, N_("70.7"), NULL, NULL, G_CALLBACK (view_zoom_set_callback) },
{ "ViewZoom500", NULL, N_("50"), "<alt>5", NULL, G_CALLBACK (view_zoom_set_callback) },
{ "ViewZoom354", NULL, N_("35.4"), NULL, NULL, G_CALLBACK (view_zoom_set_callback) },
{ "ViewZoom250", NULL, N_("25"), NULL, NULL, G_CALLBACK (view_zoom_set_callback) },
/* Show All, Best Fit. Same as the Gimp, Ctrl+E */
- { "ViewShowall", GTK_STOCK_ZOOM_FIT, NULL, FIRST_MODIFIER "E", N_("Zoom fit"), G_CALLBACK
(view_show_all_callback) },
+ { "ViewShowall", NULL, N_("Best Fit"), FIRST_MODIFIER "E", N_("Zoom fit"), G_CALLBACK
(view_show_all_callback) },
/* "display_toggle_entries" items go here */
{ "ViewNewview", NULL, N_("New _View"), NULL, NULL, G_CALLBACK (view_new_view_callback) },
{ "ViewCloneview", NULL, N_("C_lone View"), NULL, NULL, G_CALLBACK (view_clone_view_callback) },
- { "ViewRedraw", GTK_STOCK_REFRESH, NULL, NULL, NULL, G_CALLBACK (view_redraw_callback) },
+ { "ViewRedraw", NULL, N_("Refresh"), NULL, NULL, G_CALLBACK (view_redraw_callback) },
{ "Objects", NULL, N_("_Objects"), NULL, NULL },
- { "ObjectsSendtoback", GTK_STOCK_GOTO_BOTTOM, N_("Send to _Back"), FIRST_MODIFIER "<shift>B", N_("Move
selection to the bottom"), G_CALLBACK (objects_place_under_callback) },
- { "ObjectsBringtofront", GTK_STOCK_GOTO_TOP, N_("Bring to _Front"), FIRST_MODIFIER "<shift>F", N_("Move
selection to the top"), G_CALLBACK (objects_place_over_callback) },
- { "ObjectsSendbackwards", GTK_STOCK_GO_DOWN, N_("Send Backwards"), NULL, NULL, G_CALLBACK
(objects_place_down_callback) },
- { "ObjectsBringforwards", GTK_STOCK_GO_UP, N_("Bring Forwards"), NULL, NULL, G_CALLBACK
(objects_place_up_callback) },
+ { "ObjectsSendtoback", NULL, N_("Send to _Back"), FIRST_MODIFIER "<shift>B", N_("Move selection to the
bottom"), G_CALLBACK (objects_place_under_callback) },
+ { "ObjectsBringtofront", NULL, N_("Bring to _Front"), FIRST_MODIFIER "<shift>F", N_("Move selection to
the top"), G_CALLBACK (objects_place_over_callback) },
+ { "ObjectsSendbackwards", NULL, N_("Send Backwards"), NULL, NULL, G_CALLBACK
(objects_place_down_callback) },
+ { "ObjectsBringforwards", NULL, N_("Bring Forwards"), NULL, NULL, G_CALLBACK (objects_place_up_callback)
},
- { "ObjectsGroup", DIA_STOCK_GROUP, N_("_Group"), FIRST_MODIFIER "G", N_("Group selected objects"),
G_CALLBACK (objects_group_callback) },
+ { "ObjectsGroup", NULL, N_("_Group"), FIRST_MODIFIER "G", N_("Group selected objects"), G_CALLBACK
(objects_group_callback) },
/* deliberately not using Ctrl+U for Ungroup */
- { "ObjectsUngroup", DIA_STOCK_UNGROUP, N_("_Ungroup"), FIRST_MODIFIER "<shift>G", N_("Ungroup selected
groups"), G_CALLBACK (objects_ungroup_callback) },
+ { "ObjectsUngroup", NULL, N_("_Ungroup"), FIRST_MODIFIER "<shift>G", N_("Ungroup selected groups"),
G_CALLBACK (objects_ungroup_callback) },
{ "ObjectsParent", NULL, N_("_Parent"), FIRST_MODIFIER "K", NULL, G_CALLBACK (objects_parent_callback) },
{ "ObjectsUnparent", NULL, N_("_Unparent"), FIRST_MODIFIER "<shift>K", NULL, G_CALLBACK
(objects_unparent_callback) },
{ "ObjectsUnparentchildren", NULL, N_("_Unparent Children"), NULL, NULL, G_CALLBACK
(objects_unparent_children_callback) },
{ "ObjectsAlign", NULL, N_("Align"), NULL, NULL, NULL },
- { "ObjectsAlignLeft", GTK_STOCK_JUSTIFY_LEFT, NULL, "<alt><shift>L", NULL, G_CALLBACK
(objects_align_h_callback) },
- { "ObjectsAlignCenter", GTK_STOCK_JUSTIFY_CENTER, NULL, "<alt><shift>C", NULL, G_CALLBACK
(objects_align_h_callback) },
- { "ObjectsAlignRight", GTK_STOCK_JUSTIFY_RIGHT, NULL, "<alt><shift>R", NULL, G_CALLBACK
(objects_align_h_callback) },
+ { "ObjectsAlignLeft", NULL, N_("Left"), "<alt><shift>L", NULL, G_CALLBACK (objects_align_h_callback) },
+ { "ObjectsAlignCenter", NULL, N_("Center"), "<alt><shift>C", NULL, G_CALLBACK
(objects_align_h_callback) },
+ { "ObjectsAlignRight", NULL, N_("Right"), "<alt><shift>R", NULL, G_CALLBACK (objects_align_h_callback)
},
{ "ObjectsAlignTop", NULL, N_("Top"), "<alt><shift>T", NULL, G_CALLBACK (objects_align_v_callback) },
{ "ObjectsAlignMiddle", NULL, N_("Middle"), "<alt><shift>M", NULL, G_CALLBACK
(objects_align_v_callback) },
@@ -205,7 +195,7 @@ static const GtkActionEntry display_entries[] =
{ "ObjectsAlignStacked", NULL, N_("Stacked"), "<alt><shift>S", NULL, G_CALLBACK
(objects_align_v_callback) },
{ "ObjectsAlignConnected", NULL, N_("Connected"), "<alt><shift>O", NULL, G_CALLBACK
(objects_align_connected_callback) },
- { "ObjectsProperties", GTK_STOCK_PROPERTIES, NULL, "<alt>Return", NULL, G_CALLBACK
(dialogs_properties_callback) },
+ { "ObjectsProperties", NULL, N_("Properties"), "<alt>Return", NULL, G_CALLBACK
(dialogs_properties_callback) },
{ "Select", NULL, N_("_Select"), NULL, NULL, NULL },
{ "SelectAll", NULL, N_("All"), FIRST_MODIFIER "A", NULL, G_CALLBACK (select_all_callback) },
@@ -255,7 +245,7 @@ static const GtkActionEntry tool_entries[] =
/* Toggle-Actions for diagram window */
static const GtkToggleActionEntry display_toggle_entries[] =
{
- { "ViewFullscreen", GTK_STOCK_FULLSCREEN, NULL, "F11", NULL, G_CALLBACK (view_fullscreen_callback) },
+ { "ViewFullscreen", NULL, N_("Fullscreen"), "F11", NULL, G_CALLBACK (view_fullscreen_callback) },
{ "ViewAntialiased", NULL, N_("_Antialiased"), NULL, NULL, G_CALLBACK (view_aa_callback) },
{ "ViewShowgrid", NULL, N_("Show _Grid"), NULL, NULL, G_CALLBACK (view_visible_grid_callback) },
{ "ViewSnaptogrid", NULL, N_("_Snap to Grid"), NULL, NULL, G_CALLBACK (view_snap_to_grid_callback) },
@@ -354,18 +344,6 @@ load_accels(void)
g_free(accelfilename);
}
}
-static gint
-save_accels(gpointer data)
-{
- gchar *accelfilename;
-
- accelfilename = dia_config_filename("menurc");
- if (accelfilename) {
- gtk_accel_map_save (accelfilename);
- g_free (accelfilename);
- }
- return TRUE;
-}
/**
* Synchronized the Object snap property button with the display.
@@ -764,46 +742,6 @@ add_plugin_actions (GtkUIManager *ui_manager, const gchar *base_path)
}
}
-static void
-_add_stock_icon (GtkIconFactory *factory, const char *name, const guint8 *data, const size_t size)
-{
- GdkPixbuf *pixbuf;
- GtkIconSet *set;
- GError *err = NULL;
-
- pixbuf = gdk_pixbuf_new_from_inline (size, data, FALSE, &err);
- if (err) {
- g_warning ("%s", err->message);
- g_error_free (err);
- err = NULL;
- }
- set = gtk_icon_set_new_from_pixbuf (pixbuf);
- gtk_icon_factory_add (factory, name, set);
- g_object_unref (pixbuf);
- pixbuf = NULL;
-}
-
-static void
-register_stock_icons (void)
-{
- GtkIconFactory *factory;
-
- factory = gtk_icon_factory_new ();
-
- _add_stock_icon (factory, DIA_STOCK_GROUP, dia_group_icon, sizeof(dia_group_icon));
- _add_stock_icon (factory, DIA_STOCK_UNGROUP, dia_ungroup_icon, sizeof(dia_ungroup_icon));
-
- _add_stock_icon (factory, DIA_STOCK_LAYER_ADD, dia_layer_add, sizeof(dia_layer_add));
- _add_stock_icon (factory, DIA_STOCK_LAYER_RENAME, dia_layer_rename, sizeof(dia_layer_rename));
- _add_stock_icon (factory, DIA_STOCK_OBJECTS_LAYER_ABOVE, dia_objects_layer_above,
sizeof(dia_objects_layer_above));
- _add_stock_icon (factory, DIA_STOCK_OBJECTS_LAYER_BELOW, dia_objects_layer_below,
sizeof(dia_objects_layer_below));
- _add_stock_icon (factory, DIA_STOCK_LAYERS, dia_layers, sizeof(dia_layers));
-
- gtk_icon_factory_add_default (factory);
- g_object_unref (factory);
- factory = NULL;
-}
-
gchar*
build_ui_filename (const gchar* name)
{
@@ -912,8 +850,6 @@ _setup_global_actions (void)
g_return_if_fail (_ui_manager == NULL);
g_return_if_fail (toolbox_actions == NULL);
- register_stock_icons ();
-
/* for the toolbox menu */
toolbox_actions = gtk_action_group_new ("toolbox-actions");
gtk_action_group_set_translation_domain (toolbox_actions, NULL);
@@ -937,7 +873,6 @@ _setup_global_actions (void)
G_CALLBACK (_action_done),
NULL);
- gtk_ui_manager_set_add_tearoffs (_ui_manager, DIA_SHOW_TEAROFFS);
gtk_ui_manager_insert_action_group (_ui_manager, toolbox_actions, 0);
tool_actions = create_or_ref_tool_actions ();
@@ -971,7 +906,6 @@ menus_init(void)
"connect_proxy",
G_CALLBACK (_ui_manager_connect_proxy),
NULL);
- gtk_ui_manager_set_add_tearoffs (display_ui_manager, DIA_SHOW_TEAROFFS);
gtk_ui_manager_insert_action_group (display_ui_manager, display_actions, 0);
gtk_ui_manager_insert_action_group (display_ui_manager, tool_actions, 0);
if (!gtk_ui_manager_add_ui_from_string (display_ui_manager, ui_info, -1, &error)) {
@@ -1098,7 +1032,6 @@ menus_create_display_menubar (GtkUIManager **ui_manager,
tool_actions = create_or_ref_tool_actions ();
*ui_manager = gtk_ui_manager_new ();
- gtk_ui_manager_set_add_tearoffs (*ui_manager, DIA_SHOW_TEAROFFS);
gtk_ui_manager_insert_action_group (*ui_manager, *actions, 0);
gtk_ui_manager_insert_action_group (*ui_manager, tool_actions, 0);
g_object_unref (G_OBJECT (tool_actions));
diff --git a/app/pagesetup.c b/app/pagesetup.c
index 0a6ed2ac..f56b1191 100644
--- a/app/pagesetup.c
+++ b/app/pagesetup.c
@@ -77,9 +77,9 @@ create_page_setup_dlg(Diagram *dia)
_("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,
+ _("Close"), GTK_RESPONSE_CLOSE,
+ _("Apply"), GTK_RESPONSE_APPLY,
+ _("Okay"), 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));
diff --git a/app/plugin-manager.c b/app/plugin-manager.c
index d9000f70..e1f83b39 100644
--- a/app/plugin-manager.c
+++ b/app/plugin-manager.c
@@ -207,7 +207,7 @@ get_plugin_manager(void)
dialog = gtk_dialog_new_with_buttons(
_("Plugins"),
NULL, 0,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ _("Close"), GTK_RESPONSE_CLOSE,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);
diff --git a/app/preferences.c b/app/preferences.c
index eed691ea..de97d492 100644
--- a/app/preferences.c
+++ b/app/preferences.c
@@ -576,9 +576,9 @@ prefs_create_dialog(void)
_("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,
+ _("Close"), GTK_RESPONSE_CLOSE,
+ _("Apply"), GTK_RESPONSE_APPLY,
+ _("Okay"), 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);
diff --git a/app/properties-dialog.c b/app/properties-dialog.c
index 431c1b26..98509f26 100644
--- a/app/properties-dialog.c
+++ b/app/properties-dialog.c
@@ -60,9 +60,9 @@ create_dialog(GtkWidget *parent)
_("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,
+ _("Close"), GTK_RESPONSE_CLOSE,
+ _("Apply"), GTK_RESPONSE_APPLY,
+ _("Okay"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_OK);
diff --git a/lib/dialinechooser.c b/lib/dialinechooser.c
index 01f5b909..993f5722 100644
--- a/lib/dialinechooser.c
+++ b/lib/dialinechooser.c
@@ -280,9 +280,9 @@ dia_line_chooser_init (DiaLineChooser *lchooser)
lchooser->dialog = gtk_dialog_new_with_buttons(_("Line Style Properties"),
NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL,
+ _("Cancel"),
GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK,
+ _("Okay"),
GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response(GTK_DIALOG(lchooser->dialog),
diff --git a/lib/prop_sdarray_widget.c b/lib/prop_sdarray_widget.c
index e906ccd1..df5d1275 100644
--- a/lib/prop_sdarray_widget.c
+++ b/lib/prop_sdarray_widget.c
@@ -454,10 +454,10 @@ _make_button_box_for_view (GtkTreeView *view, GtkTreeView *master_view)
const gchar *stock;
GCallback callback;
} _button_data[] = {
- { GTK_STOCK_ADD, G_CALLBACK (_insert_row_callback) },
- { GTK_STOCK_REMOVE, G_CALLBACK (_remove_row_callback) },
- { GTK_STOCK_GO_UP, G_CALLBACK (_upper_row_callback) },
- { GTK_STOCK_GO_DOWN, G_CALLBACK (_lower_row_callback) },
+ { N_("Add"), G_CALLBACK (_insert_row_callback) },
+ { N_("Remove"), G_CALLBACK (_remove_row_callback) },
+ { N_("Up"), G_CALLBACK (_upper_row_callback) },
+ { N_("Down"), G_CALLBACK (_lower_row_callback) },
{ NULL, NULL }
};
GtkWidget *vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
@@ -465,7 +465,7 @@ _make_button_box_for_view (GtkTreeView *view, GtkTreeView *master_view)
int i;
for (i = 0; _button_data[i].stock != NULL; ++i) {
- button = gtk_button_new_from_stock (_button_data[i].stock);
+ button = gtk_button_new_with_label (_button_data[i].stock);
/* start with everything disabled ... */
gtk_widget_set_sensitive (button, FALSE);
g_signal_connect (G_OBJECT (button), "clicked",
diff --git a/lib/widgets.c b/lib/widgets.c
index 938f016e..0ece3cfe 100644
--- a/lib/widgets.c
+++ b/lib/widgets.c
@@ -392,9 +392,9 @@ dia_file_selector_browse_pressed(GtkWidget *widget, gpointer data)
dialog = fs->dialog =
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);
+ _("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);
diff --git a/objects/AADL/edit_port_declaration.c b/objects/AADL/edit_port_declaration.c
index 93c89b6b..ac1be93e 100755
--- 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_label (_("Okay"));
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);
diff --git a/objects/UML/class_attributes_dialog.c b/objects/UML/class_attributes_dialog.c
index bed1700a..49296b8b 100644
--- a/objects/UML/class_attributes_dialog.c
+++ b/objects/UML/class_attributes_dialog.c
@@ -476,22 +476,22 @@ _attributes_create_page(GtkNotebook *notebook, UMLClass *umlclass)
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
- button = gtk_button_new_from_stock (GTK_STOCK_NEW);
+ button = gtk_button_new_with_label (_("New"));
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK(attributes_list_new_callback), umlclass);
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, TRUE, 0);
gtk_widget_show (button);
- button = gtk_button_new_from_stock (GTK_STOCK_DELETE);
+ button = gtk_button_new_with_label (_("Delete"));
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK(attributes_list_delete_callback), umlclass);
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, TRUE, 0);
gtk_widget_show (button);
- button = gtk_button_new_from_stock (GTK_STOCK_GO_UP);
+ button = gtk_button_new_with_label (_("Up"));
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK(attributes_list_move_up_callback), umlclass);
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, TRUE, 0);
gtk_widget_show (button);
- button = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN);
+ button = gtk_button_new_with_label (_("Down"));
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK(attributes_list_move_down_callback), umlclass);
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, TRUE, 0);
diff --git a/objects/UML/class_operations_dialog.c b/objects/UML/class_operations_dialog.c
index 5e01630c..3c02cc11 100644
--- a/objects/UML/class_operations_dialog.c
+++ b/objects/UML/class_operations_dialog.c
@@ -935,25 +935,25 @@ operations_parameters_editor_create_vbox (UMLClass *umlclass)
vbox3 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
- button = gtk_button_new_from_stock (GTK_STOCK_NEW);
+ button = gtk_button_new_with_label (_("New"));
prop_dialog->param_new_button = button;
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK(parameters_list_new_callback), umlclass);
gtk_box_pack_start (GTK_BOX (vbox3), button, FALSE, TRUE, 0);
gtk_widget_show (button);
- button = gtk_button_new_from_stock (GTK_STOCK_DELETE);
+ button = gtk_button_new_with_label (_("Delete"));
prop_dialog->param_delete_button = button;
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK(parameters_list_delete_callback), umlclass);
gtk_box_pack_start (GTK_BOX (vbox3), button, FALSE, TRUE, 0);
gtk_widget_show (button);
- button = gtk_button_new_from_stock (GTK_STOCK_GO_UP);
+ button = gtk_button_new_with_label (_("Up"));
prop_dialog->param_up_button = button;
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK(parameters_list_move_up_callback), umlclass);
gtk_box_pack_start (GTK_BOX (vbox3), button, FALSE, TRUE, 0);
gtk_widget_show (button);
- button = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN);
+ button = gtk_button_new_with_label (_("Down"));
prop_dialog->param_down_button = button;
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK(parameters_list_move_down_callback), umlclass);
@@ -1133,23 +1133,23 @@ _operations_create_page(GtkNotebook *notebook, UMLClass *umlclass)
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
- button = gtk_button_new_from_stock (GTK_STOCK_NEW);
+ button = gtk_button_new_with_label (_("New"));
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK(operations_list_new_callback),
umlclass);
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, TRUE, 0);
gtk_widget_show (button);
- button = gtk_button_new_from_stock (GTK_STOCK_DELETE);
+ button = gtk_button_new_with_label (_("Delete"));
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK(operations_list_delete_callback), umlclass);
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, TRUE, 0);
gtk_widget_show (button);
- button = gtk_button_new_from_stock (GTK_STOCK_GO_UP);
+ button = gtk_button_new_with_label (_("Up"));
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK(operations_list_move_up_callback), umlclass);
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, TRUE, 0);
gtk_widget_show (button);
- button = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN);
+ button = gtk_button_new_with_label (_("Down"));
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK(operations_list_move_down_callback), umlclass);
diff --git a/objects/UML/class_templates_dialog.c b/objects/UML/class_templates_dialog.c
index 5b4ea91e..78fa2a0e 100644
--- a/objects/UML/class_templates_dialog.c
+++ b/objects/UML/class_templates_dialog.c
@@ -396,22 +396,22 @@ _templates_create_page(GtkNotebook *notebook, UMLClass *umlclass)
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
- button = gtk_button_new_from_stock (GTK_STOCK_NEW);
+ button = gtk_button_new_with_label (_("New"));
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK(templates_list_new_callback), umlclass);
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, TRUE, 0);
gtk_widget_show (button);
- button = gtk_button_new_from_stock (GTK_STOCK_DELETE);
+ button = gtk_button_new_with_label (_("Delete"));
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK(templates_list_delete_callback), umlclass);
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, TRUE, 0);
gtk_widget_show (button);
- button = gtk_button_new_from_stock (GTK_STOCK_GO_UP);
+ button = gtk_button_new_with_label (_("Up"));
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK(templates_list_move_up_callback), umlclass);
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, TRUE, 0);
gtk_widget_show (button);
- button = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN);
+ button = gtk_button_new_with_label (_("Down"));
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK(templates_list_move_down_callback), umlclass);
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, TRUE, 0);
diff --git a/plug-ins/xslt/xsltdialog.c b/plug-ins/xslt/xsltdialog.c
index 418d5a77..d55bea34 100644
--- a/plug-ins/xslt/xsltdialog.c
+++ b/plug-ins/xslt/xsltdialog.c
@@ -99,8 +99,8 @@ xslt_dialog_create(void) {
dialog = gtk_dialog_new_with_buttons(
_("Export through XSLT"),
NULL, 0,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("Cancel"), GTK_RESPONSE_CANCEL,
+ _("Okay"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG(dialog), GTK_RESPONSE_OK);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
