crtxcr/qsrun
1
0
Fork 0
Code Issues 29 Pull Requests 1 Releases Activity

Implement basic 'Terminal=' support for .desktop files

Browse Source
This commit is contained in:
Albert S. 2020-10-04 22:16:49 +02:00
parent bf8f09ec66
commit 59ff382856
5 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
entryprovider.cpp
View File

@ -79,6 +79,10 @@ EntryConfig EntryProvider::readFromDesktopFile(const QString &path)
{ {
result.hidden = args == "true"; result.hidden = args == "true";
} }
if(key == "terminal")
{
result.isTerminalCommand = args == "true";
}
} }
result.type = EntryType::SYSTEM; result.type = EntryType::SYSTEM;
return result; return result;

1
entryprovider.h
View File

@ -27,6 +27,7 @@ class EntryConfig
public: public:
EntryType type = SYSTEM; EntryType type = SYSTEM;
bool hidden = false; bool hidden = false;
bool isTerminalCommand = false;
QString entryPath; QString entryPath;
QString key; QString key;
QString name; QString name;

5
settingsprovider.cpp
View File

@ -28,3 +28,8 @@ bool SettingsProvider::singleInstanceMode() const
{ {
return settings->value("singleInstance", true).toBool(); return settings->value("singleInstance", true).toBool();
} }
QString SettingsProvider::getTerminalCommand() const
{
return settings->value("terminal", "/usr/bin/x-terminal-emulator -e %c").toString();
}

1
settingsprovider.h
View File

@ -15,6 +15,7 @@ class SettingsProvider
virtual QStringList systemApplicationsEntriesPaths() const; virtual QStringList systemApplicationsEntriesPaths() const;
virtual int getMaxCols() const; virtual int getMaxCols() const;
virtual bool singleInstanceMode() const; virtual bool singleInstanceMode() const;
QString getTerminalCommand() const;
}; };
#endif // SETTINGSPROVIDER_H #endif // SETTINGSPROVIDER_H

11
window.cpp
View File

@ -120,7 +120,16 @@ void Window::populateGrid(const QVector<EntryPushButton *> &list)
void Window::executeConfig(const EntryConfig &config) void Window::executeConfig(const EntryConfig &config)
{ {
QProcess::startDetached(config.command, config.arguments); if(config.isTerminalCommand)
{
QString cmd = settingsProvider->getTerminalCommand();
cmd.replace("%c", config.command);
QProcess::startDetached(cmd);
}
else
{
QProcess::startDetached(config.command, config.arguments);
}
this->closeWindow(); this->closeWindow();
} }