[nautilus] src: don't use deprecated GtkImageMenuItem and GtkStock
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] src: don't use deprecated GtkImageMenuItem and GtkStock
- Date: Tue, 13 Aug 2013 12:29:39 +0000 (UTC)
commit 82a7c3ddaa1b2bda7d03f9d258fa218468156488
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Tue Aug 13 14:25:10 2013 +0200
src: don't use deprecated GtkImageMenuItem and GtkStock
There's another occurrence of GtkImageMenuItem right now, for the "Open
With..." menu which is harder to fix.
src/nautilus-connect-server-dialog.c | 2 +-
src/nautilus-floating-bar.c | 4 +-
src/nautilus-floating-bar.h | 2 +-
src/nautilus-list-view.c | 2 +-
src/nautilus-location-entry.c | 2 +-
src/nautilus-mime-actions.c | 14 ++++----
src/nautilus-progress-info-widget.c | 4 +-
src/nautilus-properties-window.c | 16 ++++----
src/nautilus-query-editor.c | 2 +-
src/nautilus-shell-search-provider.c | 1 -
src/nautilus-view.c | 48 ++++++++++++------------
src/nautilus-window-menus.c | 65 +++++++++++++++++++--------------
src/nautilus-window-slot.c | 2 +-
src/nautilus-window.c | 5 +--
14 files changed, 87 insertions(+), 82 deletions(-)
---
diff --git a/src/nautilus-connect-server-dialog.c b/src/nautilus-connect-server-dialog.c
index 5421624..7de6983 100644
--- a/src/nautilus-connect-server-dialog.c
+++ b/src/nautilus-connect-server-dialog.c
@@ -698,7 +698,7 @@ nautilus_connect_server_dialog_init (NautilusConnectServerDialog *dialog)
dialog->details->browse_button = button;
gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL,
+ _("_Cancel"),
GTK_RESPONSE_CANCEL);
gtk_dialog_add_button (GTK_DIALOG (dialog),
_("C_onnect"),
diff --git a/src/nautilus-floating-bar.c b/src/nautilus-floating-bar.c
index c90fdc3..40090f1 100644
--- a/src/nautilus-floating-bar.c
+++ b/src/nautilus-floating-bar.c
@@ -407,12 +407,12 @@ nautilus_floating_bar_new (const gchar *primary_label,
void
nautilus_floating_bar_add_action (NautilusFloatingBar *self,
- const gchar *stock_id,
+ const gchar *icon_name,
gint action_id)
{
GtkWidget *w, *button;
- w = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU);
+ w = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
gtk_widget_show (w);
button = gtk_button_new ();
diff --git a/src/nautilus-floating-bar.h b/src/nautilus-floating-bar.h
index 8bcec0f..ba31ac5 100644
--- a/src/nautilus-floating-bar.h
+++ b/src/nautilus-floating-bar.h
@@ -73,7 +73,7 @@ void nautilus_floating_bar_set_show_spinner (NautilusFloatingBar *self,
gboolean show_spinner);
void nautilus_floating_bar_add_action (NautilusFloatingBar *self,
- const gchar *stock_id,
+ const gchar *icon_name,
gint action_id);
void nautilus_floating_bar_cleanup_actions (NautilusFloatingBar *self);
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index 80e45d2..e428e70 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -2945,7 +2945,7 @@ create_column_editor (NautilusListView *view)
window = gtk_dialog_new_with_buttons (str,
GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ _("_Close"), GTK_RESPONSE_CLOSE,
NULL);
g_free (str);
g_signal_connect (window, "response",
diff --git a/src/nautilus-location-entry.c b/src/nautilus-location-entry.c
index 8dc7db7..4de76c5 100644
--- a/src/nautilus-location-entry.c
+++ b/src/nautilus-location-entry.c
@@ -272,7 +272,7 @@ drag_data_received_callback (GtkWidget *widget,
GTK_MESSAGE_QUESTION,
prompt,
detail,
- GTK_STOCK_CANCEL, GTK_STOCK_OK,
+ _("_Cancel"), _("_OK"),
NULL) != 0 /* GNOME_OK */;
g_free (prompt);
diff --git a/src/nautilus-mime-actions.c b/src/nautilus-mime-actions.c
index c628861..ae9fa8a 100644
--- a/src/nautilus-mime-actions.c
+++ b/src/nautilus-mime-actions.c
@@ -669,11 +669,11 @@ report_broken_symbolic_link (GtkWindow *parent_window, NautilusFile *file)
if (!can_trash) {
eel_run_simple_dialog (GTK_WIDGET (parent_window), FALSE, GTK_MESSAGE_WARNING,
- prompt, detail, GTK_STOCK_CANCEL, NULL);
+ prompt, detail, _("_Cancel"), NULL);
goto out;
}
- dialog = eel_show_yes_no_dialog (prompt, detail, _("Mo_ve to Trash"), GTK_STOCK_CANCEL,
+ dialog = eel_show_yes_no_dialog (prompt, detail, _("Mo_ve to Trash"), _("_Cancel"),
parent_window);
gtk_dialog_set_default_response (dialog, GTK_RESPONSE_CANCEL);
@@ -744,7 +744,7 @@ get_executable_text_file_action (GtkWindow *parent_window, NautilusFile *file)
_("Run in _Terminal"), RESPONSE_RUN_IN_TERMINAL,
_("_Display"), RESPONSE_DISPLAY,
parent_window);
- gtk_dialog_add_button (dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (dialog, _("_Cancel"), GTK_RESPONSE_CANCEL);
gtk_dialog_add_button (dialog, _("_Run"), RESPONSE_RUN);
gtk_dialog_set_default_response (dialog, GTK_RESPONSE_CANCEL);
gtk_widget_show (GTK_WIDGET (dialog));
@@ -1087,7 +1087,7 @@ confirm_multiple_windows (GtkWindow *parent_window,
"This will open %d separate windows.", count), count);
}
dialog = eel_show_yes_no_dialog (prompt, detail,
- GTK_STOCK_OK, GTK_STOCK_CANCEL,
+ _("_OK"), _("_Cancel"),
parent_window);
g_free (detail);
@@ -1264,7 +1264,7 @@ show_unhandled_type_error (ActivateParametersInstall *parameters)
gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Select Application"), GTK_RESPONSE_ACCEPT);
- gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_OK);
+ gtk_dialog_add_button (GTK_DIALOG (dialog), _("_OK"), GTK_RESPONSE_OK);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -1593,7 +1593,7 @@ activate_desktop_file (ActivateParameters *parameters,
_("Mark as _Trusted"), RESPONSE_MARK_TRUSTED);
}
gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ _("_Cancel"), GTK_RESPONSE_CANCEL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
g_signal_connect (dialog, "response",
@@ -1817,7 +1817,7 @@ activate_files (ActivateParameters *parameters)
detail = g_strdup_printf (ngettext ("This will open %d separate application.",
"This will open %d separate applications.", num_apps),
num_apps);
dialog = eel_show_yes_no_dialog (prompt, detail,
- GTK_STOCK_OK, GTK_STOCK_CANCEL,
+ _("_OK"), _("_Cancel"),
parameters->parent_window);
g_free (detail);
diff --git a/src/nautilus-progress-info-widget.c b/src/nautilus-progress-info-widget.c
index 474c238..637ec15 100644
--- a/src/nautilus-progress-info-widget.c
+++ b/src/nautilus-progress-info-widget.c
@@ -124,8 +124,8 @@ nautilus_progress_info_widget_constructed (GObject *obj)
TRUE, TRUE,
0);
- image = gtk_image_new_from_stock (GTK_STOCK_CANCEL,
- GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name ("gtk-cancel",
+ GTK_ICON_SIZE_BUTTON);
button = gtk_button_new ();
gtk_container_add (GTK_CONTAINER (button), image);
gtk_box_pack_start (GTK_BOX (hbox),
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index ece349d..a5e9b33 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -4464,9 +4464,9 @@ on_change_permissions_clicked (GtkWidget *button,
dialog = gtk_dialog_new_with_buttons (_("Change Permissions for Enclosed Files"),
GTK_WINDOW (window),
GTK_DIALOG_MODAL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- _("Change"), GTK_RESPONSE_OK,
- NULL);
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("Change"), GTK_RESPONSE_OK,
+ NULL);
grid = GTK_GRID (create_grid_with_standard_properties ());
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
@@ -4942,8 +4942,8 @@ create_properties_window (StartupData *startup_data)
append_extension_pages (window);
gtk_dialog_add_buttons (GTK_DIALOG (window),
- GTK_STOCK_HELP, GTK_RESPONSE_HELP,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ _("_Help"), GTK_RESPONSE_HELP,
+ _("_Close"), GTK_RESPONSE_CLOSE,
NULL);
/* FIXME - HIGificiation, should be done inside GTK+ */
@@ -5461,9 +5461,9 @@ select_image_button_callback (GtkWidget *widget,
if (dialog == NULL) {
dialog = gtk_file_chooser_dialog_new (_("Select Custom Icon"), GTK_WINDOW (window),
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_REVERT_TO_SAVED, GTK_RESPONSE_NO,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+ _("_Revert"), GTK_RESPONSE_NO,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Open"), GTK_RESPONSE_OK,
NULL);
gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (dialog),
g_get_user_special_dir (G_USER_DIRECTORY_PICTURES),
diff --git a/src/nautilus-query-editor.c b/src/nautilus-query-editor.c
index 219fb93..92ddac7 100644
--- a/src/nautilus-query-editor.c
+++ b/src/nautilus-query-editor.c
@@ -517,7 +517,7 @@ type_combo_changed (GtkComboBox *combo_box, NautilusQueryEditorRow *row)
dialog = gtk_dialog_new_with_buttons (_("Select type"),
GTK_WINDOW (toplevel),
0,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
_("Select"), GTK_RESPONSE_OK,
NULL);
gtk_window_set_default_size (GTK_WINDOW (dialog), 400, 600);
diff --git a/src/nautilus-shell-search-provider.c b/src/nautilus-shell-search-provider.c
index b1d2c45..449ab70 100644
--- a/src/nautilus-shell-search-provider.c
+++ b/src/nautilus-shell-search-provider.c
@@ -515,7 +515,6 @@ result_list_attributes_ready_cb (GList *file_list,
NautilusFile *file;
GList *l;
gchar *uri, *display_name;
- GdkPixbuf *pix;
gchar *thumbnail_path;
GIcon *gicon;
GFile *location;
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index f499b37..86ebe1d 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -967,7 +967,7 @@ nautilus_view_confirm_multiple (GtkWindow *parent_window,
"This will open %'d separate windows.", count), count);
}
dialog = eel_show_yes_no_dialog (prompt, detail,
- GTK_STOCK_OK, GTK_STOCK_CANCEL,
+ _("_OK"), _("_Cancel"),
parent_window);
g_free (detail);
@@ -1491,11 +1491,11 @@ select_pattern (NautilusView *view)
dialog = gtk_dialog_new_with_buttons (_("Select Items Matching"),
nautilus_view_get_containing_window (view),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_HELP,
+ _("_Help"),
GTK_RESPONSE_HELP,
- GTK_STOCK_CANCEL,
+ _("_Cancel"),
GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK,
+ _("_OK"),
GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
@@ -1613,10 +1613,10 @@ action_save_search_as_callback (GtkAction *action,
dialog = gtk_dialog_new_with_buttons (_("Save Search as"),
nautilus_view_get_containing_window (directory_view),
0,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
NULL);
save_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_SAVE, GTK_RESPONSE_OK);
+ _("_Save"), GTK_RESPONSE_OK);
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
GTK_RESPONSE_OK);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -5992,7 +5992,7 @@ copy_or_move_selection (NautilusView *view,
dialog = gtk_file_chooser_dialog_new (_("Select Destination"),
GTK_WINDOW (nautilus_view_get_window (view)),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
_("_Select"), GTK_RESPONSE_OK,
NULL);
gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
@@ -7150,7 +7150,7 @@ static const GtkActionEntry directory_view_entries[] = {
/* name, stock id, label */ { NAUTILUS_ACTION_NEW_DOCUMENTS, "document-new", N_("New _Document") },
/* name, stock id, label */ { NAUTILUS_ACTION_OPEN_WITH, NULL, N_("Open Wit_h"),
NULL, N_("Choose a program with which to open the selected item") },
- /* name, stock id */ { NAUTILUS_ACTION_PROPERTIES, GTK_STOCK_PROPERTIES,
+ /* name, stock id */ { NAUTILUS_ACTION_PROPERTIES, NULL,
/* label, accelerator */ N_("P_roperties"), "<alt>Return",
/* tooltip */ N_("View or modify the properties of each selected item"),
G_CALLBACK (action_properties_callback) },
@@ -7202,21 +7202,21 @@ static const GtkActionEntry directory_view_entries[] = {
/* label, accelerator */ N_("E_mpty Trash"), NULL,
/* tooltip */ N_("Delete all items in the Trash"),
G_CALLBACK (action_empty_trash_callback) },
- /* name, stock id */ { NAUTILUS_ACTION_CUT, GTK_STOCK_CUT,
- /* label, accelerator */ NULL, NULL,
+ /* name, stock id */ { NAUTILUS_ACTION_CUT, NULL,
+ /* label, accelerator */ N_("Cu_t"), NULL,
/* tooltip */ N_("Prepare the selected files to be moved with a Paste command"),
G_CALLBACK (action_cut_files_callback) },
- /* name, stock id */ { NAUTILUS_ACTION_COPY, GTK_STOCK_COPY,
- /* label, accelerator */ NULL, NULL,
+ /* name, stock id */ { NAUTILUS_ACTION_COPY, NULL,
+ /* label, accelerator */ N_("_Copy"), NULL,
/* tooltip */ N_("Prepare the selected files to be copied with a Paste command"),
G_CALLBACK (action_copy_files_callback) },
- /* name, stock id */ { NAUTILUS_ACTION_PASTE, GTK_STOCK_PASTE,
- /* label, accelerator */ NULL, NULL,
+ /* name, stock id */ { NAUTILUS_ACTION_PASTE, NULL,
+ /* label, accelerator */ N_("_Paste"), NULL,
/* tooltip */ N_("Move or copy files previously selected by a Cut or Copy command"),
G_CALLBACK (action_paste_files_callback) },
/* We make accelerator "" instead of null here to not inherit the stock
accelerator for paste */
- /* name, stock id */ { NAUTILUS_ACTION_PASTE_FILES_INTO, GTK_STOCK_PASTE,
+ /* name, stock id */ { NAUTILUS_ACTION_PASTE_FILES_INTO, NULL,
/* label, accelerator */ N_("_Paste Into Folder"), "",
/* tooltip */ N_("Move or copy files previously selected by a Cut or Copy command into
the selected folder"),
G_CALLBACK (action_paste_files_into_callback) },
@@ -7268,11 +7268,11 @@ static const GtkActionEntry directory_view_entries[] = {
/* label, accelerator */ N_("_Restore"), NULL,
NULL,
G_CALLBACK (action_restore_from_trash_callback) },
- /* name, stock id */ { NAUTILUS_ACTION_UNDO, GTK_STOCK_UNDO,
+ /* name, stock id */ { NAUTILUS_ACTION_UNDO, NULL,
/* label, accelerator */ N_("_Undo"), "<control>Z",
/* tooltip */ N_("Undo the last action"),
G_CALLBACK (action_undo_callback) },
- /* name, stock id */ { NAUTILUS_ACTION_REDO, GTK_STOCK_REDO,
+ /* name, stock id */ { NAUTILUS_ACTION_REDO, NULL,
/* label, accelerator */ N_("_Redo"), "<shift><control>Z",
/* tooltip */ N_("Redo the last undone action"),
G_CALLBACK (action_redo_callback) },
@@ -7357,15 +7357,15 @@ static const GtkActionEntry directory_view_entries[] = {
/* tooltip */ N_("Open this folder in a new tab"),
G_CALLBACK (action_location_open_in_new_tab_callback) },
- /* name, stock id */ { NAUTILUS_ACTION_LOCATION_CUT, GTK_STOCK_CUT,
- /* label, accelerator */ NULL, "",
+ /* name, stock id */ { NAUTILUS_ACTION_LOCATION_CUT, NULL,
+ /* label, accelerator */ N_("Cu_t"), "",
/* tooltip */ N_("Prepare this folder to be moved with a Paste command"),
G_CALLBACK (action_location_cut_callback) },
- /* name, stock id */ { NAUTILUS_ACTION_LOCATION_COPY, GTK_STOCK_COPY,
- /* label, accelerator */ NULL, "",
+ /* name, stock id */ { NAUTILUS_ACTION_LOCATION_COPY, NULL,
+ /* label, accelerator */ N_("_Copy"), "",
/* tooltip */ N_("Prepare this folder to be copied with a Paste command"),
G_CALLBACK (action_location_copy_callback) },
- /* name, stock id */ { NAUTILUS_ACTION_LOCATION_PASTE_FILES_INTO, GTK_STOCK_PASTE,
+ /* name, stock id */ { NAUTILUS_ACTION_LOCATION_PASTE_FILES_INTO, NULL,
/* label, accelerator */ N_("_Paste Into Folder"), "",
/* tooltip */ N_("Move or copy files previously selected by a Cut or Copy command into
this folder"),
G_CALLBACK (action_location_paste_files_into_callback) },
@@ -7407,7 +7407,7 @@ static const GtkActionEntry directory_view_entries[] = {
/* tooltip */ N_("Detect media in the selected drive"),
G_CALLBACK (action_location_detect_media_callback) },
- /* name, stock id */ { NAUTILUS_ACTION_LOCATION_PROPERTIES, GTK_STOCK_PROPERTIES,
+ /* name, stock id */ { NAUTILUS_ACTION_LOCATION_PROPERTIES, NULL,
/* label, accelerator */ N_("P_roperties"), NULL,
/* tooltip */ N_("View or modify the properties of this folder"),
G_CALLBACK (action_location_properties_callback) },
@@ -8602,7 +8602,7 @@ real_update_menus (NautilusView *view)
GTK_IMAGE_MENU_ITEM (menuitem), app_icon != NULL);
if (app_icon == NULL) {
- app_icon = g_themed_icon_new (GTK_STOCK_OPEN);
+ app_icon = g_themed_icon_new ("gtk-open");
}
gtk_action_set_gicon (action, app_icon);
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index dfcdf35..ae14fc2 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -467,22 +467,23 @@ action_view_radio_changed (GtkRadioAction *action,
static const GtkActionEntry main_entries[] = {
/* name, stock id, label */ { "Help", NULL, N_("_Help") },
- /* name, stock id */ { NAUTILUS_ACTION_CLOSE, GTK_STOCK_CLOSE,
+ /* name, stock id */ { NAUTILUS_ACTION_CLOSE, NULL,
/* label, accelerator */ N_("_Close"), "<control>W",
/* tooltip */ N_("Close this folder"),
G_CALLBACK (action_close_window_slot_callback) },
- { NAUTILUS_ACTION_PREFERENCES, GTK_STOCK_PREFERENCES,
+ { NAUTILUS_ACTION_PREFERENCES, NULL,
N_("Prefere_nces"),
NULL, N_("Edit Nautilus preferences"),
G_CALLBACK (action_preferences_callback) },
- /* name, stock id, label */ { NAUTILUS_ACTION_UP, GTK_STOCK_GO_UP, N_("Open _Parent"),
- "<alt>Up", N_("Open the parent folder"),
+ /* name, stock id */ { NAUTILUS_ACTION_UP, NULL,
+ /* label, accelerator */ N_("Open _Parent"), "<alt>Up",
+ N_("Open the parent folder"),
G_CALLBACK (action_up_callback) },
- /* name, stock id */ { NAUTILUS_ACTION_STOP, GTK_STOCK_STOP,
+ /* name, stock id */ { NAUTILUS_ACTION_STOP, NULL,
/* label, accelerator */ N_("_Stop"), NULL,
/* tooltip */ N_("Stop loading the current location"),
G_CALLBACK (action_stop_callback) },
- /* name, stock id */ { NAUTILUS_ACTION_RELOAD, GTK_STOCK_REFRESH,
+ /* name, stock id */ { NAUTILUS_ACTION_RELOAD, NULL,
/* label, accelerator */ N_("_Reload"), "<control>R",
/* tooltip */ N_("Reload the current location"),
G_CALLBACK (action_reload_callback) },
@@ -490,7 +491,7 @@ static const GtkActionEntry main_entries[] = {
/* label, accelerator */ "ReloadAccel", "F5",
/* tooltip */ NULL,
G_CALLBACK (action_reload_callback) },
- /* name, stock id */ { NAUTILUS_ACTION_HELP, GTK_STOCK_HELP,
+ /* name, stock id */ { NAUTILUS_ACTION_HELP, NULL,
/* label, accelerator */ N_("_All Topics"), "F1",
/* tooltip */ N_("Display Nautilus help"),
G_CALLBACK (action_nautilus_manual_callback) },
@@ -510,11 +511,11 @@ static const GtkActionEntry main_entries[] = {
/* label, accelerator */ N_("Share and transfer files"), NULL,
/* tooltip */ N_("Easily transfer files to your contacts and devices from the file
manager."),
G_CALLBACK (action_nautilus_manual_callback) },
- /* name, stock id */ { NAUTILUS_ACTION_ABOUT, GTK_STOCK_ABOUT,
+ /* name, stock id */ { NAUTILUS_ACTION_ABOUT, NULL,
/* label, accelerator */ N_("_About"), NULL,
/* tooltip */ N_("Display credits for the creators of Nautilus"),
G_CALLBACK (action_about_nautilus_callback) },
- /* name, stock id */ { NAUTILUS_ACTION_ZOOM_IN, GTK_STOCK_ZOOM_IN,
+ /* name, stock id */ { NAUTILUS_ACTION_ZOOM_IN, NULL,
/* label, accelerator */ N_("Zoom _In"), "<control>plus",
/* tooltip */ N_("Increase the view size"),
G_CALLBACK (action_zoom_in_callback) },
@@ -526,7 +527,7 @@ static const GtkActionEntry main_entries[] = {
/* label, accelerator */ "ZoomInAccel2", "<control>KP_Add",
/* tooltip */ NULL,
G_CALLBACK (action_zoom_in_callback) },
- /* name, stock id */ { NAUTILUS_ACTION_ZOOM_OUT, GTK_STOCK_ZOOM_OUT,
+ /* name, stock id */ { NAUTILUS_ACTION_ZOOM_OUT, NULL,
/* label, accelerator */ N_("Zoom _Out"), "<control>minus",
/* tooltip */ N_("Decrease the view size"),
G_CALLBACK (action_zoom_out_callback) },
@@ -534,7 +535,7 @@ static const GtkActionEntry main_entries[] = {
/* label, accelerator */ "ZoomOutAccel", "<control>KP_Subtract",
/* tooltip */ NULL,
G_CALLBACK (action_zoom_out_callback) },
- /* name, stock id */ { NAUTILUS_ACTION_ZOOM_NORMAL, GTK_STOCK_ZOOM_100,
+ /* name, stock id */ { NAUTILUS_ACTION_ZOOM_NORMAL, NULL,
/* label, accelerator */ N_("Normal Si_ze"), "<control>0",
/* tooltip */ N_("Use the normal view size"),
G_CALLBACK (action_zoom_normal_callback) },
@@ -546,29 +547,37 @@ static const GtkActionEntry main_entries[] = {
/* label, accelerator */ N_("_Home"), "<alt>Home",
/* tooltip */ N_("Open your personal folder"),
G_CALLBACK (action_home_callback) },
- /* name, stock id, label */ { NAUTILUS_ACTION_NEW_WINDOW, "window-new", N_("New _Window"),
- "<control>N", N_("Open another Nautilus window for the displayed location"),
+ /* name, stock id */ { NAUTILUS_ACTION_NEW_WINDOW, "window-new",
+ N_("New _Window"), "<control>N",
+ N_("Open another Nautilus window for the displayed location"),
G_CALLBACK (action_new_window_callback) },
- /* name, stock id, label */ { NAUTILUS_ACTION_NEW_TAB, "tab-new", N_("New _Tab"),
- "<control>T", N_("Open another tab for the displayed location"),
+ /* name, stock id */ { NAUTILUS_ACTION_NEW_TAB, "tab-new",
+ N_("New _Tab"), "<control>T",
+ N_("Open another tab for the displayed location"),
G_CALLBACK (action_new_tab_callback) },
- /* name, stock id, label */ { NAUTILUS_ACTION_CLOSE_ALL_WINDOWS, NULL, N_("Close _All Windows"),
- "<control>Q", N_("Close all Navigation windows"),
+ /* name, stock id */ { NAUTILUS_ACTION_CLOSE_ALL_WINDOWS, NULL,
+ N_("Close _All Windows"), "<control>Q",
+ N_("Close all Navigation windows"),
G_CALLBACK (action_close_all_windows_callback) },
- /* name, stock id, label */ { NAUTILUS_ACTION_BACK, "go-previous-symbolic", N_("_Back"),
- "<alt>Left", N_("Go to the previous visited location"),
+ /* name, stock id */ { NAUTILUS_ACTION_BACK, "go-previous-symbolic",
+ N_("_Back"), "<alt>Left",
+ N_("Go to the previous visited location"),
G_CALLBACK (action_back_callback) },
- /* name, stock id, label */ { NAUTILUS_ACTION_FORWARD, "go-next-symbolic", N_("_Forward"),
- "<alt>Right", N_("Go to the next visited location"),
+ /* name, stock id */ { NAUTILUS_ACTION_FORWARD, "go-next-symbolic",
+ N_("_Forward"), "<alt>Right",
+ N_("Go to the next visited location"),
G_CALLBACK (action_forward_callback) },
- /* name, stock id, label */ { NAUTILUS_ACTION_ENTER_LOCATION, NULL, N_("Enter _Location…"),
- "<control>L", N_("Specify a location to open"),
+ /* name, stock id */ { NAUTILUS_ACTION_ENTER_LOCATION, NULL,
+ N_("Enter _Location…"), "<control>L",
+ N_("Specify a location to open"),
G_CALLBACK (action_enter_location_callback) },
- /* name, stock id, label */ { NAUTILUS_ACTION_ADD_BOOKMARK, GTK_STOCK_ADD, N_("Bookmark this Location"),
- "<control>d", N_("Add a bookmark for the current location"),
+ /* name, stock id */ { NAUTILUS_ACTION_ADD_BOOKMARK, NULL,
+ N_("Bookmark this Location"), "<control>d",
+ N_("Add a bookmark for the current location"),
G_CALLBACK (action_add_bookmark_callback) },
- /* name, stock id, label */ { NAUTILUS_ACTION_EDIT_BOOKMARKS, NULL, N_("_Bookmarks…"),
- "<control>b", N_("Display and edit bookmarks"),
+ /* name, stock id */ { NAUTILUS_ACTION_EDIT_BOOKMARKS, NULL,
+ N_("_Bookmarks…"), "<control>b",
+ N_("Display and edit bookmarks"),
G_CALLBACK (action_bookmarks_callback) },
{ "TabsPrevious", NULL, N_("_Previous Tab"), "<control>Page_Up",
N_("Activate previous tab"),
@@ -582,7 +591,7 @@ static const GtkActionEntry main_entries[] = {
{ "TabsMoveRight", NULL, N_("Move Tab _Right"), "<shift><control>Page_Down",
N_("Move current tab to right"),
G_CALLBACK (action_tabs_move_right_callback) },
- /* name, stock id */ { NAUTILUS_ACTION_LOCATION_PROPERTIES, GTK_STOCK_PROPERTIES,
+ /* name, stock id */ { NAUTILUS_ACTION_LOCATION_PROPERTIES, NULL,
/* label, accelerator */ N_("P_roperties"), NULL,
/* tooltip */ N_("View or modify the properties of this folder"),
G_CALLBACK (action_location_properties_callback) },
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index 0df13e7..cdfd48a 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -2248,7 +2248,7 @@ real_setup_loading_floating_bar (NautilusWindowSlot *slot)
nautilus_floating_bar_set_show_spinner (NAUTILUS_FLOATING_BAR (slot->details->floating_bar),
TRUE);
nautilus_floating_bar_add_action (NAUTILUS_FLOATING_BAR (slot->details->floating_bar),
- GTK_STOCK_STOP,
+ "gtk-stop",
NAUTILUS_FLOATING_BAR_ACTION_ID_STOP);
gtk_widget_set_halign (slot->details->floating_bar, GTK_ALIGN_END);
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 1aa3fed..371e52b 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -1152,7 +1152,6 @@ notebook_popup_menu_show (NautilusWindow *window,
{
GtkWidget *popup;
GtkWidget *item;
- GtkWidget *image;
int button, event_time;
gboolean can_move_left, can_move_right;
NautilusNotebook *notebook;
@@ -1193,9 +1192,7 @@ notebook_popup_menu_show (NautilusWindow *window,
gtk_menu_shell_append (GTK_MENU_SHELL (popup),
gtk_separator_menu_item_new ());
- item = gtk_image_menu_item_new_with_mnemonic (_("_Close Tab"));
- image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+ item = gtk_menu_item_new_with_mnemonic (_("_Close Tab"));
g_signal_connect (item, "activate",
G_CALLBACK (notebook_popup_menu_close_cb), window);
gtk_menu_shell_append (GTK_MENU_SHELL (popup),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
