entryprovider.cpp

@@ -25,22 +25,20 @@ EntryConfig EntryProvider::readFromDesktopFile(const QString &path)
 	if(!file.open(QIODevice::ReadOnly | QIODevice::Text))
 	{
 		// TODO: better exception class
-		throw std::runtime_error("Failed to open file");
+		throw new std::runtime_error("Failed to open file");
 	}
 	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
-	// Ignore that as there some that violate that in the wild
-	const QString startSection = "[Desktop Entry]";
-	QString line;
+	QString firstLine;
 	do
 	{
-		line = stream.readLine().trimmed();
-	} while(!stream.atEnd() && line != startSection);
+		firstLine = stream.readLine().trimmed();
+	} while(!stream.atEnd() && (firstLine.isEmpty() || firstLine[0] == '#'));
 
-	if(line != startSection)
+	if(firstLine != "[Desktop Entry]")
 	{
-		throw ConfigFormatException(".desktop file does not contain [Desktop Entry] section: " + path.toStdString());
+		throw ConfigFormatException(".desktop file does not start with [Desktop Entry]: " + path.toStdString());
 	}
 
 	while(!stream.atEnd())
@@ -122,7 +120,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
 	if(!file.open(QIODevice::ReadOnly | QIODevice::Text))
 	{
 		// TODO: better exception class
-		throw std::runtime_error("Failed to open file");
+		throw new std::runtime_error("Failed to open file");
 	}
 	QHash<QString, QString> map;
 	QTextStream stream(&file);
@@ -133,7 +131,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
 		int spacePos = line.indexOf(' ');
 		if(spacePos == -1)
 		{
-			throw ConfigFormatException("misformated line in .qsrun config file " + path.toStdString());
+			throw new ConfigFormatException("misformated line in .qsrun config file " + path.toStdString());
 		}
 
 		QString key = line.mid(0, spacePos);
@@ -141,7 +139,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
 
 		if(key == "" || value == "")
 		{
-			throw ConfigFormatException("empty key or value in .qsrun config file " + path.toStdString());
+			throw new ConfigFormatException("empty key or value in .qsrun config file " + path.toStdString());
 		}
 		map[key] = value;
 	}
@@ -156,7 +154,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
 		}
 		else
 		{
-			throw ConfigFormatException("Error attempting to read inherited entry");
+			throw new ConfigFormatException("Error attempting to read inherited entry");
 		}
 	}
 	QString type = map["type"];
@@ -164,7 +162,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
 	{
 		if(type == "system")
 		{
-			throw ConfigFormatException(".qsrun files cannot be designated as system entries " +
+			throw new ConfigFormatException(".qsrun files cannot be designated as system entries " +
 											path.toStdString());
 		}
 		else if(type == "inherit")
@@ -177,7 +175,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
 		}
 		else
 		{
-			throw ConfigFormatException("Invalid value for type provided in file: " + path.toStdString());
+			throw new ConfigFormatException("Invalid value for type provided in file: " + path.toStdString());
 		}
 	}
 	else
@@ -303,35 +301,32 @@ 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") << Qt::endl;
+	outStream << "type" << " " << ((config.type == EntryType::USER) ? "user" : "inherit") << endl;
 	if(!config.inherit.isEmpty())
 	{
-		outStream << "inherit" << " " << config.inherit << Qt::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 << Qt::endl;
+		outStream << "inherit" << " " << config.inherit << endl;
 	}
+	outStream << "row" << " " << config.row << endl;
+	outStream << "col" << " " << config.col << endl;
+	outStream << "hidden" << " " << config.hidden << endl;
+	outStream << "key" << " " << config.key << endl;
 	if(config.type == EntryType::USER)
 	{
 		if(!config.name.isEmpty())
 		{
-			outStream << "name" << " " << config.name << Qt::endl;
+			outStream << "name" << " " << config.name << endl;
 		}
 		if(!config.command.isEmpty())
 		{
-			outStream << "command" << " " << config.command << Qt::endl;
+			outStream << "command" << " " << config.command << endl;
 		}
 		if(!config.iconPath.isEmpty())
 		{
-			outStream << "icon" << " " << config.iconPath << Qt::endl;
+			outStream << "icon" << " " << config.iconPath << endl;
 		}
 		if(!config.arguments.empty())
 		{
-			outStream << "arguments" << " " << config.arguments.join(' ') << Qt::endl;
+			outStream << "arguments" << " " << config.arguments.join(' ') << endl;
 		}
 	}
 

