diff options
author | Anne Jan Brouwer <annejan@noprotocol.com> | 2015-07-30 22:49:17 +0200 |
---|---|---|
committer | Anne Jan Brouwer <annejan@noprotocol.com> | 2015-07-30 22:49:17 +0200 |
commit | 7a8236a128f0d70599805a922eb3659d9cb973a6 (patch) | |
tree | f94e33fac97456bb1267b0911ea3737369b162ae | |
parent | 6ce38bb65b5ea508cb3742d39e7b4097ad33f3c2 (diff) |
don't allways wizard when using configv0.9.2
-rw-r--r-- | mainwindow.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mainwindow.cpp b/mainwindow.cpp index bcadcfbf..f4449aa0 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -360,8 +360,9 @@ void MainWindow::config() { d->useSymbols(useSymbols); d->setPasswordLength(passwordLength); d->setPasswordChars(passwordChars); - d->wizard(); // does shit - + if (startupPhase) { + d->wizard(); // does shit + } if (d->exec()) { if (d->result() == QDialog::Accepted) { passExecutable = d->getPassPath(); @@ -1047,7 +1048,7 @@ void MainWindow::on_editButton_clicked() */ QList<UserInfo> MainWindow::listKeys(QString keystring, bool secret) { - waitFor(20); + waitFor(5); QList<UserInfo> users; currentAction = GPG_INTERNAL; QString listopt = secret ? "--list-secret-keys " : "--list-keys "; @@ -1479,7 +1480,7 @@ void MainWindow::editPassword() QString MainWindow::generatePassword() { QString passwd; if (usePwgen) { - waitFor(10); + waitFor(2); QString args = (useSymbols?"--symbols -1 ":"-1 ") + QString::number(passwordLength); currentAction = PWGEN; executeWrapper(pwgenExecutable, args); |