From fade488f1261429433e71c20bc2e8d2fd9bd85b1 Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Mon, 4 Dec 2017 19:33:09 +0200
Subject: [PATCH] reorder Appearance page

---
 .../configuration/AppearanceConfig.qml        | 133 +++++++++---------
 1 file changed, 66 insertions(+), 67 deletions(-)

diff --git a/shell/package/contents/configuration/AppearanceConfig.qml b/shell/package/contents/configuration/AppearanceConfig.qml
index 7aa735077..0074a3bfc 100644
--- a/shell/package/contents/configuration/AppearanceConfig.qml
+++ b/shell/package/contents/configuration/AppearanceConfig.qml
@@ -319,71 +319,6 @@ PlasmaComponents.Page {
         }
         //! END: Applet Size
 
-        //! BEGIN: Animations
-        ColumnLayout {
-            Layout.fillWidth: true
-            spacing: units.smallSpacing
-
-            Header {
-                text: i18n("Animations")
-            }
-
-            RowLayout {
-                Layout.fillWidth: true
-                Layout.leftMargin: units.smallSpacing * 2
-                Layout.rightMargin: units.smallSpacing * 2
-                spacing: 2
-
-                property int duration: plasmoid.configuration.durationTime
-
-                ExclusiveGroup {
-                    id: animationsGroup
-                    onCurrentChanged: {
-                        if (current.checked)
-                            plasmoid.configuration.durationTime = current.duration
-                    }
-                }
-
-                PlasmaComponents.Button {
-                    Layout.fillWidth: true
-                    text: i18n("None")
-                    checked: parent.duration === duration
-                    checkable: true
-                    exclusiveGroup: animationsGroup
-
-                    readonly property int duration: 0
-                }
-                PlasmaComponents.Button {
-                    Layout.fillWidth: true
-                    text: i18n("x1")
-                    checked: parent.duration === duration
-                    checkable: true
-                    exclusiveGroup: animationsGroup
-
-                    readonly property int duration: 1
-                }
-                PlasmaComponents.Button {
-                    Layout.fillWidth: true
-                    text: i18n("x2")
-                    checked: parent.duration === duration
-                    checkable: true
-                    exclusiveGroup: animationsGroup
-
-                    readonly property int duration: 2
-                }
-                PlasmaComponents.Button {
-                    Layout.fillWidth: true
-                    text: i18n("x3")
-                    checked: parent.duration === duration
-                    checkable: true
-                    exclusiveGroup: animationsGroup
-
-                    readonly property int duration: 3
-                }
-            }
-        }
-        //! END: Animations
-
         //! BEGIN: Background
         ColumnLayout {
             Layout.fillWidth: true
@@ -547,6 +482,71 @@ PlasmaComponents.Page {
         }
         //! END: Background
 
+        //! BEGIN: Animations
+        ColumnLayout {
+            Layout.fillWidth: true
+            spacing: units.smallSpacing
+
+            Header {
+                text: i18n("Animations")
+            }
+
+            RowLayout {
+                Layout.fillWidth: true
+                Layout.leftMargin: units.smallSpacing * 2
+                Layout.rightMargin: units.smallSpacing * 2
+                spacing: 2
+
+                property int duration: plasmoid.configuration.durationTime
+
+                ExclusiveGroup {
+                    id: animationsGroup
+                    onCurrentChanged: {
+                        if (current.checked)
+                            plasmoid.configuration.durationTime = current.duration
+                    }
+                }
+
+                PlasmaComponents.Button {
+                    Layout.fillWidth: true
+                    text: i18n("None")
+                    checked: parent.duration === duration
+                    checkable: true
+                    exclusiveGroup: animationsGroup
+
+                    readonly property int duration: 0
+                }
+                PlasmaComponents.Button {
+                    Layout.fillWidth: true
+                    text: i18n("x1")
+                    checked: parent.duration === duration
+                    checkable: true
+                    exclusiveGroup: animationsGroup
+
+                    readonly property int duration: 1
+                }
+                PlasmaComponents.Button {
+                    Layout.fillWidth: true
+                    text: i18n("x2")
+                    checked: parent.duration === duration
+                    checkable: true
+                    exclusiveGroup: animationsGroup
+
+                    readonly property int duration: 2
+                }
+                PlasmaComponents.Button {
+                    Layout.fillWidth: true
+                    text: i18n("x3")
+                    checked: parent.duration === duration
+                    checkable: true
+                    exclusiveGroup: animationsGroup
+
+                    readonly property int duration: 3
+                }
+            }
+        }
+        //! END: Animations
+
         //! BEGIN: Active Indicator
         ColumnLayout{
             spacing: units.smallSpacing
@@ -586,6 +586,7 @@ PlasmaComponents.Page {
                 PlasmaComponents.Label {
                     text: i18n("Style:") + " "
                     horizontalAlignment: Text.AlignLeft
+                    visible: plasmoid.configuration.advanced
                 }
 
                 PlasmaComponents.Button {
@@ -749,8 +750,6 @@ PlasmaComponents.Page {
                         }
                     }
 
-
-
                     RowLayout{
                         PlasmaComponents.Label {
                             enabled: showGlowChk.checked