window: get number of columns from config

No functional change.

entryprovider.cpp

@@ -75,12 +75,34 @@ EntryConfig EntryProvider::readFromDesktopFile(const QString &path)
 				}
 			}
 		}
+		if(key == "nodisplay")
+		{
+			result.hidden = args == "true";
+		}
 	}
 	return result;
 }
 
-/* qsrun own's config file */
+std::optional<EntryConfig> EntryProvider::readEntryFromPath(const QString &path)
-EntryConfig EntryProvider::readFromFile(const QString &path)
+{
+	QFileInfo info(path);
+	if(info.isFile())
+	{
+		QString suffix = info.suffix();
+		if(suffix == "desktop")
+		{
+			return readFromDesktopFile(path);
+		}
+		if(suffix == "qsrun")
+		{
+			return readqsrunFile(path);
+		}
+	}
+	return {};
+}
+
+/* qsrun's own format */
+EntryConfig EntryProvider::readqsrunFile(const QString &path)
 {
 	EntryConfig result;
 	EntryConfig inheritedConfig;
@@ -159,7 +181,11 @@ EntryConfig EntryProvider::readFromFile(const QString &path)
 		}
 		if(key == "inherit")
 		{
-			inheritedConfig = readFromDesktopFile(resolveEntryPath(splitted[1]));
+			auto entry = readEntryFromPath(resolveEntryPath(splitted[1]));
+			if(entry)
+			{
+				inheritedConfig = *entry;
+			}
 		}
 	}
 	return result.update(inheritedConfig);
@@ -197,17 +223,12 @@ QVector<EntryConfig> EntryProvider::readConfig(QStringList paths)
 		while(it.hasNext())
 		{
 			QString path = it.next();
-			QFileInfo info(path);
+			std::optional<EntryConfig> entry = readEntryFromPath(path);
-			if(info.isFile())
+			if(entry)
 			{
-				QString suffix = info.suffix();
+				if(!entry->hidden)
-				if(suffix == "desktop")
 				{
-					result.append(readFromDesktopFile(path));
+					result.append(*entry);
-				}
-				if(suffix == "qsrun")
-				{
-					result.append(readFromFile(path));
 				}
 			}
 		}

entryprovider.h

@@ -2,6 +2,7 @@
 #define ENTRYPROVIDER_H
 #include <QIcon>
 #include <QSettings>
