5 Commitit

Tekijä SHA1 Viesti Päivämäärä
8a47838d94 EntryProvider: Support broken .desktop files that don't start with [Desktop Entry] 2022-07-15 18:26:02 +02:00
89c9cc573e Add more reasonable screenshots 2021-10-30 16:22:43 +02:00
7c15d7b145 Window: executeConfig: Fix after refactoring for Qt 5.15
Refactoring for 5.15 broke this (d9b0be5063),
so fix it.
2021-05-08 20:54:19 +02:00
d9b0be5063 Fix some Qt deprication warnings 2021-04-29 09:33:57 +02:00
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
6 muutettua tiedostoa jossa 23 lisäystä ja 20 poistoa

Näytä tiedosto

@ -30,15 +30,17 @@ EntryConfig EntryProvider::readFromDesktopFile(const QString &path)
QTextStream stream(&file);
// 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
QString firstLine;
// Ignore that as there some that violate that in the wild
const QString startSection = "[Desktop Entry]";
QString line;
do
{
firstLine = stream.readLine().trimmed();
} while(!stream.atEnd() && (firstLine.isEmpty() || firstLine[0] == '#'));
line = stream.readLine().trimmed();
} 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())
@ -301,35 +303,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;
}
}

BIN
screenshots/calc.png Normal file

Binary file not shown.

After

Leveys:  |  Korkeus:  |  Koko: 31 KiB

Binary file not shown.

After

Leveys:  |  Korkeus:  |  Koko: 48 KiB

Binary file not shown.

Before

Leveys:  |  Korkeus:  |  Koko: 112 KiB

BIN
screenshots/startview.png Normal file

Binary file not shown.

After

Leveys:  |  Korkeus:  |  Koko: 205 KiB

Näytä tiedosto

@ -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(args[0], 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;
}