diff options
author | Claudio Maradonna <penguyman@stronzi.org> | 2018-07-04 22:37:35 +0200 |
---|---|---|
committer | Claudio Maradonna <penguyman@stronzi.org> | 2018-07-04 22:37:35 +0200 |
commit | 84775754e59efb51808ca95b0578308759ee61b3 (patch) | |
tree | a773232b94eab32f3ec73064b38176230107688b /src | |
parent | 680515a57562325d48fb68ffe573f39d74c59aa7 (diff) |
Saving
Diffstat (limited to 'src')
-rw-r--r-- | src/mainwindow.cpp | 62 | ||||
-rw-r--r-- | src/mainwindow.h | 1 | ||||
-rw-r--r-- | src/qtpass.cpp | 5 | ||||
-rw-r--r-- | src/qtpass.h | 4 |
4 files changed, 37 insertions, 35 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index e09684b3..70fe50d2 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -762,37 +762,37 @@ void MainWindow::restoreWindow() { } } -/** - * @brief MainWindow::processError something went wrong - * @param error - */ -void MainWindow::processError(QProcess::ProcessError error) { - QString errorString; - switch (error) { - case QProcess::FailedToStart: - errorString = tr("QProcess::FailedToStart"); - break; - case QProcess::Crashed: - errorString = tr("QProcess::Crashed"); - break; - case QProcess::Timedout: - errorString = tr("QProcess::Timedout"); - break; - case QProcess::ReadError: - errorString = tr("QProcess::ReadError"); - break; - case QProcess::WriteError: - errorString = tr("QProcess::WriteError"); - break; - case QProcess::UnknownError: - errorString = tr("QProcess::UnknownError"); - break; - } - ui->textBrowser->setTextColor(Qt::red); - ui->textBrowser->setText(errorString); - ui->textBrowser->setTextColor(Qt::black); - setUiElementsEnabled(true); -} +///** +// * @brief MainWindow::processError something went wrong +// * @param error +// */ +//void MainWindow::processError(QProcess::ProcessError error) { +// QString errorString; +// switch (error) { +// case QProcess::FailedToStart: +// errorString = tr("QProcess::FailedToStart"); +// break; +// case QProcess::Crashed: +// errorString = tr("QProcess::Crashed"); +// break; +// case QProcess::Timedout: +// errorString = tr("QProcess::Timedout"); +// break; +// case QProcess::ReadError: +// errorString = tr("QProcess::ReadError"); +// break; +// case QProcess::WriteError: +// errorString = tr("QProcess::WriteError"); +// break; +// case QProcess::UnknownError: +// errorString = tr("QProcess::UnknownError"); +// break; +// } +// ui->textBrowser->setTextColor(Qt::red); +// ui->textBrowser->setText(errorString); +// ui->textBrowser->setTextColor(Qt::black); +// setUiElementsEnabled(true); +//} /** * @brief MainWindow::on_configButton_clicked run Mainwindow::config diff --git a/src/mainwindow.h b/src/mainwindow.h index fd42bdfe..f72f9102 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -80,7 +80,6 @@ private slots: void on_treeView_clicked(const QModelIndex &index); void on_treeView_doubleClicked(const QModelIndex &index); void processFinished(const QString &, const QString &); - void processError(QProcess::ProcessError); void clearPanel(bool notify = true); void on_lineEdit_textChanged(const QString &arg1); void on_lineEdit_returnPressed(); diff --git a/src/qtpass.cpp b/src/qtpass.cpp index 91210aa3..1c19cee7 100644 --- a/src/qtpass.cpp +++ b/src/qtpass.cpp @@ -5,7 +5,6 @@ #include <QProcess> QtPass::QtPass() { - m_mainWindow = mainWindow; // This should connect Pass to MainWindow connectPassSignalHandlers(QtPassSettings::getRealPass()); @@ -13,7 +12,7 @@ QtPass::QtPass() { } void QtPass::connectPassSignalHandlers(Pass *pass) { - connect(pass, &Pass::error, m_mainWindow, &MainWindow::processError); + connect(pass, &Pass::error, this, &QtPass::processError); // connect(pass, &Pass::startingExecuteWrapper, this, // &MainWindow::executeWrapperStarted); // connect(pass, &Pass::critical, this, &MainWindow::critical); @@ -61,6 +60,6 @@ void QtPass::processError(QProcess::ProcessError error) { break; } - m_mainWindow->flashText(text, true); + m_mainWindow->flashText(errorString, true); m_mainWindow->setUiElementsEnabled(true); } diff --git a/src/qtpass.h b/src/qtpass.h index 9a1125dc..8686d0c5 100644 --- a/src/qtpass.h +++ b/src/qtpass.h @@ -2,11 +2,13 @@ #define QTPASS_H #include <QObject> +#include <QProcess> class MainWindow; class Pass; class QtPass : public QObject { Q_OBJECT + public: QtPass(); @@ -24,4 +26,6 @@ public slots: private slots: void processError(QProcess::ProcessError); +}; + #endif // QTPASS_H |