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

reenable theme

Browse Source 
many qml components work now
This commit is contained in:
Marco Martin 2013-02-07 12:48:05 +01:00
parent 7f8cbc4af2
commit bb8356abb0
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
declarativeimports/core/CMakeLists.txt
View File

@ -4,7 +4,7 @@ set(corebindings_SRCS
# declarativeitemcontainer.cpp
corebindingsplugin.cpp
# dataengineconsumer.cpp
# theme.cpp
theme.cpp
# datamodel.cpp
# datasource.cpp
# runnermodel.cpp

10
declarativeimports/core/corebindingsplugin.cpp
View File

@ -37,7 +37,7 @@
#include "framesvgitem.h"
// #include "runnermodel.h"
#include "svgitem.h"
// #include "theme.h"
#include "theme.h"
// #include "dialog.h"
#include "iconitem.h"
// #include "tooltip.h"
@ -50,11 +50,11 @@ void CoreBindingsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
QQmlExtensionPlugin::initializeEngine(engine, uri);
QQmlContext *context = engine->rootContext();
/*
ThemeProxy *theme = new ThemeProxy(context);
context->setContextProperty("theme", theme);
KDeclarative kdeclarative;
/* KDeclarative kdeclarative;
kdeclarative.setDeclarativeEngine(engine);
kdeclarative.initialize();
QScriptEngine *scriptEngine = kdeclarative.scriptEngine();
@ -78,8 +78,8 @@ void CoreBindingsPlugin::registerTypes(const char *uri)
qmlRegisterType<Plasma::FrameSvg>(uri, 0, 1, "FrameSvg");
qmlRegisterType<Plasma::SvgItem>(uri, 0, 1, "SvgItem");
qmlRegisterType<Plasma::FrameSvgItem>(uri, 0, 1, "FrameSvgItem");
//
// qmlRegisterType<ThemeProxy>(uri, 0, 1, "Theme");
qmlRegisterType<ThemeProxy>(uri, 0, 1, "Theme");
//
// qmlRegisterType<Plasma::DataSource>(uri, 0, 1, "DataSource");
// qmlRegisterType<Plasma::DataModel>(uri, 0, 1, "DataModel");

2
declarativeimports/core/theme.cpp
View File

@ -38,7 +38,7 @@ public:
FontProxy smallestFont;
};
K_GLOBAL_STATIC(FontProxySingleton, privateFontProxySingleton)
Q_GLOBAL_STATIC(FontProxySingleton, privateFontProxySingleton)
FontProxy::FontProxy(Plasma::Theme::FontRole role, QObject *parent)
: QObject(parent),