Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
Plasma Desktop
Commits
71ea5098
Commit
71ea5098
authored
Jan 14, 2022
by
Nate Graham
Browse files
configuration: use standard QQC2 import name
GIT_SILENT
parent
c89b24b5
Changes
5
Hide whitespace changes
Inline
Side-by-side
desktoppackage/contents/configuration/ConfigurationContainmentActions.qml
View file @
71ea5098
...
...
@@ -5,7 +5,7 @@
*/
import
QtQuick
2.0
import
QtQuick
.
Controls
2.3
as
Q
tControls
import
QtQuick
.
Controls
2.3
as
Q
QC2
import
QtQuick
.
Layouts
1.0
Item
{
...
...
@@ -82,7 +82,7 @@ Item {
Repeater
{
model
:
configDialog
.
currentContainmentActionsModel
Q
tControls
.ComboBox
{
Q
QC2
.ComboBox
{
id
:
pluginsCombo
// "index" argument of onActivated shadows the model index
readonly
property
int
pluginIndex
:
index
...
...
@@ -124,7 +124,7 @@ Item {
Layout.column
:
2
Layout.row
:
index
Q
tControls
.Button
{
Q
QC2
.Button
{
icon.name
:
"
configure
"
width
:
height
enabled
:
model
.
hasConfigurationInterface
...
...
@@ -132,14 +132,14 @@ Item {
configDialog
.
currentContainmentActionsModel
.
showConfiguration
(
index
,
this
);
}
}
Q
tControls
.Button
{
Q
QC2
.Button
{
icon.name
:
"
dialog-information
"
width
:
height
onClicked
:
{
configDialog
.
currentContainmentActionsModel
.
showAbout
(
index
,
this
);
}
}
Q
tControls
.Button
{
Q
QC2
.Button
{
icon.name
:
"
list-remove
"
width
:
height
onClicked
:
{
...
...
desktoppackage/contents/configuration/ConfigurationContainmentAppearance.qml
View file @
71ea5098
...
...
@@ -6,7 +6,7 @@
import
QtQuick
2.0
import
org
.
kde
.
plasma
.
configuration
2.0
import
QtQuick
.
Controls
2.3
as
Q
tControls
import
QtQuick
.
Controls
2.3
as
Q
QC2
import
QtQuick
.
Layouts
1.1
import
QtQml
2.15
...
...
@@ -77,7 +77,7 @@ AbstractKCM {
id
:
parentLayout
// needed for twinFormLayouts to work in wallpaper plugins
twinFormLayouts
:
main
.
currentItem
.
formLayout
Layout.fillWidth
:
true
Q
tControls
.ComboBox
{
Q
QC2
.ComboBox
{
id
:
pluginComboBox
Layout.preferredWidth
:
Math
.
max
(
implicitWidth
,
wallpaperComboBox
.
implicitWidth
)
Kirigami.FormData.label
:
i18nd
(
"
plasma_shell_org.kde.plasma.desktop
"
,
"
Layout:
"
)
...
...
@@ -96,7 +96,7 @@ AbstractKCM {
Layout.fillWidth
:
true
visible
:
!
switchContainmentWarning
.
visible
Kirigami.FormData.label
:
i18nd
(
"
plasma_shell_org.kde.plasma.desktop
"
,
"
Wallpaper type:
"
)
Q
tControls
.ComboBox
{
Q
QC2
.ComboBox
{
id
:
wallpaperComboBox
Layout.preferredWidth
:
Math
.
max
(
implicitWidth
,
pluginComboBox
.
implicitWidth
)
model
:
configDialog
.
wallpaperConfigModel
...
...
@@ -122,13 +122,13 @@ AbstractKCM {
id
:
switchContainmentWarning
Layout.fillWidth
:
true
visible
:
configDialog
.
containmentPlugin
!==
root
.
containmentPlugin
Q
tControls
.Label
{
Q
QC2
.Label
{
Layout.fillWidth
:
true
text
:
i18nd
(
"
plasma_shell_org.kde.plasma.desktop
"
,
"
Layout changes must be applied before other changes can be made
"
)
wrapMode
:
Text
.
Wrap
horizontalAlignment
:
Text
.
AlignHCenter
}
Q
tControls
.Button
{
Q
QC2
.Button
{
Layout.alignment
:
Qt
.
AlignHCenter
text
:
i18nd
(
"
plasma_shell_org.kde.plasma.desktop
"
,
"
Apply now
"
)
onClicked
:
saveConfig
()
...
...
@@ -151,7 +151,7 @@ AbstractKCM {
id
:
emptyConfig
}
Q
tControls
.StackView
{
Q
QC2
.StackView
{
id
:
main
Layout.fillHeight
:
true
;
...
...
desktoppackage/contents/configuration/ConfigurationKcmPage.qml
View file @
71ea5098
...
...
@@ -7,7 +7,7 @@
*/
import
QtQuick
2.6
import
QtQuick
.
Controls
2.2
as
Controls
import
QtQuick
.
Controls
2.2
as
QQC2
import
org
.
kde
.
kirigami
2.5
as
Kirigami
Kirigami.Page
{
...
...
desktoppackage/contents/configuration/ConfigurationShortcuts.qml
View file @
71ea5098
...
...
@@ -5,7 +5,7 @@
*/
import
QtQuick
2.0
import
QtQuick
.
Controls
2.3
as
Q
tControls
import
QtQuick
.
Controls
2.3
as
Q
QC2
import
QtQuick
.
Layouts
1.0
import
org
.
kde
.
kquickcontrols
2.0
import
org
.
kde
.
kirigami
2.14
as
Kirigami
...
...
@@ -21,7 +21,7 @@ Kirigami.ScrollablePage {
}
ColumnLayout
{
Q
tControls
.Label
{
Q
QC2
.Label
{
Layout.fillWidth
:
true
text
:
i18nd
(
"
plasma_shell_org.kde.plasma.desktop
"
,
"
This shortcut will activate the applet as though it had been clicked.
"
)
wrapMode
:
Text
.
WordWrap
...
...
desktoppackage/contents/configuration/MouseEventInputButton.qml
View file @
71ea5098
...
...
@@ -5,12 +5,12 @@
*/
import
QtQuick
2.0
import
QtQuick
.
Controls
2.3
as
Q
tControls
import
QtQuick
.
Controls
2.3
as
Q
QC2
import
QtQuick
.
Layouts
1.0
import
org
.
kde
.
plasma
.
core
2.0
as
PlasmaCore
Q
tControls
.Button
{
Q
QC2
.Button
{
id
:
mouseInputButton
property
string
defaultText
:
i18nd
(
"
plasma_shell_org.kde.plasma.desktop
"
,
"
Add Action
"
)
text
:
defaultText
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment