From 7a8236a128f0d70599805a922eb3659d9cb973a6 Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Thu, 30 Jul 2015 22:49:17 +0200 Subject: don't allways wizard when using config --- mainwindow.cpp | 9 +++++---- 1 file 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 MainWindow::listKeys(QString keystring, bool secret) { - waitFor(20); + waitFor(5); QList 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); -- cgit v1.2.3