github-forks
/
latte-dock
mirror of https://github.com/KDE/latte-dock.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "use PlasmaComponents3.ComboBox in dock config win"

Browse Source 
This reverts commit cfab941889.
pull/2/head
Michail Vourlakos 7 years ago
parent 61227abaeb
commit dd14fdb6d0
5 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File

2
CMakeLists.txt
Unescape Escape View File

@ -10,7 +10,7 @@ set(BUG_ADDRESS "https://github.com/psifidotos/Latte-Dock/issues")
set(FAQS "https://github.com/psifidotos/Latte-Dock/wiki/F.A.Q.")
set(QT_MIN_VERSION "5.7.0")
set(KF5_MIN_VERSION "5.33.0")
set(KF5_MIN_VERSION "5.29.0")
set(KF5_LOCALE_PREFIX "")

5
shell/package/contents/configuration/AppearanceConfig.qml
Unescape Escape View File

@ -26,7 +26,6 @@ import QtQuick.Dialogs 1.2
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.components 3.0 as PlasmaComponents3
import org.kde.plasma.plasmoid 2.0
import org.kde.latte 0.1 as Latte
@ -69,7 +68,7 @@ PlasmaComponents.Page {
Layout.rightMargin: units.smallSpacing * 2
spacing: units.smallSpacing
PlasmaComponents3.ComboBox {
PlasmaComponents.ComboBox {
id: layoutCmb
Layout.fillWidth: true
@ -863,7 +862,7 @@ PlasmaComponents.Page {
text:" "
enabled: showAppletShadow.checked
PlasmaComponents3.ComboBox {
PlasmaComponents.ComboBox {
id: restoreCmb
anchors.fill: parent
enabled: backColorBtn.enabled

3
shell/package/contents/configuration/BehaviorConfig.qml
Unescape Escape View File

@ -25,7 +25,6 @@ import QtGraphicalEffects 1.0
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.components 3.0 as PlasmaComponents3
import org.kde.plasma.plasmoid 2.0
import org.kde.latte 0.1 as Latte
@ -131,7 +130,7 @@ PlasmaComponents.Page {
Layout.alignment: Qt.AlignRight
}
PlasmaComponents3.ComboBox {
PlasmaComponents.ComboBox {
id: screenCmb
Layout.fillWidth: true
Component.onCompleted: screenRow.updateScreens();

3
shell/package/contents/configuration/LatteDockConfiguration.qml
Unescape Escape View File

@ -26,7 +26,6 @@ import QtQuick.Window 2.2
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.components 3.0 as PlasmaComponents3
import org.kde.plasma.extras 2.0 as PlasmaExtras
import QtQuick.Controls.Styles.Plasma 2.0 as Styles
@ -383,7 +382,7 @@ FocusScope {
Layout.fillWidth: true
text:" "
PlasmaComponents3.ComboBox {
PlasmaComponents.ComboBox {
id: actionsCmb
anchors.fill: parent
enabled: addDock.enabled

9
shell/package/contents/configuration/TasksConfig.qml
Unescape Escape View File

@ -24,7 +24,6 @@ import QtGraphicalEffects 1.0
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.components 3.0 as PlasmaComponents3
import org.kde.plasma.plasmoid 2.0
import org.kde.latte 0.1 as Latte
@ -170,7 +169,7 @@ PlasmaComponents.Page {
Layout.alignment: Qt.AlignRight
}
PlasmaComponents3.ComboBox {
PlasmaComponents.ComboBox {
id: middleClickAction
Layout.fillWidth: true
model: [i18nc("The click action", "None"), i18n("Close Window or Group"),
@ -186,7 +185,7 @@ PlasmaComponents.Page {
spacing: units.smallSpacing
visible: plasmoid.configuration.advanced
PlasmaComponents3.ComboBox {
PlasmaComponents.ComboBox {
id: modifier
Layout.maximumWidth: theme.mSize(theme.defaultFont).width * 5
model: ["Shift", "Ctrl", "Alt", "Meta"]
@ -199,7 +198,7 @@ PlasmaComponents.Page {
text: "+"
}
PlasmaComponents3.ComboBox {
PlasmaComponents.ComboBox {
id: modifierClick
Layout.maximumWidth: theme.mSize(theme.defaultFont).width * 10
model: [i18n("Left Click"), i18n("Middle Click"), i18n("Right Click")]
@ -212,7 +211,7 @@ PlasmaComponents.Page {
text: "="
}
PlasmaComponents3.ComboBox {
PlasmaComponents.ComboBox {
id: modifierClickAction
Layout.fillWidth: true
model: [i18nc("The click action", "None"), i18n("Close Window or Group"),

Write Preview
Loading…
Cancel
Save