From 84f23b08053c93c9f6f324abb7507c0f975c381a Mon Sep 17 00:00:00 2001
From: Denis Fomin <fominde@gmail.com>
Date: Fri, 20 Sep 2013 12:35:49 +0400
Subject: [PATCH] filetransfer and xml console dialogs. Do not "Show images on
 buttons". see #7186

---
 data/gui/filetransfers.ui      | 96 +++++++---------------------------
 data/gui/xml_console_window.ui | 72 ++++---------------------
 2 files changed, 28 insertions(+), 140 deletions(-)

diff --git a/data/gui/filetransfers.ui b/data/gui/filetransfers.ui
index 8933b714d..201d8e7c3 100644
--- a/data/gui/filetransfers.ui
+++ b/data/gui/filetransfers.ui
@@ -41,11 +41,11 @@
                   </object>
                 </child>
                 <signal name="button_press_event" handler="on_transfers_list_button_press_event"/>
+                <signal name="row_activated" handler="on_transfers_list_row_activated"/>
                 <signal name="button_release_event" handler="on_transfers_list_button_release_event"/>
                 <signal name="key_press_event" handler="on_transfers_list_key_press_event"/>
-                <signal name="leave_notify_event" handler="on_transfers_list_leave_notify_event"/>
                 <signal name="motion_notify_event" handler="on_transfers_list_motion_notify_event"/>
-                <signal name="row_activated" handler="on_transfers_list_row_activated"/>
+                <signal name="leave_notify_event" handler="on_transfers_list_leave_notify_event"/>
               </object>
             </child>
           </object>
@@ -81,12 +81,15 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cleanup_button">
+                <property name="label" translatable="yes">Clean _up</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
                 <property name="tooltip_text" translatable="yes">Removes completed, cancelled and failed file transfers from the list</property>
+                <property name="image">image1</property>
+                <property name="use_underline">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="cleanup_button-atkobject">
                     <property name="AtkObject::accessible-name" translatable="yes">Remove file transfer from the list.</property>
@@ -94,42 +97,6 @@
                   </object>
                 </child>
                 <signal name="clicked" handler="on_cleanup_button_clicked"/>
-                <child>
-                  <object class="GtkAlignment" id="alignment91">
-                    <property name="visible">True</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox2992">
-                        <property name="visible">True</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image1143">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-clear</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label358">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">Clean _up</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -139,48 +106,15 @@
             </child>
             <child>
               <object class="GtkButton" id="pause_restore_button">
+                <property name="label" translatable="yes">_Pause</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
+                <property name="image">image2</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_pause_restore_button_clicked"/>
-                <child>
-                  <object class="GtkAlignment" id="alignment92">
-                    <property name="visible">True</property>
-                    <property name="xscale">0</property>
-                    <property name="yscale">0</property>
-                    <child>
-                      <object class="GtkHBox" id="hbox2993">
-                        <property name="visible">True</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkImage" id="image1147">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-media-pause</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label359">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">_Pause</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -252,7 +186,7 @@
     </child>
     <child>
       <object class="GtkImageMenuItem" id="continue_menuitem">
-        <property name="label" translatable="yes">_Continue</property>
+        <property name="label">_Continue</property>
         <property name="no_show_all">True</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
@@ -262,7 +196,7 @@
     </child>
     <child>
       <object class="GtkImageMenuItem" id="pause_menuitem">
-        <property name="label" translatable="yes">_Pause</property>
+        <property name="label">_Pause</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <property name="accel_group">accelgroup1</property>
@@ -285,7 +219,7 @@
     </child>
     <child>
       <object class="GtkImageMenuItem" id="open_folder_menuitem">
-        <property name="label" translatable="yes">_Open Containing Folder</property>
+        <property name="label">_Open Containing Folder</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <property name="accel_group">accelgroup1</property>
@@ -294,4 +228,12 @@
     </child>
   </object>
   <object class="GtkAccelGroup" id="accelgroup1"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="stock">gtk-clear</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="stock">gtk-media-pause</property>
+  </object>
 </interface>
