dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor CMake files

Browse Source
This commit is contained in:
Jonas Kvinge
2024-10-03 22:32:51 +02:00
parent 525ebbb9b7
commit 0768298b95
43 changed files with 1494 additions and 1768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.cpp
View File

@@ -84,8 +84,8 @@
# include "core/mac_startup.h"
#endif
#ifdef HAVE_DBUS
# include "core/mpris2.h"
#ifdef HAVE_MPRIS2
# include "mpris2/mpris2.h"
#endif
#include "core/metatypes.h"
#include "core/iconloader.h"
@@ -266,7 +266,7 @@ int main(int argc, char *argv[]) {
ScopedPtr<Translations> translations(new Translations);
translations->LoadTranslation(QStringLiteral("qt"), QLibraryInfo::path(QLibraryInfo::TranslationsPath), language);
translations->LoadTranslation(QStringLiteral("strawberry"), QStringLiteral(":/translations"), language);
translations->LoadTranslation(QStringLiteral("strawberry"), QStringLiteral(":/src/translations"), language);
translations->LoadTranslation(QStringLiteral("strawberry"), QStringLiteral(TRANSLATIONS_DIR), language);
translations->LoadTranslation(QStringLiteral("strawberry"), QCoreApplication::applicationDirPath(), language);
translations->LoadTranslation(QStringLiteral("strawberry"), QDir::currentPath(), language);
@@ -293,7 +293,7 @@ int main(int argc, char *argv[]) {
OSDBase osd(tray_icon, &app);
#endif
#ifdef HAVE_DBUS
#ifdef HAVE_MPRIS2
mpris::Mpris2 mpris2(&app);
#endif
@@ -304,7 +304,7 @@ int main(int argc, char *argv[]) {
mac::EnableFullScreen(w);
#endif // Q_OS_MACOS
#ifdef HAVE_DBUS
#ifdef HAVE_MPRIS2
QObject::connect(&mpris2, &mpris::Mpris2::RaiseMainWindow, &w, &MainWindow::Raise);
#endif
QObject::connect(&single_app, &KDSingleApplication::messageReceived, &w, QOverload<const QByteArray&>::of(&MainWindow::CommandlineOptionsReceived));