diff --git a/containments/desktop/package/contents/config/config.qml b/containments/desktop/package/contents/config/config.qml
--- a/containments/desktop/package/contents/config/config.qml
+++ b/containments/desktop/package/contents/config/config.qml
@@ -45,11 +45,4 @@
source: "ConfigFilter.qml"
visible: isFolder
}
-
- ConfigCategory {
- name: i18n("Tweaks")
- icon: "preferences-other"
- source: "ConfigTweaks.qml"
- visible: plasmoid.configuration.showTweaks && ("containmentType" in plasmoid)
- }
}
diff --git a/containments/desktop/package/contents/config/main.xml b/containments/desktop/package/contents/config/main.xml
--- a/containments/desktop/package/contents/config/main.xml
+++ b/containments/desktop/package/contents/config/main.xml
@@ -131,22 +131,5 @@
all/all
-
-
-
- true
-
-
-
- true
-
-
-
- true
-
-
-
- true
-
diff --git a/containments/desktop/package/contents/ui/ConfigTweaks.qml b/containments/desktop/package/contents/ui/ConfigTweaks.qml
deleted file mode 100644
--- a/containments/desktop/package/contents/ui/ConfigTweaks.qml
+++ /dev/null
@@ -1,76 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2014 by Eike Hein *
- * *
- * 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 02110-1301 USA . *
- ***************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.4
-import QtQuick.Dialogs 1.1
-import QtQuick.Layouts 1.0
-import org.kde.kirigami 2.4 as Kirigami
-
-import org.kde.plasma.plasmoid 2.0
-
-Item {
- id: configExperimental
-
- width: childrenRect.width
- height: childrenRect.height
-
- property alias cfg_showToolbox: showToolbox.checked
- property alias cfg_pressToMove: pressToMove.checked
-
- property bool showMessage: false
-
- ColumnLayout {
-
- Kirigami.InlineMessage {
- visible: showMessage || animating
- text: i18nd("plasma_applet_org.kde.desktopcontainment", "With the Desktop Toolbox hidden, right-click on the desktop and choose 'Configure Desktop...' to access this configuration window in the future")
- Layout.fillWidth: true
- Layout.leftMargin: Kirigami.Units.smallSpacing
- Layout.rightMargin: Kirigami.Units.smallSpacing
- }
-
- Kirigami.FormLayout {
-
- CheckBox {
- id: showToolbox
-
- text: i18n("Show the desktop toolbox")
-
- // Only show the message when the user actively unchecks it, not if it's
- // already unchecked
- nextCheckState: function() {
- if (checkState === Qt.Checked) {
- showMessage = true
- return Qt.Unhecked
- } else {
- showMessage = false
- return Qt.Checked
- }
- }
- }
-
- CheckBox {
- id: pressToMove
-
- text: i18n("Press and hold widgets to move them and reveal their handles")
- }
- }
- }
-}
diff --git a/containments/desktop/package/contents/ui/main.qml b/containments/desktop/package/contents/ui/main.qml
--- a/containments/desktop/package/contents/ui/main.qml
+++ b/containments/desktop/package/contents/ui/main.qml
@@ -239,50 +239,6 @@
CompactRepresentation { folderView: folderViewLayer.view }
}
- Connections {
- target: plasmoid
-
- ignoreUnknownSignals: true
-
-
- onImmutableChanged: {
- if (root.isContainment && !plasmoid.immutable) {
- pressToMoveHelp.show();
- }
- }
- }
-
- Connections {
- target: plasmoid.configuration
-
- onPressToMoveChanged: {
- if (plasmoid.configuration.pressToMove && plasmoid.configuration.pressToMoveHelp && !plasmoid.immutable) {
- pressToMoveHelp.show();
- }
- }
- }
-
- Binding {
- target: toolBox
- property: "visible"
- value: plasmoid.configuration.showToolbox
- }
-
- Desktop.InfoNotification {
- id: pressToMoveHelp
-
- enabled: plasmoid.configuration.pressToMove && plasmoid.configuration.pressToMoveHelp
-
- iconName: "plasma"
- titleText: i18n("Widgets unlocked")
- text: i18n("You can press and hold widgets to move them and reveal their handles.")
- acknowledgeActionText: i18n("Got it")
-
- onAcknowledged: {
- plasmoid.configuration.pressToMoveHelp = false;
- }
- }
-
PlasmaCore.FrameSvgItem {
id : highlightItemSvg
@@ -346,7 +302,7 @@
id: appletContainer
editModeCondition: plasmoid.immutable
? ContainmentLayoutManager.ItemContainer.Locked
- : (plasmoid.configuration.pressToMove ? ContainmentLayoutManager.ItemContainer.AfterPressAndHold : ContainmentLayoutManager.ItemContainer.AfterMouseOver)
+ : ContainmentLayoutManager.ItemContainer.AfterPressAndHold
configOverlayComponent: ConfigOverlay {}
onUserDrag: {
var pos = mapToItem(root.parent, dragCenter.x, dragCenter.y);