arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-04-24 15:37:23 +00:00
Code Issues Projects Releases Wiki Activity

implement #37

Browse Source
This commit is contained in:
arcan1s 2015-03-17 14:07:05 +03:00
parent bf7521481a
commit 308f9824b4
6 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sources/gui/src/commonfunctions.cpp
View File

@ -72,3 +72,30 @@ QString checkStatus(const bool statusBool, const bool nullFalse)
return QString(""); return QString("");
} }
QStringList externalApps(const QString apps, const QMap<QString, QString> configuration)
{
QStringList app;
if ((apps == QString("helper")) || (apps == QString("all"))) {
app.append(configuration[QString("HELPER_PATH")]);
}
if ((apps == QString("netctl")) || (apps == QString("all"))) {
app.append(configuration[QString("NETCTL_PATH")]);
app.append(configuration[QString("NETCTLAUTO_PATH")]);
app.append(configuration[QString("SUDO_PATH")]);
}
if ((apps == QString("sudo")) || (apps == QString("wpasup")) || (apps == QString("all"))) {
app.append(configuration[QString("SUDO_PATH")]);
}
if ((apps == QString("systemctl")) || (apps == QString("all"))) {
app.append(configuration[QString("SYSTEMCTL_PATH")]);
app.append(configuration[QString("SUDO_PATH")]);
}
if ((apps == QString("wpasup")) || (apps == QString("wpasup-only")) || (apps == QString("all"))) {
app.append(configuration[QString("WPACLI_PATH")]);
app.append(configuration[QString("WPASUP_PATH")]);
}
return app;
}

4
sources/gui/src/commonfunctions.h
View File

@ -19,13 +19,15 @@
#define COMMONFUNCTIONS_H #define COMMONFUNCTIONS_H
#include <QMap> #include <QMap>
#include <QString> #include <QStringList>
bool checkExternalApps(const QString apps = QString("all"), bool checkExternalApps(const QString apps = QString("all"),
const QMap<QString, QString> configuration = QMap<QString, QString>(), const QMap<QString, QString> configuration = QMap<QString, QString>(),
const bool debug = false); const bool debug = false);
QString checkStatus(const bool statusBool, const bool nullFalse = false); QString checkStatus(const bool statusBool, const bool nullFalse = false);
QStringList externalApps(const QString apps,
const QMap<QString, QString> configuration = QMap<QString, QString>());
#endif /* COMMONFUNCTIONS_H */ #endif /* COMMONFUNCTIONS_H */

7
sources/gui/src/errorwindow.cpp
View File

