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

Compare commits

base: crtxcr:ac5498990bfeca0cba787056aba3faf614830027
Branches Tags
crtxcr:master crtxcr:WIP/speciallcommands crtxcr:wip/dynamics_buttons crtxcr:wip/cliparser crtxcr:wip/terminalkeyword crtxcr:wip/rearrange crtxcr:wip/inheritance
..
compare: crtxcr:wip/terminalkeyword
Branches Tags
crtxcr:master crtxcr:WIP/speciallcommands crtxcr:wip/dynamics_buttons crtxcr:wip/cliparser crtxcr:wip/terminalkeyword crtxcr:wip/rearrange crtxcr:wip/inheritance

3 Commits
ac5498990b ... wip/termin

Author SHA1 Message Date
Albert S
1ce3a6c397 fixup! Implement basic 'Terminal=' support for .desktop files 2020-10-05 22:57:43 +02:00
Albert S
0183ad58b8 add 'terminal=true' support for .qsrun entries 2020-10-05 22:50:53 +02:00
Albert S
2b1fb5b0c2 EntryPushButton: Set term icon for terminal cmds w/o icon 2020-10-05 22:28:18 +02:00
3 changed files with 3 additions and 9 deletions
Expand all files Collapse all files

9
entryprovider.cpp
View File

@ -13,11 +13,6 @@ EntryProvider::EntryProvider(QStringList userEntriesDirsPaths, QStringList syste
<< "%u"; << "%u";
} }
bool EntryProvider::isSavable(const EntryConfig &config) const
{
return ! config.entryPath.isEmpty() && (config.type == EntryType::USER || config.type == EntryType::INHERIT);
}
EntryConfig EntryProvider::readFromDesktopFile(const QString &path) EntryConfig EntryProvider::readFromDesktopFile(const QString &path)
{ {
EntryConfig result; EntryConfig result;
@ -290,7 +285,7 @@ QVector<EntryConfig> EntryProvider::getSystemEntries()
void EntryProvider::saveUserEntry(const EntryConfig &config) void EntryProvider::saveUserEntry(const EntryConfig &config)
{ {
if(!isSavable(config)) if(config.type == EntryType::SYSTEM || config.entryPath.isEmpty())
{ {
throw std::runtime_error("Only user/inherited entries can be saved"); throw std::runtime_error("Only user/inherited entries can be saved");
} }
@ -344,7 +339,7 @@ void EntryProvider::saveUserEntry(const EntryConfig &config)
bool EntryProvider::deleteUserEntry(const EntryConfig &config) bool EntryProvider::deleteUserEntry(const EntryConfig &config)
{ {
if(!isSavable(config)) if(config.type == EntryType::SYSTEM || config.entryPath.isEmpty())
{ {
throw std::runtime_error("Only user/inherited entries can be deleted"); throw std::runtime_error("Only user/inherited entries can be deleted");
} }

1
entryprovider.h
View File

@ -55,7 +55,6 @@ class EntryProvider
public: public:
EntryProvider(QStringList userEntriesDirsPaths, QStringList systemEntriesDirsPaths); EntryProvider(QStringList userEntriesDirsPaths, QStringList systemEntriesDirsPaths);
bool isSavable(const EntryConfig &config) const;
QVector<EntryConfig> getUserEntries(); QVector<EntryConfig> getUserEntries();
QVector<EntryConfig> getSystemEntries(); QVector<EntryConfig> getSystemEntries();
void saveUserEntry(const EntryConfig &config); void saveUserEntry(const EntryConfig &config);

2
window.cpp
View File

@ -123,7 +123,7 @@ void Window::executeConfig(const EntryConfig &config)
if(config.isTerminalCommand) if(config.isTerminalCommand)
{ {
QString cmd = settingsProvider->getTerminalCommand(); QString cmd = settingsProvider->getTerminalCommand();
cmd.replace("%c", config.command); cmd.replace("%c", config.command + " " + config.arguments.join(' '));
QProcess::startDetached(cmd); QProcess::startDetached(cmd);
} }
else else