replace testcontainment with real desktopcontainment
Delete the testcontainment package, which is only one file + metadata anyway. This means that in order to run the default plasma-shell, an installation of kde-workspace[frameworks-scratch] is needed.
This commit is contained in:
Sebastian Kügler
parent
7d607b49a8
commit
61fc0fece0
@ -98,6 +98,5 @@ private:
|
||||
#define K_EXPORT_PLASMA_PACKAGE(libname, classname) \
|
||||
K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) \
|
||||
K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION)
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -1,3 +1,2 @@
|
||||
|
||||
installPackage(testcontainment org.kde.testcontainment plasma/plasmoids containment)
|
||||
installPackage(testpanel org.kde.panel plasma/plasmoids containment)
|
||||
|
||||
@ -1,219 +0,0 @@
|
||||
/*
|
||||
* Copyright 2013 Marco Martin <mart@kde.org>
|
||||
*
|
||||
* 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 org.kde.plasma.core 2.0 as PlasmaCore
|
||||
import org.kde.plasma.components 2.0 as PlasmaComponents
|
||||
|
||||
Item {
|
||||
id: root
|
||||
width: 640
|
||||
height: 480
|
||||
|
||||
property Item toolBox
|
||||
|
||||
Connections {
|
||||
target: plasmoid
|
||||
onAppletAdded: {
|
||||
var container = appletContainerComponent.createObject(root)
|
||||
container.visible = true
|
||||
print("Applet added: " + applet)
|
||||
applet.parent = container
|
||||
container.applet = applet
|
||||
applet.anchors.fill= applet.parent
|
||||
applet.visible = true
|
||||
}
|
||||
}
|
||||
|
||||
Component {
|
||||
id: appletContainerComponent
|
||||
Item {
|
||||
id: frameParent
|
||||
x: 50
|
||||
y: 50
|
||||
|
||||
property int small: 90
|
||||
property int large: 400
|
||||
|
||||
width: large + frame.margins.left + frame.margins.right
|
||||
height: large + frame.margins.top + frame.margins.bottom
|
||||
|
||||
property alias applet: appletContainer.children
|
||||
onAppletChanged: {
|
||||
if (appletContainer.children.length == 0) {
|
||||
killAnim.running = true
|
||||
}
|
||||
}
|
||||
PlasmaCore.FrameSvgItem {
|
||||
id: frame
|
||||
anchors.fill: parent
|
||||
|
||||
property int tm: 0
|
||||
property int lm: 0
|
||||
|
||||
imagePath: applet.length > 0 && applet[0].backgroundHints == 0 ? "" : "widgets/background"
|
||||
|
||||
onImagePathChanged: {
|
||||
// Reposition applet so it fits into the frame
|
||||
if (imagePath == "") {
|
||||
frameParent.x = frameParent.x + lm;
|
||||
frameParent.y = frameParent.y + tm;
|
||||
} else {
|
||||
// Cache values, so we can subtract them when the background is removed
|
||||
frame.lm = frame.margins.left;
|
||||
frame.tm = frame.margins.top;
|
||||
|
||||
frameParent.x = frameParent.x - frame.margins.left;
|
||||
frameParent.y = frameParent.y - frame.margins.top;
|
||||
}
|
||||
}
|
||||
MouseArea {
|
||||
id: mouseArea
|
||||
|
||||
property real dx: 0
|
||||
property real dy: 0
|
||||
property real startX
|
||||
property real startY
|
||||
|
||||
anchors.fill: parent
|
||||
drag.target: frameParent
|
||||
onClicked: {
|
||||
var s = (frameParent.width == frameParent.large) ? frameParent.small : frameParent.large;
|
||||
frameParent.height = s
|
||||
frameParent.width = s
|
||||
}
|
||||
onPressed: {
|
||||
speedSampleTimer.running = true
|
||||
mouseArea.startX = mouse.x
|
||||
mouseArea.startY = mouse.y
|
||||
speedSampleTimer.lastFrameParentX = frameParent.x
|
||||
speedSampleTimer.lastFrameParentY = frameParent.y
|
||||
}
|
||||
onPositionChanged: {
|
||||
//mouseArea.dx = mouse.x - mouseArea.startX
|
||||
//mouseArea.dy = mouse.y - mouseArea.startY
|
||||
dxAnim.running = false
|
||||
dyAnim.running = false
|
||||
}
|
||||
onReleased: {
|
||||
speedSampleTimer.running = false
|
||||
dxAnim.running = true
|
||||
dyAnim.running = true
|
||||
}
|
||||
Timer {
|
||||
id: speedSampleTimer
|
||||
interval: 40
|
||||
repeat: true
|
||||
property real lastFrameParentX
|
||||
property real lastFrameParentY
|
||||
onTriggered: {
|
||||
mouseArea.dx = frameParent.x - lastFrameParentX
|
||||
mouseArea.dy = frameParent.y - lastFrameParentY
|
||||
lastFrameParentX = frameParent.x
|
||||
lastFrameParentY = frameParent.y
|
||||
dxAnim.running = true
|
||||
dyAnim.running = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Item {
|
||||
id: appletContainer
|
||||
anchors {
|
||||
fill: parent
|
||||
leftMargin: frame.margins.left
|
||||
rightMargin: parent.margins.right
|
||||
topMargin: parent.margins.top
|
||||
bottomMargin: parent.margins.bottom
|
||||
}
|
||||
}
|
||||
|
||||
PlasmaComponents.BusyIndicator {
|
||||
id: busyIndicator
|
||||
z: 1000
|
||||
visible: applet.length > 0 && applet[0].busy
|
||||
running: visible
|
||||
anchors.centerIn: parent
|
||||
}
|
||||
SequentialAnimation {
|
||||
id: killAnim
|
||||
NumberAnimation {
|
||||
target: frame
|
||||
properties: "scale"
|
||||
to: 0
|
||||
duration: 250
|
||||
}
|
||||
ScriptAction { script: frame.destroy()}
|
||||
}
|
||||
}
|
||||
ShaderEffect {
|
||||
id: wobbleShader
|
||||
anchors.fill: frame
|
||||
property variant source: ShaderEffectSource {
|
||||
hideSource: true
|
||||
sourceItem: frame
|
||||
}
|
||||
|
||||
property int fadeDuration: 150
|
||||
property real time: 0
|
||||
property real dx: mouseArea.dx
|
||||
property real dy: mouseArea.dy
|
||||
property real startX: mouseArea.startX/mouseArea.width
|
||||
property real startY: mouseArea.startY/mouseArea.height
|
||||
|
||||
NumberAnimation on dx { id: dxAnim; to: 0; duration: 350; easing.type: Easing.OutElastic }
|
||||
NumberAnimation on dy { id: dyAnim; to: 0; duration: 350; easing.type: Easing.OutElastic }
|
||||
//! [fragment]
|
||||
fragmentShader: {
|
||||
"uniform lowp float qt_Opacity;" +
|
||||
"uniform highp float dx;" +
|
||||
"uniform highp float dy;" +
|
||||
"uniform highp float startX;" +
|
||||
"uniform highp float startY;" +
|
||||
"uniform sampler2D source;" +
|
||||
"varying highp vec2 qt_TexCoord0;" +
|
||||
"void main() {" +
|
||||
|
||||
" highp vec2 tmp = 1.0 / (1.0 + abs(qt_TexCoord0 - vec2(startX, startY)));" +
|
||||
" vec2 wave = qt_TexCoord0 - vec2(dx, dy) * 0.0025 * tmp.xx * tmp.yy;" +
|
||||
" gl_FragColor = texture2D(source, wave);" +
|
||||
"}"
|
||||
}
|
||||
//! [fragment]
|
||||
}
|
||||
}
|
||||
}
|
||||
PlasmaCore.IconItem {
|
||||
width: 24
|
||||
height: 24
|
||||
source: "list-add"
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
onClicked: {
|
||||
print("Add widgets ...");
|
||||
plasmoid.action("add widgets").trigger();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
print("Test Containment loaded")
|
||||
print(plasmoid)
|
||||
}
|
||||
}
|
||||
@ -1,27 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Keywords=
|
||||
Name=Containment Test
|
||||
Name[es]=Prueba de contenedor
|
||||
Name[fr]=Test du conteneur
|
||||
Name[mr]=कंटेनमेंट चाचणी
|
||||
Name[nl]=Test van container
|
||||
Name[pt]=Teste de Contentores
|
||||
Name[pt_BR]=Teste de contenção
|
||||
Name[sk]=Test uzavretia
|
||||
Name[sv]=Omgivningstest
|
||||
Name[uk]=Тестування контейнера
|
||||
Name[x-test]=xxContainment Testxx
|
||||
Type=Service
|
||||
|
||||
X-KDE-ServiceTypes=Plasma/Applet,Plasma/Containment
|
||||
X-Plasma-API=declarativeappletscript
|
||||
X-KDE-ParentApp=
|
||||
X-KDE-PluginInfo-Author=Marco Martin
|
||||
X-KDE-PluginInfo-Category=
|
||||
X-KDE-PluginInfo-Email=mart@kde.org
|
||||
X-KDE-PluginInfo-License=GPLv2+
|
||||
X-KDE-PluginInfo-Name=org.kde.testcontainment
|
||||
X-KDE-PluginInfo-Version=
|
||||
X-KDE-PluginInfo-Website=
|
||||
X-Plasma-MainScript=ui/main.qml
|
||||
@ -160,7 +160,7 @@ void DesktopCorona::checkDesktop(/*Activity *activity,*/ bool signalWhenExists,
|
||||
|
||||
//TODO: remove following when activities are restored
|
||||
if (!c) {
|
||||
c = createContainment(m_desktopDefaultsConfig.readEntry("Containment", "org.kde.testcontainment"));
|
||||
c = createContainment(m_desktopDefaultsConfig.readEntry("Containment", "org.kde.desktopcontainment"));
|
||||
}
|
||||
|
||||
if (!c) {
|
||||
|
||||
@ -109,8 +109,7 @@ QScriptValue ScriptEngine::activityForScreen(QScriptContext *context, QScriptEng
|
||||
|
||||
QScriptValue ScriptEngine::newActivity(QScriptContext *context, QScriptEngine *engine)
|
||||
{
|
||||
//FIXME: will be org.kde.desktop
|
||||
return createContainment("Desktop", "org.kde.testcontainment", context, engine);
|
||||
return createContainment("Desktop", "org.kde.desktopcontainment", context, engine);
|
||||
}
|
||||
|
||||
QScriptValue ScriptEngine::newPanel(QScriptContext *context, QScriptEngine *engine)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user