[pitivi] For non-toolbar dialog buttons with labels, remove superfluous icons

[Jean-François Fortin Tam <jfft src gnome org>]

commit 2efc7a74428925fb5cda813d53b38726ba3307cb
Author: Jean-François Fortin Tam <nekohayo gmail com>
Date:   Sun Sep 28 19:58:34 2014 -0400

    For non-toolbar dialog buttons with labels, remove superfluous icons
    
    The recent slew of changes in master added extra icons to various buttons.
    
    In 2011 I would not have imagined that I'd be in favor of this in 2014,
    but I've gotten used to not having random icons on buttons anymore.
    It's also easier to support as an app maintainer, with more labeling freedom.
    
    This commit also clarifies some button labels, replacing "Clear" by "Reset all".

 data/ui/cliptransformation.ui    |    5 +-
 data/ui/elementsettingsdialog.ui |   20 +-----
 data/ui/preferences.ui           |  133 ++++++++++++++++++--------------------
 data/ui/projectsettings.ui       |   19 +----
 data/ui/renderingdialog.ui       |   13 ++--
 data/ui/renderingprogress.ui     |   28 --------
 data/ui/startupwizard.ui         |   25 +------
 7 files changed, 80 insertions(+), 163 deletions(-)
---
diff --git a/data/ui/cliptransformation.ui b/data/ui/cliptransformation.ui
index 37ee987..86553e2 100644
--- a/data/ui/cliptransformation.ui
+++ b/data/ui/cliptransformation.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
+<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="crop_bottom_adjustment">
@@ -74,12 +74,11 @@
         <property name="layout_style">end</property>
         <child>
           <object class="GtkButton" id="clear_button">
-            <property name="label">gtk-clear</property>
+            <property name="label">Reset all</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_stock">True</property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/data/ui/elementsettingsdialog.ui b/data/ui/elementsettingsdialog.ui
index fec79fb..44cccf6 100644
--- a/data/ui/elementsettingsdialog.ui
+++ b/data/ui/elementsettingsdialog.ui
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
+<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
-  <object class="GtkImage" id="clear_icon">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">document-revert</property>
-  </object>
-  <object class="GtkImage" id="close_icon">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">window-close</property>
-  </object>
   <object class="GtkDialog" id="dialog1">
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
@@ -31,13 +21,11 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="reset">
-                <property name="label" translatable="yes">Clear</property>
+                <property name="label" translatable="yes">Reset all</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="image">clear_icon</property>
-                <property name="always_show_image">True</property>
                 <signal name="clicked" handler="_resetValuesClickedCb" swapped="no"/>
               </object>
               <packing>
@@ -48,14 +36,12 @@
             </child>
             <child>
               <object class="GtkButton" id="okbutton1">
-                <property name="label" translatable="yes">Close</property>
+                <property name="label" translatable="yes">OK</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="image">close_icon</property>
-                <property name="always_show_image">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/data/ui/preferences.ui b/data/ui/preferences.ui
index fcd7547..a076a6a 100644
--- a/data/ui/preferences.ui
+++ b/data/ui/preferences.ui
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
+<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
-  <object class="GtkImage" id="close_icon">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">window-close</property>
-  </object>
   <object class="GtkListStore" id="liststore1">
     <columns>
       <!-- column-name column1 -->
@@ -27,70 +22,6 @@
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="resetButton">
-                <property name="label" translatable="yes">Reset to Factory Settings</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Reset all settings to their default 
values</property>
-                <signal name="clicked" handler="_factorySettingsButtonCb" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-                <property name="secondary">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="revertButton">
-                <property name="label" translatable="yes">Revert</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Revert all settings to the previous values 
(before you opened the preferences dialog)</property>
-                <signal name="clicked" handler="_revertButtonCb" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="acceptButton">
-                <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="image">close_icon</property>
-                <property name="always_show_image">True</property>
-                <signal name="clicked" handler="_acceptButtonCb" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkPaned" id="paned1">
             <property name="visible">True</property>
@@ -221,6 +152,68 @@
             <property name="position">1</property>
           </packing>
         </child>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="resetButton">
+                <property name="label" translatable="yes">Reset to Factory Settings</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Reset all settings to their default 
values</property>
+                <signal name="clicked" handler="_factorySettingsButtonCb" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+                <property name="secondary">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="revertButton">
+                <property name="label" translatable="yes">Revert</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Revert all settings to the previous values 
(before you opened the preferences dialog)</property>
+                <signal name="clicked" handler="_revertButtonCb" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="acceptButton">
+                <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>
+                <signal name="clicked" handler="_acceptButtonCb" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
       </object>
     </child>
     <action-widgets>
diff --git a/data/ui/projectsettings.ui b/data/ui/projectsettings.ui
index 5ad0c4e..d0c6a37 100644
--- a/data/ui/projectsettings.ui
+++ b/data/ui/projectsettings.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
+<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -23,11 +23,6 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkImage" id="cancel_icon">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">gtk-cancel</property>
-  </object>
   <object class="GtkListStore" id="model1">
     <columns>
       <!-- column-name gchararray -->
@@ -61,11 +56,6 @@
       </row>
     </data>
   </object>
