GNOME.org
 

[balsa/gtk3] Abandon buttons with both an icon and text

commit 0e90a763610401a2673fd84f3a196f4484e20740
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sat Mar 14 12:33:05 2015 -0400

    Abandon buttons with both an icon and text
    
        * src/balsa-app.c: remove balsa_stock_button_with_label.
        * src/balsa-app.h: ditto.
        * src/ab-window.c (balsa_ab_window_init): drop icons.
        * src/filter-edit-dialog.c (build_left_side),
        (build_right_side): ditto.
        * src/filter-run-dialog.c (balsa_filter_run_dialog_init): drop
        icons from "Apply" buttons; drop labels from direction buttons.
        * src/spell-check.c (balsa_spell_check_init): drop icons.
        * src/toolbar-prefs.c (create_toolbar_page): drop labels from
        direction buttons.

 ChangeLog                |   16 ++++++++++++++++
 src/ab-window.c          |    6 ++----
 src/balsa-app.c          |   26 --------------------------
 src/balsa-app.h          |    2 --
 src/filter-edit-dialog.c |   14 ++++++--------
 src/filter-run-dialog.c  |   24 +++++++++++++++---------
 src/spell-check.c        |   18 +++++++-----------
 src/toolbar-prefs.c      |   12 ++++++++----
 8 files changed, 54 insertions(+), 64 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4742987..1345ff8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2015-03-14  Peter Bloomfield  <pbloomfield bellsouth net>
+
+       Abandon buttons with both an icon and text, and use a symbolic
+       icon where we keep the icon.
+
+       * src/balsa-app.c: remove balsa_stock_button_with_label.
+       * src/balsa-app.h: ditto.
+       * src/ab-window.c (balsa_ab_window_init): drop icons.
+       * src/filter-edit-dialog.c (build_left_side),
+       (build_right_side): ditto.
+       * src/filter-run-dialog.c (balsa_filter_run_dialog_init): drop
+       icons from "Apply" buttons; drop labels from direction buttons.
+       * src/spell-check.c (balsa_spell_check_init): drop icons.
+       * src/toolbar-prefs.c (create_toolbar_page): drop labels from
+       direction buttons.
+
 2015-03-13  Peter Bloomfield  <pbloomfield bellsouth net>
 
        * src/ab-window.c (balsa_ab_window_init): use
diff --git a/src/ab-window.c b/src/ab-window.c
index cb3f7f6..485a6ba 100644
--- a/src/ab-window.c
+++ b/src/ab-window.c
@@ -311,15 +311,13 @@ balsa_ab_window_init(BalsaAbWindow *ab)
     gtk_grid_attach(GTK_GRID(grid), hbox, 0, 2, 1, 1);
     gtk_widget_show(GTK_WIDGET(hbox));
 
-    w = balsa_stock_button_with_label("document-open",
-                                      _("Run Editor"));
+    w = gtk_button_new_with_mnemonic(_("Run _Editor"));
     g_signal_connect(w, "clicked",
                      G_CALLBACK(balsa_ab_window_run_editor), NULL);
     gtk_container_add(GTK_CONTAINER(hbox), w);
     gtk_widget_show(GTK_WIDGET(w));
 
-    w = balsa_stock_button_with_label("list-add",
-                                      _("_Re-Import"));
+    w = gtk_button_new_with_mnemonic(_("_Re-Import"));
     g_signal_connect(G_OBJECT(w), "clicked",
                      G_CALLBACK(balsa_ab_window_reload),
                       ab);
diff --git a/src/balsa-app.c b/src/balsa-app.c
index 0dcf38c..9d0399f 100644
--- a/src/balsa-app.c
+++ b/src/balsa-app.c
@@ -581,32 +581,6 @@ balsa_add_open_mailbox_urls(GPtrArray * url_array)
                                 append_url_if_open, url_array);
 }
 