diff --git a/data/gui/xml_console_window.ui b/data/gui/xml_console_window.ui
index 45c4a9948..350037124 100644
--- a/data/gui/xml_console_window.ui
+++ b/data/gui/xml_console_window.ui
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-apply</property>
+  </object>
   <object class="GtkWindow" id="xml_console_window">
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
@@ -53,11 +58,9 @@
             <child>
               <object class="GtkCheckButton" id="enable_checkbutton">
                 <property name="label" translatable="yes" comments="XML Console enable checkbutton">_Enable</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
@@ -72,11 +75,9 @@
             <child>
               <object class="GtkButton" id="clear_button">
                 <property name="label">gtk-clear</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="on_clear_button_clicked" swapped="no"/>
               </object>
@@ -110,11 +111,9 @@
                     <child>
                       <object class="GtkCheckButton" id="in_stanza_checkbutton">
                         <property name="label" translatable="yes">Hide IN stanzas</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                         <signal name="toggled" handler="on_in_stanza_checkbutton_toggled" swapped="no"/>
@@ -128,11 +127,9 @@
                     <child>
                       <object class="GtkCheckButton" id="out_stanza_checkbutton">
                         <property name="label" translatable="yes">Hide OUT stanzas</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                         <signal name="toggled" handler="on_out_stanza_checkbutton_toggled" swapped="no"/>
@@ -146,11 +143,9 @@
                     <child>
                       <object class="GtkCheckButton" id="presence_stanza_checkbutton">
                         <property name="label" translatable="yes">Hide Presence stanzas</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                         <signal name="toggled" handler="on_presence_stanza_checkbutton_toggled" swapped="no"/>
@@ -164,11 +159,9 @@
                     <child>
                       <object class="GtkCheckButton" id="iq_stanza_checkbutton">
                         <property name="label" translatable="yes">Hide IQ stanzas</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                         <signal name="toggled" handler="on_iq_stanza_checkbutton_toggled" swapped="no"/>
@@ -182,11 +175,9 @@
                     <child>
                       <object class="GtkCheckButton" id="message_stanza_checkbutton">
                         <property name="label" translatable="yes">Hide Message stanzas</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                         <signal name="toggled" handler="on_message_stanza_checkbutton_toggled" swapped="no"/>
@@ -254,8 +245,8 @@
                   <object class="GtkScrolledWindow" id="scrolledwindow42">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="shadow_type">in</property>
                     <property name="hscrollbar_policy">never</property>
+                    <property name="shadow_type">in</property>
                     <child>
                       <object class="GtkTextView" id="input_textview">
                         <property name="height_request">120</property>
@@ -280,12 +271,10 @@
                     <child>
                       <object class="GtkButton" id="iq_button">
                         <property name="label" translatable="yes" comments="Info/Query: all(?) jabber xml start with &lt;iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say &lt;iq in your language (of course))">_IQ</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes">Info/Query</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <signal name="clicked" handler="on_iq_button_clicked" swapped="no"/>
                       </object>
@@ -298,11 +287,9 @@
                     <child>
                       <object class="GtkButton" id="presence_button">
                         <property name="label" translatable="yes">_Presence</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <signal name="clicked" handler="on_presence_button_clicked" swapped="no"/>
                       </object>
@@ -315,11 +302,9 @@
                     <child>
                       <object class="GtkButton" id="message_button">
                         <property name="label" translatable="yes">_Message</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <signal name="clicked" handler="on_message_button_clicked" swapped="no"/>
                       </object>
@@ -331,53 +316,14 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="send_button">
-                        <property name="use_action_appearance">False</property>
+                        <property name="label" translatable="yes">_Send</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="image">image1</property>
+                        <property name="use_underline">True</property>
                         <signal name="clicked" handler="on_send_button_clicked" swapped="no"/>
-                        <child>
-                          <object class="GtkAlignment" id="alignment80">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xscale">0</property>
-                            <property name="yscale">0</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox2980">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkImage" id="image833">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="stock">gtk-apply</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label341">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">_Send</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>