alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into mart/ToolTipArea

Browse Source
This commit is contained in:
Sebastian Kügler 2014-01-09 02:33:11 +01:00
commit b8fc3aea7f
12 changed files with 110 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -49,7 +49,7 @@ find_package(KF5 CONFIG REQUIRED IdleTime ItemModels WidgetsAddons WindowSystem
Bookmarks Declarative UnitConversion Parts Kross KIO DNSSD KDE4Support)
find_package(KActivities)
find_package(KActivities 5.0.0 CONFIG REQUIRED)
set_package_properties(KActivities PROPERTIES DESCRIPTION "The KActivities library"
URL "https://projects.kde.org/kactivities"
TYPE REQUIRED

2
src/declarativeimports/accessdenied/CMakeLists.txt
View File

@ -1,4 +1,4 @@
project(accessdenied)
install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/core)
install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/accessdenied)

1
src/declarativeimports/core/CMakeLists.txt
View File

@ -35,7 +35,6 @@ target_link_libraries(corebindingsplugin
KF5::Declarative
KF5::CoreAddons
KF5::IconThemes
KF5::KDE4Support #for kglobal.h
KF5::Service #for kplugininfo.h
KF5::WindowSystem
KF5::Plasma)

4
src/declarativeimports/core/dialogshadows.cpp
View File

@ -18,6 +18,7 @@
#include "dialogshadows_p.h"
#include <QGlobalStatic>
#include <QWindow>
#include <QPainter>
@ -30,7 +31,6 @@
#endif
#include <qdebug.h>
#include <kglobal.h>
class DialogShadows::Private
{
@ -94,7 +94,7 @@ public:
DialogShadows self;
};
K_GLOBAL_STATIC(DialogShadowsSingleton, privateDialogShadowsSelf)
Q_GLOBAL_STATIC(DialogShadowsSingleton, privateDialogShadowsSelf)
DialogShadows::DialogShadows(QObject *parent, const QString &prefix)
: Plasma::Svg(parent),

1
src/declarativeimports/core/tests/CMakeLists.txt
View File

@ -16,7 +16,6 @@ target_link_libraries(sortfiltermodeltest
Qt5::Gui
Qt5::Test
KF5::I18n
KF5::KDE4Support #qtest_kde.h
KF5::Service
Qt5::Qml
)

2
src/declarativeimports/core/tests/sortfiltermodeltest.cpp
View File

@ -21,12 +21,12 @@
#include <datamodel.h>
// KDE
#include <qtest_kde.h>
// Qt
#include <QStandardItemModel>
#include <QStringListModel>
#include <QSignalSpy>
#include <QtTest>
using namespace Plasma;

9
src/shell/CMakeLists.txt
View File

@ -33,12 +33,6 @@ set(scripting_SRC
scripting/widget.cpp
)
set(widgetexplorer_SRC
widgetexplorer/kcategorizeditemsviewmodels.cpp
widgetexplorer/plasmaappletitemmodel.cpp
widgetexplorer/widgetexplorer.cpp
)
add_executable(plasma-shell
activity.cpp
main.cpp
@ -54,7 +48,6 @@ add_executable(plasma-shell
shellpluginloader.cpp
shellmanager.cpp
${scripting_SRC}
${widgetexplorer_SRC}
)
# The Qt5Widgets_LIBRARIES variable also includes QtGui and QtCore
@ -85,3 +78,5 @@ endif()
install(TARGETS plasma-shell ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES plasma-shell.desktop DESTINATION ${AUTOSTART_INSTALL_DIR})
add_subdirectory(widgetexplorer)

3
src/shell/shellcorona.cpp
View File

@ -97,9 +97,6 @@ ShellCorona::ShellCorona(QObject *parent)
{
d->desktopDefaultsConfig = KConfigGroup(KSharedConfig::openConfig(package().filePath("defaults")), "Desktop");
qmlRegisterType<WidgetExplorer>("org.kde.plasma.private.shell", 2, 0, "WidgetExplorer");
qmlRegisterType<Plasma::Containment>();
connect(&d->appConfigSyncTimer, &QTimer::timeout,
this, &ShellCorona::syncAppConfig);

27
src/shell/widgetexplorer/CMakeLists.txt Normal file
View File

@ -0,0 +1,27 @@
project(plasmawidgetexplorerplugin)
set(widgetexplorer_SRC
kcategorizeditemsviewmodels.cpp
plasmaappletitemmodel.cpp
widgetexplorer.cpp
widgetexplorerplugin.cpp
)
add_library(plasmawidgetexplorerplugin SHARED ${widgetexplorer_SRC})
target_link_libraries(plasmawidgetexplorerplugin
Qt5::Core
Qt5::Quick
Qt5::Qml
Qt5::Gui
Qt5::Widgets
Qt5::Quick
Qt5::Qml
KF5::Plasma
KF5::PlasmaQuick
KF5::I18n
KF5::Service
)
install(TARGETS plasmawidgetexplorerplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/shell)
install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/shell)

2
src/shell/widgetexplorer/qmldir Normal file
View File

@ -0,0 +1,2 @@
module org.kde.plasma.private.shell
plugin plasmawidgetexplorerplugin

36
src/shell/widgetexplorer/widgetexplorerplugin.cpp Normal file
View File

@ -0,0 +1,36 @@
/*
Copyright 2014 by David Edmundson <davidedmundson@kde.org>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include "widgetexplorerplugin.h"
#include <QtQml>
#include "widgetexplorer.h"
#include <plasma/containment.h>
void WidgetExplorerPlugin::registerTypes(const char *uri)
{
Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.shell"));
qmlRegisterType<Plasma::Containment>();
qmlRegisterType<WidgetExplorer>(uri, 2, 0, "WidgetExplorer");
}

37
src/shell/widgetexplorer/widgetexplorerplugin.h Normal file
View File

@ -0,0 +1,37 @@
/*
Copyright 2014 by David Edmundson <davidedmundson@kde.org>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#ifndef WIDGETEXPLORERPLUGIN_H
#define WIDGETEXPLORERPLUGIN_H
#include <QQmlExtensionPlugin>
class WidgetExplorerPlugin : public QQmlExtensionPlugin
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
void registerTypes(const char *uri);
};
#endif