EntryPushButton: Don't allow moving dynamic buttons

Fixes #23

TODO

@@ -1,4 +0,0 @@
- - Investigate memory leaks (relevant now that we have a single user mode,
- so qsrun may stay open after launch)
- - Provide --help
- - ESC/CTRL+Q close the app. May not be expected behaviour

entryprovider.cpp

@@ -13,6 +13,11 @@ EntryProvider::EntryProvider(QStringList userEntriesDirsPaths, QStringList syste
 					   << "%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 result;
@@ -20,7 +25,7 @@ EntryConfig EntryProvider::readFromDesktopFile(const QString &path)
 	if(!file.open(QIODevice::ReadOnly | QIODevice::Text))
 	{
 		// TODO: better exception class
-		throw new std::runtime_error("Failed to open file");
+		throw 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.
@@ -79,6 +84,10 @@ EntryConfig EntryProvider::readFromDesktopFile(const QString &path)
 		{
 			result.hidden = args == "true";
 		}
+		if(key == "terminal")
+		{
+			result.isTerminalCommand = args == "true";
+		}
 	}
 	result.type = EntryType::SYSTEM;
 	return result;
@@ -111,7 +120,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
 	if(!file.open(QIODevice::ReadOnly | QIODevice::Text))
 	{
 		// TODO: better exception class
-		throw new std::runtime_error("Failed to open file");
+		throw std::runtime_error("Failed to open file");
 	}
 	QHash<QString, QString> map;
 	QTextStream stream(&file);
@@ -122,7 +131,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
 		int spacePos = line.indexOf(' ');
 		if(spacePos == -1)
 		{
-			throw new ConfigFormatException("misformated line in .qsrun config file " + path.toStdString());
+			throw ConfigFormatException("misformated line in .qsrun config file " + path.toStdString());
 		}
 
 		QString key = line.mid(0, spacePos);
@@ -130,7 +139,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
 
 		if(key == "" || value == "")
 		{
-			throw new ConfigFormatException("empty key or value in .qsrun config file " + path.toStdString());
+			throw ConfigFormatException("empty key or value in .qsrun config file " + path.toStdString());
 		}
 		map[key] = value;
 	}
@@ -145,7 +154,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
 		}
 		else
 		{
-			throw new ConfigFormatException("Error attempting to read inherited entry");
+			throw ConfigFormatException("Error attempting to read inherited entry");
 		}
 	}
 	QString type = map["type"];
@@ -153,7 +162,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
 	{
 		if(type == "system")
 		{
-			throw new ConfigFormatException(".qsrun files cannot be designated as system entries " +
+			throw ConfigFormatException(".qsrun files cannot be designated as system entries " +
 											path.toStdString());
 		}
 		else if(type == "inherit")
@@ -166,7 +175,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
 		}
 		else
 		{
-			throw new ConfigFormatException("Invalid value for type provided in file: " + path.toStdString());
+			throw ConfigFormatException("Invalid value for type provided in file: " + path.toStdString());
 		}
 	}
 	else
@@ -219,6 +228,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
 	}
 	result.col = map["col"].toInt();
 	result.row = map["row"].toInt();
+	result.isTerminalCommand = map["terminal"] == "true";
 	return result;
 }
 
