b754d9f · unity8 · git.iko.soy

Shell.qml+36−17

compare with xenial

unifiedsplit

@@ -20,6 +20,7 @@ import Ubuntu.Application 0.1

20import Ubuntu.Components 0.1

21import Ubuntu.Gestures 0.1

22import LightDM 0.1 as LightDM

23+import Powerd 0.1

23import "Dash"

24import "Dash"

24import "Greeter"

25import "Greeter"

25import "Launcher"

26import "Launcher"

@@ -428,9 +429,6 @@ FocusScope {

428

429

429 dragHandleWidth: shell.edgeSize

430 dragHandleWidth: shell.edgeSize

430

431

431− property var previousMainApp: null

432− property var previousSideApp: null

433−

434 onShownChanged: {

432 onShownChanged: {

435 if (shown) {

433 if (shown) {

436 lockscreen.reset();

434 lockscreen.reset();

@@ -440,20 +438,6 @@ FocusScope {

440 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));

438 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));

441 }

439 }

442 greeter.forceActiveFocus();

440 greeter.forceActiveFocus();

443− // FIXME: *FocusedApplication are not updated when unfocused, hence the need to check whether

444− // the stage was actually shown

445− if (mainStage.fullyShown) greeter.previousMainApp = applicationManager.mainStageFocusedApplication;

446− if (sideStage.fullyShown) greeter.previousSideApp = applicationManager.sideStageFocusedApplication;

447− applicationManager.unfocusCurrentApplication();

448− } else {

449− if (greeter.previousMainApp) {

450− applicationManager.focusApplication(greeter.previousMainApp);

451− greeter.previousMainApp = null;

452− }

453− if (greeter.previousSideApp) {

454− applicationManager.focusApplication(greeter.previousSideApp);

455− greeter.previousSideApp = null;

456− }

457 }

441 }

458 }

442 }

459

443

@@ -475,6 +459,41 @@ FocusScope {

475 blockInput: greeter.shown || lockscreen.shown

459 blockInput: greeter.shown || lockscreen.shown

476 }

460 }

477

461

462+ Connections {

463+ id: powerConnection

464+ target: Powerd

465+

466+ property var previousMainApp: null

467+ property var previousSideApp: null

468+

469+ function setFocused(focused) {

470+ if (!focused) {

471+ // FIXME: *FocusedApplication are not updated when unfocused, hence the need to check whether

472+ // the stage was actually shown

473+ if (mainStage.fullyShown) powerConnection.previousMainApp = applicationManager.mainStageFocusedApplication;

474+ if (sideStage.fullyShown) powerConnection.previousSideApp = applicationManager.sideStageFocusedApplication;

475+ applicationManager.unfocusCurrentApplication();

476+ } else {

477+ if (powerConnection.previousMainApp) {

478+ applicationManager.focusApplication(powerConnection.previousMainApp);

479+ powerConnection.previousMainApp = null;

480+ }

481+ if (powerConnection.previousSideApp) {

482+ applicationManager.focusApplication(powerConnection.previousSideApp);

483+ powerConnection.previousSideApp = null;

484+ }

485+ }

486+ }

487+

488+ onPowerStateChange: {

489+ if (state == 0) { // suspend

490+ powerConnection.setFocused(false);

491+ } else if (state == 1) { // active

492+ powerConnection.setFocused(true);

493+ }

494+ }

495+ }

496+

