GNOME.org
 

[pitivi] Stock buttons have been deprecated. icon names have changed.

commit 97d70fdb7ffbf7ce8325672d246fb54676e0f996
Author: Lubosz Sarnecki <lubosz gmail com>
Date:   Tue Sep 16 16:29:02 2014 +0200

    Stock buttons have been deprecated. icon names have changed.
    
    https://developer.gnome.org/gtk3/unstable/GtkButton.html#gtk-button-new-from-stock
    
    * use custom buttons
    * replace stock-id with icon-name
    
    https://developer.gnome.org/gtk3/3.13/GtkToolButton.html#GtkToolButton--stock-id
    
    update icon names
    
    * use correct gtk menu icon
    * zoom-fit-best icon name has changed
    * add icon to document-open in startup wizzard

 data/ui/depsmanager.ui           |    2 +-
 data/ui/elementsettingsdialog.ui |   20 ++++++++++++---
 data/ui/filelisterrordialog.ui   |    2 +-
 data/ui/mainmenubutton.ui        |    2 +-
 data/ui/preferences.ui           |   10 ++++++-
 data/ui/projectsettings.ui       |   20 ++++++++++++---
 data/ui/renderingdialog.ui       |   25 +++++++++++++-----
 data/ui/renderingprogress.ui     |   50 ++++++++++++++++++++++++++++----------
 data/ui/startupwizard.ui         |   27 +++++++++++++++++---
 data/ui/titleeditor.ui           |    6 ++--
 pitivi/mainwindow.py             |   29 +++++++++++----------
 pitivi/utils/widgets.py          |    2 +-
 12 files changed, 140 insertions(+), 55 deletions(-)
---
diff --git a/data/ui/depsmanager.ui b/data/ui/depsmanager.ui
index c27a409..fc1845d 100644
--- a/data/ui/depsmanager.ui
+++ b/data/ui/depsmanager.ui
@@ -17,7 +17,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="close_btn">
-                <property name="label">gtk-close</property>
+                <property name="label">window-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
diff --git a/data/ui/elementsettingsdialog.ui b/data/ui/elementsettingsdialog.ui
index 2f46c8e..8e80f8f 100644
--- a/data/ui/elementsettingsdialog.ui
+++ b/data/ui/elementsettingsdialog.ui
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.4"/>
+  <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>
@@ -20,12 +30,13 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="reset">
-                <property name="label">gtk-clear</property>
+                <property name="label" translatable="yes">Clear</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="image">clear_icon</property>
+                <property name="always_show_image">True</property>
                 <signal name="clicked" handler="_resetValuesClickedCb" swapped="no"/>
               </object>
               <packing>
@@ -36,13 +47,14 @@
             </child>
             <child>
               <object class="GtkButton" id="okbutton1">
-                <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="image">close_icon</property>
+                <property name="always_show_image">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/data/ui/filelisterrordialog.ui b/data/ui/filelisterrordialog.ui
index 02ee107..6e06d17 100644
--- a/data/ui/filelisterrordialog.ui
+++ b/data/ui/filelisterrordialog.ui
@@ -24,7 +24,7 @@
               <object class="GtkImage" id="image1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="stock">gtk-dialog-warning</property>
+                <property name="icon-name">dialog-warning</property>
                 <property name="icon-size">6</property>
               </object>
               <packing>
diff --git a/data/ui/mainmenubutton.ui b/data/ui/mainmenubutton.ui
index 2c4e0c9..7a9de5b 100644
--- a/data/ui/mainmenubutton.ui
+++ b/data/ui/mainmenubutton.ui
@@ -135,7 +135,7 @@
       <object class="GtkImage" id="image1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="icon_name">view-more-symbolic</property>
+        <property name="icon_name">open-menu-symbolic</property>
       </object>
     </child>
   </object>
diff --git a/data/ui/preferences.ui b/data/ui/preferences.ui
index 3cce03e..ad13007 100644
--- a/data/ui/preferences.ui
+++ b/data/ui/preferences.ui
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.4 -->
+  <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">5</property>
@@ -187,13 +192,14 @@
             </child>
             <child>
               <object class="GtkButton" id="acceptButton">
-                <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="image">close_icon</property>
+                <property name="always_show_image">True</property>
                 <signal name="clicked" handler="_acceptButtonCb" swapped="no"/>
               </object>
               <packing>
diff --git a/data/ui/projectsettings.ui b/data/ui/projectsettings.ui
index 1a8790d..b4c71f0 100644
--- a/data/ui/projectsettings.ui
+++ b/data/ui/projectsettings.ui
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.4 -->
+  <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="ok_icon">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon-name">gtk-ok</property>
+  </object>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
     <property name="upper">9999</property>
