24ea541 · unity8 · git.iko.soy

git.iko.soy/unity8

Move BottomBarVisibilityThing to Utils plugin

commit24ea541d847dad0735f22e8b912bf0f9e5a0fb17 authorMichal Hruby <michal.mhr@gmail.com> dateTue 12 Nov 2013, 12:13 (13 years ago) parentb097fab

7 files changed+14−14

compare with xenial

unifiedsplit

Bottombar/Bottombar.qml+1−1 plugins/Unity/CMakeLists.txt−1 plugins/Unity/plugin.cpp−12 plugins/Utils/CMakeLists.txt+1 plugins/Unity/bottombarvisibilitycommunicatorshell.cpp → plugins/Utils/bottombarvisibilitycommunicatorshell.cpp plugins/Unity/bottombarvisibilitycommunicatorshell.h → plugins/Utils/bottombarvisibilitycommunicatorshell.h plugins/Utils/plugin.cpp+12

Bottombar/Bottombar.qml+1−1

@@ -16,7 +16,7 @@

1616

1717import QtQuick 2.0

1818import "../Components"

19−import Unity 0.1

19+import Utils 0.1

2020import Unity.Application 0.1

2121import Ubuntu.Gestures 0.1

2222import Ubuntu.Components 0.1

plugins/Unity/CMakeLists.txt−1

@@ -34,7 +34,6 @@ set(QMLPLUGIN_SRC

3434 radiooptionfilter.cpp

3535 ratingsfilter.cpp

3636 ratingfilteroption.cpp

37− bottombarvisibilitycommunicatorshell.cpp

3837 applicationpreview.cpp

3938 genericpreview.cpp

4039 moviepreview.cpp

plugins/Unity/plugin.cpp−12

@@ -17,8 +17,6 @@

1717 */

1818

1919// Qt

20−#include <QDBusConnection>

21−#include <QQmlContext>

2220#include <qqml.h>

2321

2422// self

@@ -33,16 +31,12 @@

3331#include "scopes.h"

3432#include "categories.h"

3533#include "categoryresults.h"

36−#include "bottombarvisibilitycommunicatorshell.h"

3734#include "genericoptionsmodel.h"

3835#include "result.h"

3936

4037// libqtdee

4138#include "deelistmodel.h"

4239

43−static const char* BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_PATH = "/BottomBarVisibilityCommunicator";

44−static const char* DBUS_SERVICE = "com.canonical.Shell.BottomBarVisibilityCommunicator";

45−

4640void UnityPlugin::registerTypes(const char *uri)

4741{

4842 Q_ASSERT(uri == QLatin1String("Unity"));

@@ -57,7 +51,6 @@ void UnityPlugin::registerTypes(const char *uri)

5751 qmlRegisterType<Categories>(uri, 0, 1, "Categories");

5852 qmlRegisterUncreatableType<CategoryResults>(uri, 0, 1, "CategoryResults", "Can't create new Category Results in QML. Get them from Categories instance.");

5953 qmlRegisterType<DeeListModel>(uri, 0, 1, "DeeListModel");

60− qmlRegisterUncreatableType<BottomBarVisibilityCommunicatorShell>(uri, 0, 1, "BottomBarVisibilityCommunicatorShell", "Can't create BottomBarVisibilityCommunicatorShell");

6154}

6255

6356void UnityPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

@@ -66,9 +59,4 @@ void UnityPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

6659#ifndef GLIB_VERSION_2_36

6760 g_type_init();

6861#endif

69−

70− QDBusConnection::sessionBus().registerService(DBUS_SERVICE);

71− BottomBarVisibilityCommunicatorShell *bottomBarVisibilityCommunicator = &BottomBarVisibilityCommunicatorShell::instance();

72− QDBusConnection::sessionBus().registerObject(BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_PATH, bottomBarVisibilityCommunicator, QDBusConnection::ExportAllContents);

73− engine->rootContext()->setContextProperty("bottomBarVisibilityCommunicatorShell", bottomBarVisibilityCommunicator);

7462}

plugins/Utils/CMakeLists.txt+1

@@ -13,6 +13,7 @@ include_directories(

1313set(QMLPLUGIN_SRC

1414 albumartprovider.cpp

1515 applicationpaths.h

16+ bottombarvisibilitycommunicatorshell.cpp

1617 mediaartcache.cpp

1718 qlimitproxymodelqml.cpp

1819 qsortfilterproxymodelqml.cpp

plugins/Unity/bottombarvisibilitycommunicatorshell.cpp → plugins/Utils/bottombarvisibilitycommunicatorshell.cpprenamed

The content is the same.

plugins/Unity/bottombarvisibilitycommunicatorshell.h → plugins/Utils/bottombarvisibilitycommunicatorshell.hrenamed

The content is the same.

plugins/Utils/plugin.cpp+12

@@ -18,6 +18,8 @@

1818

1919// Qt

2020#include <QtQml/qqml.h>

21+#include <QDBusConnection>

22+#include <QQmlContext>

2123#include <QtQuick/QQuickWindow>

2224#include <QDebug>

2325// self

@@ -26,11 +28,15 @@

2628// local

2729#include "albumartprovider.h"

2830#include "applicationpaths.h"

31+#include "bottombarvisibilitycommunicatorshell.h"

2932#include "qlimitproxymodelqml.h"

3033#include "qsortfilterproxymodelqml.h"

3134#include "ubuntuwindow.h"

3235#include "unitymenumodelpaths.h"

3336

37+static const char* BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_PATH = "/BottomBarVisibilityCommunicator";

38+static const char* DBUS_SERVICE = "com.canonical.Shell.BottomBarVisibilityCommunicator";

39+

3440static QObject* applicationsPathsSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {

3541 Q_UNUSED(engine);

3642 Q_UNUSED(scriptEngine);

@@ -46,6 +52,7 @@ void UtilsPlugin::registerTypes(const char *uri)

4652 qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");

4753 qmlRegisterExtendedType<QQuickWindow, UbuntuWindow>(uri, 0, 1, "Window");

4854 qmlRegisterSingletonType<ApplicationPaths>(uri, 0, 1, "ApplicationPaths", applicationsPathsSingleton);

55+ qmlRegisterUncreatableType<BottomBarVisibilityCommunicatorShell>(uri, 0, 1, "BottomBarVisibilityCommunicatorShell", "Can't create BottomBarVisibilityCommunicatorShell");

4956}

5057

5158void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

@@ -64,4 +71,9 @@ void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

6471 {

6572 qWarning() << "Failed to register image provider for albumart (unknown error)";

6673 }

74+

75+ QDBusConnection::sessionBus().registerService(DBUS_SERVICE);

76+ BottomBarVisibilityCommunicatorShell *bottomBarVisibilityCommunicator = &BottomBarVisibilityCommunicatorShell::instance();

77+ QDBusConnection::sessionBus().registerObject(BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_PATH, bottomBarVisibilityCommunicator, QDBusConnection::ExportAllContents);

78+ engine->rootContext()->setContextProperty("bottomBarVisibilityCommunicatorShell", bottomBarVisibilityCommunicator);

6779}