-  <object class="GtkImage" id="ok_icon">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">gtk-ok</property>
-  </object>
   <object class="GtkDialog" id="project-settings-dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -90,8 +80,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="image">cancel_icon</property>
-                <property name="always_show_image">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -105,8 +93,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="image">ok_icon</property>
-                <property name="always_show_image">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -333,6 +319,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="halign">start</property>
+                        <property name="xalign">0.5</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
                         <signal name="toggled" handler="_selectDarRadiobuttonToggledCb" swapped="no"/>
@@ -383,6 +370,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="halign">start</property>
+                        <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">select_dar_radiobutton</property>
                       </object>
@@ -455,6 +443,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="halign">start</property>
+                            <property name="xalign">0.5</property>
                             <property name="draw_indicator">True</property>
                             <signal name="toggled" handler="_constrainSarButtonToggledCb" swapped="no"/>
                           </object>
diff --git a/data/ui/renderingdialog.ui b/data/ui/renderingdialog.ui
index dcfec39..1738463 100644
--- a/data/ui/renderingdialog.ui
+++ b/data/ui/renderingdialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
+<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -9,11 +9,6 @@
     <property name="step_increment">1</property>
     <property name="page_increment">1</property>
   </object>
-  <object class="GtkImage" id="close_icon">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">window-close</property>
-  </object>
   <object class="GtkImage" id="help_icon">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -102,8 +97,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="image">close_icon</property>
-                <property name="always_show_image">True</property>
                 <signal name="clicked" handler="_closeButtonClickedCb" swapped="no"/>
               </object>
               <packing>
@@ -457,6 +450,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="halign">start</property>
+                        <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -471,6 +465,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="halign">start</property>
+                        <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
@@ -682,6 +677,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="halign">start</property>
+                            <property name="xalign">0.5</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                             <signal name="toggled" handler="_videoOutputCheckbuttonToggledCb" swapped="no"/>
@@ -797,6 +793,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="halign">start</property>
+                            <property name="xalign">0.5</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                             <signal name="toggled" handler="_audioOutputCheckbuttonToggledCb" swapped="no"/>
diff --git a/data/ui/renderingprogress.ui b/data/ui/renderingprogress.ui
index 70487bf..cb8ddf5 100644
--- a/data/ui/renderingprogress.ui
+++ b/data/ui/renderingprogress.ui
@@ -2,26 +2,6 @@
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
-  <object class="GtkImage" id="cancel_icon">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">gtk-cancel</property>
-  </object>
-  <object class="GtkImage" id="close_icon">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">window-close</property>
-  </object>
-  <object class="GtkImage" id="media_play_icon">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">media-playback-start</property>
-  </object>
-  <object class="GtkImage" id="play_pause_icon">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">media-playback-pause</property>
-  </object>
   <object class="GtkDialog" id="render-progress">
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
@@ -65,8 +45,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="image">play_pause_icon</property>
-                <property name="always_show_image">True</property>
                 <signal name="toggled" handler="_pauseButtonClickedCb" swapped="no"/>
               </object>
               <packing>
@@ -81,8 +59,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="image">cancel_icon</property>
-                <property name="always_show_image">True</property>
                 <signal name="clicked" handler="_cancelButtonClickedCb" swapped="no"/>
               </object>
               <packing>
@@ -97,8 +73,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="image">media_play_icon</property>
-                <property name="always_show_image">True</property>
                 <signal name="clicked" handler="_playRenderedFileButtonClickedCb" swapped="no"/>
               </object>
               <packing>
@@ -113,8 +87,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="image">close_icon</property>
-                <property name="always_show_image">True</property>
                 <signal name="clicked" handler="_closeButtonClickedCb" swapped="no"/>
               </object>
               <packing>
diff --git a/data/ui/startupwizard.ui b/data/ui/startupwizard.ui
index d1deaf4..36b127b 100644
--- a/data/ui/startupwizard.ui
+++ b/data/ui/startupwizard.ui
@@ -1,22 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
+<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
-  <object class="GtkImage" id="help_icon">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">help-contents</property>
-  </object>
-  <object class="GtkImage" id="new_icon">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">document-new</property>
-  </object>
-  <object class="GtkImage" id="open_icon">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">document-open</property>
-  </object>
   <object class="GtkWindow" id="window1">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Welcome</property>
@@ -95,9 +80,9 @@
                     <property name="label" translatable="yes">New</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="can_default">True</property>
+                    <property name="has_default">True</property>
                     <property name="receives_default">True</property>
-                    <property name="image">new_icon</property>
-                    <property name="always_show_image">True</property>
                     <signal name="clicked" handler="_newProjectCb" swapped="no"/>
                   </object>
                   <packing>
@@ -112,8 +97,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="image">open_icon</property>
-                    <property name="always_show_image">True</property>
                     <signal name="clicked" handler="_onBrowseButtonClickedCb" swapped="no"/>
                   </object>
                   <packing>
@@ -128,8 +111,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="image">help_icon</property>
-                    <property name="always_show_image">True</property>
                     <signal name="clicked" handler="_userManualCb" swapped="no"/>
                   </object>
                   <packing>