5693d1a · unity8 · git.iko.soy

git.iko.soy/unity8

add a plugin for IPC comunication between Shell and Dash

commit5693d1a32f95689974d8fc93dfb7a43bbe7c718c authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 24 Jul 2014, 18:02 (12 years ago) parent2295f15

13 files changed+327−5

compare with xenial

unifiedsplit

plugins/Unity/CMakeLists.txt+1

@@ -1,3 +1,4 @@

11add_subdirectory(Indicators)

22add_subdirectory(Launcher)

33add_subdirectory(Session)

4+add_subdirectory(DashCommunicator)

plugins/Unity/DashCommunicator/CMakeLists.txtnew file+19

@@ -0,0 +1,19 @@

1+include_directories(

2+ ${CMAKE_CURRENT_SOURCE_DIR}

3+)

5+set(QMLDASHCOMMUNICATORPLUGIN_SRC

6+ plugin.cpp

7+ dbusdashcommunicatorservice.cpp

8+ dashcommunicatorservice.cpp

9+ dashcommunicator.cpp

10+ )

11+

12+add_library(DashCommunicator-qml MODULE

13+ ${QMLDASHCOMMUNICATORPLUGIN_SRC}

14+ )

15+

16+qt5_use_modules(DashCommunicator-qml DBus Qml)

17+

18+# export the qmldir and qmltypes files

19+add_unity8_plugin(Unity.DashCommunicator 0.1 Unity/DashCommunicator TARGETS DashCommunicator-qml)

plugins/Unity/DashCommunicator/dashcommunicator.cppnew file+43

@@ -0,0 +1,43 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "dashcommunicator.h"

18+

19+#include <QObject>

20+#include <QDBusConnection>

21+#include <QDBusInterface>

22+#include <QDebug>

23+

24+DashCommunicator::DashCommunicator(QObject *parent):

25+ QObject(parent)

26+{

27+}

28+

29+DashCommunicator::~DashCommunicator()

30+{

31+}

32+

33+

34+void DashCommunicator::setCurrentScope(const QString &scopeId, bool animate, bool reset)

35+{

36+ QDBusConnection connection = QDBusConnection::sessionBus();

37+ QDBusInterface dashIface ("com.canonical.UnityDash",

38+ "/com/canonical/UnityDash",

39+ "",

40+ connection);

41+

42+ dashIface.call("SetCurrentScope", scopeId, animate, reset);

43+}

plugins/Unity/DashCommunicator/dashcommunicator.hnew file+35

@@ -0,0 +1,35 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef DASHCOMMUNICATOR_H

18+#define DASHCOMMUNICATOR_H

19+

20+#include <QObject>

21+

22+class DashCommunicator: public QObject

23+{

24+ Q_OBJECT

25+ Q_CLASSINFO("D-Bus Interface", "com.canonical.Unity.DashCommunicator")

26+

27+public:

28+ DashCommunicator(QObject *parent = 0);

29+ ~DashCommunicator();

30+

31+public Q_SLOTS:

32+ void setCurrentScope(const QString &scopeId, bool animate, bool reset);

33+};

34+

35+#endif

plugins/Unity/DashCommunicator/dashcommunicatorservice.cppnew file+30

@@ -0,0 +1,30 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "dashcommunicatorservice.h"

18+

19+DashCommunicatorService::DashCommunicatorService(QObject *parent):

20+ QObject(parent),

21+ m_dbusService(new DBusDashCommunicatorService(this))

22+{

23+ connect(m_dbusService, &DBusDashCommunicatorService::setCurrentScope, this, &DashCommunicatorService::setCurrentScope);

24+}

25+

26+

27+DashCommunicatorService::~DashCommunicatorService()

28+{

29+

30+}

plugins/Unity/DashCommunicator/dashcommunicatorservice.hnew file+38

@@ -0,0 +1,38 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef DASHCOMMUNICATORSERVICE_H

18+#define DASHCOMMUNICATORSERVICE_H

19+

20+#include "dbusdashcommunicatorservice.h"

21+

22+#include <QObject>

23+

24+class DashCommunicatorService: public QObject

25+{

26+ Q_OBJECT

27+public:

28+ DashCommunicatorService(QObject *parent = 0);

29+ ~DashCommunicatorService();

30+

31+Q_SIGNALS:

32+ void setCurrentScope(const QString &scopeId, bool animate, bool reset);

33+

34+private:

35+ DBusDashCommunicatorService *m_dbusService;

36+};

37+

38+#endif // DBUSUNITYSESSIONSERVICE_H

plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.cppnew file+39

@@ -0,0 +1,39 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "dbusdashcommunicatorservice.h"

18+

19+#include <QDBusConnection>

20+#include <QDBusInterface>

21+#include <QDebug>

22+

23+DBusDashCommunicatorService::DBusDashCommunicatorService(QObject *parent):

24+ QObject(parent)

25+{

26+ QDBusConnection connection = QDBusConnection::sessionBus();

27+

28+ connection.registerService("com.canonical.UnityDash");

29+ connection.registerObject("/com/canonical/UnityDash", this, QDBusConnection::ExportScriptableSlots);

30+}

31+

32+DBusDashCommunicatorService::~DBusDashCommunicatorService()

33+{

34+}

35+

36+void DBusDashCommunicatorService::SetCurrentScope(const QString &scopeId, bool animate, bool reset)

