From 498dcb30b61875a10ed627393858b9ca3bdd914d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= Date: Tue, 26 Mar 2013 22:54:37 +0100 Subject: [PATCH] enable a few more things --- .../testcomponentsapplet/metadata.desktop | 2 +- .../applets/testshaderapplet/metadata.desktop | 3 ++- .../contents/explorer/WidgetExplorer.qml | 20 ++++++++++--------- .../widgetexplorer/widgetexplorerview.cpp | 6 ++---- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/shell/applets/testcomponentsapplet/metadata.desktop b/src/shell/applets/testcomponentsapplet/metadata.desktop index 013954947..80d4645c8 100644 --- a/src/shell/applets/testcomponentsapplet/metadata.desktop +++ b/src/shell/applets/testcomponentsapplet/metadata.desktop @@ -20,7 +20,7 @@ X-KDE-ServiceTypes=Plasma/Applet X-Plasma-API=declarativeappletscript X-KDE-ParentApp= X-KDE-PluginInfo-Author=Sebastian Kügler -X-KDE-PluginInfo-Category= +X-KDE-PluginInfo-Category=Development Tools X-KDE-PluginInfo-Email=sebas@kde.org X-KDE-PluginInfo-License=GPLv2+ X-KDE-PluginInfo-Name=org.kde.testcomponentsapplet diff --git a/src/shell/applets/testshaderapplet/metadata.desktop b/src/shell/applets/testshaderapplet/metadata.desktop index b13d62c66..da69c1552 100644 --- a/src/shell/applets/testshaderapplet/metadata.desktop +++ b/src/shell/applets/testshaderapplet/metadata.desktop @@ -10,6 +10,7 @@ Name[sk]=Test Shadera Name[sv]=Skuggningstest Name[uk]=Тестування підпрограм побудови тіней Name[x-test]=xxShader Testxx +Comment=Futzing with Visual Effects Type=Service Icon=plasma @@ -17,7 +18,7 @@ X-KDE-ServiceTypes=Plasma/Applet X-Plasma-API=declarativeappletscript X-KDE-ParentApp= X-KDE-PluginInfo-Author=Sebastian Kügler -X-KDE-PluginInfo-Category= +X-KDE-PluginInfo-Category=Graphics X-KDE-PluginInfo-Email=sebas@kde.org X-KDE-PluginInfo-License=GPLv2+ X-KDE-PluginInfo-Name=org.kde.testshaderapplet diff --git a/src/shell/qmlpackages/desktop/contents/explorer/WidgetExplorer.qml b/src/shell/qmlpackages/desktop/contents/explorer/WidgetExplorer.qml index a9be3c0be..384f5c168 100644 --- a/src/shell/qmlpackages/desktop/contents/explorer/WidgetExplorer.qml +++ b/src/shell/qmlpackages/desktop/contents/explorer/WidgetExplorer.qml @@ -40,6 +40,8 @@ Item { property Item getWidgetsButton property Item categoryButton + function i18n(inp) { return inp; } + PlasmaComponents.ContextMenu { id: categoriesDialog visualParent: main.categoryButton @@ -72,15 +74,15 @@ Item { Repeater { parent: getWidgetsDialog model: widgetExplorer.widgetsMenuActions -// delegate: PlasmaComponents.MenuItem { -// icon: modelData.icon -// text: modelData.text -// separator: modelData.separator -// onClicked: modelData.trigger() -// Component.onCompleted: { -// parent = getWidgetsDialog -// } -// } + delegate: PlasmaComponents.MenuItem { + icon: modelData.icon + text: modelData.text + separator: modelData.separator + onClicked: modelData.trigger() + Component.onCompleted: { + parent = getWidgetsDialog + } + } } PlasmaCore.Dialog { diff --git a/src/shell/widgetexplorer/widgetexplorerview.cpp b/src/shell/widgetexplorer/widgetexplorerview.cpp index 5217e1cff..5fd6a48c3 100644 --- a/src/shell/widgetexplorer/widgetexplorerview.cpp +++ b/src/shell/widgetexplorer/widgetexplorerview.cpp @@ -70,11 +70,9 @@ void WidgetExplorerView::init() connect(this, &QQuickView::visibleChanged, this, &WidgetExplorerView::widgetExplorerClosed); setResizeMode(QQuickView::SizeRootObjectToView); m_widgetExplorer->setContainment(m_containment); - - - } + void WidgetExplorerView::setContainment(Plasma::Containment* c) { m_containment = c; @@ -96,7 +94,7 @@ void WidgetExplorerView::setContainment(Plasma::Containment* c) void WidgetExplorerView::widgetExplorerClosed(bool visible) { if (!visible) { - deleteLater(); + //deleteLater(); //m_widgetExplorerView = 0; } }