From 66fff0eb6bf7e812548d7a247612640432a14dba Mon Sep 17 00:00:00 2001 From: Awawa <69086569+awawa-dev@users.noreply.github.com> Date: Sun, 8 Mar 2026 00:30:43 +0100 Subject: [PATCH] Migrate to standard OS config location if ~/.hyperhdr folder is missing --- cmake/linux/resources/hyperhdr.desktop | 4 ++-- sources/hyperhdr/main.cpp | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/cmake/linux/resources/hyperhdr.desktop b/cmake/linux/resources/hyperhdr.desktop index c600c05be..e35d11edf 100644 --- a/cmake/linux/resources/hyperhdr.desktop +++ b/cmake/linux/resources/hyperhdr.desktop @@ -1,11 +1,11 @@ [Desktop Entry] Name=HyperHDR GenericName=HyperHDR Ambient Lighting -Comment=HyperHDR mimics the well known Ambilight from Philips +Comment=Real-time ambient lighting system for TVs, monitors and LEDs Icon=/usr/share/pixmaps/hyperhdr/hyperhdr_128.png Terminal=false TryExec=hyperhdr Exec=hyperhdr Type=Application StartupNotify=false -Categories=Application; +Categories=AudioVideo;Video;Settings;Multimedia; diff --git a/sources/hyperhdr/main.cpp b/sources/hyperhdr/main.cpp index f53c7cfd0..c7ee7fe49 100644 --- a/sources/hyperhdr/main.cpp +++ b/sources/hyperhdr/main.cpp @@ -14,6 +14,7 @@ #include #endif +#include #include #if !defined(__APPLE__) && !defined(_WIN32) @@ -107,7 +108,7 @@ QCoreApplication* createApplication(bool& isGuiApp, int& argc, char* argv[]) #endif QCoreApplication* app = new QCoreApplication(argc, argv); - QCoreApplication::setApplicationName("HyperHdr"); + QCoreApplication::setApplicationName("HyperHDR"); QCoreApplication::setApplicationVersion(HYPERHDR_VERSION); // add optional library path QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath() + "/../lib"); @@ -140,8 +141,13 @@ int main(int argc, char** argv) Parser parser("HyperHDR Daemon"); parser.addHelpOption(); + QString defaultDataPath = QDir(QDir::homePath()).absoluteFilePath(".hyperhdr"); + if (!QDir(defaultDataPath).exists()) { + defaultDataPath = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation); + } + BooleanOption& versionOption = parser.add(0x0, "version", "Show version information"); - Option& userDataOption = parser.add