diff --git a/data/ui/create-playlist.ui b/data/ui/create-playlist.ui index 7d16a375d..9bca16720 100644 --- a/data/ui/create-playlist.ui +++ b/data/ui/create-playlist.ui @@ -116,11 +116,11 @@ - gtk-add + _Add True True True - True + True False diff --git a/data/ui/library-prefs.ui b/data/ui/library-prefs.ui index 62bac770c..27816133f 100644 --- a/data/ui/library-prefs.ui +++ b/data/ui/library-prefs.ui @@ -19,8 +19,8 @@ True False - 0 Library Location + 0 False @@ -103,7 +103,7 @@ True False - gtk-directory + folder False @@ -190,9 +190,9 @@ True False - 0 Library Structure True + 0 False @@ -229,9 +229,9 @@ True False True - 0 F_older hierarchy: True + 0 0 @@ -243,9 +243,9 @@ True False True - 0 _File name: True + 0 0 @@ -257,9 +257,9 @@ True False True - 0 _Preferred format: True + 0 0 @@ -270,8 +270,8 @@ True False - 0 Artist/Artist - Album/Artist (Album) - 01 - Title.ogg + 0 1 @@ -320,8 +320,8 @@ True False True - 0 Format settings: + 0 0 diff --git a/data/ui/media-player-properties.ui b/data/ui/media-player-properties.ui index 09ccc510a..4ec98cb6b 100644 --- a/data/ui/media-player-properties.ui +++ b/data/ui/media-player-properties.ui @@ -19,12 +19,12 @@ end - gtk-close + _Close True True True False - True + True False diff --git a/data/ui/playlist-save.ui b/data/ui/playlist-save.ui index 7d9d8e144..fdb8702fe 100644 --- a/data/ui/playlist-save.ui +++ b/data/ui/playlist-save.ui @@ -34,12 +34,12 @@ end - gtk-cancel + _Cancel True True True False - True + True False @@ -49,13 +49,13 @@ - gtk-save + _Save True True True True False - True + True False diff --git a/data/ui/song-info.ui b/data/ui/song-info.ui index a9512965c..b8a7c82d9 100644 --- a/data/ui/song-info.ui +++ b/data/ui/song-info.ui @@ -77,10 +77,10 @@ True False - 0 Albu_m: True song_info_album + 0 2 @@ -93,10 +93,10 @@ True False - 0 _Title: True song_info_title + 0 GTK_FILL @@ -107,10 +107,10 @@ True False - 0 Track _number: True song_info_track_cur + 0 6 @@ -123,10 +123,10 @@ True False - 0 _Genre: True song_info_genre + 0 5 @@ -179,10 +179,10 @@ True False - 0 _Artist: True song_info_artist + 0 1 @@ -195,10 +195,10 @@ True False - 0 _Disc number: True song_info_disc_cur + 0 7 @@ -250,10 +250,10 @@ True False - 0 _Year: True song_info_year + 0 8 @@ -284,10 +284,10 @@ True False - 0 _BPM: True song_info_bpm + 0 9 @@ -300,10 +300,10 @@ True False - 0 Comm_ent: True song_info_comment + 0 10 @@ -335,10 +335,10 @@ True False - 0 Album a_rtist: True song_info_album_artist + 0 3 @@ -365,10 +365,10 @@ True False - 0 _Composer: True song_info_composer + 0 4 @@ -466,7 +466,8 @@ True False - gtk-dialog-error + 64 + dialog-error 6 @@ -555,10 +556,10 @@ True False - 0 Albu_m sort order: True song_info_album_sortname + 0 1 @@ -571,10 +572,10 @@ True False - 0 _Artist sort order: True song_info_artist_sortname + 0 GTK_FILL @@ -585,9 +586,9 @@ True False - 0 Album a_rtist sort order: True + 0 2 @@ -614,9 +615,9 @@ True False - 0 _Composer sort order: True + 0 3 @@ -668,9 +669,9 @@ True False - 0 File name: song_info_name + 0 GTK_FILL @@ -681,8 +682,8 @@ True True - 0 True + 0 1 @@ -697,9 +698,9 @@ True False - 0 Bitrate: song_info_bitrate + 0 2 @@ -712,8 +713,8 @@ True True - 0 True + 0 1 @@ -728,9 +729,9 @@ True False - 0 Location: song_info_location + 0 3 @@ -756,9 +757,9 @@ True False - 0 Last played: song_info_lastplayed + 0 7 @@ -771,8 +772,8 @@ True True - 0 True + 0 1 @@ -787,9 +788,9 @@ True False - 0 Play count: song_info_playcount + 0 8 @@ -802,8 +803,8 @@ True True - 0 True + 0 1 @@ -862,10 +863,10 @@ True False - 0 - 0 _Rating: True + 0 + 0 10 @@ -910,9 +911,9 @@ True False - 0 Duration: song_info_duration + 0 1 @@ -943,9 +944,9 @@ True False - 0 File size: song_info_filesize + 0 4 @@ -958,8 +959,8 @@ True True - 0 True + 0 1 @@ -974,9 +975,9 @@ True False - 0 Date added: song_info_dateadded + 0 6 @@ -989,8 +990,8 @@ True True - 0 True + 0 1 diff --git a/data/ui/sync-dialog.ui b/data/ui/sync-dialog.ui index 95b776a12..6a7e43418 100644 --- a/data/ui/sync-dialog.ui +++ b/data/ui/sync-dialog.ui @@ -102,7 +102,8 @@ False 6 6 - gtk-dialog-error + 64 + dialog-error 6 diff --git a/plugins/daap/daap-prefs.ui b/plugins/daap/daap-prefs.ui index bca49c365..f27b54112 100644 --- a/plugins/daap/daap-prefs.ui +++ b/plugins/daap/daap-prefs.ui @@ -384,12 +384,11 @@ - gtk-close - False + _Close True True True - True + True True diff --git a/plugins/ipod/ipod-init.ui b/plugins/ipod/ipod-init.ui index a6e97eb59..71a612929 100644 --- a/plugins/ipod/ipod-init.ui +++ b/plugins/ipod/ipod-init.ui @@ -18,14 +18,12 @@ end - gtk-cancel - False + _Cancel True True True False - False - True + True False diff --git a/plugins/iradio/rb-station-properties-dialog.c b/plugins/iradio/rb-station-properties-dialog.c index 151490e4d..91d127635 100644 --- a/plugins/iradio/rb-station-properties-dialog.c +++ b/plugins/iradio/rb-station-properties-dialog.c @@ -183,7 +183,7 @@ rb_station_properties_dialog_constructed (GObject *object) GTK_WIDGET (gtk_builder_get_object (builder, "stationproperties"))); dialog->priv->close_button = gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_CLOSE, + _("_Close"), GTK_RESPONSE_CLOSE); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); diff --git a/plugins/iradio/station-properties.ui b/plugins/iradio/station-properties.ui index 0e1d8d92e..1de3bc225 100644 --- a/plugins/iradio/station-properties.ui +++ b/plugins/iradio/station-properties.ui @@ -25,10 +25,10 @@ True False - 0 _Title: True titleEntry + 0 GTK_FILL @@ -52,10 +52,10 @@ True False - 0 _Genre: True genreEntry + 0 1 @@ -89,7 +89,8 @@ True False - gtk-dialog-error + 64 + dialog-error 6 @@ -144,10 +145,10 @@ True False - 0 L_ocation: True locationEntry + 0 GTK_FILL @@ -171,9 +172,9 @@ True False - 0 Bitrate: bitrateLabel + 0 1 @@ -201,10 +202,10 @@ True False - 0 Last played: True lastplayedLabel + 0 2 @@ -232,9 +233,9 @@ True False - 0 Play count: playcountLabel + 0 3 @@ -262,9 +263,9 @@ True False - 0 _Rating: True + 0 4 diff --git a/plugins/lyrics/lyrics-prefs.ui b/plugins/lyrics/lyrics-prefs.ui index d1333fdb1..2b1b77b7f 100644 --- a/plugins/lyrics/lyrics-prefs.ui +++ b/plugins/lyrics/lyrics-prefs.ui @@ -36,8 +36,8 @@ True False - 0 Search engines + 0 @@ -99,7 +99,7 @@ True False - gtk-open + folder False @@ -139,8 +139,8 @@ True False - 0 Lyrics Folder + 0 diff --git a/podcast/rb-feed-podcast-properties-dialog.c b/podcast/rb-feed-podcast-properties-dialog.c index f40dea607..f72e028f1 100644 --- a/podcast/rb-feed-podcast-properties-dialog.c +++ b/podcast/rb-feed-podcast-properties-dialog.c @@ -127,7 +127,7 @@ rb_feed_podcast_properties_dialog_init (RBFeedPodcastPropertiesDialog *dialog) GTK_WIDGET (gtk_builder_get_object (builder, "podcastproperties"))); dialog->priv->close_button = gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_CLOSE, + _("_Close"), GTK_RESPONSE_CLOSE); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); diff --git a/podcast/rb-podcast-source.c b/podcast/rb-podcast-source.c index 4bfdd396e..84af52876 100644 --- a/podcast/rb-podcast-source.c +++ b/podcast/rb-podcast-source.c @@ -531,7 +531,7 @@ podcast_feed_delete_action_cb (GSimpleAction *action, GVariant *parameter, gpoin gtk_dialog_add_buttons (GTK_DIALOG (dialog), _("Delete _Feed Only"), GTK_RESPONSE_NO, - GTK_STOCK_CANCEL, + _("_Cancel"), GTK_RESPONSE_CANCEL, NULL); @@ -1101,7 +1101,7 @@ impl_delete_selected (RBSource *asource) gtk_dialog_add_buttons (GTK_DIALOG (dialog), _("Delete _Episode Only"), GTK_RESPONSE_NO, - GTK_STOCK_CANCEL, + _("_Cancel"), GTK_RESPONSE_CANCEL, NULL); button = gtk_dialog_add_button (GTK_DIALOG (dialog), diff --git a/shell/rb-application.c b/shell/rb-application.c index 68e7a5e06..76b0ae995 100644 --- a/shell/rb-application.c +++ b/shell/rb-application.c @@ -141,7 +141,7 @@ plugins_action_cb (GSimpleAction *action, GVariant *parameters, gpointer user_da app->priv->plugins = gtk_dialog_new_with_buttons (_("Configure Plugins"), window, GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CLOSE, + _("_Close"), GTK_RESPONSE_CLOSE, NULL); content_area = gtk_dialog_get_content_area (GTK_DIALOG (app->priv->plugins)); diff --git a/shell/rb-shell-preferences.c b/shell/rb-shell-preferences.c index 19fad98d7..7073bcc1b 100644 --- a/shell/rb-shell-preferences.c +++ b/shell/rb-shell-preferences.c @@ -189,10 +189,10 @@ rb_shell_preferences_init (RBShellPreferences *shell_preferences) shell_preferences, 0); gtk_dialog_add_button (GTK_DIALOG (shell_preferences), - GTK_STOCK_CLOSE, + _("_Close"), GTK_RESPONSE_CLOSE); tmp = gtk_dialog_add_button (GTK_DIALOG (shell_preferences), - GTK_STOCK_HELP, + _("_Help"), GTK_RESPONSE_HELP); g_signal_connect_object (tmp, "clicked", G_CALLBACK (help_cb), shell_preferences, 0); diff --git a/widgets/rb-alert-dialog.c b/widgets/rb-alert-dialog.c index 65c8354e3..1e9694dce 100644 --- a/widgets/rb-alert-dialog.c +++ b/widgets/rb-alert-dialog.c @@ -135,7 +135,7 @@ rb_alert_dialog_init (RBAlertDialog *dialog) dialog->details->primary_label = gtk_label_new (NULL); dialog->details->secondary_label = gtk_label_new (NULL); dialog->details->details_label = gtk_label_new (NULL); - dialog->details->image = gtk_image_new_from_stock (NULL, GTK_ICON_SIZE_DIALOG); + dialog->details->image = gtk_image_new_from_icon_name ("broken-image", GTK_ICON_SIZE_DIALOG); gtk_misc_set_alignment (GTK_MISC (dialog->details->image), 0.5, 0.0); gtk_label_set_line_wrap (GTK_LABEL (dialog->details->primary_label), TRUE); @@ -188,37 +188,26 @@ static void setup_type (RBAlertDialog *dialog, GtkMessageType type) { - const gchar *stock_id = NULL; - GtkStockItem item; - + const char *icon_name = "dialog-information"; switch (type) { case GTK_MESSAGE_INFO: - stock_id = GTK_STOCK_DIALOG_INFO; + icon_name = "dialog-information"; break; case GTK_MESSAGE_QUESTION: - stock_id = GTK_STOCK_DIALOG_QUESTION; + icon_name = "dialog-question"; break; case GTK_MESSAGE_WARNING: - stock_id = GTK_STOCK_DIALOG_WARNING; + icon_name = "dialog-warning"; break; case GTK_MESSAGE_ERROR: - stock_id = GTK_STOCK_DIALOG_ERROR; + icon_name = "dialog-error"; break; default: g_warning ("Unknown GtkMessageType %d", type); break; } - if (stock_id == NULL) { - stock_id = GTK_STOCK_DIALOG_INFO; - } - - if (gtk_stock_lookup (stock_id, &item)) { - gtk_image_set_from_stock (GTK_IMAGE (dialog->details->image), stock_id, - GTK_ICON_SIZE_DIALOG); - } else { - g_warning ("Stock dialog ID doesn't exist?"); - } + gtk_image_set_from_icon_name (GTK_IMAGE (dialog->details->image), icon_name, GTK_ICON_SIZE_DIALOG); } static void @@ -374,41 +363,41 @@ rb_alert_dialog_add_buttons (RBAlertDialog* alert_dialog, break; case GTK_BUTTONS_OK: gtk_dialog_add_button (dialog, - GTK_STOCK_OK, + _("_OK"), GTK_RESPONSE_OK); gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK); break; case GTK_BUTTONS_CLOSE: gtk_dialog_add_button (dialog, - GTK_STOCK_CLOSE, - GTK_RESPONSE_CLOSE); + _("_Close"), + GTK_RESPONSE_CLOSE); gtk_dialog_set_default_response (dialog, GTK_RESPONSE_CLOSE); break; case GTK_BUTTONS_CANCEL: gtk_dialog_add_button (dialog, - GTK_STOCK_CANCEL, + _("_Cancel"), GTK_RESPONSE_CANCEL); gtk_dialog_set_default_response (dialog, GTK_RESPONSE_CANCEL); break; case GTK_BUTTONS_YES_NO: gtk_dialog_add_button (dialog, - GTK_STOCK_NO, + _("_No"), GTK_RESPONSE_NO); gtk_dialog_add_button (dialog, - GTK_STOCK_YES, + _("_Yes"), GTK_RESPONSE_YES); gtk_dialog_set_default_response (dialog, GTK_RESPONSE_YES); break; case GTK_BUTTONS_OK_CANCEL: gtk_dialog_add_button (dialog, - GTK_STOCK_CANCEL, + _("_Cancel"), GTK_RESPONSE_CANCEL); gtk_dialog_add_button (dialog, - GTK_STOCK_OK, + _("_OK"), GTK_RESPONSE_OK); gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK); diff --git a/widgets/rb-dialog.c b/widgets/rb-dialog.c index 88c19a266..5cef00dab 100644 --- a/widgets/rb-dialog.c +++ b/widgets/rb-dialog.c @@ -130,16 +130,16 @@ rb_file_chooser_new (const char *title, action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER) { dialog = gtk_file_chooser_dialog_new (title, parent, action, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + _("_Cancel"), GTK_RESPONSE_CANCEL, + _("_Open"), GTK_RESPONSE_ACCEPT, NULL); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); } else if (action == GTK_FILE_CHOOSER_ACTION_SAVE) { dialog = gtk_file_chooser_dialog_new (title, parent, action, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + _("_Cancel"), GTK_RESPONSE_CANCEL, + _("_Save"), GTK_RESPONSE_ACCEPT, NULL); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); diff --git a/widgets/rb-query-creator.c b/widgets/rb-query-creator.c index 640d536d9..c2edf4b9c 100644 --- a/widgets/rb-query-creator.c +++ b/widgets/rb-query-creator.c @@ -188,14 +188,14 @@ rb_query_creator_constructed (GObject *object) if (priv->creating) { gtk_dialog_add_button (GTK_DIALOG (creator), - GTK_STOCK_CANCEL, + _("_Cancel"), GTK_RESPONSE_CLOSE); gtk_dialog_add_button (GTK_DIALOG (creator), - GTK_STOCK_NEW, + _("_New"), GTK_RESPONSE_OK); } else { gtk_dialog_add_button (GTK_DIALOG (creator), - GTK_STOCK_CLOSE, + _("_Close"), GTK_RESPONSE_CLOSE); } gtk_dialog_set_default_response (GTK_DIALOG (creator), @@ -799,7 +799,7 @@ append_row (RBQueryCreator *creator) gtk_size_group_add_widget (priv->entry_size_group, entry); gtk_box_pack_start (hbox, GTK_WIDGET (entry), TRUE, TRUE, 0); - remove_button = gtk_button_new_from_stock (GTK_STOCK_REMOVE); + remove_button = gtk_button_new_with_label (_("Remove")); g_signal_connect_object (G_OBJECT (remove_button), "clicked", G_CALLBACK (remove_button_click_cb), creator, 0); gtk_size_group_add_widget (priv->button_size_group, remove_button); diff --git a/widgets/rb-uri-dialog.c b/widgets/rb-uri-dialog.c index a0ba9bc2f..7c7a223a0 100644 --- a/widgets/rb-uri-dialog.c +++ b/widgets/rb-uri-dialog.c @@ -155,10 +155,10 @@ rb_uri_dialog_init (RBURIDialog *dialog) gtk_box_set_spacing (GTK_BOX (content_area), 2); dialog->priv->cancelbutton = gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, + _("_Cancel"), GTK_RESPONSE_CANCEL); dialog->priv->okbutton = gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_ADD, + _("_Add"), GTK_RESPONSE_OK); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);