-GtkWidget *
-balsa_stock_button_with_label(const gchar * icon, const gchar * text)
-{
-    GtkWidget *button;
-    GtkWidget *hbox;
-    GtkWidget *pixmap;
-
-    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-    gtk_widget_set_halign(hbox, GTK_ALIGN_CENTER);
-    gtk_widget_set_valign(hbox, GTK_ALIGN_CENTER);
-
-    button = gtk_button_new();
-    gtk_container_add(GTK_CONTAINER(button), hbox);
-
-    pixmap = gtk_image_new_from_icon_name(balsa_icon_id(icon), GTK_ICON_SIZE_BUTTON);
-    gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, FALSE, 0);
-    if (text && *text) {
-        GtkWidget *label = gtk_label_new_with_mnemonic(text);
-        gtk_label_set_mnemonic_widget(GTK_LABEL(label), button);
-        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
-    }
-
-    gtk_widget_show_all(button);
-    return button;
-}
-
 /* 
  * Utilities for searching a GNode tree of BalsaMailboxNodes
  *
diff --git a/src/balsa-app.h b/src/balsa-app.h
index 782644b..5d72810 100644
--- a/src/balsa-app.h
+++ b/src/balsa-app.h
@@ -399,8 +399,6 @@ void balsa_app_destroy(void);
 void update_timer(gboolean update, guint minutes);
 
 gchar *ask_password(LibBalsaServer * server, LibBalsaMailbox * mbox);
-GtkWidget *balsa_stock_button_with_label(const char *icon,
-                                        const char *label);
 void balsa_open_mailbox_list(gchar ** urls);
 
 /* Search functions */
diff --git a/src/filter-edit-dialog.c b/src/filter-edit-dialog.c
index 5189acf..5abd78a 100644
--- a/src/filter-edit-dialog.c
+++ b/src/filter-edit-dialog.c
@@ -223,17 +223,16 @@ build_left_side(void)
     gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 2);
 
     /* new button */
-    fe_new_button = balsa_stock_button_with_label("document-new", _("_New"));
+    fe_new_button = gtk_button_new_with_mnemonic(_("_New"));
     g_signal_connect(G_OBJECT(fe_new_button), "clicked",
                     G_CALLBACK(fe_new_pressed), NULL);
     gtk_container_add(GTK_CONTAINER(bbox), fe_new_button);
     /* delete button */
-    fe_delete_button =
-        balsa_stock_button_with_label("edit-delete", _("_Delete"));
+    fe_delete_button = gtk_button_new_with_mnemonic(("_Delete"));
     g_signal_connect(G_OBJECT(fe_delete_button), "clicked",
                     G_CALLBACK(fe_delete_pressed), NULL);
     gtk_container_add(GTK_CONTAINER(bbox), fe_delete_button);
-    gtk_widget_set_sensitive(fe_delete_button,FALSE);
+    gtk_widget_set_sensitive(fe_delete_button, FALSE);
 
     return vbox;
 }                              /* end build_left_side() */
@@ -503,13 +502,12 @@ build_right_side(GtkWindow * window)
                     G_CALLBACK(fe_apply_pressed), NULL);
     gtk_container_add(GTK_CONTAINER(bbox), fe_apply_button);
 
-    fe_revert_button =
-        balsa_stock_button_with_label("edit-undo", _("Revert"));
+    fe_revert_button = gtk_button_new_with_mnemonic(_("Re_vert"));
     g_signal_connect(G_OBJECT(fe_revert_button), "clicked",
                     G_CALLBACK(fe_revert_pressed), NULL);
     gtk_container_add(GTK_CONTAINER(bbox), fe_revert_button);
-    gtk_widget_set_sensitive(fe_apply_button,FALSE);
-    gtk_widget_set_sensitive(fe_revert_button,FALSE);
+    gtk_widget_set_sensitive(fe_apply_button, FALSE);
+    gtk_widget_set_sensitive(fe_revert_button, FALSE);
 
     return rightside;
 }                              /* end build_right_side() */
diff --git a/src/filter-run-dialog.c b/src/filter-run-dialog.c
index 8ebee14..b0068c6 100644
--- a/src/filter-run-dialog.c
+++ b/src/filter-run-dialog.c
@@ -298,7 +298,7 @@ void balsa_filter_run_dialog_init(BalsaFilterRunDialog * p)
                                  NULL, TRUE);
     g_signal_connect(G_OBJECT(p->available_filters), "row-activated",
                      G_CALLBACK(available_list_activated), p);
-                                                  
+
     sw = gtk_scrolled_window_new(NULL, NULL);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
                                   GTK_POLICY_AUTOMATIC,
@@ -314,8 +314,7 @@ void balsa_filter_run_dialog_init(BalsaFilterRunDialog * p)
     gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 2);
 
     /* "Apply selected" button */