@@ -75,11 +85,12 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button8">
-                <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="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="image">cancel_icon</property>
+                <property name="always_show_image">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -89,11 +100,12 @@
             </child>
             <child>
               <object class="GtkButton" id="ok_button">
-                <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="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="image">ok_icon</property>
+                <property name="always_show_image">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/data/ui/renderingdialog.ui b/data/ui/renderingdialog.ui
index b973059..bd8376b 100644
--- a/data/ui/renderingdialog.ui
+++ b/data/ui/renderingdialog.ui
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.4 -->
+  <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>
+    <property name="icon-name">help-contents</property>
+  </object>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
     <property name="upper">100</property>
@@ -87,11 +97,12 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="closebutton">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="label" translatable="yes">Close</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="_closeButtonClickedCb" swapped="no"/>
               </object>
               <packing>
@@ -416,11 +427,11 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="container_context_help_button">
-                                <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="receives_default">True</property>
-                                <property name="use_stock">True</property>
+                                <property name="image">help_icon</property>
                                 <property name="always_show_image">True</property>
                                 <signal name="clicked" handler="_containerContextHelpClickedCb" 
swapped="no"/>
                               </object>
diff --git a/data/ui/renderingprogress.ui b/data/ui/renderingprogress.ui
index 8391502..fd6884f 100644
--- a/data/ui/renderingprogress.ui
+++ b/data/ui/renderingprogress.ui
@@ -1,6 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.4 -->
+  <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="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="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="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="render-progress">
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
@@ -39,14 +59,15 @@
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkToggleButton" id="play_pause_button">
-                <property name="label">gtk-media-pause</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 class="GtkToggleButton" id="play_pause_button">
+                <property name="label" translatable="yes">Pause</property>
+                 <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>
+               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -55,11 +76,12 @@
             </child>
             <child>
               <object class="GtkButton" id="cancel_button">
-                <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="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="image">cancel_icon</property>
+                <property name="always_show_image">True</property>
                 <signal name="clicked" handler="_cancelButtonClickedCb" swapped="no"/>
               </object>
               <packing>
@@ -70,11 +92,12 @@
             </child>
             <child>
               <object class="GtkButton" id="play_rendered_file_button">
-                <property name="label">gtk-media-play</property>
+                <property name="label" translatable="yes">Play</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">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>
@@ -85,11 +108,12 @@
             </child>
             <child>
               <object class="GtkButton" id="close_button">
-                <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="receives_default">True</property>
-                <property name="use_stock">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 1fe1811..a19c19a 100644
--- a/data/ui/startupwizard.ui
+++ b/data/ui/startupwizard.ui
@@ -1,6 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.4 -->
+  <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="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="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>
@@ -78,11 +93,12 @@
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkButton" id="new_button">
-                    <property name="label">gtk-new</property>
+                    <property name="label" translatable="yes">New</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_stock">True</property>
+                    <property name="image">new_icon</property>
+                    <property name="always_show_image">True</property>
                     <signal name="clicked" handler="_newProjectCb" swapped="no"/>
                   </object>
                   <packing>
@@ -97,6 +113,8 @@
                     <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>
@@ -107,11 +125,12 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="help_button">
-                    <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="receives_default">True</property>
-                    <property name="use_stock">True</property>
+                    <property name="image">help_icon</property>
+                    <property name="always_show_image">True</property>
                     <signal name="clicked" handler="_userManualCb" swapped="no"/>
                   </object>
                   <packing>
diff --git a/data/ui/titleeditor.ui b/data/ui/titleeditor.ui
index 79c8715..a32750e 100644
--- a/data/ui/titleeditor.ui
+++ b/data/ui/titleeditor.ui
@@ -97,7 +97,7 @@
                 <property name="tooltip_text" translatable="yes">Bold</property>
                 <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">Bold</property>
-                <property name="stock_id">gtk-bold</property>
+                <property name="icon_name">gtk-bold</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -113,7 +113,7 @@
                 <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">Italic</property>
                 <property name="use_underline">True</property>
-                <property name="stock_id">gtk-italic</property>
+                <property name="icon_name">gtk-italic</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -209,7 +209,7 @@
                 <property name="tooltip_text" translatable="yes">Convert to markup</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
-                <property name="stock_id">gtk-convert</property>
+                <property name="icon_name">gtk-convert</property>
                 <signal name="toggled" handler="_markupToggleCb" swapped="no"/>
               </object>
               <packing>
