megacoffee.net Gentoo overlay - legacy mirror

We have moved to Git. This repository is only provided for compatibility with old installations. Learn how to migrate your installation here.

annotate app-misc/qutescoop/files/userdir.patch @ 266:ece4c118e053

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[sync] imported eb63403..6e83727 from upstream commit 6e8372740386620a83b33749bb19fc8f40fc948a Author: Daniel Neugebauer <dneuge@energiequant.de> Date: Sat Nov 9 22:29:27 2024 +0100 app-misc/qutescoop: bump to 3.0.0-rc3
author Migration Sync <gentoo-overlay@megacoffee.net>
date Sat, 09 Nov 2024 21:45:01 +0000
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
266
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
1 diff --git a/src/Settings.cpp b/src/Settings.cpp
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
2 index 040fa65..4f21092 100644
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
3 --- a/src/Settings.cpp
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
4 +++ b/src/Settings.cpp
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
5 @@ -1,5 +1,7 @@
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
6 #include "Settings.h"
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
7
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
8 +#include <QStandardPaths>
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
9 +
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
10 #include "GuiMessage.h"
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
11 #include "Whazzup.h"
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
12 #include "dialogs/AirportDetails.h"
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
13 @@ -198,6 +200,14 @@ void Settings::importFromFile(QString fileName) {
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
14 * @returns fully qualified path to the 'application data directory'.
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
15 **/
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
16 QString Settings::dataDirectory(const QString &composeFilePath) {
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
17 + // try local data directory first, use if it exists
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
18 + QString appLocalDataPath = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation);
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
19 + QDir appLocalDataDir(appLocalDataPath);
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
20 + if (appLocalDataDir.exists()) {
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
21 + return QString("%1/%2").arg(appLocalDataPath, composeFilePath);
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
22 + }
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
23 +
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
24 + // fall back to installation directory
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
25 return QString("%1/%2")
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
26 .arg(QCoreApplication::applicationDirPath(), composeFilePath);
ece4c118e053 [sync] imported eb63403..6e83727 from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
27 }