[Xfce4-commits] [apps/xfce4-dict] 08/43: Replace GtkStock by GtkImage
noreply at xfce.org
noreply at xfce.org
Tue Nov 1 00:31:21 CET 2016
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 264ed9b93372b572b002079c2a2ec03f0c2ff368
Author: Andre Miranda <andre42m at gmail.com>
Date: Wed Jul 20 22:28:33 2016 -0300
Replace GtkStock by GtkImage
---
lib/dictd.c | 2 +-
lib/gui.c | 6 +++---
lib/prefs.c | 12 +++++------
lib/speedreader.c | 45 +++++++++++++++-------------------------
panel-plugin/xfce4-dict-plugin.c | 2 +-
5 files changed, 27 insertions(+), 40 deletions(-)
diff --git a/lib/dictd.c b/lib/dictd.c
index d9364d7..28f5451 100644
--- a/lib/dictd.c
+++ b/lib/dictd.c
@@ -750,7 +750,7 @@ void dict_dictd_get_information(GtkWidget *button, DictData *dd)
dialog = gtk_dialog_new_with_buttons(text,
GTK_WINDOW(dd->window),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
+ "gtk-close", GTK_RESPONSE_CLOSE, NULL);
vbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), vbox);
diff --git a/lib/gui.c b/lib/gui.c
index 5c648a3..2f44c54 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -590,7 +590,7 @@ static void update_search_button(DictData *dd, GtkWidget *box)
{
case DICTMODE_DICT:
{
- image = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name("gtk-find", GTK_ICON_SIZE_BUTTON);
break;
}
case DICTMODE_WEB:
@@ -600,7 +600,7 @@ static void update_search_button(DictData *dd, GtkWidget *box)
}
case DICTMODE_SPELL:
{
- image = gtk_image_new_from_stock(GTK_STOCK_SPELL_CHECK, GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name("gtk-spell-check", GTK_ICON_SIZE_BUTTON);
break;
}
default:
@@ -784,7 +784,7 @@ void dict_gui_create_main_window(DictData *dd)
button = gtk_button_new_with_mnemonic(_("Speed _Reader"));
gtk_button_set_image(GTK_BUTTON(button),
- gtk_image_new_from_stock(GTK_STOCK_JUSTIFY_CENTER, GTK_ICON_SIZE_MENU));
+ gtk_image_new_from_icon_name("gtk-justify-center", GTK_ICON_SIZE_MENU));
g_signal_connect(button, "clicked", G_CALLBACK(speedreader_clicked_cb), dd);
gtk_widget_show(button);
gtk_box_pack_start(GTK_BOX(entry_box), button, FALSE, FALSE, 2);
diff --git a/lib/prefs.c b/lib/prefs.c
index 90a0006..9aad6c5 100644
--- a/lib/prefs.c
+++ b/lib/prefs.c
@@ -223,11 +223,11 @@ static gboolean spell_entry_focus_cb(GtkEntry *entry, GdkEventFocus *ev, GtkWidg
if (path != NULL)
{
- gtk_image_set_from_stock(GTK_IMAGE(icon), GTK_STOCK_YES, GTK_ICON_SIZE_BUTTON);
+ gtk_image_set_from_icon_name(GTK_IMAGE(icon), "gtk-yes", GTK_ICON_SIZE_BUTTON);
g_free(path);
}
else
- gtk_image_set_from_stock(GTK_IMAGE(icon), GTK_STOCK_STOP, GTK_ICON_SIZE_BUTTON);
+ gtk_image_set_from_icon_name(GTK_IMAGE(icon), "gtk-stop", GTK_ICON_SIZE_BUTTON);
return FALSE;
}
@@ -499,14 +499,14 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent, DictData *dd)
g_object_set_data(G_OBJECT(dialog), "port_spinner", port_spinner);
g_object_set_data(G_OBJECT(dialog), "dict_combo", dict_combo);
- button_get_list = gtk_button_new_from_stock("gtk-refresh");
+ button_get_list = gtk_button_new_from_icon_name("gtk-refresh", GTK_ICON_SIZE_BUTTON);
gtk_widget_show(button_get_list);
g_signal_connect(button_get_list, "clicked", G_CALLBACK(dict_dictd_get_list), dd);
g_object_set_data(G_OBJECT(button_get_list), "dict_combo", dict_combo);
g_object_set_data(G_OBJECT(button_get_list), "port_spinner", port_spinner);
g_object_set_data(G_OBJECT(button_get_list), "server_entry", server_entry);
- button_get_info = gtk_button_new_from_stock("gtk-info");
+ button_get_info = gtk_button_new_from_icon_name("gtk-info", GTK_ICON_SIZE_BUTTON);
gtk_widget_show(button_get_info);
g_signal_connect(button_get_info, "clicked", G_CALLBACK(dict_dictd_get_information), dd);
g_object_set_data(G_OBJECT(button_get_info), "port_spinner", port_spinner);
@@ -649,9 +649,7 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent, DictData *dd)
g_signal_connect(spell_combo, "changed", G_CALLBACK(spell_combo_changed_cb), dd);
gtk_widget_show(spell_combo);
- button_refresh = gtk_button_new();
- image = gtk_image_new_from_stock("gtk-refresh", GTK_ICON_SIZE_BUTTON);
- gtk_button_set_image(GTK_BUTTON(button_refresh), image);
+ button_refresh = gtk_button_new_from_icon_name("gtk-info", GTK_ICON_SIZE_BUTTON);
gtk_widget_show(button_refresh);
g_object_set_data(G_OBJECT(button_refresh), "spell_combo", spell_combo);
g_signal_connect(button_refresh, "clicked", G_CALLBACK(button_dict_refresh_cb), dd);
diff --git a/lib/speedreader.c b/lib/speedreader.c
index 4a69944..dc68391 100644
--- a/lib/speedreader.c
+++ b/lib/speedreader.c
@@ -251,7 +251,8 @@ static gchar *sr_replace_unicode_characters(const gchar *text, gboolean mark_par
static void xfd_speed_reader_set_window_title(XfdSpeedReader *dialog, gint state)
{
gchar *title, *state_str, *name;
- const gchar *button_label = GTK_STOCK_MEDIA_STOP;
+ const gchar *button_label = _("S_top");
+ const gchar *button_image = "gtk-media-stop";
gboolean pausable = TRUE;
XfdSpeedReaderPrivate *priv = XFD_SPEED_READER_GET_PRIVATE(dialog);
@@ -262,7 +263,8 @@ static void xfd_speed_reader_set_window_title(XfdSpeedReader *dialog, gint state
break;
case XSR_STATE_FINISHED:
state_str = _("Finished");
- button_label = GTK_STOCK_GO_BACK;
+ button_label = _("_Back");
+ button_image = "gtk-go-back";
pausable = FALSE;
break;
default:
@@ -274,6 +276,8 @@ static void xfd_speed_reader_set_window_title(XfdSpeedReader *dialog, gint state
gtk_window_set_title(GTK_WINDOW(dialog), title);
gtk_button_set_label(GTK_BUTTON(priv->button_stop), button_label);
+ gtk_button_set_image(GTK_BUTTON(priv->button_stop),
+ gtk_image_new_from_icon_name(button_image, GTK_ICON_SIZE_MENU));
gtk_widget_set_sensitive(priv->button_pause, pausable);
g_free(title);
@@ -445,13 +449,13 @@ static void sr_pause(XfdSpeedReader *dialog, gboolean paused)
if (paused)
{
gtk_button_set_image(GTK_BUTTON(priv->button_pause),
- gtk_image_new_from_stock(GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_MENU));
+ gtk_image_new_from_icon_name("gtk-media-play", GTK_ICON_SIZE_MENU));
gtk_button_set_label(GTK_BUTTON(priv->button_pause), XFD_TITLE_RESUME);
}
else
{
gtk_button_set_image(GTK_BUTTON(priv->button_pause),
- gtk_image_new_from_stock(GTK_STOCK_MEDIA_PAUSE, GTK_ICON_SIZE_MENU));
+ gtk_image_new_from_icon_name("gtk-media-pause", GTK_ICON_SIZE_MENU));
gtk_button_set_label(GTK_BUTTON(priv->button_pause), XFD_TITLE_PAUSE);
}
/* set the new value */
@@ -504,8 +508,8 @@ static void sr_open_clicked_cb(GtkButton *button, XfdSpeedReader *window)
dialog = gtk_file_chooser_dialog_new(_("Choose a file to load"),
GTK_WINDOW(window),
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ "gtk-cancel", GTK_RESPONSE_CANCEL,
+ "gtk-open", GTK_RESPONSE_ACCEPT,
NULL);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
@@ -647,30 +651,18 @@ static void xfd_speed_reader_init(XfdSpeedReader *dialog)
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(swin), textview);
- button_open = gtk_button_new();
- gtk_button_set_image(GTK_BUTTON(button_open),
- gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU));
+ button_open = gtk_button_new_from_icon_name("gtk-open", GTK_ICON_SIZE_MENU);
g_signal_connect(button_open, "clicked", G_CALLBACK(sr_open_clicked_cb), dialog);
-#if GTK_CHECK_VERSION(2, 12, 0)
gtk_widget_set_tooltip_text(button_open, _("Load the contents of a file"));
-#endif
- button_paste = gtk_button_new();
- gtk_button_set_image(GTK_BUTTON(button_paste),
- gtk_image_new_from_stock(GTK_STOCK_PASTE, GTK_ICON_SIZE_MENU));
+ button_paste = gtk_button_new_from_icon_name("gtk-paste", GTK_ICON_SIZE_MENU);
g_signal_connect(button_paste, "clicked", G_CALLBACK(sr_paste_clicked_cb), priv->buffer);
-#if GTK_CHECK_VERSION(2, 12, 0)
gtk_widget_set_tooltip_text(button_paste,
_("Clear the contents of the text field and paste the contents of the clipboard"));
-#endif
- button_clear = gtk_button_new();
- gtk_button_set_image(GTK_BUTTON(button_clear),
- gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU));
+ button_clear = gtk_button_new_from_icon_name("gtk-clear", GTK_ICON_SIZE_MENU);
g_signal_connect(button_clear, "clicked", G_CALLBACK(sr_clear_clicked_cb), priv->buffer);
-#if GTK_CHECK_VERSION(2, 12, 0)
gtk_widget_set_tooltip_text(button_clear, _("Clear the contents of the text field"));
-#endif
vbox_text_buttons = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_box_pack_start(GTK_BOX(vbox_text_buttons), button_open, FALSE, FALSE, 0);
@@ -681,19 +673,16 @@ static void xfd_speed_reader_init(XfdSpeedReader *dialog)
gtk_box_pack_start(GTK_BOX(hbox_text), swin, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(hbox_text), vbox_text_buttons, FALSE, FALSE, 3);
- priv->button_pause = gtk_dialog_add_button(GTK_DIALOG(dialog), _("P_ause"), RESPONSE_PAUSE);
+ priv->button_pause = gtk_dialog_add_button(GTK_DIALOG(dialog), "gtk-media-pause", RESPONSE_PAUSE);
priv->button_start = gtk_dialog_add_button(GTK_DIALOG(dialog), _("_Start"), RESPONSE_START);
- priv->button_stop = gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_MEDIA_STOP, RESPONSE_STOP);
- gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ priv->button_stop = gtk_dialog_add_button(GTK_DIALOG(dialog), "gtk-media-stop", RESPONSE_STOP);
+ gtk_dialog_add_button(GTK_DIALOG(dialog), "gtk-close", GTK_RESPONSE_CLOSE);
gtk_widget_hide(priv->button_pause);
gtk_widget_hide(priv->button_stop);
gtk_button_set_image(GTK_BUTTON(priv->button_start),
- gtk_image_new_from_stock(GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_MENU));
- gtk_button_set_image(GTK_BUTTON(priv->button_pause),
- gtk_image_new_from_stock(GTK_STOCK_MEDIA_PAUSE, GTK_ICON_SIZE_MENU));
- gtk_button_set_use_stock(GTK_BUTTON(priv->button_pause), TRUE);
+ gtk_image_new_from_icon_name("gtk-media-play", GTK_ICON_SIZE_MENU));
g_signal_connect(dialog, "response", G_CALLBACK(xfd_speed_reader_response_cb), NULL);
diff --git a/panel-plugin/xfce4-dict-plugin.c b/panel-plugin/xfce4-dict-plugin.c
index 43fdca4..3fe6457 100644
--- a/panel-plugin/xfce4-dict-plugin.c
+++ b/panel-plugin/xfce4-dict-plugin.c
@@ -460,7 +460,7 @@ static void dict_plugin_construct(XfcePanelPlugin *plugin)
/* panel entry */
dpd->dd->panel_entry = gtk_entry_new();
- gtk_entry_set_icon_from_stock(GTK_ENTRY(dpd->dd->panel_entry), GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+ gtk_entry_set_icon_from_icon_name(GTK_ENTRY(dpd->dd->panel_entry), GTK_ENTRY_ICON_SECONDARY, "gtk-clear");
gtk_entry_set_width_chars(GTK_ENTRY(dpd->dd->panel_entry), 25);
gtk_entry_set_text(GTK_ENTRY(dpd->dd->panel_entry), _("Search term"));
g_signal_connect(dpd->dd->panel_entry, "icon-release", G_CALLBACK(entry_icon_release_cb), dpd);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list