+#include <optional>
 
 class ConfigFormatException : public std::runtime_error
 {
@@ -17,6 +18,7 @@ class ConfigFormatException : public std::runtime_error
 class EntryConfig
 {
   public:
+	bool hidden = false;
 	QString key;
 	QString name;
 	QString command;
@@ -34,8 +36,9 @@ class EntryProvider
 	QStringList _desktopIgnoreArgs;
 	QStringList userEntriesDirsPaths;
 	QStringList systemEntriesDirsPaths;
-	EntryConfig readFromFile(const QString &path);
+	EntryConfig readqsrunFile(const QString &path);
 	EntryConfig readFromDesktopFile(const QString &path);
+	std::optional<EntryConfig> readEntryFromPath(const QString &path);
 	QVector<EntryConfig> readConfig(QStringList paths);
 	QString resolveEntryPath(QString path);
 

qsrun.pro

@@ -23,5 +23,5 @@ SOURCES += calculationengine.cpp \
 QT += widgets sql network
 QT_CONFIG -= no-pkg-config
 LIBS += -lcln
-CONFIG += link_pkgconfig
+CONFIG += link_pkgconfig c++17
 PKGCONFIG += libqalculate

settingsprovider.cpp

@@ -1,6 +1,6 @@
 #include "settingsprovider.h"
-#include <QFileInfo>
 #include <QDir>
+#include <QFileInfo>
 
 SettingsProvider::SettingsProvider(QSettings &settings)
 {
@@ -9,9 +9,9 @@ SettingsProvider::SettingsProvider(QSettings &settings)
 
 QStringList SettingsProvider::userEntriesPaths() const
 {
-	//TODO: make it configurable, but we stick with this for now.
+	// TODO: make it configurable, but we stick with this for now.
 	QFileInfo fi(this->settings->fileName());
-	return { fi.absoluteDir().absolutePath() };
+	return {fi.absoluteDir().absolutePath()};
 }
 
 QStringList SettingsProvider::systemApplicationsEntriesPaths() const
@@ -19,9 +19,12 @@ QStringList SettingsProvider::systemApplicationsEntriesPaths() const
 	return settings->value("sysAppsPaths", "/usr/share/applications/").toStringList();
 }
 
+int SettingsProvider::getMaxCols() const
+{
+	return settings->value("maxColumns", 3).toInt();
+}
+
 bool SettingsProvider::singleInstanceMode() const
 {
 	return settings->value("singleInstance", true).toBool();
 }
-
-

settingsprovider.h

@@ -1,17 +1,19 @@
 #ifndef SETTINGSPROVIDER_H
 #define SETTINGSPROVIDER_H
 
-#include <stdexcept>
 #include <QSettings>
+#include <stdexcept>
 
 class SettingsProvider
 {
-private:
+  private:
 	QSettings *settings;
-public:
+
+  public:
 	SettingsProvider(QSettings &settings);
 	virtual QStringList userEntriesPaths() const;
 	virtual QStringList systemApplicationsEntriesPaths() const;
+	virtual int getMaxCols() const;
 	virtual bool singleInstanceMode() const;
 };
 

window.cpp

@@ -1,34 +1,35 @@
 /*
-* Copyright (c) 2018-2019 Albert S. <mail at quitesimple dot org>
+ * Copyright (c) 2018-2020 Albert S. <mail at quitesimple dot org>
-*
+ *
-* Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and distribute this software for any
-* purpose with or without fee is hereby granted, provided that the above
+ * purpose with or without fee is hereby granted, provided that the above
-* copyright notice and this permission notice appear in all copies.
+ * copyright notice and this permission notice appear in all copies.
-*
+ *
-* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
+ */
-#include <QProcess>
+#include <QClipboard>
-#include <QProcessEnvironment>
+#include <QDate>
+#include <QDebug>
+#include <QDesktopServices>
 #include <QDirIterator>
+#include <QFileIconProvider>
+#include <QHeaderView>
 #include <QIcon>
 #include <QKeySequence>
 #include <QLabel>
-#include <QDate>
-#include <QHeaderView>
-#include <QDesktopServices>
-#include <QFileIconProvider>
-#include <QDebug>
 #include <QMenu>
-#include <QClipboard>
+#include <QProcess>
+#include <QProcessEnvironment>
 #include <QScrollArea>
-#include "window.h"
+
 #include "entryprovider.h"
+#include "window.h"
 Window::Window(EntryProvider &entryProvider, SettingsProvider &configProvider)
 {
 	this->entryProvider = &entryProvider;
@@ -43,13 +44,12 @@ Window::Window(EntryProvider &entryProvider, SettingsProvider &configProvider)
 	calculationResultLabel.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 	calculationResultLabel.setAlignment(Qt::AlignCenter);
 	calculationResultLabel.setContextMenuPolicy(Qt::ContextMenuPolicy::CustomContextMenu);
-	connect(&calculationResultLabel, &QLabel::customContextMenuRequested, this, &Window::showCalculationResultContextMenu);
+	connect(&calculationResultLabel, &QLabel::customContextMenuRequested, this,
+			&Window::showCalculationResultContextMenu);
 }
 
 Window::~Window()
 {
-
-
 }
 
 void Window::initFromConfig()
@@ -77,9 +77,9 @@ void Window::showCalculationResultContextMenu(const QPoint &point)
 	menu.exec(QCursor::pos());
 }
 
-QVector<EntryPushButton*> Window::generateEntryButtons(const QVector<EntryConfig> &configs)
+QVector<EntryPushButton *> Window::generateEntryButtons(const QVector<EntryConfig> &configs)
 {
-	QVector<EntryPushButton*> result;
+	QVector<EntryPushButton *> result;
 	for(const EntryConfig &config : configs)
 	{
 		EntryPushButton *button = createEntryButton(config);
@@ -167,8 +167,8 @@ void Window::addPATHSuggestion(const QString &text)
 	{
 		EntryConfig e;
 		e.name = suggestions[0];
-		e.col=0;
+		e.col = 0;
-		e.row=0;
+		e.row = 0;
 		e.command = suggestions[0];
 		e.icon = QIcon::fromTheme(suggestions[0]);
 		EntryPushButton *button = createEntryButton(e);
@@ -198,7 +198,6 @@ void Window::addCalcResult(const QString &expression)
 	calculationResultLabel.setText(labelText);
 	calculationResultLabel.setVisible(true);
 
-
 	QFont currentFont = calculationResultLabel.font();
 	int calculatedPointSize = currentFont.pointSize();
 	QFontMetrics fm(currentFont);
@@ -221,7 +220,7 @@ void Window::addCalcResult(const QString &expression)
 	grid->addWidget(&calculationResultLabel, 0, 0);
 }
 
-//main problem here there is no easy event compression (clearing emit queue and only processing the last one)
+// main problem here there is no easy event compression (clearing emit queue and only processing the last one)
 void Window::lineEditTextChanged(QString text)
 {
 	if(text.length() >= 2)
@@ -268,11 +267,11 @@ void Window::keyReleaseEvent(QKeyEvent *event)
 		}
 	}
 	QWidget::keyReleaseEvent(event);
-
 }
 void Window::keyPressEvent(QKeyEvent *event)
 {
-	bool closeWindow = ((event->modifiers() & Qt::ControlModifier && event->key() == Qt::Key_Q) || event->key() == Qt::Key_Escape);
+	bool closeWindow =
+		((event->modifiers() & Qt::ControlModifier && event->key() == Qt::Key_Q) || event->key() == Qt::Key_Escape);
 	if(closeWindow)
 	{
 		this->closeWindow();
@@ -294,7 +293,8 @@ void Window::keyPressEvent(QKeyEvent *event)
 		QKeySequence seq(event->key());
 		QString key = seq.toString().toLower();
 
-		auto it = std::find_if(buttonsInGrid.begin(), buttonsInGrid.end(), [&key](const EntryPushButton *y) { return y->getShortcutKey() == key; });
+		auto it = std::find_if(buttonsInGrid.begin(), buttonsInGrid.end(),
+							   [&key](const EntryPushButton *y) { return y->getShortcutKey() == key; });
 		if(it != buttonsInGrid.end())
 		{
 			buttonClick(**it);
@@ -324,6 +324,7 @@ void Window::filterGridFor(QString filter)
 			int currow = 0;
 			int curcol = 0;
 			int i = 1;
+			const int MAX_COLS = this->settingsProvider->getMaxCols();
 			for(EntryPushButton *button : this->systemEntryButtons)
 			{
 				if(button->getName().contains(filter, Qt::CaseInsensitive))
@@ -335,7 +336,7 @@ void Window::filterGridFor(QString filter)
 					}
 					grid->addWidget(button, currow, curcol++);
 					this->buttonsInGrid.append(button);
-					if(curcol == 3)
+					if(curcol == MAX_COLS)
 					{
 						curcol = 0;
 						++currow;
@@ -343,18 +344,14 @@ void Window::filterGridFor(QString filter)
 				}
 			}
 		}
-
-
-
 	}
 	else
 	{
 		populateGrid(this->userEntryButtons);
 	}
-
 }
 
