on xenial help sign in
register unitymenumodel type
commit82045e4521efedd03b20f20a5099550bb803026e authorNick Dedekind <nick.dedekind@canonical.com> dateFri 12 Sep 2014, 15:56 (12 years ago) parent1a54052
3 files changed+14−8
plugins/Unity/Indicators/plugin.cpp+3 qml/Greeter/Clock.qml+8−8 tests/mocks/Unity/Indicators/fakeplugin.cpp+3
plugins/Unity/Indicators/plugin.cpp+3
@@ -35,6 +35,8 @@
3535#include "unitymenumodelstack.h"
3636#include "visibleindicatorsmodel.h"
3737
38+#include <unitymenumodel.h>
39+
3840static QObject* menuModelCacheSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
3941 Q_UNUSED(engine);
4042 Q_UNUSED(scriptEngine);
@@ -44,6 +46,7 @@ static QObject* menuModelCacheSingleton(QQmlEngine* engine, QJSEngine* scriptEng
4446void Indicators2Plugin::registerTypes(const char *uri)
4547{
4648 Q_INIT_RESOURCE(indicators);
49+ qRegisterMetaType<UnityMenuModel*>("UnityMenuModel*");
4750
4851 qmlRegisterType<IndicatorsManager>(uri, 0, 1, "IndicatorsManager");
4952 qmlRegisterType<IndicatorsModel>(uri, 0, 1, "IndicatorsModel");
qml/Greeter/Clock.qml+8−8
@@ -34,21 +34,21 @@ Item {
3434 }
3535 }
3636
37− SharedUnityMenuModel {
37+ Indicators.SharedUnityMenuModel {
3838 id: timeModel
3939 objectName: "timeModel"
4040
4141 busName: "com.canonical.indicator.datetime"
4242 actions: { "indicator": "/com/canonical/indicator/datetime" }
4343 menuObjectPath: clock.visible ? "/com/canonical/indicator/datetime/phone" : ""
44+ }
4445
45− Indicators.RootActionState {
46− menu: timeModel.model
47− onUpdated: {
48− if (timeLabel.text != rightLabel) {
49− timeLabel.text = rightLabel;
50− clock.currentDate = new Date();
51− }
46+ Indicators.RootActionState {
47+ menu: timeModel.model
48+ onUpdated: {
49+ if (timeLabel.text != rightLabel) {
50+ timeLabel.text = rightLabel;
51+ clock.currentDate = new Date();
5252 }
5353 }
5454 }
tests/mocks/Unity/Indicators/fakeplugin.cpp+3
@@ -31,6 +31,8 @@
3131#include "unitymenumodelstack.h"
3232#include "visibleindicatorsmodel.h"
3333
34+#include <unitymenumodel.h>
35+
3436static QObject* menuModelCacheSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
3537 Q_UNUSED(engine);
3638 Q_UNUSED(scriptEngine);
@@ -40,6 +42,7 @@ static QObject* menuModelCacheSingleton(QQmlEngine* engine, QJSEngine* scriptEng
4042void IndicatorsFakePlugin::registerTypes(const char * uri)
4143{
4244 Q_INIT_RESOURCE(indicators_fake);
45+ qRegisterMetaType<UnityMenuModel*>("UnityMenuModel*");
4346
4447 // internal
4548 qmlRegisterType<FakeIndicatorsModel>(uri, 0, 1, "FakeIndicatorsModel");