@@ -280,7 +290,7 @@ QVector<EntryConfig> EntryProvider::getSystemEntries()
 
 void EntryProvider::saveUserEntry(const EntryConfig &config)
 {
-	if(config.type == EntryType::SYSTEM || config.entryPath.isEmpty())
+	if(!isSavable(config))
 	{
 		throw std::runtime_error("Only user/inherited entries can be saved");
 	}
@@ -299,7 +309,10 @@ void EntryProvider::saveUserEntry(const EntryConfig &config)
 	outStream << "row" << " " << config.row << endl;
 	outStream << "col" << " " << config.col << endl;
 	outStream << "hidden" << " " << config.hidden << endl;
-	outStream << "key" << " " << config.key << endl;
+	if(!config.key.isEmpty())
+	{
+		outStream << "key" << " " << config.key << endl;
+	}
 	if(config.type == EntryType::USER)
 	{
 		if(!config.name.isEmpty())
@@ -334,7 +347,7 @@ void EntryProvider::saveUserEntry(const EntryConfig &config)
 
 bool EntryProvider::deleteUserEntry(const EntryConfig &config)
 {
-	if(config.type == EntryType::SYSTEM || config.entryPath.isEmpty())
+	if(!isSavable(config))
 	{
 		throw std::runtime_error("Only user/inherited entries can be deleted");
 	}

entryprovider.h

@@ -19,7 +19,8 @@ enum EntryType
 {
 	USER,
 	INHERIT,
-	SYSTEM
+	SYSTEM,
+	DYNAMIC
 };
 
 class EntryConfig
@@ -27,6 +28,7 @@ class EntryConfig
   public:
 	EntryType type = SYSTEM;
 	bool hidden = false;
+	bool isTerminalCommand = false;
 	QString entryPath;
 	QString key;
 	QString name;
@@ -54,6 +56,7 @@ class EntryProvider
 
   public:
 	EntryProvider(QStringList userEntriesDirsPaths, QStringList systemEntriesDirsPaths);
+	bool isSavable(const EntryConfig &config) const;
 	QVector<EntryConfig> getUserEntries();
 	QVector<EntryConfig> getSystemEntries();
 	void saveUserEntry(const EntryConfig &config);

entrypushbutton.cpp

@@ -23,7 +23,15 @@ EntryPushButton::EntryPushButton(const EntryConfig &config) : QPushButton()
 {
 	this->setText(config.name);
 	this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-	QIcon icon = resolveIcon(config.iconPath);
+	QIcon icon;
+	if(config.isTerminalCommand && config.iconPath.isEmpty())
+	{
+		icon = resolveIcon("utilities-terminal");
+	}
+	else
+	{
+		icon = resolveIcon(config.iconPath);
+	}
 	this->setIcon(icon);
 	if(!icon.availableSizes().isEmpty())
 	{
@@ -98,7 +106,7 @@ void EntryPushButton::mousePressEvent(QMouseEvent *event)
 		{
 			this->userEntryMenu.exec(QCursor::pos());
 		}
-		else
+		else if(this->config.type == EntryType::SYSTEM)
 		{
 			this->systemEntryMenu.exec(QCursor::pos());
 		}
@@ -108,7 +116,7 @@ void EntryPushButton::mousePressEvent(QMouseEvent *event)
 
 void EntryPushButton::mouseMoveEvent(QMouseEvent *event)
 {
-	if(this->config.type == EntryType::SYSTEM)
+	if(this->config.type == EntryType::SYSTEM || this->config.type == EntryType::DYNAMIC)
 	{
 		return;
 	}

main.cpp

@@ -14,6 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <QApplication>
+#include <QCommandLineParser>
 #include <QFuture>
 #include <QFutureWatcher>
 #include <QtConcurrent/QtConcurrentRun>
@@ -30,56 +31,76 @@ int main(int argc, char *argv[])
 	QApplication app(argc, argv);
 	QString configDirectoryPath;
 	QDir dir;
+	bool newInstanceRequested = false;
 	if(argc >= 2)
 	{
-		configDirectoryPath = QCoreApplication::arguments().at(1);
-		if(!dir.exists(configDirectoryPath))
+		QCommandLineParser parser;
+		parser.addOptions({
+			{"new-instance", "Launch a new instance, ignoring any running ones"},
+			{"config", "Use supplied config dir instead of default"},
+		});
+		parser.addHelpOption();
+		parser.process(app.arguments());
+		configDirectoryPath = parser.value("config");
+		newInstanceRequested = parser.isSet("new-instance");
+
+		if(!configDirectoryPath.isEmpty() && !dir.exists(configDirectoryPath))
 		{
 			QMessageBox::warning(nullptr, "Directory not found", configDirectoryPath + " was not found");
 			return 1;
 		}
 	}
-	else
+	if(configDirectoryPath.isEmpty())
 	{
 		configDirectoryPath = QDir::homePath() + "/.config/qsrun/";
 	}
-	qRegisterMetaType<QVector<QString> >("QVector<QString>");
 
+	qRegisterMetaType<QVector<QString>>("QVector<QString>");
 
 	if(!dir.exists(configDirectoryPath))
 	{
 		if(!dir.mkdir(configDirectoryPath))
 		{
-			QMessageBox::warning(nullptr, "Failed to create dir", configDirectoryPath + " was not found and could not be created!");
+			QMessageBox::warning(nullptr, "Failed to create dir",
+								 configDirectoryPath + " was not found and could not be created!");
 			return 1;
 		}
 	}
 
 	QSettings settings(configDirectoryPath + "qsrun.config", QSettings::NativeFormat);
 
-	SettingsProvider settingsProvider { settings };
+	SettingsProvider settingsProvider{settings};
 	EntryProvider entryProvider(settingsProvider.userEntriesPaths(), settingsProvider.systemApplicationsEntriesPaths());
-	//TODO if setting single instance mode
-	QLocalSocket localSocket;
-	localSocket.connectToServer("/tmp/qsrun.socket");
-	SingleInstanceServer server;
-	if(localSocket.isOpen() && localSocket.isWritable())
+
+	SingleInstanceServer *server = nullptr;
+
+	bool singleInstanceMode = !newInstanceRequested && settingsProvider.singleInstanceMode();
+	if(singleInstanceMode)
 	{
-		QDataStream stream(&localSocket);
-		stream << (int)0x01; //maximize
-		localSocket.flush();
-		localSocket.waitForBytesWritten();
-		localSocket.disconnectFromServer();
-		return 0;
-	}
-	else
-	{
-		if(!server.listen("/tmp/qsrun.socket"))
+		QLocalSocket localSocket;
+		localSocket.connectToServer(settingsProvider.socketPath());
+		if(localSocket.isOpen() && localSocket.isWritable())
+		{
+			QDataStream stream(&localSocket);
+			stream << (int)0x01; // maximize
+			localSocket.flush();
+			localSocket.waitForBytesWritten();
+			localSocket.disconnectFromServer();
+			return 0;
+		}
+
+		server = new SingleInstanceServer();
+		if(!server->listen(settingsProvider.socketPath()))
 		{
 			qDebug() << "Failed to listen on socket!";
+			return 1;
 		}
-		Window *w = new Window { entryProvider, settingsProvider };
-		QObject::connect(&server, &SingleInstanceServer::receivedMaximizationRequest, [&w]{
+	}
+
+	Window *w = new Window{entryProvider, settingsProvider};
+	if(singleInstanceMode && server != nullptr)
+	{
+		QObject::connect(server, &SingleInstanceServer::receivedMaximizationRequest, [&w] {
 			if(w != nullptr)
 			{
 				qInfo() << "maximizing as requested by other instance";
@@ -89,12 +110,10 @@ int main(int argc, char *argv[])
 				w->focusInput();
 			}
 		});
-		w->showMaximized();
-		w->focusInput();
-
 	}
 
-
+	w->showMaximized();
+	w->focusInput();
 
 	return app.exec();
 }

settingsprovider.cpp

@@ -28,3 +28,13 @@ bool SettingsProvider::singleInstanceMode() const
 {
 	return settings->value("singleInstance", true).toBool();
 }
+
+QString SettingsProvider::getTerminalCommand() const
+{
+	return settings->value("terminal", "/usr/bin/x-terminal-emulator -e %c").toString();
+}
+
+QString SettingsProvider::socketPath() const
+{
+	return settings->value("singleInstanceSocket", "/tmp/qsrun").toString();
+}

settingsprovider.h

@@ -15,6 +15,8 @@ class SettingsProvider
 	virtual QStringList systemApplicationsEntriesPaths() const;
 	virtual int getMaxCols() const;
 	virtual bool singleInstanceMode() const;
+	QString getTerminalCommand() const;
+	QString socketPath() const;
 };
 
 #endif // SETTINGSPROVIDER_H

window.cpp

@@ -120,7 +120,16 @@ void Window::populateGrid(const QVector<EntryPushButton *> &list)
 
 void Window::executeConfig(const EntryConfig &config)
 {
-	QProcess::startDetached(config.command, config.arguments);
+	if(config.isTerminalCommand || QApplication::keyboardModifiers().testFlag(Qt::ShiftModifier))
+	{
+		QString cmd = settingsProvider->getTerminalCommand();
+		cmd.replace("%c", config.command);
+		QProcess::startDetached(cmd);
+	}
+	else
+	{
+		QProcess::startDetached(config.command, config.arguments);
+	}
 	this->closeWindow();
 }
 
@@ -157,6 +166,7 @@ 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));
 }
 
@@ -256,6 +266,7 @@ 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);
@@ -333,6 +344,7 @@ void Window::lineEditTextChanged(QString text)
 			}
 			e.command = arguments[0];
 			e.iconPath = "utilities-terminal";
+			e.type = EntryType::DYNAMIC;
 
 			EntryPushButton *button = createEntryButton(e);
 			clearGrid();
@@ -372,7 +384,10 @@ void Window::keyPressEvent(QKeyEvent *event)
 
 		for(EntryPushButton *button : buttonsInGrid)
 		{
-			button->showShortcut();
+			if(!button->getEntryConfig().key.isEmpty())
+			{
+				button->showShortcut();
+			}
 		}
 
 		QKeySequence seq(event->key());