diff options
Diffstat (limited to 'libcaja-private')
| -rw-r--r-- | libcaja-private/caja-autorun.c | 4 | ||||
| -rw-r--r-- | libcaja-private/caja-clipboard.c | 14 | ||||
| -rw-r--r-- | libcaja-private/caja-column-chooser.c | 8 | ||||
| -rw-r--r-- | libcaja-private/caja-file-conflict-dialog.c | 6 | ||||
| -rw-r--r-- | libcaja-private/caja-file-operations.c | 70 | ||||
| -rw-r--r-- | libcaja-private/caja-mime-actions.c | 12 | ||||
| -rw-r--r-- | libcaja-private/caja-mime-application-chooser.c | 14 | ||||
| -rw-r--r-- | libcaja-private/caja-open-with-dialog.c | 8 |
8 files changed, 73 insertions, 63 deletions
diff --git a/libcaja-private/caja-autorun.c b/libcaja-private/caja-autorun.c index 22ed18df..1b85237a 100644 --- a/libcaja-private/caja-autorun.c +++ b/libcaja-private/caja-autorun.c @@ -1127,8 +1127,8 @@ show_dialog: gtk_box_pack_start (GTK_BOX (vbox), always_check_button, TRUE, TRUE, 0); gtk_dialog_add_buttons (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, + "gtk-cancel", GTK_RESPONSE_CANCEL, + "gtk-ok", GTK_RESPONSE_OK, NULL); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); diff --git a/libcaja-private/caja-clipboard.c b/libcaja-private/caja-clipboard.c index 87d390be..88f2a808 100644 --- a/libcaja-private/caja-clipboard.c +++ b/libcaja-private/caja-clipboard.c @@ -451,22 +451,22 @@ target_data_free (TargetCallbackData *target_data) static const GtkActionEntry clipboard_entries[] = { - /* name, stock id */ { "Cut", GTK_STOCK_CUT, - /* label, accelerator */ NULL, NULL, + /* name, icon name */ { "Cut", "edit-cut", + /* label, accelerator */ N_("Cu_t"), NULL, /* tooltip */ N_("Cut the selected text to the clipboard"), G_CALLBACK (action_cut_callback) }, - /* name, stock id */ { "Copy", GTK_STOCK_COPY, - /* label, accelerator */ NULL, NULL, + /* name, icon name */ { "Copy", "edit-copy", + /* label, accelerator */ N_("_Copy"), NULL, /* tooltip */ N_("Copy the selected text to the clipboard"), G_CALLBACK (action_copy_callback) }, - /* name, stock id */ { "Paste", GTK_STOCK_PASTE, - /* label, accelerator */ NULL, NULL, + /* name, icon name */ { "Paste", "edit-paste", + /* label, accelerator */ N_("_Paste"), NULL, /* tooltip */ N_("Paste the text stored on the clipboard"), G_CALLBACK (action_paste_callback) }, - /* name, stock id */ { "Select All", NULL, + /* name, icon name */ { "Select All", NULL, /* label, accelerator */ N_("Select _All"), "<control>A", /* tooltip */ N_("Select all the text in a text field"), G_CALLBACK (action_select_all_callback) diff --git a/libcaja-private/caja-column-chooser.c b/libcaja-private/caja-column-chooser.c index 6574ae52..0e2520a5 100644 --- a/libcaja-private/caja-column-chooser.c +++ b/libcaja-private/caja-column-chooser.c @@ -354,13 +354,13 @@ use_default_clicked_callback (GtkWidget *button, gpointer user_data) } static GtkWidget * -button_new_with_mnemonic (const gchar *stockid, const gchar *str) +button_new_with_mnemonic (const gchar *icon_name, const gchar *str) { GtkWidget *image; GtkWidget *button; button = gtk_button_new_with_mnemonic (str); - image = gtk_image_new_from_stock (stockid, GTK_ICON_SIZE_BUTTON); + image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON); gtk_button_set_image (GTK_BUTTON (button), image); @@ -376,7 +376,7 @@ add_buttons (CajaColumnChooser *chooser) box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); gtk_widget_show (box); - chooser->details->move_up_button = button_new_with_mnemonic (GTK_STOCK_GO_UP, + chooser->details->move_up_button = button_new_with_mnemonic ("go-up", _("Move _Up")); g_signal_connect (chooser->details->move_up_button, "clicked", G_CALLBACK (move_up_clicked_callback), @@ -386,7 +386,7 @@ add_buttons (CajaColumnChooser *chooser) gtk_box_pack_start (GTK_BOX (box), chooser->details->move_up_button, FALSE, FALSE, 0); - chooser->details->move_down_button = button_new_with_mnemonic (GTK_STOCK_GO_DOWN, + chooser->details->move_down_button = button_new_with_mnemonic ("go-down", _("Move Dow_n")); g_signal_connect (chooser->details->move_down_button, "clicked", G_CALLBACK (move_down_clicked_callback), diff --git a/libcaja-private/caja-file-conflict-dialog.c b/libcaja-private/caja-file-conflict-dialog.c index 003bcf76..2a231e8f 100644 --- a/libcaja-private/caja-file-conflict-dialog.c +++ b/libcaja-private/caja-file-conflict-dialog.c @@ -622,7 +622,7 @@ caja_file_conflict_dialog_init (CajaFileConflictDialog *fcd) widget = gtk_button_new_with_label (_("Reset")); gtk_button_set_image (GTK_BUTTON (widget), - gtk_image_new_from_stock (GTK_STOCK_UNDO, + gtk_image_new_from_icon_name ("edit-undo", GTK_ICON_SIZE_MENU)); gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 6); g_signal_connect (widget, "clicked", @@ -633,7 +633,7 @@ caja_file_conflict_dialog_init (CajaFileConflictDialog *fcd) /* Setup the diff button for text files */ details->diff_button = gtk_button_new_with_label (_("Differences...")); gtk_button_set_image (GTK_BUTTON (details->diff_button), - gtk_image_new_from_stock (GTK_STOCK_FIND, + gtk_image_new_from_icon_name ("edit-find", GTK_ICON_SIZE_MENU)); gtk_box_pack_start (GTK_BOX (vbox), details->diff_button, FALSE, FALSE, 6); g_signal_connect (details->diff_button, "clicked", @@ -651,7 +651,7 @@ caja_file_conflict_dialog_init (CajaFileConflictDialog *fcd) /* Add buttons */ gtk_dialog_add_buttons (dialog, - GTK_STOCK_CANCEL, + "gtk-cancel", GTK_RESPONSE_CANCEL, _("_Skip"), CONFLICT_RESPONSE_SKIP, diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c index d8320339..b1eac871 100644 --- a/libcaja-private/caja-file-operations.c +++ b/libcaja-private/caja-file-operations.c @@ -1367,7 +1367,7 @@ confirm_delete_from_trash (CommonJob *job, f (_("If you delete an item, it will be permanently lost.")), NULL, FALSE, - GTK_STOCK_CANCEL, GTK_STOCK_DELETE, + "gtk-cancel", "gtk-delete", NULL); return (response == 1); @@ -1391,7 +1391,7 @@ confirm_empty_trash (CommonJob *job) f(_("All items in the Trash will be permanently deleted.")), NULL, FALSE, - GTK_STOCK_CANCEL, _("Empty _Trash"), + "gtk-cancel", _("Empty _Trash"), NULL); return (response == 1); @@ -1433,7 +1433,7 @@ confirm_delete_directly (CommonJob *job, f (_("If you delete an item, it will be permanently lost.")), NULL, FALSE, - GTK_STOCK_CANCEL, GTK_STOCK_DELETE, + "gtk-cancel", "gtk-delete", NULL); return response == 1; @@ -1475,7 +1475,7 @@ confirm_trash (CommonJob *job, f (_("Items moved to the trash may be recovered until the trash is emptied.")), NULL, FALSE, - GTK_STOCK_CANCEL, _("Move to _Trash"), + "gtk-cancel", _("Move to _Trash"), NULL); return response == 1; @@ -1609,7 +1609,7 @@ delete_dir (CommonJob *job, GFile *dir, secondary, details, FALSE, - GTK_STOCK_CANCEL, _("_Skip files"), + "gtk-cancel", _("_Skip files"), NULL); g_error_free (error); @@ -1642,7 +1642,7 @@ delete_dir (CommonJob *job, GFile *dir, secondary, details, FALSE, - GTK_STOCK_CANCEL, SKIP, RETRY, + "gtk-cancel", SKIP, RETRY, NULL); g_error_free (error); @@ -1675,7 +1675,7 @@ delete_dir (CommonJob *job, GFile *dir, secondary, details, (source_info->num_files - transfer_info->num_files) > 1, - GTK_STOCK_CANCEL, SKIP_ALL, SKIP, + "gtk-cancel", SKIP_ALL, SKIP, NULL); if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) { @@ -1752,7 +1752,7 @@ delete_file (CommonJob *job, GFile *file, secondary, details, (source_info->num_files - transfer_info->num_files) > 1, - GTK_STOCK_CANCEL, SKIP_ALL, SKIP, + "gtk-cancel", SKIP_ALL, SKIP, NULL); if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) { @@ -1895,7 +1895,7 @@ trash_files (CommonJob *job, GList *files, int *files_skipped) secondary, details, (total_files - files_trashed) > 1, - GTK_STOCK_CANCEL, SKIP_ALL, SKIP, DELETE_ALL, GTK_STOCK_DELETE, + "gtk-cancel", SKIP_ALL, SKIP, DELETE_ALL, "gtk-delete", NULL); if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) { @@ -2316,7 +2316,7 @@ prompt_empty_trash (GtkWindow *parent_window) "will be permanently lost.")); gtk_dialog_add_buttons (GTK_DIALOG (dialog), _("Do _not Empty Trash"), GTK_RESPONSE_REJECT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + "gtk-cancel", GTK_RESPONSE_CANCEL, _("Empty _Trash"), GTK_RESPONSE_ACCEPT, NULL); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); gtk_window_set_title (GTK_WINDOW (dialog), ""); /* as per HIG */ @@ -2631,7 +2631,7 @@ scan_dir (GFile *dir, secondary, details, FALSE, - GTK_STOCK_CANCEL, RETRY, SKIP, + "gtk-cancel", RETRY, SKIP, NULL); g_error_free (error); @@ -2672,7 +2672,7 @@ scan_dir (GFile *dir, secondary, details, TRUE, - GTK_STOCK_CANCEL, SKIP_ALL, SKIP, RETRY, + "gtk-cancel", SKIP_ALL, SKIP, RETRY, NULL); g_error_free (error); @@ -2750,7 +2750,7 @@ scan_file (GFile *file, secondary, details, TRUE, - GTK_STOCK_CANCEL, SKIP_ALL, SKIP, RETRY, + "gtk-cancel", SKIP_ALL, SKIP, RETRY, NULL); g_error_free (error); @@ -2854,7 +2854,7 @@ verify_destination (CommonJob *job, secondary, details, FALSE, - GTK_STOCK_CANCEL, RETRY, + "gtk-cancel", RETRY, NULL); g_error_free (error); @@ -2889,7 +2889,7 @@ verify_destination (CommonJob *job, secondary, NULL, FALSE, - GTK_STOCK_CANCEL, + "gtk-cancel", NULL); abort_job (job); @@ -2924,7 +2924,7 @@ verify_destination (CommonJob *job, secondary, details, FALSE, - GTK_STOCK_CANCEL, + "gtk-cancel", COPY_FORCE, RETRY, NULL); @@ -2952,7 +2952,7 @@ verify_destination (CommonJob *job, secondary, NULL, FALSE, - GTK_STOCK_CANCEL, + "gtk-cancel", NULL); g_error_free (error); @@ -3472,7 +3472,7 @@ create_dest_dir (CommonJob *job, secondary, details, FALSE, - GTK_STOCK_CANCEL, SKIP, RETRY, + "gtk-cancel", SKIP, RETRY, NULL); g_error_free (error); @@ -3613,7 +3613,7 @@ copy_move_directory (CopyMoveJob *copy_job, secondary, details, FALSE, - GTK_STOCK_CANCEL, _("_Skip files"), + "gtk-cancel", _("_Skip files"), NULL); g_error_free (error); @@ -3658,7 +3658,7 @@ copy_move_directory (CopyMoveJob *copy_job, secondary, details, FALSE, - GTK_STOCK_CANCEL, SKIP, RETRY, + "gtk-cancel", SKIP, RETRY, NULL); g_error_free (error); @@ -3700,7 +3700,7 @@ copy_move_directory (CopyMoveJob *copy_job, secondary, details, (source_info->num_files - transfer_info->num_files) > 1, - GTK_STOCK_CANCEL, SKIP_ALL, SKIP, + "gtk-cancel", SKIP_ALL, SKIP, NULL); if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) { @@ -3789,7 +3789,7 @@ remove_target_recursively (CommonJob *job, secondary, details, TRUE, - GTK_STOCK_CANCEL, SKIP_ALL, SKIP, + "gtk-cancel", SKIP_ALL, SKIP, NULL); if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) { @@ -3830,7 +3830,7 @@ remove_target_recursively (CommonJob *job, secondary, details, TRUE, - GTK_STOCK_CANCEL, SKIP_ALL, SKIP, + "gtk-cancel", SKIP_ALL, SKIP, NULL); if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) { @@ -4147,7 +4147,7 @@ copy_move_file (CopyMoveJob *copy_job, secondary, NULL, (source_info->num_files - transfer_info->num_files) > 1, - GTK_STOCK_CANCEL, SKIP_ALL, SKIP, + "gtk-cancel", SKIP_ALL, SKIP, NULL); if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) { @@ -4180,7 +4180,7 @@ copy_move_file (CopyMoveJob *copy_job, secondary, NULL, (source_info->num_files - transfer_info->num_files) > 1, - GTK_STOCK_CANCEL, SKIP_ALL, SKIP, + "gtk-cancel", SKIP_ALL, SKIP, NULL); if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) { @@ -4400,7 +4400,7 @@ copy_move_file (CopyMoveJob *copy_job, secondary, details, TRUE, - GTK_STOCK_CANCEL, SKIP_ALL, SKIP, + "gtk-cancel", SKIP_ALL, SKIP, NULL); g_error_free (error); @@ -4468,7 +4468,7 @@ copy_move_file (CopyMoveJob *copy_job, secondary, details, (source_info->num_files - transfer_info->num_files) > 1, - GTK_STOCK_CANCEL, SKIP_ALL, SKIP, + "gtk-cancel", SKIP_ALL, SKIP, NULL); g_error_free (error); @@ -4832,7 +4832,7 @@ move_file_prepare (CopyMoveJob *move_job, secondary, NULL, files_left > 1, - GTK_STOCK_CANCEL, SKIP_ALL, SKIP, + "gtk-cancel", SKIP_ALL, SKIP, NULL); if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) { @@ -4986,7 +4986,7 @@ move_file_prepare (CopyMoveJob *move_job, secondary, details, files_left > 1, - GTK_STOCK_CANCEL, SKIP_ALL, SKIP, + "gtk-cancel", SKIP_ALL, SKIP, NULL); g_error_free (error); @@ -5432,7 +5432,7 @@ link_file (CopyMoveJob *job, secondary, details, files_left > 1, - GTK_STOCK_CANCEL, SKIP_ALL, SKIP, + "gtk-cancel", SKIP_ALL, SKIP, NULL); if (error) { @@ -6190,7 +6190,7 @@ create_job (GIOSchedulerJob *io_job, secondary, details, FALSE, - GTK_STOCK_CANCEL, SKIP, + "gtk-cancel", SKIP, NULL); g_error_free (error); @@ -6513,7 +6513,7 @@ mark_desktop_file_trusted (CommonJob *common, error->message, NULL, FALSE, - GTK_STOCK_CANCEL, RETRY, + "gtk-cancel", RETRY, NULL); } else { response = 0; @@ -6554,7 +6554,7 @@ mark_desktop_file_trusted (CommonJob *common, error->message, NULL, FALSE, - GTK_STOCK_CANCEL, RETRY, + "gtk-cancel", RETRY, NULL); } else { response = 0; @@ -6589,7 +6589,7 @@ mark_desktop_file_trusted (CommonJob *common, error->message, NULL, FALSE, - GTK_STOCK_CANCEL, RETRY, + "gtk-cancel", RETRY, NULL); } else { response = 0; @@ -6624,7 +6624,7 @@ mark_desktop_file_trusted (CommonJob *common, error->message, NULL, FALSE, - GTK_STOCK_CANCEL, RETRY, + "gtk-cancel", RETRY, NULL); } else { response = 0; diff --git a/libcaja-private/caja-mime-actions.c b/libcaja-private/caja-mime-actions.c index b52279f7..bb120a9d 100644 --- a/libcaja-private/caja-mime-actions.c +++ b/libcaja-private/caja-mime-actions.c @@ -737,11 +737,11 @@ report_broken_symbolic_link (GtkWindow *parent_window, CajaFile *file) if (caja_file_is_in_trash (file)) { eel_run_simple_dialog (GTK_WIDGET (parent_window), FALSE, GTK_MESSAGE_WARNING, - prompt, detail, GTK_STOCK_CANCEL, NULL); + prompt, detail, "gtk-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"), "gtk-cancel", parent_window); gtk_dialog_set_default_response (dialog, GTK_RESPONSE_CANCEL); @@ -814,7 +814,7 @@ get_executable_text_file_action (GtkWindow *parent_window, CajaFile *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, "gtk-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)); @@ -1179,7 +1179,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, + "gtk-ok", "gtk-cancel", parent_window); g_free (detail); @@ -1361,7 +1361,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), "gtk-ok", GTK_RESPONSE_OK); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); @@ -1714,7 +1714,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); + "gtk-cancel", GTK_RESPONSE_CANCEL); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL); g_signal_connect (dialog, "response", diff --git a/libcaja-private/caja-mime-application-chooser.c b/libcaja-private/caja-mime-application-chooser.c index 4bd322ac..b36a23c4 100644 --- a/libcaja-private/caja-mime-application-chooser.c +++ b/libcaja-private/caja-mime-application-chooser.c @@ -417,7 +417,12 @@ caja_mime_application_chooser_init (CajaMimeApplicationChooser *chooser) gtk_box_pack_start (GTK_BOX (chooser), box, FALSE, FALSE, 6); gtk_widget_show (box); - button = gtk_button_new_from_stock (GTK_STOCK_ADD); + button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON, + "label", "gtk-add", + "use-stock", TRUE, + "use-underline", TRUE, + NULL)); + g_signal_connect (button, "clicked", G_CALLBACK (add_clicked_cb), chooser); @@ -425,7 +430,12 @@ caja_mime_application_chooser_init (CajaMimeApplicationChooser *chooser) gtk_widget_show (button); gtk_container_add (GTK_CONTAINER (box), button); - button = gtk_button_new_from_stock (GTK_STOCK_REMOVE); + button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON, + "label", "gtk-remove", + "use-stock", TRUE, + "use-underline", TRUE, + NULL)); + g_signal_connect (button, "clicked", G_CALLBACK (remove_clicked_cb), chooser); diff --git a/libcaja-private/caja-open-with-dialog.c b/libcaja-private/caja-open-with-dialog.c index bbbdcf34..8e45f6f5 100644 --- a/libcaja-private/caja-open-with-dialog.c +++ b/libcaja-private/caja-open-with-dialog.c @@ -450,9 +450,9 @@ browse_clicked_cb (GtkWidget *button, chooser = gtk_file_chooser_dialog_new (_("Select an Application"), GTK_WINDOW (dialog), GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, + "gtk-cancel", GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, + "gtk-open", GTK_RESPONSE_OK, NULL); gtk_window_set_destroy_with_parent (GTK_WINDOW (chooser), TRUE); @@ -932,14 +932,14 @@ caja_open_with_dialog_init (CajaOpenWithDialog *dialog) gtk_box_pack_start (GTK_BOX (vbox), dialog->details->checkbox, FALSE, FALSE, 0); gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_REMOVE, + "gtk-remove", RESPONSE_REMOVE); gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), RESPONSE_REMOVE, FALSE); gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, + "gtk-cancel", GTK_RESPONSE_CANCEL); |