-    button = balsa_stock_button_with_label("gtk-apply",
-                                           _("Apply Selected"));
+    button = gtk_button_new_with_mnemonic(_("_Apply Selected"));
     g_signal_connect_swapped(G_OBJECT(button), "clicked",
                              G_CALLBACK(fr_apply_selected_pressed), p);
     gtk_container_add(GTK_CONTAINER(bbox), button);
@@ -326,12 +325,16 @@ void balsa_filter_run_dialog_init(BalsaFilterRunDialog * p)
     gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_SPREAD);
 
     /* Right/Add button */
-    button = balsa_stock_button_with_label("go-next", _("A_dd"));
+    button =
+        gtk_button_new_from_icon_name("go-next-symbolic",
+                                      GTK_ICON_SIZE_BUTTON);
     g_signal_connect_swapped(G_OBJECT(button), "clicked",
                              G_CALLBACK(fr_add_pressed), G_OBJECT(p));
     gtk_container_add(GTK_CONTAINER(bbox), button);
     /* Left/Remove button */
-    button = balsa_stock_button_with_label("go-previous", _("_Remove"));
+    button =
+        gtk_button_new_from_icon_name("go-previous-symbolic",
+                                      GTK_ICON_SIZE_BUTTON);
     g_signal_connect_swapped(G_OBJECT(button), "clicked",
                              G_CALLBACK(fr_remove_pressed), G_OBJECT(p));
     gtk_container_add(GTK_CONTAINER(bbox), button);
@@ -363,18 +366,21 @@ void balsa_filter_run_dialog_init(BalsaFilterRunDialog * p)
     gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 2);
 
     /* up button */
-    button = balsa_stock_button_with_label("go-up", _("_Up"));
+    button =
+        gtk_button_new_from_icon_name("go-up-symbolic",
+                                      GTK_ICON_SIZE_BUTTON);
     g_signal_connect(G_OBJECT(button), "clicked",
                     G_CALLBACK(fr_up_pressed), p);
     gtk_container_add(GTK_CONTAINER(bbox), button);
     /* down button */
-    button = balsa_stock_button_with_label("go-down", _("Do_wn"));
+    button =
+        gtk_button_new_from_icon_name("go-down-symbolic",
+                                      GTK_ICON_SIZE_BUTTON);
     g_signal_connect(G_OBJECT(button), "clicked",
                     G_CALLBACK(fr_down_pressed), p);
     gtk_container_add(GTK_CONTAINER(bbox), button);
 
-    button = balsa_stock_button_with_label("gtk-apply",
-                                           _("A_pply Now!"));
+    button = gtk_button_new_with_mnemonic(_("A_pply Now!"));
     g_signal_connect_swapped(G_OBJECT(button), "clicked",
                              G_CALLBACK(fr_apply_now_pressed), G_OBJECT(p));
     gtk_container_add(GTK_CONTAINER(bbox), button);
diff --git a/src/spell-check.c b/src/spell-check.c
index d654385..ec87061 100644
--- a/src/spell-check.c
+++ b/src/spell-check.c
@@ -347,7 +347,7 @@ balsa_spell_check_init(BalsaSpellCheck * spell_check)
     gtk_grid_set_row_spacing(grid, BALSA_SPELL_CHECK_PADDING);
     gtk_grid_set_column_spacing(grid, BALSA_SPELL_CHECK_PADDING);
 
-    widget = balsa_stock_button_with_label("edit-redo", _("C_hange"));
+    widget = gtk_button_new_with_mnemonic(_("C_hange"));
     gtk_widget_set_tooltip_text(widget,
                                 _("Replace the current word "
                                   "with the selected suggestion"));
@@ -355,8 +355,7 @@ balsa_spell_check_init(BalsaSpellCheck * spell_check)
                     G_CALLBACK(change_cb), spell_check);
     gtk_grid_attach(grid, widget, 0, 0, 1, 1);
 
-    widget = balsa_stock_button_with_label("view-refresh",
-                                           _("Change _All"));
+    widget = gtk_button_new_with_mnemonic(_("Change _All"));
     gtk_widget_set_tooltip_text(widget,
                                 _("Replace all occurrences of the current word "
                                   "with the selected suggestion"));
