Compare commits
26 次程式碼提交
wip/rearra
...
WIP/specia
作者 | SHA1 | 提交日期 | |
---|---|---|---|
8ea2f713cf | |||
65b044e618 | |||
4814872bcf | |||
6d78dbe92e | |||
7c15d7b145 | |||
d9b0be5063 | |||
f1b17c0842 | |||
4315de0e76 | |||
f0387db468 | |||
6e4f0ecabf | |||
2df37212dd | |||
b13815a924 | |||
bb74d156c9 | |||
f9038f3098 | |||
042b53a0be | |||
64d3223fb2 | |||
adfb065358 | |||
98cff50c41 | |||
5b5333585c | |||
8eb52fbfb3 | |||
241bec54ad | |||
ac5498990b | |||
38cc87fbcd | |||
2d14b01c5c | |||
59ff382856 | |||
bf8f09ec66 |
4
TODO
4
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
|
@ -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");
|
||||
}
|
||||
@ -291,32 +301,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 << 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 << "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 << 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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
@ -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);
|
||||
|
@ -23,21 +23,17 @@ EntryPushButton::EntryPushButton(const EntryConfig &config) : QPushButton()
|
||||
{
|
||||
this->setText(config.name);
|
||||
this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
|
||||
QIcon icon = resolveIcon(config.iconPath);
|
||||
this->setIcon(icon);
|
||||
if(!icon.availableSizes().isEmpty())
|
||||
QIcon icon;
|
||||
if(config.isTerminalCommand && config.iconPath.isEmpty())
|
||||
{
|
||||
auto sizes = icon.availableSizes();
|
||||
QSize maxSize = sizes.first();
|
||||
for(QSize ¤t : sizes)
|
||||
{
|
||||
if(current.width() > maxSize.width())
|
||||
{
|
||||
maxSize = current;
|
||||
}
|
||||
}
|
||||
this->setIconSize(maxSize);
|
||||
icon = resolveIcon("utilities-terminal");
|
||||
}
|
||||
else
|
||||
{
|
||||
icon = resolveIcon(config.iconPath);
|
||||
}
|
||||
this->setIcon(icon);
|
||||
this->setIconSize(QSize{256, 256});
|
||||
this->config = config;
|
||||
connect(this, SIGNAL(clicked()), this, SLOT(emitOwnClicked()));
|
||||
|
||||
@ -98,7 +94,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 +104,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;
|
||||
}
|
||||
|
73
main.cpp
73
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();
|
||||
}
|
||||
|
@ -12,6 +12,8 @@ HEADERS += calculationengine.h \
|
||||
entrypushbutton.h \
|
||||
settingsprovider.h \
|
||||
singleinstanceserver.h \
|
||||
specialcommandconfig.h \
|
||||
textoutputlabel.h \
|
||||
window.h
|
||||
SOURCES += calculationengine.cpp \
|
||||
entryprovider.cpp \
|
||||
@ -19,6 +21,7 @@ SOURCES += calculationengine.cpp \
|
||||
main.cpp \
|
||||
settingsprovider.cpp \
|
||||
singleinstanceserver.cpp \
|
||||
textoutputlabel.cpp \
|
||||
window.cpp
|
||||
QT += widgets sql network
|
||||
QT_CONFIG -= no-pkg-config
|
||||
|
二進制
screenshots/calc.png
Normal file
二進制
screenshots/calc.png
Normal file
Binary file not shown.
After Width: | Height: | 大小: 31 KiB |
二進制
screenshots/search-libreoffice.png
Normal file
二進制
screenshots/search-libreoffice.png
Normal file
Binary file not shown.
After Width: | Height: | 大小: 48 KiB |
Binary file not shown.
Before Width: | Height: | 大小: 112 KiB |
二進制
screenshots/startview.png
Normal file
二進制
screenshots/startview.png
Normal file
Binary file not shown.
After Width: | Height: | 大小: 205 KiB |
@ -28,3 +28,38 @@ 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();
|
||||
}
|
||||
|
||||
QVector<SpecialCommandConfig> SettingsProvider::specialCommands() const
|
||||
{
|
||||
QVector<SpecialCommandConfig> result;
|
||||
|
||||
SpecialCommandConfig uname;
|
||||
uname.command = "uname";
|
||||
uname.reqArgCount = 0;
|
||||
uname.immediateProcessing = true;
|
||||
result.append(uname);
|
||||
|
||||
|
||||
SpecialCommandConfig date;
|
||||
date.command = "date";
|
||||
date.reqArgCount = 0;
|
||||
date.immediateProcessing = true;
|
||||
result.append(date);
|
||||
|
||||
SpecialCommandConfig echo;
|
||||
echo.command = "echo";
|
||||
echo.reqArgCount = 0;
|
||||
echo.immediateProcessing = true;
|
||||
result.append(echo);
|
||||
return result;
|
||||
}
|
||||
|
@ -3,6 +3,7 @@
|
||||
|
||||
#include <QSettings>
|
||||
#include <stdexcept>
|
||||
#include "specialcommandconfig.h"
|
||||
|
||||
class SettingsProvider
|
||||
{
|
||||
@ -15,6 +16,9 @@ class SettingsProvider
|
||||
virtual QStringList systemApplicationsEntriesPaths() const;
|
||||
virtual int getMaxCols() const;
|
||||
virtual bool singleInstanceMode() const;
|
||||
QString getTerminalCommand() const;
|
||||
QString socketPath() const;
|
||||
QVector<SpecialCommandConfig> specialCommands() const;
|
||||
};
|
||||
|
||||
#endif // SETTINGSPROVIDER_H
|
||||
|
37
textoutputlabel.cpp
Normal file
37
textoutputlabel.cpp
Normal file
@ -0,0 +1,37 @@
|
||||
#include "textoutputlabel.h"
|
||||
|
||||
TextoutputLabel::TextoutputLabel()
|
||||
{
|
||||
QFont font;
|
||||
font.setPointSize(48);
|
||||
font.setBold(true);
|
||||
this->setFont(font);
|
||||
this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
|
||||
this->setAlignment(Qt::AlignCenter);
|
||||
this->setContextMenuPolicy(Qt::ContextMenuPolicy::CustomContextMenu);
|
||||
}
|
||||
|
||||
void TextoutputLabel::setText(const QString &text)
|
||||
{
|
||||
QLabel::setText(text);
|
||||
QFont currentFont = this->font();
|
||||
int calculatedPointSize = currentFont.pointSize();
|
||||
QFontMetrics fm(currentFont);
|
||||
int contentWidth = this->contentsRect().width() - this->margin();
|
||||
while(calculatedPointSize < 48 && fm.boundingRect(this->text()).width() < contentWidth)
|
||||
{
|
||||
calculatedPointSize += 1;
|
||||
currentFont.setPointSize(calculatedPointSize);
|
||||
fm = QFontMetrics(currentFont);
|
||||
}
|
||||
while(fm.boundingRect(this->text()).width() >= contentWidth)
|
||||
{
|
||||
calculatedPointSize -= 1;
|
||||
currentFont.setPointSize(calculatedPointSize);
|
||||
fm = QFontMetrics(currentFont);
|
||||
}
|
||||
this->setFont(currentFont);
|
||||
}
|
||||
|
||||
|
||||
|
14
textoutputlabel.h
Normal file
14
textoutputlabel.h
Normal file
@ -0,0 +1,14 @@
|
||||
#ifndef TEXTOUTPUTLABEL_H
|
||||
#define TEXTOUTPUTLABEL_H
|
||||
#include <QLabel>
|
||||
|
||||
class TextoutputLabel : public QLabel
|
||||
{
|
||||
public:
|
||||
TextoutputLabel();
|
||||
virtual void setText(const QString &text);
|
||||
|
||||
|
||||
};
|
||||
|
||||
#endif // TEXTOUTPUTLABEL_H
|
160
window.cpp
160
window.cpp
@ -30,6 +30,7 @@
|
||||
|
||||
#include "entryprovider.h"
|
||||
#include "window.h"
|
||||
|
||||
Window::Window(EntryProvider &entryProvider, SettingsProvider &configProvider)
|
||||
{
|
||||
this->entryProvider = &entryProvider;
|
||||
@ -38,13 +39,7 @@ Window::Window(EntryProvider &entryProvider, SettingsProvider &configProvider)
|
||||
initFromConfig();
|
||||
this->lineEdit->installEventFilter(this);
|
||||
this->setAcceptDrops(true);
|
||||
QFont font;
|
||||
font.setPointSize(48);
|
||||
font.setBold(true);
|
||||
calculationResultLabel.setFont(font);
|
||||
calculationResultLabel.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
|
||||
calculationResultLabel.setAlignment(Qt::AlignCenter);
|
||||
calculationResultLabel.setContextMenuPolicy(Qt::ContextMenuPolicy::CustomContextMenu);
|
||||
|
||||
connect(&calculationResultLabel, &QLabel::customContextMenuRequested, this,
|
||||
&Window::showCalculationResultContextMenu);
|
||||
}
|
||||
@ -59,6 +54,7 @@ void Window::initFromConfig()
|
||||
{
|
||||
this->userEntryButtons = generateEntryButtons(entryProvider->getUserEntries());
|
||||
this->systemEntryButtons = generateEntryButtons(entryProvider->getSystemEntries());
|
||||
this->specialCommands = settingsProvider->specialCommands();
|
||||
}
|
||||
catch(const ConfigFormatException &e)
|
||||
{
|
||||
@ -120,7 +116,17 @@ 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);
|
||||
QStringList args = QProcess::splitCommand(cmd);
|
||||
QProcess::startDetached(args[0], args);
|
||||
}
|
||||
else
|
||||
{
|
||||
QProcess::startDetached(config.command, config.arguments);
|
||||
}
|
||||
this->closeWindow();
|
||||
}
|
||||
|
||||
@ -157,6 +163,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 +263,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);
|
||||
@ -275,35 +283,23 @@ void Window::clearGrid()
|
||||
buttonsInGrid.clear();
|
||||
}
|
||||
|
||||
void Window::addCalcResult(const QString &expression)
|
||||
void Window::showGrowingOutputText(QString text)
|
||||
{
|
||||
clearGrid();
|
||||
currentCalculationResult = calcEngine.evaluate(expression);
|
||||
QString labelText = expression + ": " + currentCalculationResult;
|
||||
calculationResultLabel.setText(labelText);
|
||||
calculationResultLabel.setText(text);
|
||||
calculationResultLabel.setVisible(true);
|
||||
|
||||
QFont currentFont = calculationResultLabel.font();
|
||||
int calculatedPointSize = currentFont.pointSize();
|
||||
QFontMetrics fm(currentFont);
|
||||
int contentWidth = calculationResultLabel.contentsRect().width() - calculationResultLabel.margin();
|
||||
while(calculatedPointSize < 48 && fm.boundingRect(labelText).width() < contentWidth)
|
||||
{
|
||||
calculatedPointSize += 1;
|
||||
currentFont.setPointSize(calculatedPointSize);
|
||||
fm = QFontMetrics(currentFont);
|
||||
}
|
||||
while(fm.boundingRect(labelText).width() >= contentWidth)
|
||||
{
|
||||
calculatedPointSize -= 1;
|
||||
currentFont.setPointSize(calculatedPointSize);
|
||||
fm = QFontMetrics(currentFont);
|
||||
}
|
||||
|
||||
calculationResultLabel.setFont(currentFont);
|
||||
|
||||
grid->addWidget(&calculationResultLabel, 0, 0);
|
||||
}
|
||||
void Window::addCalcResult(const QString &expression)
|
||||
{
|
||||
currentCalculationResult = calcEngine.evaluate(expression);
|
||||
QString labelText = expression + ": " + currentCalculationResult;
|
||||
showGrowingOutputText(labelText);
|
||||
|
||||
}
|
||||
|
||||
// main problem here there is no easy event compression (clearing emit queue and only processing the last one)
|
||||
void Window::lineEditTextChanged(QString text)
|
||||
@ -324,15 +320,20 @@ void Window::lineEditTextChanged(QString text)
|
||||
addPATHSuggestion(text);
|
||||
if(this->grid->count() == 0)
|
||||
{
|
||||
QStringList arguments = text.split(" ");
|
||||
QStringList arguments = QProcess::splitCommand(text);
|
||||
QString command = arguments[0];
|
||||
auto specialCommandConfig = getSpecialCommandConfig(command);
|
||||
if(specialCommandConfig)
|
||||
{
|
||||
executeSpecialCommand(specialCommandConfig.value(), arguments);
|
||||
return;
|
||||
}
|
||||
EntryConfig e;
|
||||
e.name = "Execute: " + text;
|
||||
if(arguments.length() > 1)
|
||||
{
|
||||
e.arguments = arguments.mid(1);
|
||||
}
|
||||
e.command = arguments[0];
|
||||
e.command = command;
|
||||
e.arguments = arguments;
|
||||
e.iconPath = "utilities-terminal";
|
||||
e.type = EntryType::DYNAMIC;
|
||||
|
||||
EntryPushButton *button = createEntryButton(e);
|
||||
clearGrid();
|
||||
@ -372,7 +373,10 @@ void Window::keyPressEvent(QKeyEvent *event)
|
||||
|
||||
for(EntryPushButton *button : buttonsInGrid)
|
||||
{
|
||||
button->showShortcut();
|
||||
if(!button->getEntryConfig().key.isEmpty())
|
||||
{
|
||||
button->showShortcut();
|
||||
}
|
||||
}
|
||||
|
||||
QKeySequence seq(event->key());
|
||||
@ -388,6 +392,49 @@ 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;
|
||||
}
|
||||
|
||||
std::optional<SpecialCommandConfig> Window::getSpecialCommandConfig(QString cmd) const
|
||||
{
|
||||
SpecialCommandConfig result;
|
||||
for(const SpecialCommandConfig &config : this->specialCommands)
|
||||
{
|
||||
if(config.command == cmd)
|
||||
{
|
||||
return config;
|
||||
}
|
||||
}
|
||||
return { };
|
||||
}
|
||||
|
||||
void Window::executeSpecialCommand(const SpecialCommandConfig &config, QStringList arguments)
|
||||
{
|
||||
QProcess process;
|
||||
process.start(config.command, arguments.mid(1));
|
||||
process.waitForFinished();
|
||||
QString result = process.readAllStandardOutput();
|
||||
showGrowingOutputText(result);
|
||||
}
|
||||
|
||||
void Window::filterGridFor(QString filter)
|
||||
{
|
||||
if(filter.length() > 0)
|
||||
@ -396,7 +443,8 @@ void Window::filterGridFor(QString filter)
|
||||
bool userEntryMatch = false;
|
||||
for(EntryPushButton *button : this->userEntryButtons)
|
||||
{
|
||||
if(button->getName().contains(filter, Qt::CaseInsensitive))
|
||||
if(button->getName().contains(filter, Qt::CaseInsensitive) ||
|
||||
button->getCommand().contains(filter, Qt::CaseInsensitive))
|
||||
{
|
||||
button->setVisible(true);
|
||||
grid->addWidget(button, button->getRow(), button->getCol());
|
||||
@ -406,26 +454,38 @@ 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)
|
||||
{
|
||||
if(button->getName().contains(filter, Qt::CaseInsensitive))
|
||||
int ranking = rankConfig(button->getEntryConfig(), filter);
|
||||
if(ranking > -1)
|
||||
{
|
||||
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;
|
||||
}
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
19
window.h
19
window.h
@ -36,6 +36,15 @@
|
||||
#include "entrypushbutton.h"
|
||||
#include "calculationengine.h"
|
||||
#include "settingsprovider.h"
|
||||
#include "specialcommandconfig.h"
|
||||
#include "textoutputlabel.h"
|
||||
|
||||
class RankedButton
|
||||
{
|
||||
public:
|
||||
EntryPushButton *button = nullptr;
|
||||
int ranking;
|
||||
};
|
||||
|
||||
class Window : public QWidget
|
||||
{
|
||||
@ -52,7 +61,8 @@ class Window : public QWidget
|
||||
QVector<EntryPushButton *> userEntryButtons;
|
||||
QVector<EntryPushButton *> systemEntryButtons;
|
||||
QVector<EntryPushButton *> buttonsInGrid;
|
||||
QLabel calculationResultLabel;
|
||||
QVector<SpecialCommandConfig> specialCommands;
|
||||
TextoutputLabel calculationResultLabel;
|
||||
QString currentCalculationResult;
|
||||
QString queuedFileSearch;
|
||||
QString queuedContentSearch;
|
||||
@ -77,8 +87,11 @@ class Window : public QWidget
|
||||
QStringList generatePATHSuggestions(const QString &text);
|
||||
void closeWindow();
|
||||
std::pair<int, int> getNextFreeCell();
|
||||
|
||||
private slots:
|
||||
int rankConfig(const EntryConfig &config, QString filter) const;
|
||||
std::optional<SpecialCommandConfig> getSpecialCommandConfig(QString cmd) const;
|
||||
void executeSpecialCommand(const SpecialCommandConfig &config, QStringList arguments);
|
||||
void showGrowingOutputText(QString text);
|
||||
private slots:
|
||||
void lineEditReturnPressed();
|
||||
void showCalculationResultContextMenu(const QPoint &point);
|
||||
|
||||
|
Reference in New Issue
Block a user