GNOME.org
 

[gedit] Remove remaining use of stock items

commit 68d1af3dbb31500e22f711d5b277bebb3403b13a
Author: Paolo Borelli <pborelli gnome org>
Date:   Sat Feb 8 15:03:54 2014 +0100

    Remove remaining use of stock items

 gedit/gedit-print-preview.ui                  |    4 +-
 gedit/gedit-progress-info-bar.ui              |    2 +-
 gedit/gedit-replace-dialog.ui                 |    8 +++---
 plugins/pythonconsole/pythonconsole/config.ui |    4 +-
 plugins/snippets/snippets/snippets.ui         |    8 +++---
 plugins/sort/gedit-sort-plugin.ui             |   12 ++++----
 plugins/spell/languages-dialog.ui             |   12 ++++----
 plugins/spell/spell-checker.ui                |   32 +------------------------
 plugins/time/gedit-time-dialog.ui             |    8 +++---
 plugins/time/gedit-time-setup-dialog.ui       |    4 +-
 10 files changed, 32 insertions(+), 62 deletions(-)
---
diff --git a/gedit/gedit-print-preview.ui b/gedit/gedit-print-preview.ui
index 0947b90..d96f9ca 100644
--- a/gedit/gedit-print-preview.ui
+++ b/gedit/gedit-print-preview.ui
@@ -22,7 +22,7 @@
             <property name="tooltip_text" translatable="yes">Show the previous page</property>
             <property name="label" translatable="yes">P_revious Page</property>
             <property name="use_underline">True</property>
-            <property name="stock_id">gtk-go-back</property>
+            <property name="icon_name">go-previous</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -38,7 +38,7 @@
             <property name="tooltip_text" translatable="yes">Show the next page</property>
             <property name="label" translatable="yes">_Next Page</property>
             <property name="use_underline">True</property>
-            <property name="stock_id">gtk-go-forward</property>
+            <property name="icon_name">go-next</property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/gedit/gedit-progress-info-bar.ui b/gedit/gedit-progress-info-bar.ui
index 4ddd826..e652b0f 100644
--- a/gedit/gedit-progress-info-bar.ui
+++ b/gedit/gedit-progress-info-bar.ui
@@ -18,8 +18,8 @@
               <object class="GtkImage" id="image">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="stock">gtk-missing-image</property>
                 <property name="icon-size">2</property>
+                <property name="icon_name">image-missing</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/gedit/gedit-replace-dialog.ui b/gedit/gedit-replace-dialog.ui
index 9b900d3..6bd266d 100644
--- a/gedit/gedit-replace-dialog.ui
+++ b/gedit/gedit-replace-dialog.ui
@@ -20,13 +20,13 @@
             <property name="can_focus">False</property>
             <child>
               <object class="GtkButton" id="close_button">
-                <property name="label">gtk-close</property>
+                <property name="label" translatable="yes">_Close</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -68,13 +68,13 @@
             </child>
             <child>
               <object class="GtkButton" id="find_button">
-                <property name="label">gtk-find</property>
+                <property name="label" translatable="yes">_Find</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/plugins/pythonconsole/pythonconsole/config.ui b/plugins/pythonconsole/pythonconsole/config.ui
index 5899644..f628f3f 100644
--- a/plugins/pythonconsole/pythonconsole/config.ui
+++ b/plugins/pythonconsole/pythonconsole/config.ui
@@ -105,13 +105,13 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button1">
-                <property name="label">gtk-close</property>
+                <property name="label" translatable="yes">_Close</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/plugins/snippets/snippets/snippets.ui b/plugins/snippets/snippets/snippets.ui
index 5595557..23636a9 100644
--- a/plugins/snippets/snippets/snippets.ui
+++ b/plugins/snippets/snippets/snippets.ui
@@ -57,13 +57,13 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="closebutton1">
-                <property name="label">gtk-close</property>
+                <property name="label" translatable="yes">_Close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -73,13 +73,13 @@
             </child>
             <child>
               <object class="GtkButton" id="button1">