@@ -364,37 +363,34 @@ balsa_spell_check_init(BalsaSpellCheck * spell_check)
                     G_CALLBACK(change_all_cb), spell_check);
     gtk_grid_attach(grid, widget, 0, 1, 1, 1);
 
-    widget = balsa_stock_button_with_label("go-next",
-                                           _("_Ignore"));
+    widget = gtk_button_new_with_mnemonic(_("_Ignore"));
     gtk_widget_set_tooltip_text(widget,
                                 _("Skip the current word"));
     g_signal_connect(widget, "clicked",
                     G_CALLBACK(ignore_cb), spell_check);
     gtk_grid_attach(grid, widget, 1, 0, 1, 1);
 
-    widget = balsa_stock_button_with_label("go-last",
-                                           _("I_gnore All"));
+    widget = gtk_button_new_with_mnemonic(_("I_gnore All"));
     gtk_widget_set_tooltip_text(widget,
                                 _("Skip all occurrences of the current word"));
     g_signal_connect(widget, "clicked",
                     G_CALLBACK(ignore_all_cb), spell_check);
     gtk_grid_attach(grid, widget, 1, 1, 1, 1);
 
-    widget = balsa_stock_button_with_label(BALSA_PIXMAP_BOOK_OPEN,
-                                           _("_Learn"));
+    widget = gtk_button_new_with_mnemonic(_("_Learn"));
     gtk_widget_set_tooltip_text(widget,
                                 _("Add the current word to your personal dictionary"));
     g_signal_connect(widget, "clicked",
                     G_CALLBACK(learn_cb), spell_check);
     gtk_grid_attach(grid, widget, 2, 0, 1, 1);
 
-    widget = balsa_stock_button_with_label("gtk-ok", _("_Done"));
+    widget = gtk_button_new_with_mnemonic(_("_Done"));
     gtk_widget_set_tooltip_text(widget, _("Finish spell checking"));
     g_signal_connect(widget, "clicked",
                     G_CALLBACK(done_cb), spell_check);
     gtk_grid_attach(grid, widget, 3, 0, 1, 1);
 
-    widget = balsa_stock_button_with_label("gtk-cancel", _("_Cancel"));
+    widget = gtk_button_new_with_mnemonic(_("_Cancel"));
     gtk_widget_set_tooltip_text(widget,
                                 _("Revert all changes and finish spell checking"));
     g_signal_connect(widget, "clicked",
diff --git a/src/toolbar-prefs.c b/src/toolbar-prefs.c
index 0ee646b..628cba7 100644
--- a/src/toolbar-prefs.c
+++ b/src/toolbar-prefs.c
@@ -504,23 +504,27 @@ create_toolbar_page(BalsaToolbarModel * model, GActionMap * map)
                       FALSE, FALSE, 0);
 
     page->back_button =
-        balsa_stock_button_with_label("go-up", _("Up"));
+        gtk_button_new_from_icon_name("go-up-symbolic",
+                                      GTK_ICON_SIZE_BUTTON);
     gtk_box_pack_start(GTK_BOX(button_box), page->back_button, FALSE, FALSE, 0);
 
     move_button_box=gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
     gtk_box_pack_start(GTK_BOX(button_box), move_button_box, FALSE, FALSE, 0);
 
     page->remove_button =
-        balsa_stock_button_with_label("go-previous", "-");
+        gtk_button_new_from_icon_name("go-previous-symbolic",
+                                      GTK_ICON_SIZE_BUTTON);
     gtk_box_pack_start(GTK_BOX(move_button_box), page->remove_button,
                        FALSE, FALSE, 0);
 
     page->add_button =
-        balsa_stock_button_with_label("go-next", "+");
+        gtk_button_new_from_icon_name("go-next-symbolic",
+                                      GTK_ICON_SIZE_BUTTON);
     gtk_box_pack_start(GTK_BOX(move_button_box), page->add_button, FALSE, FALSE, 0);
 
     page->forward_button =
-        balsa_stock_button_with_label("go-down", _("Down"));
+        gtk_button_new_from_icon_name("go-down-symbolic",
+                                      GTK_ICON_SIZE_BUTTON);
     gtk_box_pack_start(GTK_BOX(button_box), page->forward_button, FALSE, FALSE, 0);
 
     /* Pack destination list */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]