chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.code.sf.net/p/sleepyhead/code

Browse Source
This commit is contained in:
Mark Watkins 2014-07-04 13:46:06 +10:00
commit 92d79a7a76
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sleepyhead/SleepLib/profiles.cpp
View File

@ -110,12 +110,28 @@ bool Profile::Open(QString filename)
} }
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
QStringList path() const class Environment
{ {
QProcessEnvironment::systemEnvironment().value(QLatin1String("PATH"), "").split(';'); public:
Environment();
QStringList path();
QString searchInDirectory(const QStringList & execs, QString directory);
QString searchInPath(const QString &executable, const QStringList & additionalDirs = QStringList());
QProcessEnvironment env;
};
Environment::Environment()
{
env = QProcessEnvironment::systemEnvironment();
} }
void searchInDirectory(const QStringList & execs, QString directory) const QStringList Environment::path()
{
return env.value(QLatin1String("PATH"), "").split(';');
}
QString Environment::searchInDirectory(const QStringList & execs, QString directory)
{ {
const QChar slash = QLatin1Char('/'); const QChar slash = QLatin1Char('/');
@ -133,7 +149,7 @@ void searchInDirectory(const QStringList & execs, QString directory) const
return QString(); return QString();
} }
void searchInPath(const QString &executable, const QStringList & additionalDirs) const QString Environment::searchInPath(const QString &executable, const QStringList & additionalDirs)
{ {
if (executable.isEmpty()) return QString(); if (executable.isEmpty()) return QString();
@ -143,7 +159,7 @@ void searchInPath(const QString &executable, const QStringList & additionalDirs)
QStringList execs(exec); QStringList execs(exec);
if (fi.suffix().isEmpty()) { if (fi.suffix().isEmpty()) {
QStringList extensions = value(QLatin1String("PATHEXT")).split(QLatin1Char(';')); QStringList extensions = env.value(QLatin1String("PATHEXT")).split(QLatin1Char(';'));
foreach (const QString &ext, extensions) { foreach (const QString &ext, extensions) {
QString tmp = executable + ext.toLower(); QString tmp = executable + ext.toLower();
@ -191,15 +207,16 @@ void showInGraphicalShell(const QString &pathIn)
// Mac, Windows support folder or file. // Mac, Windows support folder or file.
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
const QString explorer = Environment::systemEnvironment().searchInPath(QLatin1String("explorer.exe")); Environment env;
const QString explorer = env.searchInPath(QLatin1String("explorer.exe"));
if (explorer.isEmpty()) { if (explorer.isEmpty()) {
QMessageBox::warning(parent, QMessageBox::warning(parent,
tr("Launching Windows Explorer failed"), QObject::tr("Launching Windows Explorer failed"),
tr("Could not find explorer.exe in path to launch Windows Explorer.")); QObject::tr("Could not find explorer.exe in path to launch Windows Explorer."));
return; return;
} }
QString param; QString param;
if (!QFileInfo(pathIn).isDir()) //if (!QFileInfo(pathIn).isDir())
param = QLatin1String("/select,"); param = QLatin1String("/select,");
param += QDir::toNativeSeparators(pathIn); param += QDir::toNativeSeparators(pathIn);
QProcess::startDetached(explorer, QStringList(param)); QProcess::startDetached(explorer, QStringList(param));