[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [plasma-workspace] applets/digital-clock/package/contents/ui: [Digital Clock] Compact and move to th
From:       Kai Uwe Broulik <null () kde ! org>
Date:       2017-09-08 12:02:41
Message-ID: E1dqHzd-0005vW-VT () code ! kde ! org
[Download RAW message or body]

Git commit a8ae90067183ae5174c3e18aea566fce5d9f1b07 by Kai Uwe Broulik.
Committed on 08/09/2017 at 12:02.
Pushed by broulik into branch 'master'.

[Digital Clock] Compact and move to the end font setup

This makes the font selector more compact and moves it to the end of the dialog.
Settings like show seconds and date are more important than using a custom font for \
the clock.

Differential Revision: https://phabricator.kde.org/D7633

M  +42   -50   applets/digital-clock/package/contents/ui/configAppearance.qml

https://commits.kde.org/plasma-workspace/a8ae90067183ae5174c3e18aea566fce5d9f1b07

diff --git a/applets/digital-clock/package/contents/ui/configAppearance.qml \
b/applets/digital-clock/package/contents/ui/configAppearance.qml index \
                24ed74f6..83d95bfc 100644
--- a/applets/digital-clock/package/contents/ui/configAppearance.qml
+++ b/applets/digital-clock/package/contents/ui/configAppearance.qml
@@ -74,56 +74,6 @@ Item {
 
     QtLayouts.ColumnLayout {
         anchors.left: parent.left
-        QtControls.GroupBox {
-            QtLayouts.Layout.fillWidth: true
-            title: i18n("Font")
-            flat: true
-
-            QtLayouts.GridLayout { // there's no FormLayout :(
-                columns: 2
-                QtLayouts.Layout.fillWidth: true
-
-                QtControls.Label {
-                    QtLayouts.Layout.fillWidth: true
-                    horizontalAlignment: Text.AlignRight
-                    text: i18n("Font style:")
-                }
-
-                QtControls.ComboBox {
-                    id: fontFamilyComboBox
-                    QtLayouts.Layout.fillWidth: true
-                    // ComboBox's sizing is just utterly broken
-                    QtLayouts.Layout.minimumWidth: units.gridUnit * 10
-                    model: fontsModel
-                    // doesn't autodeduce from model because we manually populate it
-                    textRole: "text"
-
-                    onCurrentIndexChanged: {
-                        var current = model.get(currentIndex)
-                        if (current) {
-                            cfg_fontFamily = current.value
-                            appearancePage.configurationChanged()
-                        }
-                    }
-                }
-
-                // spacer, cannot do Qt.AlignTop on the font style label + rowSpan \
                3, otherwise looks odd
-                Item {
-                    QtLayouts.Layout.fillWidth: true
-                    QtLayouts.Layout.rowSpan: 2
-                }
-
-                QtControls.CheckBox {
-                    id: boldCheckBox
-                    text: i18n("Bold text")
-                }
-
-                QtControls.CheckBox {
-                    id: italicCheckBox
-                    text: i18n("Italic text")
-                }
-            }
-        }
 
         QtControls.GroupBox {
             QtLayouts.Layout.fillWidth: true
@@ -212,6 +162,48 @@ Item {
                 }
             }
         }
+
+        QtLayouts.RowLayout {
+            QtLayouts.Layout.fillWidth: true
+
+            QtControls.Label {
+                text: i18n("Font style:")
+            }
+
+            QtControls.ComboBox {
+                id: fontFamilyComboBox
+                QtLayouts.Layout.fillWidth: true
+                // ComboBox's sizing is just utterly broken
+                QtLayouts.Layout.minimumWidth: units.gridUnit * 10
+                model: fontsModel
+                // doesn't autodeduce from model because we manually populate it
+                textRole: "text"
+
+                onCurrentIndexChanged: {
+                    var current = model.get(currentIndex)
+                    if (current) {
+                        cfg_fontFamily = current.value
+                        appearancePage.configurationChanged()
+                    }
+                }
+            }
+
+            QtControls.Button {
+                id: boldCheckBox
+                tooltip: i18n("Bold text")
+                iconName: "format-text-bold"
+                checkable: true
+                Accessible.name: tooltip
+            }
+
+            QtControls.Button {
+                id: italicCheckBox
+                tooltip: i18n("Italic text")
+                iconName: "format-text-italic"
+                checkable: true
+                Accessible.name: tooltip
+            }
+        }
     }
 
     Component.onCompleted: {


[prev in list] [next in list] [prev in thread] [next in thread]