-                <property name="label">gtk-help</property>
+                <property name="label" translatable="yes">_Help</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/plugins/sort/gedit-sort-plugin.ui b/plugins/sort/gedit-sort-plugin.ui
index 44a976d..4b3db45 100644
--- a/plugins/sort/gedit-sort-plugin.ui
+++ b/plugins/sort/gedit-sort-plugin.ui
@@ -26,13 +26,13 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button1">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -59,13 +59,13 @@
             </child>
             <child>
               <object class="GtkButton" id="button3">
-                <property name="label">gtk-help</property>
+                <property name="label" translatable="yes">_Help</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -199,7 +199,7 @@
                   <object class="GtkImage" id="image7">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="stock">gtk-dialog-warning</property>
+                    <property name="icon_name">dialog-warning-symbolic</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -246,6 +246,6 @@
   </object>
   <object class="GtkImage" id="sort_image">
     <property name="can_focus">False</property>
-    <property name="stock">gtk-sort-ascending</property>
+    <property name="icon_name">view-sort-ascending</property>
   </object>
 </interface>
diff --git a/plugins/spell/languages-dialog.ui b/plugins/spell/languages-dialog.ui
index 5dd96d0..5786d43 100644
--- a/plugins/spell/languages-dialog.ui
+++ b/plugins/spell/languages-dialog.ui
@@ -21,13 +21,13 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="helpbutton1">
-                <property name="label">gtk-help</property>
+                <property name="label" translatable="yes">_Help</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -37,13 +37,13 @@
             </child>
             <child>
               <object class="GtkButton" id="closebutton1">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -53,13 +53,13 @@
             </child>
             <child>
               <object class="GtkButton" id="button1">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/plugins/spell/spell-checker.ui b/plugins/spell/spell-checker.ui
index fca8c74..ac4ffac 100644
--- a/plugins/spell/spell-checker.ui
+++ b/plugins/spell/spell-checker.ui
@@ -1,18 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
-  <object class="GtkImage" id="add_word_image">
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-add</property>
-  </object>
-  <object class="GtkImage" id="change_all_image">
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-convert</property>
-  </object>
-  <object class="GtkImage" id="change_image">
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-convert</property>
-  </object>
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="check_spelling_window">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -113,7 +101,6 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
-                    <property name="image">check_word_image</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
@@ -206,7 +193,6 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="use_action_appearance">False</property>
-                        <property name="image">ignore_image</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -220,7 +206,6 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="use_action_appearance">False</property>
-                        <property name="image">change_image</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -236,7 +221,6 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="use_action_appearance">False</property>
-                        <property name="image">ignore_all_image</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -252,7 +236,6 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="use_action_appearance">False</property>
-                        <property name="image">change_all_image</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
@@ -303,7 +286,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
-                            <property name="image">add_word_image</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -344,16 +326,4 @@
       </object>
     </child>
   </object>
-  <object class="GtkImage" id="check_word_image">
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-spell-check</property>
-  </object>
-  <object class="GtkImage" id="ignore_all_image">
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-goto-bottom</property>
-  </object>
-  <object class="GtkImage" id="ignore_image">
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-go-down</property>
-  </object>
 </interface>
diff --git a/plugins/time/gedit-time-dialog.ui b/plugins/time/gedit-time-dialog.ui
index 3f949e7..a63b24c 100644
--- a/plugins/time/gedit-time-dialog.ui
+++ b/plugins/time/gedit-time-dialog.ui
@@ -132,14 +132,14 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="help_button">
-                <property name="label">gtk-help</property>
+                <property name="label" translatable="yes">_Help</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -149,14 +149,14 @@
             </child>
             <child>
               <object class="GtkButton" id="cancel_button">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/plugins/time/gedit-time-setup-dialog.ui b/plugins/time/gedit-time-setup-dialog.ui
index 7b4950b..9aa45d2 100644
--- a/plugins/time/gedit-time-setup-dialog.ui
+++ b/plugins/time/gedit-time-setup-dialog.ui
@@ -18,14 +18,14 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button1">
-                <property name="label">gtk-close</property>
+                <property name="label" translatable="yes">_Close</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]