git.iko.soy/unity8
on xenial help sign in
Revert disable-hud, we weren't ready to land it yet.
04a844dMichał Sawicz
plugins/Utils/CMakeLists.txt+1
compare with xenial
unifiedsplit
@@ -12,6 +12,7 @@ include_directories(
12
12
13set(QMLPLUGIN_SRC
13set(QMLPLUGIN_SRC
14 albumartprovider.cpp
14 albumartprovider.cpp
15+ bottombarvisibilitycommunicatorshell.cpp
15 mediaartcache.cpp
16 mediaartcache.cpp
16 qlimitproxymodelqml.cpp
17 qlimitproxymodelqml.cpp
17 qsortfilterproxymodelqml.cpp
18 qsortfilterproxymodelqml.cpp
plugins/Utils/bottombarvisibilitycommunicatorshell.cppnew file+49
@@ -0,0 +1,49 @@
1+/*
2+ * Copyright (C) 2012 Canonical, Ltd.
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+
17+#include "bottombarvisibilitycommunicatorshell.h"
18+
19+BottomBarVisibilityCommunicatorShell::BottomBarVisibilityCommunicatorShell()
20+ : m_forceHidden(false),
21+ m_position(0)
22+{
23+}
24+
25+bool BottomBarVisibilityCommunicatorShell::forceHidden() const
26+{
27+ return m_forceHidden;
28+}
29+
30+double BottomBarVisibilityCommunicatorShell::position() const
31+{
32+ return m_position;
33+}
34+
35+void BottomBarVisibilityCommunicatorShell::setForceHidden(bool forceHidden)
36+{
37+ if (forceHidden != m_forceHidden) {
38+ m_forceHidden = forceHidden;
39+ Q_EMIT forceHiddenChanged(forceHidden);
40+ }
41+}
42+
43+void BottomBarVisibilityCommunicatorShell::setPosition(double position)
44+{
45+ if (position != m_position) {
46+ m_position = position;
47+ Q_EMIT positionChanged(position);
48+ }
49+}
plugins/Utils/bottombarvisibilitycommunicatorshell.hnew file+59
@@ -0,0 +1,59 @@
1+/*
2+ * Copyright (C) 2012 Canonical, Ltd.
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+
17+#ifndef BOTTOMBARVISIBILITYCOMMUNICATORSHELL_H
18+#define BOTTOMBARVISIBILITYCOMMUNICATORSHELL_H
19+
20+#include <QObject>
21+
22+class QDBusInterface;
23+
24+/** This is an internal class used to talk with the bottom bar used by either
25+ * applications or the SDK.
26+ * There is a method to force the bottom bar to be hidden or otherwise behave as usual
27+ */
28+
29+class BottomBarVisibilityCommunicatorShell : public QObject
30+{
31+ Q_OBJECT
32+ Q_PROPERTY(bool forceHidden READ forceHidden WRITE setForceHidden NOTIFY forceHiddenChanged)
33+ Q_PROPERTY(double position READ position WRITE setPosition NOTIFY positionChanged)
34+
35+ Q_CLASSINFO("D-Bus Interface", "com.canonical.Shell.BottomBarVisibilityCommunicator")
36+public:
37+ static BottomBarVisibilityCommunicatorShell& instance() {
38+ static BottomBarVisibilityCommunicatorShell instance;
39+ return instance;
40+ }
41+
42+ bool forceHidden() const;
43+ void setForceHidden(bool forceHidden);
44+
45+ double position() const;
46+ void setPosition(double position);
47+
48+Q_SIGNALS:
49+ void forceHiddenChanged(bool forceHidden);
50+ void positionChanged(double position);
51+
52+private:
53+ BottomBarVisibilityCommunicatorShell();
54+
55+ bool m_forceHidden;
56+ double m_position;
57+};
58+
59+#endif
plugins/Utils/plugin.cpp+10
@@ -27,11 +27,15 @@
27
27
28// local
28// local
29#include "albumartprovider.h"
29#include "albumartprovider.h"
30+#include "bottombarvisibilitycommunicatorshell.h"
30#include "qlimitproxymodelqml.h"
31#include "qlimitproxymodelqml.h"
31#include "qsortfilterproxymodelqml.h"
32#include "qsortfilterproxymodelqml.h"
32#include "timeformatter.h"
33#include "timeformatter.h"
33#include "unitymenumodelpaths.h"
34#include "unitymenumodelpaths.h"
34
35
36+static const char* BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_PATH = "/BottomBarVisibilityCommunicator";
37+static const char* DBUS_SERVICE = "com.canonical.Shell.BottomBarVisibilityCommunicator";
38+
35void UtilsPlugin::registerTypes(const char *uri)
39void UtilsPlugin::registerTypes(const char *uri)
36{
40{
37 Q_ASSERT(uri == QLatin1String("Utils"));
41 Q_ASSERT(uri == QLatin1String("Utils"));
@@ -41,6 +45,7 @@ void UtilsPlugin::registerTypes(const char *uri)
41 qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");
45 qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");
42 qmlRegisterType<TimeFormatter>(uri, 0, 1, "TimeFormatter");
46 qmlRegisterType<TimeFormatter>(uri, 0, 1, "TimeFormatter");
43 qmlRegisterType<GDateTimeFormatter>(uri, 0, 1, "GDateTimeFormatter");
47 qmlRegisterType<GDateTimeFormatter>(uri, 0, 1, "GDateTimeFormatter");
48+ qmlRegisterUncreatableType<BottomBarVisibilityCommunicatorShell>(uri, 0, 1, "BottomBarVisibilityCommunicatorShell", "Can't create BottomBarVisibilityCommunicatorShell");
44}
49}
45
50
46void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
51void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
@@ -59,4 +64,9 @@ void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
59 {
64 {
60 qWarning() << "Failed to register image provider for albumart (unknown error)";
65 qWarning() << "Failed to register image provider for albumart (unknown error)";
61 }
66 }
67+
68+ QDBusConnection::sessionBus().registerService(DBUS_SERVICE);
69+ BottomBarVisibilityCommunicatorShell *bottomBarVisibilityCommunicator = &BottomBarVisibilityCommunicatorShell::instance();
70+ QDBusConnection::sessionBus().registerObject(BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_PATH, bottomBarVisibilityCommunicator, QDBusConnection::ExportAllContents);
71+ engine->rootContext()->setContextProperty("bottomBarVisibilityCommunicatorShell", bottomBarVisibilityCommunicator);
62}
72}
qml/Shell.qml+49−3
@@ -28,7 +28,9 @@ import "Dash"
28import "Greeter"
28import "Greeter"
29import "Launcher"
29import "Launcher"
30import "Panel"
30import "Panel"
31+import "Hud"
31import "Components"
32import "Components"
33+import "Bottombar"
32import "SideStage"
34import "SideStage"
33import "Notifications"
35import "Notifications"
34import Unity.Notifications 1.0 as NotificationBackend
36import Unity.Notifications 1.0 as NotificationBackend
@@ -401,7 +403,7 @@ FocusScope {
401
403
402 readonly property int backgroundTopMargin: -panel.panelHeight
404 readonly property int backgroundTopMargin: -panel.panelHeight
403
405
404− hides: [launcher, panel.indicators]
406+ hides: [launcher, panel.indicators, hud]
405 shown: false
407 shown: false
406 enabled: true
408 enabled: true
407 showAnimation: StandardAnimation { property: "opacity"; to: 1 }
409 showAnimation: StandardAnimation { property: "opacity"; to: 1 }
@@ -456,7 +458,7 @@ FocusScope {
456 objectName: "greeter"
458 objectName: "greeter"
457
459
458 available: true
460 available: true
459− hides: [launcher, panel.indicators]
461+ hides: [launcher, panel.indicators, hud]
460 shown: true
462 shown: true
461
463
462 defaultBackground: shell.background
464 defaultBackground: shell.background
@@ -543,7 +545,7 @@ FocusScope {
543 InputFilterArea {
545 InputFilterArea {
544 anchors.fill: parent
546 anchors.fill: parent
545 blockInput: !applicationFocused || greeter.shown || lockscreen.shown || launcher.shown
547 blockInput: !applicationFocused || greeter.shown || lockscreen.shown || launcher.shown
546− || panel.indicators.shown
548+ || panel.indicators.shown || hud.shown
547 }
549 }
548
550
549 Connections {
551 Connections {
@@ -605,6 +607,48 @@ FocusScope {
605 }
607 }
606 }
608 }
607
609
610+ Hud {
611+ id: hud
612+
613+ width: parent.width > units.gu(60) ? units.gu(40) : parent.width
614+ height: parent.height
615+
616+ available: !greeter.shown && !panel.indicators.shown && !lockscreen.shown && edgeDemo.dashEnabled
617+ shown: false
618+ showAnimation: StandardAnimation { property: "y"; duration: hud.showableAnimationDuration; to: 0; easing.type: Easing.Linear }
619+ hideAnimation: StandardAnimation { property: "y"; duration: hud.showableAnimationDuration; to: hudRevealer.closedValue; easing.type: Easing.Linear }
620+
621+ Connections {
622+ target: shell.applicationManager
623+ onMainStageFocusedApplicationChanged: hud.hide()
624+ onSideStageFocusedApplicationChanged: hud.hide()
625+ }
626+ }
627+
628+ Revealer {
629+ id: hudRevealer
630+
631+ enabled: hud.shown
632+ width: hud.width
633+ anchors.left: hud.left
634+ height: parent.height
635+ target: hud.revealerTarget
636+ closedValue: height
637+ openedValue: 0
638+ direction: Qt.RightToLeft
639+ orientation: Qt.Vertical
640+ handleSize: hud.handleHeight
641+ onCloseClicked: target.hide()
642+ }
643+
644+ Bottombar {
645+ id: bottombar
646+ theHud: hud
647+ anchors.fill: parent
648+ enabled: hud.available
649+ applicationIsOnForeground: applicationFocused
650+ }
651+
608 InputFilterArea {
652 InputFilterArea {
609 blockInput: launcher.shown
653 blockInput: launcher.shown
610 anchors {
654 anchors {
@@ -649,6 +693,8 @@ FocusScope {
649 onShownChanged: {
693 onShownChanged: {
650 if (shown) {
694 if (shown) {
651 panel.indicators.hide()
695 panel.indicators.hide()
696+ hud.hide()
697+ bottombar.hide()
652 }
698 }
653 }
699 }
654 }
700 }