ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Raise windows also on other platforms

Browse Source 
And unify code related to unique application handling
This commit is contained in:
Carl Schwan
2021-12-28 23:50:25 +01:00
parent 297684a139
commit 200281702a
1 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/main.cpp
View File

@@ -137,20 +137,6 @@ int main(int argc, char *argv[])
KAboutData::setApplicationData(about); KAboutData::setApplicationData(about);
QGuiApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("org.kde.neochat"))); QGuiApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("org.kde.neochat")));
#ifdef HAVE_KDBUSADDONS
KDBusService service(KDBusService::Unique);
service.connect(&service, &KDBusService::activateRequested, &RoomManager::instance(), [](const QStringList &arguments, const QString &workingDirectory) {
Q_UNUSED(workingDirectory);
if (arguments.isEmpty()) {
return;
}
auto args = arguments;
args.removeFirst();
for (const auto &arg : args) {
RoomManager::instance().openResource(arg);
}
});
#endif
#ifdef NEOCHAT_FLATPAK #ifdef NEOCHAT_FLATPAK
// Copy over the included FontConfig configuration to the // Copy over the included FontConfig configuration to the
@@ -248,17 +234,35 @@ int main(int argc, char *argv[])
} }
#ifdef HAVE_KDBUSADDONS #ifdef HAVE_KDBUSADDONS
QObject::connect(&service, &KDBusService::activateRequested, &engine, [&engine](const QStringList & /*arguments*/, const QString & /*workingDirectory*/) { KDBusService service(KDBusService::Unique);
const auto rootObjects = engine.rootObjects(); service.connect(&service,
for (auto obj : rootObjects) { &KDBusService::activateRequested,
auto view = qobject_cast<QQuickWindow *>(obj); &RoomManager::instance(),
if (view) { [&engine](const QStringList &arguments, const QString &workingDirectory) {
view->show(); Q_UNUSED(workingDirectory);
raiseWindow(view);
return; // Raise windows
} const auto rootObjects = engine.rootObjects();
} for (auto obj : rootObjects) {
}); auto view = qobject_cast<QQuickWindow *>(obj);
if (view) {
view->show();
raiseWindow(view);
return;
}
}
// Open matrix uri
if (arguments.isEmpty()) {
return;
}
auto args = arguments;
args.removeFirst();
for (const auto &arg : args) {
RoomManager::instance().openResource(arg);
}
});
#endif
const auto rootObjects = engine.rootObjects(); const auto rootObjects = engine.rootObjects();
for (auto obj : rootObjects) { for (auto obj : rootObjects) {
auto view = qobject_cast<QQuickWindow *>(obj); auto view = qobject_cast<QQuickWindow *>(obj);
@@ -269,6 +273,5 @@ int main(int argc, char *argv[])
break; break;
} }
} }
#endif
return app.exec(); return app.exec();
} }