This is an automated email from the git hooks/post-receive script. f2404 pushed a commit to branch master in repository apps/ristretto.
commit f9747268f53dfd37d2d025d0c5a61d777f062908 Author: Igor <f2...@yandex.ru> Date: Sat Sep 17 19:49:11 2016 +0300 Prepare for gtk3 migration: Do not use deprecated GTK_STOCK_* --- src/gnome_wallpaper_manager.c | 6 ++--- src/main_window.c | 62 +++++++++++++++++++++---------------------- src/preferences_dialog.c | 2 +- src/privacy_dialog.c | 6 ++--- src/properties_dialog.c | 4 +-- src/xfce_wallpaper_manager.c | 6 ++--- 6 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/gnome_wallpaper_manager.c b/src/gnome_wallpaper_manager.c index 0389d89..5341c99 100644 --- a/src/gnome_wallpaper_manager.c +++ b/src/gnome_wallpaper_manager.c @@ -246,11 +246,11 @@ rstto_gnome_wallpaper_manager_init (GObject *object) _("Set as wallpaper"), NULL, 0, - GTK_STOCK_CANCEL, + _("_Cancel"), GTK_RESPONSE_CANCEL, - GTK_STOCK_APPLY, + _("_Apply"), GTK_RESPONSE_APPLY, - GTK_STOCK_OK, + _("_OK"), GTK_RESPONSE_OK, NULL); diff --git a/src/main_window.c b/src/main_window.c index 88206ab..ef5abc9 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -373,31 +373,31 @@ static GtkActionEntry action_entries[] = N_ ("Open an image"), /* Tooltip text */ G_CALLBACK (cb_rstto_main_window_open_image), }, { "save-copy", - GTK_STOCK_SAVE_AS, /* Icon-name */ + "document-save-as", /* Icon-name */ N_ ("_Save copy..."), /* Label-text */ "<control>s", /* Keyboard shortcut */ N_ ("Save a copy of the image"), /* Tooltip text */ G_CALLBACK (cb_rstto_main_window_save_copy), }, { "properties", - GTK_STOCK_PROPERTIES, /* Icon-name */ + "document-properties", /* Icon-name */ N_ ("_Properties..."), /* Label-text */ NULL, /* Keyboard shortcut */ N_ ("Show file properties"), /* Tooltip text */ G_CALLBACK (cb_rstto_main_window_properties), }, { "edit", - GTK_STOCK_EDIT, /* Icon-name */ + "gtk-edit", /* Icon-name */ N_ ("_Edit"), /* Label-text */ NULL, /* Keyboard shortcut */ N_ ("Edit this image"), /* Tooltip text */ G_CALLBACK (cb_rstto_main_window_edit), }, { "close", - GTK_STOCK_CLOSE, /* Icon-name */ + "window-close", /* Icon-name */ N_ ("_Close"), /* Label-text */ "<control>W", /* Keyboard shortcut */ N_ ("Close this image"), /* Tooltip text */ G_CALLBACK (cb_rstto_main_window_close), }, { "quit", - GTK_STOCK_QUIT, /* Icon-name */ + "application-exit", /* Icon-name */ N_ ("_Quit"), /* Label-text */ "<control>Q", /* Keyboard shortcut */ N_ ("Quit Ristretto"), /* Tooltip text */ @@ -416,19 +416,19 @@ static GtkActionEntry action_entries[] = N_ ("_Sorting"), NULL, }, { "delete", - GTK_STOCK_DELETE, /* Icon-name */ + "edit-delete", /* Icon-name */ N_ ("_Delete"), /* Label-text */ "Delete", /* Keyboard shortcut */ N_ ("Delete this image from disk"), /* Tooltip text */ G_CALLBACK (cb_rstto_main_window_delete), }, { "clear-private-data", - GTK_STOCK_CLEAR, /* Icon-name */ + "edit-clear", /* Icon-name */ N_ ("_Clear private data..."), /* Label-text */ "<control><shift>Delete", /* Keyboard shortcut */ NULL, /* Tooltip text */ G_CALLBACK(cb_rstto_main_window_clear_private_data), }, { "preferences", - GTK_STOCK_PREFERENCES, /* Icon-name */ + "preferences-system", /* Icon-name */ N_ ("_Preferences..."), /* Label-text */ NULL, /* Keyboard shortcut */ NULL, /* Tooltip text */ @@ -439,13 +439,13 @@ static GtkActionEntry action_entries[] = N_ ("_View"), NULL, }, { "fullscreen", - GTK_STOCK_FULLSCREEN, /* Icon-name */ + "view-fullscreen", /* Icon-name */ N_ ("_Fullscreen"), /* Label-text */ "F11", /* Keyboard shortcut */ N_ ("Switch to fullscreen"), /* Tooltip text */ G_CALLBACK (cb_rstto_main_window_fullscreen), }, { "unfullscreen", - GTK_STOCK_LEAVE_FULLSCREEN, /* Icon-name */ + "view-restore", /* Icon-name */ N_ ("_Leave Fullscreen"), /* Label-text */ NULL, /* Keyboard shortcut */ N_ ("Leave Fullscreen"), /* Tooltip text */ @@ -462,25 +462,25 @@ static GtkActionEntry action_entries[] = N_ ("_Zoom"), NULL, }, { "zoom-in", - GTK_STOCK_ZOOM_IN, /* Icon-name */ + "zoom-in", /* Icon-name */ N_ ("Zoom _In"), /* Label-text */ "<control>plus", /* Keyboard shortcut */ N_ ("Zoom in"), /* Tooltip text */ G_CALLBACK (cb_rstto_main_window_zoom_in),}, { "zoom-out", - GTK_STOCK_ZOOM_OUT, /* Icon-name */ + "zoom-out", /* Icon-name */ N_ ("Zoom _Out"), /* Label-text */ "<control>minus", /* Keyboard shortcut */ N_ ("Zoom out"), /* Tooltip text */ G_CALLBACK (cb_rstto_main_window_zoom_out), }, { "zoom-fit", - GTK_STOCK_ZOOM_FIT, /* Icon-name */ + "zoom-fit-best", /* Icon-name */ N_ ("Zoom _Fit"), /* Label-text */ "<control>equal", /* Keyboard shortcut */ N_ ("Zoom to fit window"), /* Tooltip text */ G_CALLBACK (cb_rstto_main_window_zoom_fit), }, { "zoom-100", - GTK_STOCK_ZOOM_100, /* Icon-name */ + "zoom-original", /* Icon-name */ N_ ("_Normal Size"), /* Label-text */ "<control>0", /* Keyboard shortcut */ N_ ("Zoom to 100%"), /* Tooltip text */ @@ -508,25 +508,25 @@ static GtkActionEntry action_entries[] = N_ ("_Go"), NULL, }, { "forward", - GTK_STOCK_GO_FORWARD, /* Icon-name */ + "go-next", /* Icon-name */ N_ ("_Forward"), /* Label-text */ "space", /* Keyboard shortcut */ N_("Next image"), /* Tooltip text */ G_CALLBACK (cb_rstto_main_window_next_image), }, { "back", - GTK_STOCK_GO_BACK, /* Icon-name */ + "go-previous", /* Icon-name */ N_ ("_Back"), /* Label-text */ "BackSpace", /* Keyboard shortcut */ N_("Previous image"), /* Tooltip text */ G_CALLBACK (cb_rstto_main_window_previous_image), }, { "first", - GTK_STOCK_GOTO_FIRST, /* Icon-name */ + "go-first", /* Icon-name */ N_ ("F_irst"), /* Label-text */ "Home", /* Keyboard shortcut */ N_("First image"), /* Tooltip text */ G_CALLBACK (cb_rstto_main_window_first_image), }, { "last", - GTK_STOCK_GOTO_LAST, /* Icon-name */ + "go-last", /* Icon-name */ N_ ("_Last"), /* Label-text */ "End", /* Keyboard shortcut */ N_("Last image"), /* Tooltip text */ @@ -537,13 +537,13 @@ static GtkActionEntry action_entries[] = N_ ("_Help"), NULL, }, { "contents", - GTK_STOCK_HELP, /* Icon-name */ + "help-browser", /* Icon-name */ N_ ("_Contents"), /* Label-text */ "F1", /* Keyboard shortcut */ N_ ("Display ristretto user manual"), /* Tooltip text */ G_CALLBACK (cb_rstto_main_window_contents), }, { "about", - GTK_STOCK_ABOUT, /* Icon-name */ + "help-about", /* Icon-name */ N_ ("_About"), /* Label-text */ NULL, /* Keyboard shortcut */ N_ ("Display information about ristretto"), /* Tooltip text */ @@ -567,7 +567,7 @@ static GtkActionEntry action_entries[] = NULL, }, /* Misc */ { "leave-fullscreen", - GTK_STOCK_LEAVE_FULLSCREEN, /* Icon-name */ + "view-restore", /* Icon-name */ N_ ("Leave _Fullscreen"), /* Label-text */ NULL, /* Keyboard shortcut */ NULL, /* Tooltip text */ @@ -850,8 +850,8 @@ rstto_main_window_init (RsttoMainWindow *window) /* Create Play/Pause Slideshow actions */ - window->priv->play_action = gtk_action_new ("play", _("_Play"), _("Play slideshow"), GTK_STOCK_MEDIA_PLAY); - window->priv->pause_action = gtk_action_new ("pause", _("_Pause"), _("Pause slideshow"), GTK_STOCK_MEDIA_PAUSE); + window->priv->play_action = gtk_action_new ("play", _("_Play"), _("Play slideshow"), "gtk-media-play"); + window->priv->pause_action = gtk_action_new ("pause", _("_Pause"), _("Pause slideshow"), "gtk-media-pause"); /* Create Recently used items Action */ window->priv->recent_action = gtk_recent_action_new_for_manager ("document-open-recent", _("_Recently used"), _("Recently used"), 0, GTK_RECENT_MANAGER(window->priv->recent_manager)); @@ -2141,9 +2141,9 @@ cb_rstto_main_window_set_as_wallpaper (GtkWidget *widget, RsttoMainWindow *windo _("Choose 'set wallpaper' method"), GTK_WINDOW(window), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_OK, + _("_OK"), GTK_RESPONSE_OK, - GTK_STOCK_CANCEL, + _("_Cancel"), GTK_RESPONSE_CANCEL, NULL); @@ -2954,8 +2954,8 @@ cb_rstto_main_window_open_image (GtkWidget *widget, RsttoMainWindow *window) dialog = gtk_file_chooser_dialog_new(_("Open image"), GTK_WINDOW(window), GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_OK, + _("_Cancel"), GTK_RESPONSE_CANCEL, + _("_Open"), GTK_RESPONSE_OK, NULL); gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE); @@ -3187,8 +3187,8 @@ cb_rstto_main_window_save_copy (GtkWidget *widget, RsttoMainWindow *window) dialog = gtk_file_chooser_dialog_new(_("Save copy"), GTK_WINDOW(window), GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_OK, + _("_Cancel"), GTK_RESPONSE_CANCEL, + _("_Save"), GTK_RESPONSE_OK, NULL); gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); @@ -3809,9 +3809,9 @@ rstto_main_window_launch_editor_chooser ( _("Edit with"), GTK_WINDOW (window), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, - GTK_STOCK_CANCEL, + _("_Cancel"), GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, + _("_OK"), GTK_RESPONSE_OK, NULL); diff --git a/src/preferences_dialog.c b/src/preferences_dialog.c index 2297deb..cf1dcdc 100644 --- a/src/preferences_dialog.c +++ b/src/preferences_dialog.c @@ -540,7 +540,7 @@ rstto_preferences_dialog_init ( RsttoPreferencesDialog *dialog ) /* Window should not be resizable */ gtk_window_set_resizable (GTK_WINDOW(dialog), FALSE); - gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_OK); + gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Close"), GTK_RESPONSE_OK); } diff --git a/src/privacy_dialog.c b/src/privacy_dialog.c index 6198168..82f3410 100644 --- a/src/privacy_dialog.c +++ b/src/privacy_dialog.c @@ -179,8 +179,8 @@ rstto_privacy_dialog_init (RsttoPrivacyDialog *dialog) /* Window should not be resizable */ gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); - gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); - gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_APPLY, GTK_RESPONSE_OK); + gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Cancel"), GTK_RESPONSE_CANCEL); + gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Apply"), GTK_RESPONSE_OK); } static void @@ -458,7 +458,7 @@ rstto_privacy_dialog_new (GtkWindow *parent, GtkRecentManager *recent_manager) { GtkWidget *dialog = g_object_new (RSTTO_TYPE_PRIVACY_DIALOG, "title", _("Clear private data"), - "icon-name", GTK_STOCK_CLEAR, + "icon-name", "edit-clear", "recent-manager", recent_manager, NULL); diff --git a/src/properties_dialog.c b/src/properties_dialog.c index def362a..cf6cf73 100644 --- a/src/properties_dialog.c +++ b/src/properties_dialog.c @@ -325,7 +325,7 @@ rstto_properties_dialog_init (RsttoPropertiesDialog *dialog) gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); - gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_OK); + gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Close"), GTK_RESPONSE_OK); } static void @@ -639,7 +639,7 @@ rstto_properties_dialog_new ( gchar *title = g_strdup_printf (_("%s - Properties"), rstto_file_get_display_name (file)); GtkWidget *dialog = g_object_new (RSTTO_TYPE_PROPERTIES_DIALOG, "title", title, - "icon-name", GTK_STOCK_PROPERTIES, + "icon-name", "document-properties", "file", file, NULL); g_free (title); diff --git a/src/xfce_wallpaper_manager.c b/src/xfce_wallpaper_manager.c index 01b694a..ef72250 100644 --- a/src/xfce_wallpaper_manager.c +++ b/src/xfce_wallpaper_manager.c @@ -404,11 +404,11 @@ rstto_xfce_wallpaper_manager_init (GObject *object) _("Set as wallpaper"), NULL, 0, - GTK_STOCK_CANCEL, + _("_Cancel"), GTK_RESPONSE_CANCEL, - GTK_STOCK_APPLY, + _("_Apply"), GTK_RESPONSE_APPLY, - GTK_STOCK_OK, + _("_OK"), GTK_RESPONSE_OK, NULL); vbox = gtk_dialog_get_content_area ( GTK_DIALOG (manager->priv->dialog)); -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits