24ea541 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Move BottomBarVisibilityThing to Utils plugin

24ea541Michal Hruby13 years ago

Bottombar/Bottombar.qml+1−1

compare with xenial

unifiedsplit

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

17import QtQuick 2.0

18import "../Components"

19−import Unity 0.1

19+import Utils 0.1

20import Unity.Application 0.1

21import Ubuntu.Gestures 0.1

22import Ubuntu.Components 0.1

plugins/Unity/CMakeLists.txt−1

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

34 radiooptionfilter.cpp

35 ratingsfilter.cpp

36 ratingfilteroption.cpp

37− bottombarvisibilitycommunicatorshell.cpp

38 applicationpreview.cpp

37 applicationpreview.cpp

39 genericpreview.cpp

38 genericpreview.cpp

40 moviepreview.cpp

39 moviepreview.cpp

plugins/Unity/plugin.cpp−12

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

17 */

19// Qt

20−#include <QDBusConnection>

21−#include <QQmlContext>

22#include <qqml.h>

20#include <qqml.h>

24// self

22// self

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

33#include "scopes.h"

31#include "scopes.h"

34#include "categories.h"

32#include "categories.h"

35#include "categoryresults.h"

33#include "categoryresults.h"

36−#include "bottombarvisibilitycommunicatorshell.h"

37#include "genericoptionsmodel.h"

34#include "genericoptionsmodel.h"

38#include "result.h"

35#include "result.h"

40// libqtdee

37// libqtdee

41#include "deelistmodel.h"

38#include "deelistmodel.h"

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

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

45−

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

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

47{

41{

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

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

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

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

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

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

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

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

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

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

61}

54}

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

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

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

66#ifndef GLIB_VERSION_2_36

59#ifndef GLIB_VERSION_2_36

67 g_type_init();

60 g_type_init();

68#endif

61#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);

74}

62}

plugins/Utils/CMakeLists.txt+1

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

13set(QMLPLUGIN_SRC

14 albumartprovider.cpp

15 applicationpaths.h

16+ bottombarvisibilitycommunicatorshell.cpp

16 mediaartcache.cpp

17 mediaartcache.cpp

17 qlimitproxymodelqml.cpp

18 qlimitproxymodelqml.cpp

18 qsortfilterproxymodelqml.cpp

19 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 @@

19// Qt

20#include <QtQml/qqml.h>

21+#include <QDBusConnection>

22+#include <QQmlContext>

21#include <QtQuick/QQuickWindow>

23#include <QtQuick/QQuickWindow>

22#include <QDebug>

24#include <QDebug>

23// self

25// self

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

26// local

28// local

27#include "albumartprovider.h"

29#include "albumartprovider.h"

28#include "applicationpaths.h"

30#include "applicationpaths.h"

31+#include "bottombarvisibilitycommunicatorshell.h"

29#include "qlimitproxymodelqml.h"

32#include "qlimitproxymodelqml.h"

30#include "qsortfilterproxymodelqml.h"

33#include "qsortfilterproxymodelqml.h"

31#include "ubuntuwindow.h"

34#include "ubuntuwindow.h"

32#include "unitymenumodelpaths.h"

35#include "unitymenumodelpaths.h"

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

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

39+

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

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

35 Q_UNUSED(engine);

41 Q_UNUSED(engine);

36 Q_UNUSED(scriptEngine);

42 Q_UNUSED(scriptEngine);

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

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

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

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

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

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

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

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

49}

56}

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

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

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

64 {

71 {

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

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

66 }

73 }

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);

67}

79}