entryprovider.h

@@ -19,8 +19,7 @@ enum EntryType
 {
 	USER,
 	INHERIT,
-	SYSTEM,
-	DYNAMIC
+	SYSTEM
 };
 
 class EntryConfig

entrypushbutton.cpp

@@ -33,7 +33,19 @@ EntryPushButton::EntryPushButton(const EntryConfig &config) : QPushButton()
 		icon = resolveIcon(config.iconPath);
 	}
 	this->setIcon(icon);
-	this->setIconSize(QSize{256, 256});
+	if(!icon.availableSizes().isEmpty())
+	{
+		auto sizes = icon.availableSizes();
+		QSize maxSize = sizes.first();
+		for(QSize &current : sizes)
+		{
+			if(current.width() > maxSize.width())
+			{
+				maxSize = current;
+			}
+		}
+		this->setIconSize(maxSize);
+	}
 	this->config = config;
 	connect(this, SIGNAL(clicked()), this, SLOT(emitOwnClicked()));
 
@@ -94,7 +106,7 @@ void EntryPushButton::mousePressEvent(QMouseEvent *event)
 		{
 			this->userEntryMenu.exec(QCursor::pos());
 		}
-		else if(this->config.type == EntryType::SYSTEM)
+		else
 		{
 			this->systemEntryMenu.exec(QCursor::pos());
 		}
@@ -104,7 +116,7 @@ void EntryPushButton::mousePressEvent(QMouseEvent *event)
 
 void EntryPushButton::mouseMoveEvent(QMouseEvent *event)
 {
-	if(this->config.type == EntryType::SYSTEM || this->config.type == EntryType::DYNAMIC)
+	if(this->config.type == EntryType::SYSTEM)
 	{
 		return;
 	}

window.cpp

@@ -120,12 +120,11 @@ void Window::populateGrid(const QVector<EntryPushButton *> &list)
 
 void Window::executeConfig(const EntryConfig &config)
 {
-	if(config.isTerminalCommand || QApplication::keyboardModifiers().testFlag(Qt::ShiftModifier))
+	if(config.isTerminalCommand)
 	{
 		QString cmd = settingsProvider->getTerminalCommand();
 		cmd.replace("%c", config.command);
-		QStringList args = QProcess::splitCommand(cmd);
-		QProcess::startDetached(args[0], args);
+		QProcess::startDetached(cmd);
 	}
 	else
 	{
@@ -167,7 +166,6 @@ void Window::addToFavourites(const EntryConfig &config)
 	when we add it to the favourites. the alternative would be to reload the whole config,
 	but that's probably overkill. */
 	userConfig.update(config);
-	userConfig.key = "";
 	userEntryButtons.append(createEntryButton(userConfig));
 }
 
@@ -267,7 +265,6 @@ void Window::addPATHSuggestion(const QString &text)
 		e.row = 0;
 		e.command = suggestions[0];
 		e.iconPath = suggestions[0];
-		e.type = EntryType::DYNAMIC;
 		EntryPushButton *button = createEntryButton(e);
 		clearGrid();
 		grid->addWidget(button, 0, 0);
@@ -345,7 +342,6 @@ void Window::lineEditTextChanged(QString text)
 			}
 			e.command = arguments[0];
 			e.iconPath = "utilities-terminal";
-			e.type = EntryType::DYNAMIC;
 
 			EntryPushButton *button = createEntryButton(e);
 			clearGrid();
@@ -385,10 +381,7 @@ void Window::keyPressEvent(QKeyEvent *event)
 
 		for(EntryPushButton *button : buttonsInGrid)
 		{
-			if(!button->getEntryConfig().key.isEmpty())
-			{
-				button->showShortcut();
-			}
+			button->showShortcut();
 		}
 
 		QKeySequence seq(event->key());
@@ -404,27 +397,6 @@ void Window::keyPressEvent(QKeyEvent *event)
 	QWidget::keyPressEvent(event);
 }
 
