[Xfce4-commits] <parole:master> Merge branch 'bluesabre/gtk3' of ssh://git.xfce.org/apps/parole into bluesabre/gtk3

[Simon Steinbeiss]

Updating branch refs/heads/master
         to 9e9ae122090074909f06920cef016b68ada90b20 (commit)
       from 8e4fb48b1bdce6f920d7db093163a402fa92fb81 (commit)

commit 9e9ae122090074909f06920cef016b68ada90b20
Merge: 8e4fb48 520cd96
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Thu Aug 22 01:30:26 2013 +0200

    Merge branch 'bluesabre/gtk3' of ssh://git.xfce.org/apps/parole into bluesabre/gtk3

commit 520cd967196f6291bd5415830d49683bc64a1752
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Wed Aug 21 19:22:24 2013 -0400

    More symbolics

 data/interfaces/parole.ui |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index b897553..567729b 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -35,7 +35,7 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="pixel_size">16</property>
-    <property name="icon_name">media-cdrom</property>
+    <property name="icon_name">media-optical-symbolic</property>
   </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
@@ -80,6 +80,12 @@
     <property name="pixel_size">16</property>
     <property name="icon_name">parole-extension</property>
   </object>
+  <object class="GtkImage" id="image9">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixel_size">16</property>
+    <property name="icon_name">document-properties-symbolic</property>
+  </object>
   <object class="GtkWindow" id="main-window">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Parole Media Player</property>
@@ -166,7 +172,6 @@
                         <property name="label">gtk-quit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <signal name="activate" handler="parole_player_menu_exit_cb" swapped="no"/>
@@ -221,11 +226,11 @@
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="preferences">
-                        <property name="label">gtk-preferences</property>
+                        <property name="label">Preferences</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">image9</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" handler="parole_player_open_preferences_cb" swapped="no"/>
                       </object>
                     </child>
@@ -456,8 +461,8 @@
                         <property name="use_underline">True</property>
                         <property name="image">image3</property>
                         <property name="use_stock">False</property>
-                        <accelerator key="equal" signal="activate"/>
                         <accelerator key="plus" signal="activate"/>
+                        <accelerator key="equal" signal="activate"/>
                         <signal name="activate" handler="parole_player_volume_up" swapped="no"/>
                       </object>
                     </child>