From cfd57e0b92c9e5676818f67dc6d766ba499d8d13 Mon Sep 17 00:00:00 2001
From: Nikita Zlobin <nick87720z@gmail.com>
Date: Fri, 23 Aug 2019 17:29:12 +0500
Subject: [PATCH 1/2] xfwm4-tweaks-dialog.glade: Apply property sorting

New glade feature, solving reordering problem for different
glade users.
---
 settings-dialogs/xfwm4-tweaks-dialog.glade | 48 ++++++++--------------
 1 file changed, 17 insertions(+), 31 deletions(-)

diff --git a/settings-dialogs/xfwm4-tweaks-dialog.glade b/settings-dialogs/xfwm4-tweaks-dialog.glade
index 38135a7e..94bda5b4 100644
--- a/settings-dialogs/xfwm4-tweaks-dialog.glade
+++ b/settings-dialogs/xfwm4-tweaks-dialog.glade
@@ -117,8 +117,8 @@
               <object class="GtkBox" id="vbox1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="cycle_minimum_check">
@@ -234,8 +234,8 @@ or "skip taskbar" properties set</property>
               <object class="GtkBox" id="vbox3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="prevent_focus_stealing_check">
@@ -279,8 +279,8 @@ or "skip taskbar" properties set</property>
                       <object class="GtkLabel" id="label11">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">When a window raises itself:</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -298,8 +298,8 @@ or "skip taskbar" properties set</property>
                           <object class="GtkBox" id="vbox14">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
                             <property name="border_width">6</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="activate_action_bring_option">
@@ -391,23 +391,22 @@ or "skip taskbar" properties set</property>
               <object class="GtkBox" id="vbox4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkBox" id="hbox1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">horizontal</property>
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkLabel" id="label7">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">Key used to _grab and move windows:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">easy_click_combo_box</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -581,8 +580,8 @@ or "skip taskbar" properties set</property>
               <object class="GtkBox" id="vbox5">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="scroll_workspaces_check">
@@ -670,17 +669,17 @@ when switching via keyboard shortcuts</property>
               <object class="GtkBox" id="vbox6">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label8">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes">_Minimum size of windows to trigger smart placement:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">placement_ratio_scale</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -698,7 +697,6 @@ when switching via keyboard shortcuts</property>
                       <object class="GtkBox" id="hbox2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="orientation">horizontal</property>
                         <property name="spacing">12</property>
                         <child>
                           <object class="GtkLabel" id="label9">
@@ -717,7 +715,6 @@ when switching via keyboard shortcuts</property>
                           <object class="GtkScale" id="placement_ratio_scale">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="orientation">horizontal</property>
                             <property name="adjustment">adjustment1</property>
                             <property name="restrict_to_fill_level">False</property>
                             <property name="draw_value">False</property>
@@ -760,8 +757,8 @@ when switching via keyboard shortcuts</property>
                       <object class="GtkLabel" id="label27">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes">By default, place windows:</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -779,8 +776,8 @@ when switching via keyboard shortcuts</property>
                           <object class="GtkBox" id="vbox18">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
                             <property name="border_width">6</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="placement_center_option">
@@ -853,8 +850,8 @@ when switching via keyboard shortcuts</property>
               <object class="GtkBox" id="vbox7">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
                 <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="use_compositing_check">
@@ -878,7 +875,6 @@ when switching via keyboard shortcuts</property>
                     <property name="sensitive">False</property>
                     <property name="can_focus">True</property>
                     <property name="hscrollbar_policy">never</property>
-                    <property name="vscrollbar_policy">automatic</property>
                     <child>
                       <object class="GtkViewport" id="viewport1">
                         <property name="visible">True</property>
@@ -981,10 +977,10 @@ when switching via keyboard shortcuts</property>
                                   <object class="GtkLabel" id="label12">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Opaci_ty of window decorations:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">frame_opacity_scale</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1002,7 +998,6 @@ when switching via keyboard shortcuts</property>
                                       <object class="GtkBox" id="hbox3">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="orientation">horizontal</property>
                                         <child>
                                           <object class="GtkLabel" id="label17">
                                             <property name="visible">True</property>
