Compare commits

...

2 Commits

Author SHA1 Message Date
Albert S. d9b0be5063 Fix some Qt deprication warnings 2021-04-29 09:33:57 +02:00
Albert S. f1b17c0842 Ranking: Prioritizee name before command/binary name
This seems to work better for flatpak apps and should
argueably be more natural.
2021-04-29 09:33:31 +02:00
2 changed files with 16 additions and 15 deletions

View File

@ -301,35 +301,35 @@ void EntryProvider::saveUserEntry(const EntryConfig &config)
throw std::runtime_error("Error: Can not open file for writing");
}
QTextStream outStream(&file);
outStream << "type" << " " << ((config.type == EntryType::USER) ? "user" : "inherit") << endl;
outStream << "type" << " " << ((config.type == EntryType::USER) ? "user" : "inherit") << Qt::endl;
if(!config.inherit.isEmpty())
{
outStream << "inherit" << " " << config.inherit << endl;
outStream << "inherit" << " " << config.inherit << Qt::endl;
}
outStream << "row" << " " << config.row << endl;
outStream << "col" << " " << config.col << endl;
outStream << "hidden" << " " << config.hidden << endl;
outStream << "row" << " " << config.row << Qt::endl;
outStream << "col" << " " << config.col << Qt::endl;
outStream << "hidden" << " " << config.hidden << Qt::endl;
if(!config.key.isEmpty())
{
outStream << "key" << " " << config.key << endl;
outStream << "key" << " " << config.key << Qt::endl;
}
if(config.type == EntryType::USER)
{
if(!config.name.isEmpty())
{
outStream << "name" << " " << config.name << endl;
outStream << "name" << " " << config.name << Qt::endl;
}
if(!config.command.isEmpty())
{
outStream << "command" << " " << config.command << endl;
outStream << "command" << " " << config.command << Qt::endl;
}
if(!config.iconPath.isEmpty())
{
outStream << "icon" << " " << config.iconPath << endl;
outStream << "icon" << " " << config.iconPath << Qt::endl;
}
if(!config.arguments.empty())
{
outStream << "arguments" << " " << config.arguments.join(' ') << endl;
outStream << "arguments" << " " << config.arguments.join(' ') << Qt::endl;
}
}

View File

@ -124,7 +124,8 @@ void Window::executeConfig(const EntryConfig &config)
{
QString cmd = settingsProvider->getTerminalCommand();
cmd.replace("%c", config.command);
QProcess::startDetached(cmd);
QStringList args = QProcess::splitCommand(cmd);
QProcess::startDetached(cmd, args);
}
else
{
@ -405,19 +406,19 @@ void Window::keyPressEvent(QKeyEvent *event)
int Window::rankConfig(const EntryConfig &config, QString filter) const
{
if(config.command.startsWith(filter, Qt::CaseInsensitive))
if(config.name.startsWith(filter, Qt::CaseInsensitive))
{
return 0;
}
else if(config.command.contains(filter, Qt::CaseInsensitive))
else if(config.command.startsWith(filter, Qt::CaseInsensitive))
{
return 1;
}
else if(config.name.startsWith(filter, Qt::CaseInsensitive))
else if(config.name.contains(filter, Qt::CaseInsensitive))
{
return 2;
}
else if(config.name.contains(filter, Qt::CaseInsensitive))
else if(config.command.contains(filter, Qt::CaseInsensitive))
{
return 3;
}