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

Add warning when enabling X11 shortcuts on gnome, cinnamon and KDE

Browse Source
This commit is contained in:
Jonas Kvinge
2019-01-25 21:36:28 +01:00
parent 3241815a11
commit f90de75e3a
7 changed files with 147 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/core/utilities.cpp
View File

@@ -700,6 +700,10 @@ QString FiddleFileExtension(const QString &filename, const QString &new_extensio
return PathWithoutFilenameExtension(filename) + "." + new_extension;
}
QString GetEnv(const QString &key) {
return QString::fromLocal8Bit(qgetenv(key.toLocal8Bit()));
}
void SetEnv(const char *key, const QString &value) {
#ifdef Q_OS_WIN32
@@ -767,6 +771,33 @@ QString GetRandomString(const int len, const QString &UseCharacters) {
}
QString DesktopEnvironment() {
const QString de = GetEnv("XDG_CURRENT_DESKTOP");
if (!de.isEmpty()) return de;
if (!qEnvironmentVariableIsEmpty("KDE_FULL_SESSION")) return "KDE";
if (!qEnvironmentVariableIsEmpty("GNOME_DESKTOP_SESSION_ID")) return "Gnome";
QString session = GetEnv("DESKTOP_SESSION");
int slash = session.lastIndexOf('/');
if (slash != -1) {
QSettings desktop_file(QString(session + ".desktop"), QSettings::IniFormat);
desktop_file.beginGroup("Desktop Entry");
QString name = desktop_file.value("DesktopNames").toString();
desktop_file.endGroup();
if (!name.isEmpty()) return name;
session = session.mid(slash + 1);
}
if (session == "kde") return "KDE";
else if (session == "gnome") return "Gnome";
else if (session == "xfce") return "XFCE";
return "Unknown";
}
} // namespace Utilities
ScopedWCharArray::ScopedWCharArray(const QString &str)

5
src/core/utilities.h
View File

@@ -122,6 +122,7 @@ QUrl GetRelativePathToStrawberryBin(const QUrl &url);
QString PathWithoutFilenameExtension(const QString &filename);
QString FiddleFileExtension(const QString &filename, const QString &new_extension);
QString GetEnv(const QString &key);
void SetEnv(const char *key, const QString &value);
void IncreaseFDLimit();
void CheckPortable();
@@ -153,7 +154,9 @@ QString GetRandomStringWithChars(const int len);
QString GetRandomStringWithCharsAndNumbers(const int len);
QString GetRandomString(const int len, const QString &UseCharacters);
}
QString DesktopEnvironment();
} // namespace
class ScopedWCharArray {
public: