summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@qt.io>2021-07-06 03:05:40 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-07-20 16:16:14 +0000
commited1216c3369e32e4d10ffc20dcfa8ab81a18a677 (patch)
tree2bb9a23a7318836edbc5a86ab9f14326b3ff1f07
parent7791094e19e7ad9cfc3c251357a88e8a693b09ce (diff)
downloadqtapplicationmanager-ed1216c3369e32e4d10ffc20dcfa8ab81a18a677.tar.gz
Expose the windowManagerCompositorReady property on the DBus
Change-Id: I61aab301848aff2b2d7a02357c6dca9990c4e175 Reviewed-by: Dominik Holland <dominik.holland@qt.io> Reviewed-by: Kai Uwe Broulik <kde@privat.broulik.de> (cherry picked from commit b0d786b62d23d8277df7a351e534dc15a21cf7b1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/dbus-lib/applicationmanagerdbuscontextadaptor.cpp7
-rw-r--r--src/dbus-lib/io.qt.applicationmanager.xml4
-rw-r--r--src/manager-lib/applicationmanager.h3
3 files changed, 13 insertions, 1 deletions
diff --git a/src/dbus-lib/applicationmanagerdbuscontextadaptor.cpp b/src/dbus-lib/applicationmanagerdbuscontextadaptor.cpp
index 7176e1d0..3d3c5cae 100644
--- a/src/dbus-lib/applicationmanagerdbuscontextadaptor.cpp
+++ b/src/dbus-lib/applicationmanagerdbuscontextadaptor.cpp
@@ -83,6 +83,8 @@ ApplicationManagerAdaptor::ApplicationManagerAdaptor(QObject *parent)
this, &ApplicationManagerAdaptor::applicationAboutToBeRemoved);
connect(am, &ApplicationManager::applicationWasActivated,
this, &ApplicationManagerAdaptor::applicationWasActivated);
+ connect(am, &ApplicationManager::windowManagerCompositorReadyChanged,
+ this, &ApplicationManagerAdaptor::windowManagerCompositorReadyChanged);
// connect this signal via a lambda, since it needs a type conversion
connect(am, &ApplicationManager::applicationRunStateChanged,
@@ -119,6 +121,11 @@ QVariantMap ApplicationManagerAdaptor::systemProperties() const
return convertFromJSVariant(ApplicationManager::instance()->systemProperties()).toMap();
}
+bool ApplicationManagerAdaptor::windowManagerCompositorReady() const
+{
+ return ApplicationManager::instance()->isWindowManagerCompositorReady();
+}
+
QStringList ApplicationManagerAdaptor::applicationIds()
{
AM_AUTHENTICATE_DBUS(QStringList)
diff --git a/src/dbus-lib/io.qt.applicationmanager.xml b/src/dbus-lib/io.qt.applicationmanager.xml
index 74294862..c7a9d4fa 100644
--- a/src/dbus-lib/io.qt.applicationmanager.xml
+++ b/src/dbus-lib/io.qt.applicationmanager.xml
@@ -8,6 +8,7 @@
<property name="systemProperties" type="a{sv}" access="read">
<annotation name="org.qtproject.QtDBus.QtTypeName" value="QVariantMap"/>
</property>
+ <property name="windowManagerCompositorReady" type="b" access="read"/>
<signal name="applicationWasActivated">
<arg name="id" type="s" direction="out"/>
<arg name="aliasId" type="s" direction="out"/>
@@ -28,6 +29,9 @@
<arg name="id" type="s" direction="out"/>
<arg name="runState" type="u" direction="out"/>
</signal>
+ <signal name="windowManagerCompositorReadyChanged">
+ <arg name="ready" type="b" direction="out"/>
+ </signal>
<method name="applicationIds">
<arg type="as" direction="out"/>
</method>
diff --git a/src/manager-lib/applicationmanager.h b/src/manager-lib/applicationmanager.h
index 498f2ba5..0454df58 100644
--- a/src/manager-lib/applicationmanager.h
+++ b/src/manager-lib/applicationmanager.h
@@ -168,6 +168,8 @@ signals:
Q_SCRIPTABLE void applicationAboutToBeRemoved(const QString &id);
Q_SCRIPTABLE void applicationChanged(const QString &id, const QStringList &changedRoles);
+ Q_SCRIPTABLE void windowManagerCompositorReadyChanged(bool ready);
+
void openUrlRequested(const QString &requestId, const QString &url, const QString &mimeType, const QStringList &possibleAppIds);
void memoryLowWarning();
@@ -176,7 +178,6 @@ signals:
void containerSelectionFunctionChanged();
void shuttingDownChanged();
void shutDownFinished();
- void windowManagerCompositorReadyChanged(bool ready);
private slots:
void openUrlRelay(const QUrl &url);