-int Window::rankConfig(const EntryConfig &config, QString filter) const
-{
-	if(config.name.startsWith(filter, Qt::CaseInsensitive))
-	{
-		return 0;
-	}
-	else if(config.command.startsWith(filter, Qt::CaseInsensitive))
-	{
-		return 1;
-	}
-	else if(config.name.contains(filter, Qt::CaseInsensitive))
-	{
-		return 2;
-	}
-	else if(config.command.contains(filter, Qt::CaseInsensitive))
-	{
-		return 3;
-	}
-	return -1;
-}
-
 void Window::filterGridFor(QString filter)
 {
 	if(filter.length() > 0)
@@ -433,8 +405,7 @@ void Window::filterGridFor(QString filter)
 		bool userEntryMatch = false;
 		for(EntryPushButton *button : this->userEntryButtons)
 		{
-			if(button->getName().contains(filter, Qt::CaseInsensitive) ||
-			   button->getCommand().contains(filter, Qt::CaseInsensitive))
+			if(button->getName().contains(filter, Qt::CaseInsensitive))
 			{
 				button->setVisible(true);
 				grid->addWidget(button, button->getRow(), button->getCol());
@@ -444,38 +415,26 @@ void Window::filterGridFor(QString filter)
 		}
 		if(!userEntryMatch)
 		{
-			QVector<RankedButton> rankedEntries;
 			int currow = 0;
 			int curcol = 0;
 			int i = 1;
 			const int MAX_COLS = this->settingsProvider->getMaxCols();
 			for(EntryPushButton *button : this->systemEntryButtons)
 			{
-				int ranking = rankConfig(button->getEntryConfig(), filter);
-				if(ranking > -1)
+				if(button->getName().contains(filter, Qt::CaseInsensitive))
 				{
-					RankedButton rb;
-					rb.button = button;
-					rb.ranking = ranking;
-					rankedEntries.append(rb);
-				}
-			}
-			std::sort(rankedEntries.begin(), rankedEntries.end(),
-					  [](const RankedButton &a, const RankedButton &b) -> bool { return a.ranking < b.ranking; });
-			for(RankedButton &rankedButton : rankedEntries)
-			{
-				EntryPushButton *button = rankedButton.button;
-				button->setVisible(true);
-				if(i < 10)
-				{
-					button->setShortcutKey(QString::number(i++));
-				}
-				grid->addWidget(button, currow, curcol++);
-				this->buttonsInGrid.append(button);
-				if(curcol == MAX_COLS)
-				{
-					curcol = 0;
-					++currow;
+					button->setVisible(true);
+					if(i < 10)
+					{
+						button->setShortcutKey(QString::number(i++));
+					}
+					grid->addWidget(button, currow, curcol++);
+					this->buttonsInGrid.append(button);
+					if(curcol == MAX_COLS)
+					{
+						curcol = 0;
+						++currow;
+					}
 				}
 			}
 		}

window.h

@@ -37,13 +37,6 @@
 #include "calculationengine.h"
 #include "settingsprovider.h"
 
-class RankedButton
-{
-  public:
-	EntryPushButton *button = nullptr;
-	int ranking;
-};
-
 class Window : public QWidget
 {
 	Q_OBJECT
@@ -84,7 +77,7 @@ class Window : public QWidget
 	QStringList generatePATHSuggestions(const QString &text);
 	void closeWindow();
 	std::pair<int, int> getNextFreeCell();
-	int rankConfig(const EntryConfig &config, QString filter) const;
+
   private slots:
 	void lineEditReturnPressed();
 	void showCalculationResultContextMenu(const QPoint &point);