Commit 7104d72c authored by Nate Graham's avatar Nate Graham
Browse files

Use standard QQC2 import name everywhere

GIT_SILENT
parent 71ea5098
......@@ -6,7 +6,7 @@
*/
import QtQuick 2.5
import QtQuick.Controls 2.5 as QtControls
import QtQuick.Controls 2.5 as QQC2
import org.kde.kirigami 2.5 as Kirigami
......@@ -58,15 +58,15 @@ Kirigami.FormLayout {
cfg_displayedTextChanged();
}
QtControls.ButtonGroup {
QQC2.ButtonGroup {
id: displayedTextGroup
}
QtControls.ButtonGroup {
QQC2.ButtonGroup {
id: currentDesktopSelectedGroup
}
QtControls.CheckBox {
QQC2.CheckBox {
id: showWindowIcons
Kirigami.FormData.label: i18n("General:")
......@@ -74,12 +74,12 @@ Kirigami.FormLayout {
text: i18n("Show application icons on window outlines")
}
QtControls.CheckBox {
QQC2.CheckBox {
id: showOnlyCurrentScreen
text: i18n("Show only current screen")
}
QtControls.CheckBox {
QQC2.CheckBox {
id: wrapPage
text: i18n("Navigation wraps around")
}
......@@ -90,7 +90,7 @@ Kirigami.FormLayout {
}
QtControls.ComboBox {
QQC2.ComboBox {
id: pagerLayout
Kirigami.FormData.label: i18n("Layout:")
......@@ -106,24 +106,24 @@ Kirigami.FormLayout {
}
QtControls.RadioButton {
QQC2.RadioButton {
id: noTextRadio
Kirigami.FormData.label: i18n("Text display:")
QtControls.ButtonGroup.group: displayedTextGroup
QQC2.ButtonGroup.group: displayedTextGroup
text: i18n("No text")
onCheckedChanged: if (checked) cfg_displayedText = 2;
}
QtControls.RadioButton {
QQC2.RadioButton {
id: desktopNumberRadio
QtControls.ButtonGroup.group: displayedTextGroup
QQC2.ButtonGroup.group: displayedTextGroup
text: isActivityPager ? i18n("Activity number") : i18n("Desktop number")
onCheckedChanged: if (checked) cfg_displayedText = 0;
}
QtControls.RadioButton {
QQC2.RadioButton {
id: desktopNameRadio
QtControls.ButtonGroup.group: displayedTextGroup
QQC2.ButtonGroup.group: displayedTextGroup
text: isActivityPager ? i18n("Activity name") : i18n("Desktop name")
onCheckedChanged: if (checked) cfg_displayedText = 1;
}
......@@ -134,18 +134,18 @@ Kirigami.FormLayout {
}
QtControls.RadioButton {
QQC2.RadioButton {
id: doesNothingRadio
Kirigami.FormData.label: isActivityPager ? i18n("Selecting current Activity:") : i18n("Selecting current virtual desktop:")
QtControls.ButtonGroup.group: currentDesktopSelectedGroup
QQC2.ButtonGroup.group: currentDesktopSelectedGroup
text: i18n("Does nothing")
onCheckedChanged: if (checked) cfg_currentDesktopSelected = 0;
}
QtControls.RadioButton {
QQC2.RadioButton {
id: showsDesktopRadio
QtControls.ButtonGroup.group: currentDesktopSelectedGroup
QQC2.ButtonGroup.group: currentDesktopSelectedGroup
text: i18n("Shows the desktop")
onCheckedChanged: if (checked) cfg_currentDesktopSelected = 1;
}
......
......@@ -5,11 +5,11 @@
*/
import QtQuick 2.12
import QtQuick.Controls 2.12 as Controls
import QtQuick.Controls 2.12 as QQC2
import org.kde.kirigami 2.7 as Kirigami
Controls.ComboBox {
QQC2.ComboBox {
id: comboBox
property string label
......@@ -21,7 +21,7 @@ Controls.ComboBox {
currentIndex: component.index
onActivated: component.select(currentIndex, true)
delegate: Controls.ItemDelegate {
delegate: QQC2.ItemDelegate {
width: comboBox.popup.width
text: modelData[comboBox.textRole]
highlighted: comboBox.highlightedIndex == index
......
......@@ -6,7 +6,7 @@
import QtQuick 2.6
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.3 as QtControls
import QtQuick.Controls 2.3 as QQC2
import QtQml 2.15
import org.kde.kirigami 2.10 as Kirigami
......@@ -90,7 +90,7 @@ KCM.ScrollViewKCM {
Layout.fillWidth: true
}
QtControls.ComboBox {
QQC2.ComboBox {
id: filterCombo
textRole: "text"
enabled: kcm.kdedRunning || currentIndex > 0
......@@ -169,7 +169,7 @@ KCM.ScrollViewKCM {
}
contentItem: RowLayout {
QtControls.CheckBox {
QQC2.CheckBox {
id: autoloadCheck
// Keep focus on the delegate
focusPolicy: Qt.NoFocus
......@@ -177,7 +177,7 @@ KCM.ScrollViewKCM {
visible: delegate.checkable
onToggled: model.autoloadEnabled = !model.autoloadEnabled
QtControls.ToolTip {
QQC2.ToolTip {
text: delegate.Accessible.description
}
......@@ -190,7 +190,7 @@ KCM.ScrollViewKCM {
Layout.fillWidth: true
spacing: 0
QtControls.Label {
QQC2.Label {
id: displayLabel
Layout.fillWidth: true
text: delegate.text
......@@ -199,7 +199,7 @@ KCM.ScrollViewKCM {
color: (delegate.highlighted || (delegate.pressed && delegate.supportsMouseEvents)) ? delegate.activeTextColor : delegate.textColor
}
QtControls.Label {
QQC2.Label {
Layout.fillWidth: true
text: model.description
// FIXME do we have a descriptive label component?
......@@ -210,7 +210,7 @@ KCM.ScrollViewKCM {
}
}
QtControls.Label {
QQC2.Label {
id: statusLabel
horizontalAlignment: Text.AlignRight
opacity: model.status === Private.KCM.Running ? 1 : delegate.hovered ? 0.8 : 0.6
......@@ -225,7 +225,7 @@ KCM.ScrollViewKCM {
}
}
QtControls.Button {
QQC2.Button {
icon.name: model.status === Private.KCM.Running ? "media-playback-pause" : "media-playback-start"
visible: kcm.kdedRunning && model.status !== Private.KCM.UnknownStatus && model.type !== Private.KCM.OnDemandType
onClicked: {
......@@ -240,7 +240,7 @@ KCM.ScrollViewKCM {
}
Accessible.name: model.status === Private.KCM.Running ? i18n("Stop Service") : i18n("Start Service")
QtControls.ToolTip {
QQC2.ToolTip {
text: parent.Accessible.name
}
}
......
......@@ -6,7 +6,7 @@
import QtQuick 2.1
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.2 as QtControls
import QtQuick.Controls 2.2 as QQC2
import org.kde.kirigami 2.3 as Kirigami
import org.kde.kcm 1.3 as KCM
import org.kde.private.kcms.launchfeedback 1.0 as Private
......@@ -21,19 +21,19 @@ KCM.SimpleKCM {
readonly property bool cursorImmutable: kcm.launchFeedbackSettings.isImmutable("busyCursor") || kcm.launchFeedbackSettings.isImmutable("blinking") || kcm.launchFeedbackSettings.isImmutable("bouncing")
QtControls.ButtonGroup {
QQC2.ButtonGroup {
id: busyCursorGroup
onCheckedButtonChanged: kcm.launchFeedbackSettings.setSelectedBusyCursor(checkedButton.settingName)
}
QtControls.RadioButton {
QQC2.RadioButton {
id: busyCursorDisabled
readonly property string settingName: "busyCursorDisabled"
Kirigami.FormData.label: i18n("Cursor:")
text: i18n("No Feedback")
checked: kcm.launchFeedbackSettings.busyCursorDisabled
QtControls.ButtonGroup.group: busyCursorGroup
QQC2.ButtonGroup.group: busyCursorGroup
KCM.SettingStateBinding {
configObject: kcm.launchFeedbackSettings
......@@ -42,13 +42,13 @@ KCM.SimpleKCM {
}
}
QtControls.RadioButton {
QQC2.RadioButton {
id: busyCursorStatic
readonly property string settingName: "busyCursorStatic"
text: i18n("Static")
checked: kcm.launchFeedbackSettings.busyCursorStatic
QtControls.ButtonGroup.group: busyCursorGroup
QQC2.ButtonGroup.group: busyCursorGroup
KCM.SettingStateBinding {
configObject: kcm.launchFeedbackSettings
......@@ -57,13 +57,13 @@ KCM.SimpleKCM {
}
}
QtControls.RadioButton {
QQC2.RadioButton {
id: busyCursorBlinking
readonly property string settingName: "busyCursorBlinking"
text: i18n("Blinking")
checked: kcm.launchFeedbackSettings.busyCursorBlinking
QtControls.ButtonGroup.group: busyCursorGroup
QQC2.ButtonGroup.group: busyCursorGroup
KCM.SettingStateBinding {
configObject: kcm.launchFeedbackSettings
......@@ -72,13 +72,13 @@ KCM.SimpleKCM {
}
}
QtControls.RadioButton {
QQC2.RadioButton {
id: busyCursorBouncing
readonly property string settingName: "busyCursorBouncing"
text: i18n("Bouncing")
checked: kcm.launchFeedbackSettings.busyCursorBouncing
QtControls.ButtonGroup.group: busyCursorGroup
QQC2.ButtonGroup.group: busyCursorGroup
KCM.SettingStateBinding {
configObject: kcm.launchFeedbackSettings
......@@ -87,7 +87,7 @@ KCM.SimpleKCM {
}
}
QtControls.CheckBox {
QQC2.CheckBox {
id: taskManagerNotification
Kirigami.FormData.label: i18n("Task Manager:")
......@@ -103,7 +103,7 @@ KCM.SimpleKCM {
}
}
QtControls.SpinBox {
QQC2.SpinBox {
id: notificationTimeout
Kirigami.FormData.label: i18n("Stop animation after:")
......
......@@ -6,7 +6,7 @@
*/
import QtQuick 2.7
import QtQuick.Controls 2.0 as Controls
import QtQuick.Controls 2.0 as QQC2
import QtQuick.Layouts 1.3 as Layouts
import org.kde.kcm 1.1 as KCM
......@@ -72,7 +72,7 @@ Kirigami.ScrollablePage {
enabled: deviceCount
// Device
Controls.ComboBox {
QQC2.ComboBox {
Kirigami.FormData.label: i18nd("kcmmouse", "Device:")
id: deviceSelector
enabled: deviceCount > 1
......@@ -98,7 +98,7 @@ Kirigami.ScrollablePage {
}
// General
Controls.CheckBox {
QQC2.CheckBox {
Kirigami.FormData.label: i18nd("kcmmouse", "General:")
id: deviceEnabled
text: i18nd("kcmmouse", "Device enabled")
......@@ -124,7 +124,7 @@ Kirigami.ScrollablePage {
}
}
Controls.CheckBox {
QQC2.CheckBox {
id: leftHanded
text: i18nd("kcmmouse", "Left handed mode")
......@@ -149,7 +149,7 @@ Kirigami.ScrollablePage {
}
}
Controls.CheckBox {
QQC2.CheckBox {
id: middleEmulation
text: i18nd("kcmmouse", "Press left and right buttons for middle-click")
......@@ -179,7 +179,7 @@ Kirigami.ScrollablePage {
}
// Acceleration
Controls.Slider {
QQC2.Slider {
Kirigami.FormData.label: i18nd("kcmmouse", "Pointer speed:")
id: accelSpeed
......@@ -241,7 +241,7 @@ Kirigami.ScrollablePage {
}
}
Controls.RadioButton {
QQC2.RadioButton {
id: accelProfileFlat
text: i18nd("kcmmouse", "Flat")
......@@ -251,7 +251,7 @@ Kirigami.ScrollablePage {
onCheckedChanged: accelProfile.syncCurrent()
}
Controls.RadioButton {
QQC2.RadioButton {
id: accelProfileAdaptive
text: i18nd("kcmmouse", "Adaptive")
......@@ -267,7 +267,7 @@ Kirigami.ScrollablePage {
}
// Scrolling
Controls.CheckBox {
QQC2.CheckBox {
Kirigami.FormData.label: i18nd("kcmmouse", "Scrolling:")
id: naturalScroll
text: i18nd("kcmmouse", "Invert scroll direction")
......@@ -296,7 +296,7 @@ Kirigami.ScrollablePage {
columns: 3
Controls.Slider {
QQC2.Slider {
id: scrollFactor
from: 0
......@@ -338,13 +338,13 @@ Kirigami.ScrollablePage {
}
//row 2
Controls.Label {
QQC2.Label {
text: i18ndc("kcmmouse", "Slower Scroll", "Slower")
}
Item {
Layouts.Layout.fillWidth: true
}
Controls.Label {
QQC2.Label {
text: i18ndc("kcmmouse", "Faster Scroll Speed", "Faster")
}
}
......
......@@ -6,7 +6,7 @@
*/
import QtQuick 2.7
import QtQuick.Controls 2.0 as Controls
import QtQuick.Controls 2.0 as QQC2
import QtQuick.Layouts 1.3 as Layouts
import org.kde.kcm 1.1 as KCM
......@@ -50,7 +50,7 @@ Kirigami.ScrollablePage {
id: formLayout
// General
Controls.CheckBox {
QQC2.CheckBox {
Kirigami.FormData.label: i18nd("kcmmouse", "General:")
id: leftHanded
text: i18nd("kcmmouse", "Left handed mode")
......@@ -76,7 +76,7 @@ Kirigami.ScrollablePage {
}
}
Controls.CheckBox {
QQC2.CheckBox {
id: middleEmulation
text: i18nd("kcmmouse", "Press left and right buttons for middle-click")
......@@ -106,7 +106,7 @@ Kirigami.ScrollablePage {
}
// Acceleration
Controls.Slider {
QQC2.Slider {
Kirigami.FormData.label: i18nd("kcmmouse", "Pointer speed:")
id: accelSpeed
......@@ -168,7 +168,7 @@ Kirigami.ScrollablePage {
}
}
Controls.RadioButton {
QQC2.RadioButton {
id: accelProfileFlat
text: i18nd("kcmmouse", "Flat")
......@@ -178,7 +178,7 @@ Kirigami.ScrollablePage {
onCheckedChanged: accelProfile.syncCurrent()
}
Controls.RadioButton {
QQC2.RadioButton {
id: accelProfileAdaptive
text: i18nd("kcmmouse", "Adaptive")
......@@ -194,7 +194,7 @@ Kirigami.ScrollablePage {
}
// Scrolling
Controls.CheckBox {
QQC2.CheckBox {
Kirigami.FormData.label: i18nd("kcmmouse", "Scrolling:")
id: naturalScroll
text: i18nd("kcmmouse", "Invert scroll direction")
......
......@@ -6,7 +6,7 @@
*/
import QtQuick 2.7
import QtQuick.Controls 2.0 as Controls
import QtQuick.Controls 2.0 as QQC2
import QtQuick.Layouts 1.3 as Layouts
import org.kde.kcm 1.1 as KCM
......@@ -111,7 +111,7 @@ Kirigami.ScrollablePage {
visible: touchpadCount > 0
// Device
Controls.ComboBox {
QQC2.ComboBox {
Kirigami.FormData.label: i18nd("kcm_touchpad", "Device:")
id: deviceSelector
......@@ -138,13 +138,13 @@ Kirigami.ScrollablePage {
}
// General settings
Controls.CheckBox {
QQC2.CheckBox {
Kirigami.FormData.label: i18nd("kcm_touchpad", "General:")
id: deviceEnabled
text: i18nd("kcm_touchpad", "Device enabled")
hoverEnabled: true
Controls.ToolTip {
QQC2.ToolTip {
text: i18nd("kcm_touchpad", "Accept input through this device.")
visible: parent.hovered
delay: 1000
......@@ -167,12 +167,12 @@ Kirigami.ScrollablePage {
}
}
Controls.CheckBox {
QQC2.CheckBox {
id: dwt
text: i18nd("kcm_touchpad", "Disable while typing")
hoverEnabled: true
Controls.ToolTip {
QQC2.ToolTip {
text: i18nd("kcm_touchpad", "Disable touchpad while typing to prevent accidental inputs.")
visible: parent.hovered
delay: 1000
......@@ -195,12 +195,12 @@ Kirigami.ScrollablePage {
}
}
Controls.CheckBox {
QQC2.CheckBox {
id: leftHanded
text: i18nd("kcm_touchpad", "Left handed mode")
hoverEnabled: true
Controls.ToolTip {
QQC2.ToolTip {
text: i18nd("kcm_touchpad", "Swap left and right buttons.")
visible: parent.hovered
delay: 1000
......@@ -223,12 +223,12 @@ Kirigami.ScrollablePage {
}
}
Controls.CheckBox {
QQC2.CheckBox {
id: middleEmulation
text: i18nd("kcm_touchpad", "Press left and right buttons for middle click")
hoverEnabled: true
Controls.ToolTip {
QQC2.ToolTip {
text: i18nd("kcm_touchpad", "Clicking left and right button simultaneously sends middle button click.")
visible: parent.hovered
delay: 1000
......@@ -282,7 +282,7 @@ Kirigami.ScrollablePage {
}
}
Controls.Slider {
QQC2.Slider {
id: accelSpeedSlider
from: 1
......@@ -312,7 +312,7 @@ Kirigami.ScrollablePage {
}
}
Controls.SpinBox {
QQC2.SpinBox {
id: accelSpeedSpinbox
Layouts.Layout.minimumWidth: Kirigami.Units.gridUnit * 4
......@@ -385,12 +385,12 @@ Kirigami.ScrollablePage {
}
}
Controls.RadioButton {
QQC2.RadioButton {
id: accelProfileFlat
text: i18nd("kcm_touchpad", "Flat")
hoverEnabled: true
Controls.ToolTip {
QQC2.ToolTip {
text: i18nd("kcm_touchpad", "Cursor moves the same distance as finger.")
visible: parent.hovered
delay: 1000
......@@ -398,12 +398,12 @@ Kirigami.ScrollablePage {
onCheckedChanged: accelProfile.syncCurrent()
}
Controls.RadioButton {
QQC2.RadioButton {
id: accelProfileAdaptive
text: i18nd("kcm_touchpad", "Adaptive")
hoverEnabled: true
Controls.ToolTip {
QQC2.ToolTip {
text: i18nd("kcm_touchpad", "Cursor travel distance depends on movement speed of finger.")
visible: parent.hovered
delay: 1000
......@@ -417,13 +417,13 @@ Kirigami.ScrollablePage {
}
// Tapping
Controls.CheckBox {
QQC2.CheckBox {
Kirigami.FormData.label: i18nd("kcm_touchpad", "Tapping:")
id: tapToClick
text: i18nd("kcm_touchpad", "Tap-to-click")
hoverEnabled: true
Controls.ToolTip {
QQC2.ToolTip {
text: i18nd("kcm_touchpad", "Single tap is left button click.")
visible: parent.hovered
delay: 1000
......@@ -451,12 +451,12 @@ Kirigami.ScrollablePage {
}
}
Controls.CheckBox {
QQC2.CheckBox {
id: tapAndDrag
text: i18nd("kcm_touchpad", "Tap-and-drag")
hoverEnabled: true
Controls.ToolTip {
QQC2.ToolTip {
text: i18nd("kcm_touchpad", "Sliding over touchpad directly after tap drags.")
visible: parent.hovered
delay: 1000
......@@ -482,12 +482,12 @@ Kirigami.ScrollablePage {
}
}
Controls.CheckBox {
QQC2.CheckBox {
id: tapAndDragLock
text: i18nd("kcm_touchpad", "Tap-and-drag lock")
hoverEnabled: true
Controls.ToolTip {