@@ -1020,7 +1015,6 @@ when switching via keyboard shortcuts</property>
                                           <object class="GtkScale" id="frame_opacity_scale">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="orientation">horizontal</property>
                                             <property name="adjustment">adjustment2</property>
                                             <property name="restrict_to_fill_level">False</property>
                                             <property name="draw_value">False</property>
@@ -1057,10 +1051,10 @@ when switching via keyboard shortcuts</property>
                                   <object class="GtkLabel" id="label13">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Opacity of _inactive windows:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">inactive_opacity_scale</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1078,7 +1072,6 @@ when switching via keyboard shortcuts</property>
                                       <object class="GtkBox" id="hbox4">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="orientation">horizontal</property>
                                         <child>
                                           <object class="GtkLabel" id="label19">
                                             <property name="visible">True</property>
@@ -1096,7 +1089,6 @@ when switching via keyboard shortcuts</property>
                                           <object class="GtkScale" id="inactive_opacity_scale">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="orientation">horizontal</property>
                                             <property name="adjustment">adjustment3</property>
                                             <property name="restrict_to_fill_level">False</property>
                                             <property name="draw_value">False</property>
@@ -1133,10 +1125,10 @@ when switching via keyboard shortcuts</property>
                                   <object class="GtkLabel" id="label14">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Opacity of windows during _move:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">move_opacity_scale</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1154,7 +1146,6 @@ when switching via keyboard shortcuts</property>
                                       <object class="GtkBox" id="hbox5">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="orientation">horizontal</property>
                                         <child>
                                           <object class="GtkLabel" id="label21">
                                             <property name="visible">True</property>
@@ -1172,7 +1163,6 @@ when switching via keyboard shortcuts</property>
                                           <object class="GtkScale" id="move_opacity_scale">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="orientation">horizontal</property>
                                             <property name="adjustment">adjustment4</property>
                                             <property name="restrict_to_fill_level">False</property>
                                             <property name="draw_value">False</property>
@@ -1209,10 +1199,10 @@ when switching via keyboard shortcuts</property>
                                   <object class="GtkLabel" id="label15">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Opacity of windows during resi_ze:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">resize_opacity_scale</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1230,7 +1220,6 @@ when switching via keyboard shortcuts</property>
                                       <object class="GtkBox" id="hbox6">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="orientation">horizontal</property>
                                         <child>
                                           <object class="GtkLabel" id="label23">
                                             <property name="visible">True</property>
@@ -1248,7 +1237,6 @@ when switching via keyboard shortcuts</property>
                                           <object class="GtkScale" id="resize_opacity_scale">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="orientation">horizontal</property>
                                             <property name="adjustment">adjustment5</property>
                                             <property name="restrict_to_fill_level">False</property>
                                             <property name="draw_value">False</property>
@@ -1285,10 +1273,10 @@ when switching via keyboard shortcuts</property>
                                   <object class="GtkLabel" id="label16">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Opacity of popup wi_ndows:</property>
                                     <property name="use_underline">True</property>
                                     <property name="mnemonic_widget">popup_opacity_scale</property>
+                                    <property name="xalign">0</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1306,7 +1294,6 @@ when switching via keyboard shortcuts</property>
                                       <object class="GtkBox" id="hbox7">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="orientation">horizontal</property>
                                         <child>
                                           <object class="GtkLabel" id="label25">
                                             <property name="visible">True</property>
@@ -1324,7 +1311,6 @@ when switching via keyboard shortcuts</property>
                                           <object class="GtkScale" id="popup_opacity_scale">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="orientation">horizontal</property>
                                             <property name="adjustment">adjustment6</property>
                                             <property name="restrict_to_fill_level">False</property>
                                             <property name="draw_value">False</property>
-- 
2.21.0