[Xfce4-commits] [apps/xfce4-screensaver] 376/425: Merge branch 'fullscreen-buttons' of https://github.com/ochosi/xfce4-screensaver into ochosi-fullscreen-buttons

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-screensaver.

commit 4e58a4b8499ee6ea3d58f0c00e0ee072f291b11e
Merge: c9d3115 431bf76
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sun Oct 7 21:15:14 2018 -0400

    Merge branch 'fullscreen-buttons' of https://github.com/ochosi/xfce4-screensaver into ochosi-fullscreen-buttons

 data/xfce4-screensaver-preferences.ui | 63 ++++++++++++++++++++++-------------
 1 file changed, 40 insertions(+), 23 deletions(-)

diff --cc data/xfce4-screensaver-preferences.ui
index c8934c3,8616aef..69135dc
--- a/data/xfce4-screensaver-preferences.ui
+++ b/data/xfce4-screensaver-preferences.ui
@@@ -61,6 -36,6 +61,7 @@@ Simon Steinbei�
            <object class="GtkBox" id="hbox9">
              <property name="visible">True</property>
              <property name="can_focus">False</property>
++            <property name="spacing">6</property>
              <child>
                <object class="GtkImage" id="image2">
                  <property name="visible">True</property>
@@@ -119,43 -79,70 +120,59 @@@
                </packing>
              </child>
              <child>
-               <object class="GtkButton" id="fullscreen_preview_next_button">
+               <object class="GtkBox">
                  <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="receives_default">False</property>
+                 <property name="can_focus">False</property>
 -                <property name="margin_right">6</property>
                  <child>
-                   <object class="GtkImage" id="image4">
+                   <object class="GtkButton" id="fullscreen_preview_previous_button">
                      <property name="visible">True</property>
-                     <property name="can_focus">False</property>
-                     <property name="stock">gtk-go-forward</property>
+                     <property name="can_focus">True</property>
+                     <property name="receives_default">False</property>
+                     <child>
+                       <object class="GtkImage" id="image5">
+                         <property name="visible">True</property>
+                         <property name="can_focus">False</property>
+                         <property name="stock">gtk-go-back</property>
+                       </object>
+                     </child>
                    </object>
+                   <packing>
+                     <property name="expand">False</property>
 -                    <property name="fill">True</property>
++                    <property name="fill">False</property>
+                     <property name="position">0</property>
+                   </packing>
                  </child>
-               </object>
-               <packing>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-                 <property name="pack_type">end</property>
-                 <property name="position">4</property>
-               </packing>
-             </child>
-             <child>
-               <object class="GtkButton" id="fullscreen_preview_previous_button">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="receives_default">False</property>
                  <child>
-                   <object class="GtkImage" id="image5">
+                   <object class="GtkButton" id="fullscreen_preview_next_button">
                      <property name="visible">True</property>
-                     <property name="can_focus">False</property>
-                     <property name="stock">gtk-go-back</property>
+                     <property name="can_focus">True</property>
+                     <property name="receives_default">False</property>
+                     <child>
+                       <object class="GtkImage" id="image4">
+                         <property name="visible">True</property>
+                         <property name="can_focus">False</property>
+                         <property name="stock">gtk-go-forward</property>
+                       </object>
+                     </child>
++                    <style>
++                      <class name="linked"/>
++                    </style>
                    </object>
+                   <packing>
+                     <property name="expand">False</property>
 -                    <property name="fill">False</property>
++                    <property name="fill">True</property>
+                     <property name="position">1</property>
+                   </packing>
                  </child>
+                 <style>
+                   <class name="linked"/>
+                 </style>
                </object>
                <packing>
                  <property name="expand">False</property>
                  <property name="fill">False</property>
 -                <property name="position">3</property>
 -              </packing>
 -            </child>
 -            <child>
 -              <object class="GtkButton" id="fullscreen_preview_close">
 -                <property name="label">gtk-leave-fullscreen</property>
 -                <property name="visible">True</property>
 -                <property name="can_focus">True</property>
 -                <property name="receives_default">False</property>
 -                <property name="use_stock">True</property>
 -              </object>
 -              <packing>
 -                <property name="expand">False</property>
 -                <property name="fill">False</property>
 -                <property name="position">5</property>
 +                <property name="pack_type">end</property>
-                 <property name="position">5</property>
++                <property name="position">4</property>
                </packing>
              </child>
            </object>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.