478 Item {

497 Item {

479 id: overlay

498 id: overlay

480

499

debian/unity8-private.install+1

@@ -1,6 +1,7 @@

1usr/lib/*/unity8/qml/HudClient

2usr/lib/*/unity8/qml/LightDM

3usr/lib/*/unity8/qml/ListViewWithPageHeader

4+usr/lib/*/unity8/qml/Powerd

4usr/lib/*/unity8/qml/Ubuntu

5usr/lib/*/unity8/qml/Ubuntu

5usr/lib/*/unity8/qml/Unity

6usr/lib/*/unity8/qml/Unity

6usr/lib/*/unity8/qml/Utils

7usr/lib/*/unity8/qml/Utils

plugins/CMakeLists.txt+1

@@ -4,3 +4,4 @@ add_subdirectory(Unity)

4add_subdirectory(HudClient)

5add_subdirectory(LightDM)

6add_subdirectory(ListViewWithPageHeader)

7+add_subdirectory(Powerd)

plugins/Powerd/CMakeLists.txtnew file+13

@@ -0,0 +1,13 @@

1+include(Plugins)

2+

3+add_definitions(-DSM_BUSNAME=systemBus)

4+

5+add_library(Powerd-qml MODULE

6+ plugin.cpp

7+ Powerd.cpp

8+ )

9+

10+qt5_use_modules(Powerd-qml DBus Qml)

11+

12+export_qmlfiles(Powerd Powerd)

13+export_qmlplugin(Powerd 0.1 Powerd TARGETS Powerd-qml)

plugins/Powerd/Powerd.cppnew file+36

@@ -0,0 +1,36 @@

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+ * Author: Michael Terry <michael.terry@canonical.com>

17+ */

18+

19+#include "Powerd.h"

20+

21+Powerd::Powerd(QObject* parent)

22+ : QObject(parent),

23+ powerd(NULL)

24+{

25+ powerd = new QDBusInterface("com.canonical.powerd",

26+ "/com/canonical/powerd",

27+ "com.canonical.powerd",

28+ QDBusConnection::SM_BUSNAME(), this);

29+

30+ powerd->connection().connect("com.canonical.powerd",

31+ "/com/canonical/powerd",

32+ "com.canonical.powerd",

33+ "SysPowerStateChange",

34+ this,

35+ SIGNAL(powerStateChange(int)));

36+}

plugins/Powerd/Powerd.hnew file+40

@@ -0,0 +1,40 @@

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: Gerry Boland <gerry.boland@canonical.com>

17+ * Michael Terry <michael.terry@canonical.com>

18+ */

19+

20+#ifndef UNITY_POWERD_H

21+#define UNITY_POWERD_H

22+

23+#include <QtCore/QObject>

24+#include <QtDBus/QDBusInterface>

25+

26+class Powerd: public QObject

27+{

28+ Q_OBJECT

29+

30+public:

31+ explicit Powerd(QObject *parent = 0);

32+

33+Q_SIGNALS:

34+ void powerStateChange(int state);

35+

36+private:

37+ QDBusInterface *powerd;

38+};

39+

40+#endif

plugins/Powerd/plugin.cppnew file+36

@@ -0,0 +1,36 @@

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: Gerry Boland <gerry.boland@canonical.com>

17+ * Michael Terry <michael.terry@canonical.com>

18+ */

19+

20+#include "plugin.h"

21+#include "Powerd.h"

22+

23+#include <QtQml/QtQml>

24+

25+static QObject *powerd_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

26+{

27+ Q_UNUSED(engine)

28+ Q_UNUSED(scriptEngine)

29+ return new Powerd();

30+}

31+

32+void PowerdPlugin::registerTypes(const char *uri)

33+{

34+ Q_ASSERT(uri == QLatin1String("Powerd"));

35+ qmlRegisterSingletonType<Powerd>(uri, 0, 1, "Powerd", powerd_provider);

36+}

plugins/Powerd/plugin.hnew file+35

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

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: Gerry Boland <gerry.boland@canonical.com>

17+ * Michael Terry <michael.terry@canonical.com>

18+ */

19+

20+#ifndef POWER_PLUGIN_H

21+#define POWER_PLUGIN_H

22+

23+#include <QtQml/QQmlEngine>

24+#include <QtQml/QQmlExtensionPlugin>

25+

26+class PowerdPlugin : public QQmlExtensionPlugin

27+{

28+ Q_OBJECT

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

30+

31+public:

32+ void registerTypes(const char *uri);

33+};

34+

35+#endif

plugins/Powerd/qmldirnew file+3

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

1+module Powerd

2+plugin Powerd-qml

3+typeinfo plugin.qmltypes