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

get the components target from libkdeclarative

Browse Source
This commit is contained in:
Aaron Seigo 2012-10-30 21:31:31 +01:00
parent 050222e9ed
commit 06f5f555a9
3 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
declarativeimports/plasmacomponents/CMakeLists.txt
View File

@ -23,7 +23,7 @@ qt4_automoc(${plasmacomponents_SRCS})
add_library(plasmacomponentsplugin SHARED ${plasmacomponents_SRCS}) add_library(plasmacomponentsplugin SHARED ${plasmacomponents_SRCS})
target_link_libraries(plasmacomponentsplugin ${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_PLASMA_LIBS}) target_link_libraries(plasmacomponentsplugin ${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDECLARATIVE_LIBRARIES} ${KDE4_PLASMA_LIBS})
install(TARGETS plasmacomponentsplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/components) install(TARGETS plasmacomponentsplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/components)

37
declarativeimports/plasmacomponents/fullscreenwindow.cpp
View File

@ -36,6 +36,8 @@
#include <KWindowSystem> #include <KWindowSystem>
#include <KStandardDirs> #include <KStandardDirs>
#include <kdeclarative.h>
#include <Plasma/Corona> #include <Plasma/Corona>
#include <Plasma/WindowEffects> #include <Plasma/WindowEffects>
@ -122,31 +124,22 @@ void FullScreenWindow::init(const QString &componentName)
} }
//Try to figure out the path of the dialog component //Try to figure out the path of the dialog component
QString componentsPlatform = getenv("KDE_PLASMA_COMPONENTS_PLATFORM"); const QString target = KDeclarative::componentsTarget();
if (componentsPlatform.isEmpty()) {
KConfigGroup cg(KSharedConfig::openConfig("kdeclarativerc"), "Components-platform");
componentsPlatform = cg.readEntry("name", "desktop");
}
QString filePath; QString filePath;
if (componentsPlatform == "desktop") { if (target != KDeclarative::defaultComponentsTarget()) {
foreach(const QString &importPath, KGlobal::dirs()->findDirs("module", "imports/")) { const QString file = "platformimports/" % target % "org/kde/plasma/components/" % componentName % ".qml";
filePath = importPath % "org/kde/plasma/components/" % componentName % ".qml"; filePath = KStandardDirs::locate("module", file);
QFile f(filePath);
if (f.exists()) {
break;
}
}
} else {
foreach(const QString &importPath, KGlobal::dirs()->findDirs("module", "platformimports/" % componentsPlatform)) {
filePath = importPath % "org/kde/plasma/components/" % componentName % ".qml";
QFile f(filePath);
if (f.exists()) {
break;
}
}
} }
if (filePath.isEmpty()) {
const QString file = "imports/org/kde/plasma/components/" % componentName % ".qml";
filePath = KStandardDirs::locate("module", file);
}
if (filePath.isEmpty()) {
kWarning() << "Component not found:" << componentName;
return;
}
QDeclarativeEngine *engine = EngineBookKeeping::self()->engine(); QDeclarativeEngine *engine = EngineBookKeeping::self()->engine();
if (!engine) { if (!engine) {

14
declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp
View File

@ -29,6 +29,8 @@
#include <KSharedConfig> #include <KSharedConfig>
#include <KDebug> #include <KDebug>
#include <kdeclarative.h>
#include "enums.h" #include "enums.h"
#include "qmenu.h" #include "qmenu.h"
#include "qmenuitem.h" #include "qmenuitem.h"
@ -89,20 +91,14 @@ void PlasmaComponentsPlugin::registerTypes(const char *uri)
{ {
Q_ASSERT(uri == QLatin1String("org.kde.plasma.components")); Q_ASSERT(uri == QLatin1String("org.kde.plasma.components"));
QString componentsPlatform = getenv("KDE_PLASMA_COMPONENTS_PLATFORM");
if (componentsPlatform.isEmpty()) {
KConfigGroup cg(KSharedConfig::openConfig("kdeclarativerc"), "Components-platform");
componentsPlatform = cg.readEntry("name", "desktop");
}
//platform specific c++ components //platform specific c++ components
if (componentsPlatform == "desktop") { const QString target = KDeclarative::componentsTarget();
if (target == KDeclarative::defaultComponentsTarget()) {
qmlRegisterType<KDialogProxy>(uri, 0, 1, "QueryDialog"); qmlRegisterType<KDialogProxy>(uri, 0, 1, "QueryDialog");
qmlRegisterType<QMenuProxy>(uri, 0, 1, "Menu"); qmlRegisterType<QMenuProxy>(uri, 0, 1, "Menu");
qmlRegisterType<QMenuItem>(uri, 0, 1, "MenuItem"); qmlRegisterType<QMenuItem>(uri, 0, 1, "MenuItem");
//on touch systems the dialog is fullscreen, c++ needed to do that
} else { } else {
//on touch systems the dialog is fullscreen, c++ needed to do that
qmlRegisterType<FullScreenDialog>(uri, 0, 1, "Dialog"); qmlRegisterType<FullScreenDialog>(uri, 0, 1, "Dialog");
qmlRegisterType<FullScreenSheet>(uri, 0, 1, "Sheet"); qmlRegisterType<FullScreenSheet>(uri, 0, 1, "Sheet");
} }