diff --git a/sources/gui/src/main.cpp b/sources/gui/src/main.cpp index 0407dff..bb805b6 100644 --- a/sources/gui/src/main.cpp +++ b/sources/gui/src/main.cpp @@ -89,7 +89,7 @@ int main(int argc, char *argv[]) args[QString("debug")] = true; } else if (QString(argv[i]) == QString("--default")) { // default settings - args[QString("defaults")] = true; + args[QString("default")] = true; } else if (QString(argv[i]) == QString("--set-opts")) { // options args[QString("options")] = QString(argv[i+1]); diff --git a/sources/gui/src/mainpublicslots.cpp b/sources/gui/src/mainpublicslots.cpp index cf1c56f..087bb52 100644 --- a/sources/gui/src/mainpublicslots.cpp +++ b/sources/gui/src/mainpublicslots.cpp @@ -303,7 +303,7 @@ void MainWindow::updateConfiguration(const QMap args) deleteObjects(); settingsWin = new SettingsWindow(this, debug, configPath); - if (args[QString("defauls")].toBool()) + if (args[QString("default")].toBool()) settingsWin->setDefault(); configuration = settingsWin->getSettings(); QMap optionsDict = parseOptions(args[QString("options")].toString()); @@ -330,8 +330,6 @@ void MainWindow::updateConfiguration(const QMap args) delete settingsWin; createObjects(); - // update ui - setTab(args[QString("tab")].toInt() - 1); createActions(); // tray @@ -354,6 +352,9 @@ void MainWindow::updateConfiguration(const QMap args) } else show(); + + // update ui + setTab(args[QString("tab")].toInt() - 1); } diff --git a/sources/gui/src/settingswindow.cpp b/sources/gui/src/settingswindow.cpp index abc03c8..dfa0bd2 100644 --- a/sources/gui/src/settingswindow.cpp +++ b/sources/gui/src/settingswindow.cpp @@ -295,7 +295,7 @@ void SettingsWindow::setSettings(const QMap settings) else ui->checkBox_forceSudo->setCheckState(Qt::Unchecked); ui->lineEdit_helperPath->setText(settings[QString("HELPER_PATH")]); - ui->lineEdit_helperPath->setText(settings[QString("HELPER_SERVICE")]); + ui->lineEdit_helperService->setText(settings[QString("HELPER_SERVICE")]); ui->lineEdit_interfacesDir->setText(settings[QString("IFACE_DIR")]); ui->comboBox_language->setCurrentIndex(0); for (int i=0; icomboBox_language->count(); i++)