[Xfce4-commits] <parole:master> Fix padding to look like Xfce GTK2 dialogs

[Sean Davis]

Updating branch refs/heads/master
         to 133a53a86c4d18e86e7fc0eda68b6f90f132e4f0 (commit)
       from e55884cbfff3c2bc36e1b8d58b4ff87da4fc83fa (commit)

commit 133a53a86c4d18e86e7fc0eda68b6f90f132e4f0
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Tue Sep 3 06:59:49 2013 -0400

    Fix padding to look like Xfce GTK2 dialogs

 data/interfaces/parole-settings.ui |    9 ++++++++-
 data/interfaces/parole.ui          |   24 ++++++++++++------------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/data/interfaces/parole-settings.ui b/data/interfaces/parole-settings.ui
index ec77e7c..4cfb709 100644
--- a/data/interfaces/parole-settings.ui
+++ b/data/interfaces/parole-settings.ui
@@ -15,7 +15,6 @@
   </object>
   <object class="XfceTitledDialog" id="settings-dialog">
     <property name="can_focus">False</property>
-    <property name="border_width">0</property>
     <property name="title" translatable="yes">Parole Settings</property>
     <property name="modal">True</property>
     <property name="icon_name">parole</property>
@@ -30,6 +29,10 @@
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="can_focus">False</property>
+            <property name="margin_left">1</property>
+            <property name="margin_right">1</property>
+            <property name="margin_top">5</property>
+            <property name="margin_bottom">1</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="close">
@@ -57,6 +60,9 @@
           <object class="GtkNotebook" id="notebook1">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="margin_left">6</property>
+            <property name="margin_right">6</property>
+            <property name="margin_top">6</property>
             <child>
               <object class="GtkBox" id="box1">
                 <property name="visible">True</property>
@@ -671,6 +677,7 @@
                     <property name="can_focus">False</property>
                     <property name="row_spacing">2</property>
                     <property name="column_spacing">6</property>
+                    <property name="row_homogeneous">True</property>
                     <child>
                       <object class="GtkLabel" id="label13">
                         <property name="visible">True</property>
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 3db9a6d..2280ed3 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkImage" id="image1">
+  <object class="GtkImage" id="image12">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="pixel_size">16</property>
-    <property name="icon_name">media-optical-symbolic</property>
+    <property name="icon_name">gtk-about-symbolic</property>
     <property name="use_fallback">True</property>
   </object>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkImage" id="image10">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -20,18 +20,18 @@
     <property name="icon_name">face-sick-symbolic</property>
     <property name="use_fallback">True</property>
   </object>
-  <object class="GtkImage" id="image11">
+  <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="pixel_size">16</property>
-    <property name="icon_name">document-save-as-symbolic</property>
+    <property name="icon_name">media-optical-symbolic</property>
     <property name="use_fallback">True</property>
   </object>
-  <object class="GtkImage" id="image12">
+  <object class="GtkImage" id="image11">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="pixel_size">16</property>
-    <property name="icon_name">gtk-about-symbolic</property>
+    <property name="icon_name">document-save-as-symbolic</property>
     <property name="use_fallback">True</property>
   </object>
   <object class="GtkImage" id="image2">
@@ -422,8 +422,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>