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

fix #10, #11

Browse Source
This commit is contained in:
arcan1s 2014-08-11 23:56:26 +04:00
parent 863b49eaec
commit 80f6ccf1d1
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,7 @@ int main(int argc, char *argv[])
args[QString("debug")] = true; args[QString("debug")] = true;
} else if (QString(argv[i]) == QString("--default")) { } else if (QString(argv[i]) == QString("--default")) {
// default settings // default settings
args[QString("defaults")] = true; args[QString("default")] = true;
} else if (QString(argv[i]) == QString("--set-opts")) { } else if (QString(argv[i]) == QString("--set-opts")) {
// options // options
args[QString("options")] = QString(argv[i+1]); args[QString("options")] = QString(argv[i+1]);

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

@ -303,7 +303,7 @@ void MainWindow::updateConfiguration(const QMap<QString, QVariant> args)
deleteObjects(); deleteObjects();
settingsWin = new SettingsWindow(this, debug, configPath); settingsWin = new SettingsWindow(this, debug, configPath);
if (args[QString("defauls")].toBool()) if (args[QString("default")].toBool())
settingsWin->setDefault(); settingsWin->setDefault();
configuration = settingsWin->getSettings(); configuration = settingsWin->getSettings();
QMap<QString, QString> optionsDict = parseOptions(args[QString("options")].toString()); QMap<QString, QString> optionsDict = parseOptions(args[QString("options")].toString());
@ -330,8 +330,6 @@ void MainWindow::updateConfiguration(const QMap<QString, QVariant> args)
delete settingsWin; delete settingsWin;
createObjects(); createObjects();
// update ui
setTab(args[QString("tab")].toInt() - 1);
createActions(); createActions();
// tray // tray
@ -354,6 +352,9 @@ void MainWindow::updateConfiguration(const QMap<QString, QVariant> args)
} }
else else
show(); show();
// update ui
setTab(args[QString("tab")].toInt() - 1);
} }

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

@ -295,7 +295,7 @@ void SettingsWindow::setSettings(const QMap<QString, QString> settings)
else else
ui->checkBox_forceSudo->setCheckState(Qt::Unchecked); ui->checkBox_forceSudo->setCheckState(Qt::Unchecked);
ui->lineEdit_helperPath->setText(settings[QString("HELPER_PATH")]); 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->lineEdit_interfacesDir->setText(settings[QString("IFACE_DIR")]);
ui->comboBox_language->setCurrentIndex(0); ui->comboBox_language->setCurrentIndex(0);
for (int i=0; i<ui->comboBox_language->count(); i++) for (int i=0; i<ui->comboBox_language->count(); i++)