diff --git a/pitivi/mainwindow.py b/pitivi/mainwindow.py
index dbbd1a4..3cad1db 100644
--- a/pitivi/mainwindow.py
+++ b/pitivi/mainwindow.py
@@ -614,8 +614,8 @@ class PitiviMainWindow(Gtk.ApplicationWindow, Loggable):
         chooser = Gtk.FileChooserDialog(title=_("Open File..."),
             transient_for=self,
             action=Gtk.FileChooserAction.OPEN)
-        chooser.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
-                Gtk.STOCK_OPEN, Gtk.ResponseType.OK)
+        chooser.add_buttons(_("Cancel"), Gtk.ResponseType.CANCEL,
+                            _("Open"), Gtk.ResponseType.OK)
         chooser.set_select_multiple(False)
         # TODO: Remove this set_current_folder call when GTK bug 683999 is fixed
         chooser.set_current_folder(self.settings.lastProjectFolder)
@@ -1020,10 +1020,11 @@ class PitiviMainWindow(Gtk.ApplicationWindow, Loggable):
     def _showExportDialog(self, project):
         self.log("Export requested")
         chooser = Gtk.FileChooserDialog(title=_("Export To..."),
-            transient_for=self,
-            action=Gtk.FileChooserAction.SAVE)
-        chooser.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
-            Gtk.STOCK_SAVE, Gtk.ResponseType.OK)
+                                        transient_for=self,
+                                        action=Gtk.FileChooserAction.SAVE)
+        chooser.add_buttons(_("Cancel"), Gtk.ResponseType.CANCEL,
+                            _("Save"), Gtk.ResponseType.OK)
+        chooser.set_default_response(Gtk.ResponseType.OK)
 
         chooser.set_select_multiple(False)
         chooser.props.do_overwrite_confirmation = True
@@ -1066,9 +1067,9 @@ class PitiviMainWindow(Gtk.ApplicationWindow, Loggable):
         chooser = Gtk.FileChooserDialog(title=_("Save As..."),
             transient_for=self,
             action=Gtk.FileChooserAction.SAVE)
-        chooser.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
-            Gtk.STOCK_SAVE, Gtk.ResponseType.OK)
-
+        chooser.add_buttons(_("Cancel"), Gtk.ResponseType.CANCEL,
+                            _("Save"), Gtk.ResponseType.OK)
+        chooser.set_default_response(Gtk.ResponseType.OK)
         asset = GES.Formatter.get_default()
         filt = Gtk.FileFilter()
         filt.set_name(asset.get_meta(GES.META_DESCRIPTION))
@@ -1121,15 +1122,15 @@ class PitiviMainWindow(Gtk.ApplicationWindow, Loggable):
         returns none otherwise.
         """
         chooser = Gtk.FileChooserDialog(title=_("Save As..."),
-            transient_for=self, action=Gtk.FileChooserAction.SAVE)
-        chooser.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
-            Gtk.STOCK_SAVE, Gtk.ResponseType.OK)
-        chooser.set_icon_name("pitivi")
+                                        transient_for=self, action=Gtk.FileChooserAction.SAVE)
+        chooser.add_buttons(_("Cancel"), Gtk.ResponseType.CANCEL,
+                            _("Save"), Gtk.ResponseType.OK)
+        chooser.set_default_response(Gtk.ResponseType.OK)
         chooser.set_select_multiple(False)
         chooser.set_current_name(_("Untitled"))
         chooser.props.do_overwrite_confirmation = True
         formats = {_("PNG image"): ["image/png", ("png",)],
-                _("JPEG image"): ["image/jpeg", ("jpg", "jpeg")]}
+                   _("JPEG image"): ["image/jpeg", ("jpg", "jpeg")]}
         for format in formats:
             filt = Gtk.FileFilter()
             filt.set_name(format)
diff --git a/pitivi/utils/widgets.py b/pitivi/utils/widgets.py
index 9c6616f..71d7266 100644
--- a/pitivi/utils/widgets.py
+++ b/pitivi/utils/widgets.py
@@ -995,7 +995,7 @@ class ZoomBox(Gtk.HBox, Zoomable):
         zoom_fit_btn = Gtk.Button()
         zoom_fit_btn.set_relief(Gtk.ReliefStyle.NONE)
         zoom_fit_btn.set_tooltip_text(ZOOM_FIT)
-        zoom_fit_icon = Gtk.Image.new_from_icon_name("zoom-best-fit", Gtk.IconSize.BUTTON)
+        zoom_fit_icon = Gtk.Image.new_from_icon_name("zoom-fit-best", Gtk.IconSize.BUTTON)
         zoom_fit_btn_hbox = Gtk.HBox()
         zoom_fit_btn_hbox.pack_start(zoom_fit_icon, expand=False, fill=True, padding=0)
         zoom_fit_btn_hbox.pack_start(Gtk.Label(label=_("Zoom")), expand=False, fill=True, padding=0)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]