[kde-doc-english] [plasma-desktop] applets/taskmanager/package/contents/ui: Use column major in the taskbar when "Force row settings" is set

[Kåre Särs]

Git commit c685b9ce1f0d567b2c2c2e27a546506d29b41114 by Kåre Särs.
Committed on 20/05/2015 at 19:43.
Pushed by sars into branch 'master'.

Use column major in the taskbar when "Force row settings" is set

Rename the "Force row settings" option to
"Always arrange tasks in columns of as many rows"
+ some rearangements of the configure elements

This change minimizes the number of items that move around when a
task is started/closed.

GUI: The Configuration dialog has changed text, alignments and
enabling/disabling of options

REVIEW: 123738

M  +37   -30   applets/taskmanager/package/contents/ui/ConfigGeneral.qml
M  +6    -1    applets/taskmanager/package/contents/ui/main.qml

http://commits.kde.org/plasma-desktop/c685b9ce1f0d567b2c2c2e27a546506d29b41114

diff --git a/applets/taskmanager/package/contents/ui/ConfigGeneral.qml b/applets/taskmanager/package/contents/ui/ConfigGeneral.qml
index 36dd134..5b72901 100644
--- a/applets/taskmanager/package/contents/ui/ConfigGeneral.qml
+++ b/applets/taskmanager/package/contents/ui/ConfigGeneral.qml
@@ -43,33 +43,28 @@ Item {
         GroupBox {
             Layout.fillWidth: true
 
-            title: i18n("Appearance")
+            title: i18n("Arrangement")
             flat: true
 
-            ColumnLayout {
+            GridLayout {
+                columns: 2
                 Layout.fillWidth: true
 
-                CheckBox {
-                    id: forceStripes
-                    text: i18n("Force row settings")
+                Label {
+                    text: i18n("Maximum rows:")
                 }
 
-                CheckBox {
-                    id: showToolTips
-                    text: i18n("Show tooltips")
+                SpinBox {
+                    id: maxStripes
+                    minimumValue: 1
                 }
 
-                RowLayout {
-                    Layout.fillHeight: false
-
-                    Label {
-                        text: i18n("Maximum rows:")
-                    }
-
-                    SpinBox {
-                        id: maxStripes
-                        minimumValue: 1
-                    }
+                CheckBox {
+                    id: forceStripes
+                    Layout.column: 1
+                    Layout.row: 1
+                    text: i18n("Always arrange tasks in columns of as many rows")
+                    enabled: maxStripes.value > 1
                 }
             }
         }
@@ -84,6 +79,11 @@ Item {
                 Layout.fillWidth: true
 
                 CheckBox {
+                    id: showToolTips
+                    text: i18n("Show tooltips")
+                }
+
+                CheckBox {
                     id: wheelEnabled
                     text: i18n("Cycle through tasks with mouse wheel")
                 }
@@ -116,38 +116,45 @@ Item {
             visible: (plasmoid.pluginName != "org.kde.plasma.icontasks")
 
             ColumnLayout {
-                RowLayout {
+                GridLayout {
+                    columns: 3
                     Label {
+                        Layout.fillWidth: true
                         text: i18n("Sorting:")
+                        horizontalAlignment: Text.AlignRight
                     }
 
                     ComboBox {
                         id: sortingStrategy
-
                         Layout.fillWidth: true
-
                         model: [i18n("Do Not Sort"), i18n("Manually"), i18n("Alphabetically"), i18n("By Desktop"), i18n("By Activity")]
                     }
-                }
 
-                RowLayout {
                     Label {
+                        Layout.fillWidth: true
+                        Layout.row: 1
+                        Layout.column: 0
                         text: i18n("Grouping:")
+                        horizontalAlignment: Text.AlignRight
                     }
 
                     ComboBox {
                         id: groupingStrategy
-
+                        Layout.row: 1
+                        Layout.column: 1
                         Layout.fillWidth: true
-
                         model: [i18n("Do Not Group"), i18n("By Program Name")]
                     }
+                    CheckBox {
+                        id: onlyGroupWhenFull
+                        Layout.column: 1
+                        Layout.row: 2
+                        Layout.columnSpan: 2
+                        text: i18n("Only when the task manager is full")
+                        enabled: groupingStrategy.currentIndex > 0
+                    }
                 }
 
-                CheckBox {
-                    id: onlyGroupWhenFull
-                    text: i18n("Only when the task manager is full")
-                }
             }
         }
 
diff --git a/applets/taskmanager/package/contents/ui/main.qml b/applets/taskmanager/package/contents/ui/main.qml
index 98ba7c3..30c5372 100644
--- a/applets/taskmanager/package/contents/ui/main.qml
+++ b/applets/taskmanager/package/contents/ui/main.qml
@@ -233,7 +233,12 @@ Item {
         onWidthChanged: LayoutManager.layout(taskRepeater)
         onHeightChanged: LayoutManager.layout(taskRepeater)
 
-        flow: tasks.vertical ? Flow.TopToBottom : Flow.LeftToRight
+        flow: {
+            if (tasks.vertical) {
+                return plasmoid.configuration.forceStripes ? Flow.LeftToRight : Flow.TopToBottom
+            }
+            return plasmoid.configuration.forceStripes ? Flow.TopToBottom : Flow.LeftToRight
+        }
 
         onAnimatingChanged: {
             if (!animating) {