From 276eac85cf8017e76c823e37a86990fcc7b6fc20 Mon Sep 17 00:00:00 2001
From: Nate Graham <nate@kde.org>
Date: Wed, 8 Jan 2020 12:29:48 -0700
Subject: [PATCH] [wallpapers/image] Put spinbox labels inside the spinboxes

Summary: They look a little nicer this way, and can be localized more easily.

Test Plan:
Before: {F7871094, size=full}
After:{F7871093, size=full}

Reviewers: #vdg, #plasma, mart

Reviewed By: #vdg, #plasma, mart

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D26529
---
 .../image/imagepackage/contents/ui/config.qml | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/wallpapers/image/imagepackage/contents/ui/config.qml b/wallpapers/image/imagepackage/contents/ui/config.qml
index 01c273090..1f5054e09 100644
--- a/wallpapers/image/imagepackage/contents/ui/config.qml
+++ b/wallpapers/image/imagepackage/contents/ui/config.qml
@@ -214,9 +214,13 @@ ColumnLayout {
                         to: 24
                         editable: true
                         onValueChanged: cfg_SlideInterval = hoursInterval.value * 3600 + minutesInterval.value * 60 + secondsInterval.value
-                    }
-                    QtControls2.Label {
-                        text: i18nd("plasma_wallpaper_org.kde.image","Hours")
+
+                        textFromValue: function(value, locale) {
+                            return i18np("%1 hour", "%1 hours", value)
+                        }
+                        valueFromText: function(text, locale) {
+                            return parseInt(text);
+                        }
                     }
                     QtControls2.SpinBox {
                         id: minutesInterval
@@ -225,9 +229,13 @@ ColumnLayout {
                         to: 60
                         editable: true
                         onValueChanged: cfg_SlideInterval = hoursInterval.value * 3600 + minutesInterval.value * 60 + secondsInterval.value
-                    }
-                    QtControls2.Label {
-                        text: i18nd("plasma_wallpaper_org.kde.image","Minutes")
+
+                        textFromValue: function(value, locale) {
+                            return i18np("%1 minute", "%1 minutes", value)
+                        }
+                        valueFromText: function(text, locale) {
+                            return parseInt(text);
+                        }
                     }
                     QtControls2.SpinBox {
                         id: secondsInterval
@@ -236,9 +244,13 @@ ColumnLayout {
                         to: 60
                         editable: true
                         onValueChanged: cfg_SlideInterval = hoursInterval.value * 3600 + minutesInterval.value * 60 + secondsInterval.value
-                    }
-                    QtControls2.Label {
-                        text: i18nd("plasma_wallpaper_org.kde.image","Seconds")
+
+                        textFromValue: function(value, locale) {
+                            return i18np("%1 second", "%1 seconds", value)
+                        }
+                        valueFromText: function(text, locale) {
+                            return parseInt(text);
+                        }
                     }
                 }
             }