@ -186,9 +186,10 @@ void ErrorWindow::showWindow(const int mess, const QString sender, const bool de
QMessageBox messageBox; QMessageBox messageBox;
messageBox.setText(message[0]); messageBox.setText(message[0]);
messageBox.setInformativeText(message[1]); messageBox.setInformativeText(message[1]);
if (debugCmd) if (mess == 1)
messageBox.setDetailedText(QApplication::translate("ErrorWindow", "Sender : %1"). messageBox.setDetailedText(sender);
arg(sender)); else if (debugCmd)
messageBox.setDetailedText(QApplication::translate("ErrorWindow", "Sender : %1").arg(sender));
messageBox.setIcon(errorWin->getIcon(mess)); messageBox.setIcon(errorWin->getIcon(mess));
messageBox.setStandardButtons(QMessageBox::Ok); messageBox.setStandardButtons(QMessageBox::Ok);
messageBox.setDefaultButton(QMessageBox::Ok); messageBox.setDefaultButton(QMessageBox::Ok);

12
sources/gui/src/mainwidget.cpp
View File

@ -147,7 +147,7 @@ void MainWidget::updateMainTab()
{ {
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
if (!checkExternalApps(QString("netctl"), configuration, debug)) { if (!checkExternalApps(QString("netctl"), configuration, debug)) {
ErrorWindow::showWindow(1, QString(PDEBUG), debug); ErrorWindow::showWindow(1, externalApps(QString("netctl"), configuration).join(QChar('\n')), debug);
return mainWindow->emitNeedToBeConfigured(); return mainWindow->emitNeedToBeConfigured();
} }
@ -297,7 +297,7 @@ void MainWidget::mainTabEnableProfile()
{ {
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
if (!checkExternalApps(QString("netctl"), configuration, debug)) { if (!checkExternalApps(QString("netctl"), configuration, debug)) {
ErrorWindow::showWindow(1, QString(PDEBUG), debug); ErrorWindow::showWindow(1, externalApps(QString("netctl"), configuration).join(QChar('\n')), debug);
return mainWindow->emitNeedToBeConfigured(); return mainWindow->emitNeedToBeConfigured();
} }
if (ui->tableWidget_main->currentItem() == nullptr) return; if (ui->tableWidget_main->currentItem() == nullptr) return;
@ -332,7 +332,7 @@ void MainWidget::mainTabRestartProfile()
{ {
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
if (!checkExternalApps(QString("netctl"), configuration, debug)) { if (!checkExternalApps(QString("netctl"), configuration, debug)) {
ErrorWindow::showWindow(1, QString(PDEBUG), debug); ErrorWindow::showWindow(1, externalApps(QString("netctl"), configuration).join(QChar('\n')), debug);
return mainWindow->emitNeedToBeConfigured(); return mainWindow->emitNeedToBeConfigured();
} }
if (ui->tableWidget_main->currentItem() == nullptr) return; if (ui->tableWidget_main->currentItem() == nullptr) return;
@ -351,7 +351,7 @@ void MainWidget::mainTabStartProfile()
{ {
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
if (!checkExternalApps(QString("netctl"), configuration, debug)) { if (!checkExternalApps(QString("netctl"), configuration, debug)) {
ErrorWindow::showWindow(1, QString(PDEBUG), debug); ErrorWindow::showWindow(1, externalApps(QString("netctl"), configuration).join(QChar('\n')), debug);
return mainWindow->emitNeedToBeConfigured(); return mainWindow->emitNeedToBeConfigured();
} }
if (ui->tableWidget_main->currentItem() == nullptr) return; if (ui->tableWidget_main->currentItem() == nullptr) return;
@ -370,7 +370,7 @@ void MainWidget::mainTabStopAllProfiles()
{ {
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
if (!checkExternalApps(QString("netctl"), configuration, debug)) { if (!checkExternalApps(QString("netctl"), configuration, debug)) {
ErrorWindow::showWindow(1, QString(PDEBUG), debug); ErrorWindow::showWindow(1, externalApps(QString("netctl"), configuration).join(QChar('\n')), debug);
return mainWindow->emitNeedToBeConfigured(); return mainWindow->emitNeedToBeConfigured();
} }
@ -387,7 +387,7 @@ void MainWidget::mainTabSwitchToProfile()
{ {
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
if (!checkExternalApps(QString("netctl"), configuration, debug)) { if (!checkExternalApps(QString("netctl"), configuration, debug)) {
ErrorWindow::showWindow(1, QString(PDEBUG), debug); ErrorWindow::showWindow(1, externalApps(QString("netctl"), configuration).join(QChar('\n')), debug);
return mainWindow->emitNeedToBeConfigured(); return mainWindow->emitNeedToBeConfigured();
} }
if (ui->tableWidget_main->currentItem() == nullptr) return; if (ui->tableWidget_main->currentItem() == nullptr) return;

2
sources/gui/src/mainwindow.cpp
View File

@ -268,7 +268,7 @@ bool MainWindow::forceStartHelper()
{ {
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
if (!checkExternalApps(QString("helper"), configuration, debug)) { if (!checkExternalApps(QString("helper"), configuration, debug)) {
ErrorWindow::showWindow(1, QString(PDEBUG), debug); ErrorWindow::showWindow(1, externalApps(QString("helper"), configuration).join(QChar('\n')), debug);
emit(needToBeConfigured()); emit(needToBeConfigured());
return false; return false;
} }

6
sources/gui/src/wifimenuwidget.cpp
View File

@ -184,7 +184,7 @@ void WiFiMenuWidget::updateText(const netctlWifiInfo current)
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
if (!wifiTabSetEnabled(checkExternalApps(QString("wpasup-only"), configuration, debug))) return; if (!wifiTabSetEnabled(checkExternalApps(QString("wpasup-only"), configuration, debug))) return;
if (!checkExternalApps(QString("wpasup"), configuration, debug)) { if (!checkExternalApps(QString("wpasup"), configuration, debug)) {
ErrorWindow::showWindow(1, QString(PDEBUG), debug); ErrorWindow::showWindow(1, externalApps(QString("wpasup"), configuration).join(QChar('\n')), debug);
return mainWindow->emitNeedToBeConfigured(); return mainWindow->emitNeedToBeConfigured();
} }
ui->label_wifi->setText(QApplication::translate("WiFiMenuWidget", "Processing...")); ui->label_wifi->setText(QApplication::translate("WiFiMenuWidget", "Processing..."));
@ -202,7 +202,7 @@ void WiFiMenuWidget::updateWifiTab()
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
if (!wifiTabSetEnabled(checkExternalApps(QString("wpasup-only"), configuration, debug))) return; if (!wifiTabSetEnabled(checkExternalApps(QString("wpasup-only"), configuration, debug))) return;
if (!checkExternalApps(QString("wpasup"), configuration, debug)) { if (!checkExternalApps(QString("wpasup"), configuration, debug)) {
ErrorWindow::showWindow(1, QString(PDEBUG), debug); ErrorWindow::showWindow(1, externalApps(QString("wpasup"), configuration).join(QChar('\n')), debug);
return mainWindow->emitNeedToBeConfigured(); return mainWindow->emitNeedToBeConfigured();
} }
@ -374,7 +374,7 @@ void WiFiMenuWidget::wifiTabStart()
{ {
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
if (!checkExternalApps(QString("wpasup"), configuration, debug)) { if (!checkExternalApps(QString("wpasup"), configuration, debug)) {
ErrorWindow::showWindow(1, QString(PDEBUG), debug); ErrorWindow::showWindow(1, externalApps(QString("wpasup"), configuration).join(QChar('\n')), debug);
return mainWindow->emitNeedToBeConfigured(); return mainWindow->emitNeedToBeConfigured();
} }
if (ui->tableWidget_wifi->currentItem() == nullptr) return; if (ui->tableWidget_wifi->currentItem() == nullptr) return;