37+{

38+ Q_EMIT setCurrentScope(scopeId, animate, reset);

39+}

plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.hnew file+39

@@ -0,0 +1,39 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef DBUSDASHCOMMUNICATORSERVICE_H

18+#define DBUSDASHCOMMUNICATORSERVICE_H

19+

20+#include <QObject>

21+

22+class DBusDashCommunicatorService: public QObject

23+{

24+ Q_OBJECT

25+ Q_CLASSINFO("D-Bus Interface", "com.canonical.Unity.DashCommunicator")

26+

27+public:

28+ DBusDashCommunicatorService(QObject *parent = 0);

29+ ~DBusDashCommunicatorService();

30+

31+Q_SIGNALS:

32+ void setCurrentScope(const QString &scopeId, bool animate, bool reset);

33+

34+public Q_SLOTS:

35+ Q_SCRIPTABLE void SetCurrentScope(const QString &scopeId, bool animate, bool reset);

36+

37+};

38+

39+#endif // DBUSUNITYSESSIONSERVICE_H

plugins/Unity/DashCommunicator/plugin.cppnew file+31

@@ -0,0 +1,31 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors: Michael Zanetti <michael.zanetti@canonical.com>

17+ */

18+

19+#include "plugin.h"

20+#include "dashcommunicator.h"

21+#include "dashcommunicatorservice.h"

22+

23+#include <QDBusConnection>

24+#include <QtQml/qqml.h>

25+

26+void DashCommunicatorPlugin::registerTypes(const char *uri)

27+{

28+ Q_ASSERT(uri == QStringLiteral("Unity.DashCommunicator"));

29+ qmlRegisterType<DashCommunicatorService>(uri, 0, 1, "DashCommunicatorService");

30+ qmlRegisterType<DashCommunicator>(uri, 0, 1, "DashCommunicator");

31+}

plugins/Unity/DashCommunicator/plugin.hnew file+34

@@ -0,0 +1,34 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors: Michael Zanetti <michael.zanetti@canonical.com>

17+ */

18+

19+#ifndef DASHCOMMUNICATOR_PLUGIN_H

20+#define DASHCOMMUNICATOR_PLUGIN_H

21+

22+#include <QtQml/QQmlEngine>

23+#include <QtQml/QQmlExtensionPlugin>

24+

25+class DashCommunicatorPlugin : public QQmlExtensionPlugin

26+{

27+ Q_OBJECT

28+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

29+

30+public:

31+ void registerTypes(const char *uri);

32+};

33+

34+#endif

plugins/Unity/DashCommunicator/qmldirnew file+3

@@ -0,0 +1,3 @@

1+module Unity.DashCommunicator

2+plugin DashCommunicator-qml

3+typeinfo DashCommunicator.qmltypes

qml/Dash/Dash.qml+7

@@ -18,6 +18,7 @@ import QtQuick 2.0

1818import Ubuntu.Components 0.1

1919import Unity 0.2

2020import Utils 0.1

21+import Unity.DashCommunicator 0.1

2122import "../Components"

2223

2324Showable {

@@ -29,6 +30,12 @@ Showable {

2930 property string showScopeOnLoaded: "clickscope"

3031 property real contentScale: 1.0

3132

33+ DashCommunicatorService {

34+ onSetCurrentScope: {

35+ dash.setCurrentScope(scopeId, animate, reset)

36+ }

37+ }

38+

3239 function setCurrentScope(scopeId, animate, reset) {

3340 var scopeIndex = filteredScopes.findFirst(Scopes.RoleId, scopeId)

3441

qml/Shell.qml+8−5

@@ -34,6 +34,7 @@ import "Notifications"

3434import "Stages"

3535import Unity.Notifications 1.0 as NotificationBackend

3636import Unity.Session 0.1

37+import Unity.DashCommunicator 0.1

3738

3839Item {

3940 id: shell

@@ -83,6 +84,10 @@ Item {

8384 id: volumeControl

8485 }

8586

87+ DashCommunicator {

88+ id: dash

89+ }

90+

8691 WindowKeysFilter {

8792 // Handle but do not filter out volume keys

8893 Keys.onVolumeUpPressed: { volumeControl.volumeUp(); event.accepted = false; }

@@ -574,9 +579,8 @@ Item {

574579 greeter.hide()

575580 }

576581

577− // FIXME: IPC to dash-app needed?

578− //var animate = !LightDM.Greeter.active && !stages.shown

579− //dash.setCurrentScope("clickscope", animate, false)

582+ var animate = !LightDM.Greeter.active && !stages.shown

583+ dash.setCurrentScope("clickscope", animate, false)

580584 ApplicationManager.requestFocusApplication("unity8-dash")

581585 }

582586

@@ -638,8 +642,7 @@ Item {

638642

639643 onShowDashHome: showHome()

640644 onDash: showDash()

641− // FIXME: IPC to dash-app needed?

642−// onDashSwipeChanged: if (dashSwipe && stages.shown) dash.setCurrentScope("clickscope", false, true)

645+ onDashSwipeChanged: if (dashSwipe && stages.shown) dash.setCurrentScope("clickscope", false, true)

643646 onLauncherApplicationSelected: {

644647 if (greeter.fakeActiveForApp !== "") {

645648 lockscreen.show()