diff --git a/applets/timer/package/contents/config/config.qml b/applets/timer/package/contents/config/config.qml index f492971bf..e23c7159b 100644 --- a/applets/timer/package/contents/config/config.qml +++ b/applets/timer/package/contents/config/config.qml @@ -1,35 +1,35 @@ /* * Copyright 2015 Bernhard Friedreich * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 2.010-1301, USA. */ -import QtQuick 2.0 +import QtQuick 2.2 import org.kde.plasma.configuration 2.0 ConfigModel { ConfigCategory { name: i18nc("@title", "Appearance") icon: "preferences-desktop-color" source: "configAppearance.qml" } ConfigCategory { name: i18nc("@title", "Advanced") icon: "preferences-other" source: "configAdvanced.qml" } } diff --git a/applets/timer/package/contents/ui/configAdvanced.qml b/applets/timer/package/contents/ui/configAdvanced.qml index 8a3d972f6..f5f9779e6 100644 --- a/applets/timer/package/contents/ui/configAdvanced.qml +++ b/applets/timer/package/contents/ui/configAdvanced.qml @@ -1,68 +1,68 @@ /* * Copyright 2015 Bernhard Friedrich * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 2.010-1301, USA. */ -import QtQuick 2.0 +import QtQuick 2.2 import QtQuick.Controls 1.3 as QtControls import QtQuick.Layouts 1.0 as QtLayouts QtLayouts.ColumnLayout { id: generalPage property alias cfg_runCommand: runCommand.checked property alias cfg_command: command.text QtControls.GroupBox { id: runCommandGroup QtLayouts.Layout.fillWidth: true flat: true title: i18nc("@title:group", "Run Command") QtLayouts.ColumnLayout { anchors.fill: parent QtControls.CheckBox { id: runCommand text: i18nc("@option:check", "Execute command") onClicked: { if (checked) { command.forceActiveFocus(); } } } QtLayouts.RowLayout { QtControls.Label { enabled: runCommand.checked text: i18nc("@label:textbox", "Command:") } QtControls.TextField { id: command QtLayouts.Layout.fillWidth: true enabled: runCommand.checked } } } } Item { // tighten layout QtLayouts.Layout.fillHeight: true } } diff --git a/applets/timer/package/contents/ui/configAppearance.qml b/applets/timer/package/contents/ui/configAppearance.qml index 3baa5e839..34a37f39f 100644 --- a/applets/timer/package/contents/ui/configAppearance.qml +++ b/applets/timer/package/contents/ui/configAppearance.qml @@ -1,111 +1,111 @@ /* * Copyright 2015 Bernhard Friedreich * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 2.010-1301, USA. */ -import QtQuick 2.0 +import QtQuick 2.2 import QtQuick.Controls 1.0 as QtControls import QtQuick.Layouts 1.0 as QtLayouts QtLayouts.ColumnLayout { id: appearancePage property alias cfg_showTitle: showTitle.checked property alias cfg_title: title.text property alias cfg_showSeconds: showSeconds.checked property alias cfg_showNotification: showNotification.checked property alias cfg_notificationText: notificationText.text QtControls.GroupBox { id: displayGroup QtLayouts.Layout.fillWidth: true flat: true title: i18nc("@title:group", "Display") QtLayouts.ColumnLayout { anchors.fill: parent QtControls.CheckBox { id: showTitle text: i18nc("@option:check", "Show title"); onClicked: { if (checked) { title.forceActiveFocus(); } } } QtLayouts.RowLayout { QtControls.Label { enabled: showTitle.checked text: i18nc("@label:textbox", "Title:") } QtControls.TextField { id: title QtLayouts.Layout.fillWidth: true enabled: showTitle.checked } } QtControls.CheckBox { id: showSeconds text: i18nc("@option:check", "Show seconds"); } } } QtControls.GroupBox { id: notificationGroup QtLayouts.Layout.fillWidth: true flat: true title: i18nc("@title:group", "Notifications") QtLayouts.ColumnLayout { anchors.fill: parent QtControls.CheckBox { id: showNotification text: i18nc("@option:check", "Show notification"); onClicked: { if (checked) { notificationText.forceActiveFocus(); } } } QtLayouts.RowLayout { QtControls.Label { enabled: showNotification.checked text: i18nc("@label:textbox", "Text:") } QtControls.TextField { id: notificationText QtLayouts.Layout.fillWidth: true enabled: showNotification.checked } } } } Item { // tighten layout QtLayouts.Layout.fillHeight: true } }