GNOME.org
 

[gnumeric] Dead kittens: fewer stock id usages.

commit e7f39eee274d69a8976ccdf29302a11cc7941f6e
Author: Morten Welinder <terra gnome org>
Date:   Thu Jan 1 20:19:39 2015 -0500

    Dead kittens: fewer stock id usages.

 src/dialogs/dialog-printer-setup.c |   38 ++++++++++++++++++------------------
 src/dialogs/hf-config.ui           |   27 ++++++++++---------------
 src/dialogs/wbcg.ui                |    8 +++++-
 3 files changed, 36 insertions(+), 37 deletions(-)
---
diff --git a/src/dialogs/dialog-printer-setup.c b/src/dialogs/dialog-printer-setup.c
index 91928a1..44602d9 100644
--- a/src/dialogs/dialog-printer-setup.c
+++ b/src/dialogs/dialog-printer-setup.c
@@ -1098,36 +1098,35 @@ hf_insert_hf_stock_tag (HFCustomizeState *hf_state, GtkTextBuffer *buffer,
                        HFFieldType type, const char *options)
 {
        GtkTextIter iter;
-       gchar const *stock_id;
+       gchar const *icon_name;
        GdkPixbuf* pix;
        GtkTextMark *new_mark;
        HFMarkInfo *mark_info;
 
-
        switch (type) {
        case HF_FIELD_FILE:
-               stock_id = GTK_STOCK_FILE;
+               icon_name = GTK_STOCK_FILE;
                break;
        case HF_FIELD_PATH:
-               stock_id = GTK_STOCK_DIRECTORY;
+               icon_name = "folder";
                break;
        case HF_FIELD_PAGE:
-               stock_id = "gnumeric-pagesetup-hf-page";
+               icon_name = "gnumeric-pagesetup-hf-page";
                break;
        case HF_FIELD_PAGES:
-               stock_id = "gnumeric-pagesetup-hf-pages";
+               icon_name = "gnumeric-pagesetup-hf-pages";
                break;
        case HF_FIELD_DATE:
-               stock_id = "gnumeric-pagesetup-hf-date";
+               icon_name = "gnumeric-pagesetup-hf-date";
                break;
        case HF_FIELD_TIME:
-               stock_id = "gnumeric-pagesetup-hf-time";
+               icon_name = "gnumeric-pagesetup-hf-time";
                break;
        case HF_FIELD_SHEET:
-               stock_id = "gnumeric-pagesetup-hf-sheet";
+               icon_name = "gnumeric-pagesetup-hf-sheet";
                break;
        case HF_FIELD_CELL:
-               stock_id = "gnumeric-pagesetup-hf-cell";
+               icon_name = "gnumeric-pagesetup-hf-cell";
                break;
        default:
                return;
@@ -1137,12 +1136,13 @@ hf_insert_hf_stock_tag (HFCustomizeState *hf_state, GtkTextBuffer *buffer,
 
        if (gtk_text_buffer_insert_interactive_at_cursor
            (buffer, "", -1, TRUE)) {
+               GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (wbcg_toplevel 
(hf_state->printer_setup_state->wbcg)));
+               GtkIconTheme *theme = gtk_icon_theme_get_for_screen (screen);
+
                gtk_text_buffer_get_iter_at_mark
                        (buffer, &iter, gtk_text_buffer_get_insert (buffer));
 
-               pix = gtk_widget_render_icon_pixbuf (GTK_WIDGET (hf_state->dialog),
-                                             stock_id,
-                                             GTK_ICON_SIZE_MENU);
+               pix = gtk_icon_theme_load_icon (theme, icon_name, 16, 0, NULL);
                gtk_text_buffer_insert_pixbuf (buffer, &iter, pix);
                gtk_text_iter_backward_char (&iter);
                new_mark = gtk_text_buffer_create_mark (buffer, NULL,
@@ -1796,29 +1796,29 @@ do_hf_customize (gboolean header, PrinterSetupState *state)
                 "clicked", G_CALLBACK (hf_delete_tag_cb), hf_state);
 
        button = GTK_TOOL_BUTTON (go_gtk_builder_get_widget (gui, "insert-date-button"));
-       gtk_tool_button_set_stock_id (button, "gnumeric-pagesetup-hf-date");
+       gtk_tool_button_set_icon_name (button, "gnumeric-pagesetup-hf-date");
        hf_attach_insert_date_menu (GTK_MENU_TOOL_BUTTON (button), hf_state);
 
        button = GTK_TOOL_BUTTON (go_gtk_builder_get_widget (gui, "insert-page-button"));
-       gtk_tool_button_set_stock_id (button, "gnumeric-pagesetup-hf-page");
+       gtk_tool_button_set_icon_name (button, "gnumeric-pagesetup-hf-page");
        g_signal_connect_swapped
                (G_OBJECT (button),
                 "clicked", G_CALLBACK (hf_insert_page_cb), hf_state);
 
        button = GTK_TOOL_BUTTON (go_gtk_builder_get_widget (gui, "insert-pages-button"));
-       gtk_tool_button_set_stock_id (button, "gnumeric-pagesetup-hf-pages");
+       gtk_tool_button_set_icon_name (button, "gnumeric-pagesetup-hf-pages");
        g_signal_connect_swapped
                (G_OBJECT (button),
                 "clicked", G_CALLBACK (hf_insert_pages_cb), hf_state);
 
        button = GTK_TOOL_BUTTON (go_gtk_builder_get_widget (gui, "insert-sheet-button"));
-       gtk_tool_button_set_stock_id (button, "gnumeric-pagesetup-hf-sheet");
+       gtk_tool_button_set_icon_name (button, "gnumeric-pagesetup-hf-sheet");
        g_signal_connect_swapped
                (G_OBJECT (button),
                 "clicked", G_CALLBACK (hf_insert_sheet_cb), hf_state);
 
        button = GTK_TOOL_BUTTON (go_gtk_builder_get_widget (gui, "insert-time-button"));
-       gtk_tool_button_set_stock_id (button, "gnumeric-pagesetup-hf-time");
+       gtk_tool_button_set_icon_name (button, "gnumeric-pagesetup-hf-time");
        hf_attach_insert_time_menu (GTK_MENU_TOOL_BUTTON (button), hf_state);
 
        g_signal_connect_swapped
@@ -1830,7 +1830,7 @@ do_hf_customize (gboolean header, PrinterSetupState *state)
                 "clicked", G_CALLBACK (hf_insert_path_cb), hf_state);
 
        button = GTK_TOOL_BUTTON (go_gtk_builder_get_widget (gui, "insert-cell-button"));
-       gtk_tool_button_set_stock_id (button, "gnumeric-pagesetup-hf-cell");
+       gtk_tool_button_set_icon_name (button, "gnumeric-pagesetup-hf-cell");
        hf_attach_insert_cell_menu (GTK_MENU_TOOL_BUTTON (button), hf_state);
 
 
diff --git a/src/dialogs/hf-config.ui b/src/dialogs/hf-config.ui
index c9bd64c..5b3d803 100644
--- a/src/dialogs/hf-config.ui
+++ b/src/dialogs/hf-config.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.8"/>
   <object class="GtkDialog" id="hf-config">
     <property name="width_request">600</property>
     <property name="can_focus">False</property>
@@ -21,7 +22,6 @@
                 <property name="use_action_appearance">False</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -36,7 +36,6 @@
                 <property name="use_action_appearance">False</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -51,7 +50,6 @@
                 <property name="use_action_appearance">False</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -66,7 +64,6 @@
                 <property name="use_action_appearance">False</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -243,9 +240,8 @@
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_markup" translatable="yes">Delete the selected fields and 
text</property>
                     <property name="tooltip_text" translatable="yes">Delete the selected fields and 
text</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="label" translatable="yes">Delete Field</property>
-                    <property name="stock_id">gtk-delete</property>
+                    <property name="icon_name">edit-delete</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -260,6 +256,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="homogeneous">False</property>
                   </packing>
                 </child>
                 <child>
@@ -271,11 +268,11 @@
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_markup" translatable="yes">Insert the date of printing</property>
                     <property name="tooltip_text" translatable="yes">Insert the date of printing</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="label" translatable="yes">Date</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="homogeneous">False</property>
                   </packing>
                 </child>
                 <child>
@@ -287,11 +284,11 @@
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_markup" translatable="yes">Insert the time of printing</property>
                     <property name="tooltip_text" translatable="yes">Insert the time of printing</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="label" translatable="yes">Time</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="homogeneous">False</property>
                   </packing>
                 </child>
                 <child>
@@ -302,6 +299,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="homogeneous">False</property>
                   </packing>
                 </child>
                 <child>
@@ -313,7 +311,6 @@
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_markup" translatable="yes">Insert the page number</property>
                     <property name="tooltip_text" translatable="yes">Insert the page number</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="label" translatable="yes">Page</property>
                   </object>
                   <packing>
@@ -330,7 +327,6 @@
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_markup" translatable="yes">Insert the total number of 
pages</property>
                     <property name="tooltip_text" translatable="yes">Insert the total number of 
pages</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="label" translatable="yes">Pages</property>
                   </object>
                   <packing>
@@ -347,7 +343,6 @@
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_markup" translatable="yes">Insert the name of the current 
sheet</property>
                     <property name="tooltip_text" translatable="yes">Insert the name of the current 
sheet</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="label" translatable="yes">Sheet</property>
                   </object>
                   <packing>
@@ -363,6 +358,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="homogeneous">False</property>
                   </packing>
                 </child>
                 <child>
@@ -374,7 +370,6 @@
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_markup" translatable="yes">Insert the name of the file</property>
                     <property name="tooltip_text" translatable="yes">Insert the name of the file</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="label" translatable="yes">File</property>
                     <property name="stock_id">gtk-file</property>
                   </object>
@@ -392,9 +387,8 @@
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_markup" translatable="yes">Insert the path to the file</property>
                     <property name="tooltip_text" translatable="yes">Insert the path to the file</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="label" translatable="yes">Path</property>
-                    <property name="stock_id">gtk-directory</property>
+                    <property name="icon_name">folder</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -409,6 +403,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="homogeneous">False</property>
                   </packing>
                 </child>
                 <child>
@@ -420,11 +415,11 @@
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_markup" translatable="yes">Insert a spreadsheet cell</property>
                     <property name="tooltip_text" translatable="yes">Insert a spreadsheet cell</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="label" translatable="yes">Cell</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="homogeneous">False</property>
                   </packing>
                 </child>
               </object>
diff --git a/src/dialogs/wbcg.ui b/src/dialogs/wbcg.ui
index d8711ee..d382656 100644
--- a/src/dialogs/wbcg.ui
+++ b/src/dialogs/wbcg.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.8"/>
   <object class="GtkWindow" id="toplevel">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Gnumeric</property>
@@ -84,6 +85,7 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="homogeneous">False</property>
                       </packing>
                     </child>
                     <child>
@@ -110,6 +112,7 @@
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="homogeneous">False</property>
                       </packing>
                     </child>
                     <child>
@@ -118,7 +121,7 @@
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Enter formula...</property>
                         <property name="use_underline">True</property>
-                        <property name="stock_id">Gnumeric_Equal</property>
+                        <property name="icon_name">gnumeric-equal</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -148,6 +151,7 @@
                       </object>
                       <packing>
                         <property name="expand">True</property>
+                        <property name="homogeneous">False</property>
                       </packing>
                     </child>
                   </object>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]