Compare commits
5 Commits
4315de0e76
...
master
Author | SHA1 | Date | |
---|---|---|---|
8a47838d94 | |||
89c9cc573e | |||
7c15d7b145 | |||
d9b0be5063 | |||
f1b17c0842 |
@ -30,15 +30,17 @@ EntryConfig EntryProvider::readFromDesktopFile(const QString &path)
|
|||||||
QTextStream stream(&file);
|
QTextStream stream(&file);
|
||||||
// There should be nothing preceding this group in the desktop entry file but possibly one or more comments.
|
// There should be nothing preceding this group in the desktop entry file but possibly one or more comments.
|
||||||
// https://standards.freedesktop.org/desktop-entry-spec/latest/ar01s03.html#group-header
|
// https://standards.freedesktop.org/desktop-entry-spec/latest/ar01s03.html#group-header
|
||||||
QString firstLine;
|
// Ignore that as there some that violate that in the wild
|
||||||
|
const QString startSection = "[Desktop Entry]";
|
||||||
|
QString line;
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
firstLine = stream.readLine().trimmed();
|
line = stream.readLine().trimmed();
|
||||||
} while(!stream.atEnd() && (firstLine.isEmpty() || firstLine[0] == '#'));
|
} while(!stream.atEnd() && line != startSection);
|
||||||
|
|
||||||
if(firstLine != "[Desktop Entry]")
|
if(line != startSection)
|
||||||
{
|
{
|
||||||
throw ConfigFormatException(".desktop file does not start with [Desktop Entry]: " + path.toStdString());
|
throw ConfigFormatException(".desktop file does not contain [Desktop Entry] section: " + path.toStdString());
|
||||||
}
|
}
|
||||||
|
|
||||||
while(!stream.atEnd())
|
while(!stream.atEnd())
|
||||||
@ -301,35 +303,35 @@ void EntryProvider::saveUserEntry(const EntryConfig &config)
|
|||||||
throw std::runtime_error("Error: Can not open file for writing");
|
throw std::runtime_error("Error: Can not open file for writing");
|
||||||
}
|
}
|
||||||
QTextStream outStream(&file);
|
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())
|
if(!config.inherit.isEmpty())
|
||||||
{
|
{
|
||||||
outStream << "inherit" << " " << config.inherit << endl;
|
outStream << "inherit" << " " << config.inherit << Qt::endl;
|
||||||
}
|
}
|
||||||
outStream << "row" << " " << config.row << endl;
|
outStream << "row" << " " << config.row << Qt::endl;
|
||||||
outStream << "col" << " " << config.col << endl;
|
outStream << "col" << " " << config.col << Qt::endl;
|
||||||
outStream << "hidden" << " " << config.hidden << endl;
|
outStream << "hidden" << " " << config.hidden << Qt::endl;
|
||||||
if(!config.key.isEmpty())
|
if(!config.key.isEmpty())
|
||||||
{
|
{
|
||||||
outStream << "key" << " " << config.key << endl;
|
outStream << "key" << " " << config.key << Qt::endl;
|
||||||
}
|
}
|
||||||
if(config.type == EntryType::USER)
|
if(config.type == EntryType::USER)
|
||||||
{
|
{
|
||||||
if(!config.name.isEmpty())
|
if(!config.name.isEmpty())
|
||||||
{
|
{
|
||||||
outStream << "name" << " " << config.name << endl;
|
outStream << "name" << " " << config.name << Qt::endl;
|
||||||
}
|
}
|
||||||
if(!config.command.isEmpty())
|
if(!config.command.isEmpty())
|
||||||
{
|
{
|
||||||
outStream << "command" << " " << config.command << endl;
|
outStream << "command" << " " << config.command << Qt::endl;
|
||||||
}
|
}
|
||||||
if(!config.iconPath.isEmpty())
|
if(!config.iconPath.isEmpty())
|
||||||
{
|
{
|
||||||
outStream << "icon" << " " << config.iconPath << endl;
|
outStream << "icon" << " " << config.iconPath << Qt::endl;
|
||||||
}
|
}
|
||||||
if(!config.arguments.empty())
|
if(!config.arguments.empty())
|
||||||
{
|
{
|
||||||
outStream << "arguments" << " " << config.arguments.join(' ') << endl;
|
outStream << "arguments" << " " << config.arguments.join(' ') << Qt::endl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BIN
screenshots/calc.png
Normal file
BIN
screenshots/calc.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 31 KiB |
BIN
screenshots/search-libreoffice.png
Normal file
BIN
screenshots/search-libreoffice.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 48 KiB |
Binary file not shown.
Before Width: | Height: | Size: 112 KiB |
BIN
screenshots/startview.png
Normal file
BIN
screenshots/startview.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 205 KiB |
11
window.cpp
11
window.cpp
@ -124,7 +124,8 @@ void Window::executeConfig(const EntryConfig &config)
|
|||||||
{
|
{
|
||||||
QString cmd = settingsProvider->getTerminalCommand();
|
QString cmd = settingsProvider->getTerminalCommand();
|
||||||
cmd.replace("%c", config.command);
|
cmd.replace("%c", config.command);
|
||||||
QProcess::startDetached(cmd);
|
QStringList args = QProcess::splitCommand(cmd);
|
||||||
|
QProcess::startDetached(args[0], args);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -405,19 +406,19 @@ void Window::keyPressEvent(QKeyEvent *event)
|
|||||||
|
|
||||||
int Window::rankConfig(const EntryConfig &config, QString filter) const
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
else if(config.command.contains(filter, Qt::CaseInsensitive))
|
else if(config.command.startsWith(filter, Qt::CaseInsensitive))
|
||||||
{
|
{
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
else if(config.name.startsWith(filter, Qt::CaseInsensitive))
|
else if(config.name.contains(filter, Qt::CaseInsensitive))
|
||||||
{
|
{
|
||||||
return 2;
|
return 2;
|
||||||
}
|
}
|
||||||
else if(config.name.contains(filter, Qt::CaseInsensitive))
|
else if(config.command.contains(filter, Qt::CaseInsensitive))
|
||||||
{
|
{
|
||||||
return 3;
|
return 3;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user