-EntryPushButton * Window::createEntryButton(const EntryConfig &entry)
+EntryPushButton *Window::createEntryButton(const EntryConfig &entry)
 {
 	EntryPushButton *button = new EntryPushButton(entry);
 	connect(button, &EntryPushButton::clicked, this, &Window::buttonClick);
@@ -370,8 +367,7 @@ void Window::lineEditReturnPressed()
 		return;
 	}
 
-
+	if(buttonsInGrid.length() > 0 && this->lineEdit->text().length() > 0)
-	if(buttonsInGrid.length() > 0 && this->lineEdit->text().length() > 0 )
 	{
 		buttonClick(*buttonsInGrid[0]);
 		return;
@@ -387,7 +383,7 @@ bool Window::eventFilter(QObject *obj, QEvent *event)
 {
 	if(obj == this->lineEdit)
 	{
-		if (event->type() == QEvent::KeyPress)
+		if(event->type() == QEvent::KeyPress)
 		{
 			QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
 			if(keyEvent->key() == Qt::Key_Tab)
@@ -396,12 +392,11 @@ bool Window::eventFilter(QObject *obj, QEvent *event)
 				if(suggestions.length() == 1)
 				{
 					this->lineEdit->setText(suggestions[0] + " ");
-					this->lineEdit->setCursorPosition(this->lineEdit->text().length()+1);
+					this->lineEdit->setCursorPosition(this->lineEdit->text().length() + 1);
 				}
 				return true;
 			}
 		}
-
 	}
 	return QObject::eventFilter(obj, event);
 }