diff options
author | Anne Jan Brouwer <annejan@noprotocol.com> | 2015-11-24 00:16:36 +0100 |
---|---|---|
committer | Anne Jan Brouwer <annejan@noprotocol.com> | 2015-11-24 00:16:36 +0100 |
commit | a5792972ae196f1bc85c2f71d231845f6b53b58d (patch) | |
tree | 0e8500a5c9c3e1b8cefd9ce480b2569bd7dde12d | |
parent | 71abd820b71a011df1231ac797167ba93fecacc6 (diff) |
clang-format
-rw-r--r-- | configdialog.cpp | 856 | ||||
-rw-r--r-- | configdialog.h | 175 | ||||
-rw-r--r-- | keygendialog.cpp | 183 | ||||
-rw-r--r-- | keygendialog.h | 31 | ||||
-rw-r--r-- | main.cpp | 79 | ||||
-rw-r--r-- | mainwindow.cpp | 2717 | ||||
-rw-r--r-- | mainwindow.h | 264 | ||||
-rw-r--r-- | passworddialog.cpp | 189 | ||||
-rw-r--r-- | passworddialog.h | 37 | ||||
-rw-r--r-- | progressindicator.cpp | 147 | ||||
-rw-r--r-- | progressindicator.h | 136 | ||||
-rw-r--r-- | singleapplication.cpp | 94 | ||||
-rw-r--r-- | singleapplication.h | 25 | ||||
-rw-r--r-- | storemodel.cpp | 90 | ||||
-rw-r--r-- | storemodel.h | 19 | ||||
-rw-r--r-- | trayicon.cpp | 107 | ||||
-rw-r--r-- | trayicon.h | 33 | ||||
-rw-r--r-- | usersdialog.cpp | 155 | ||||
-rw-r--r-- | usersdialog.h | 49 | ||||
-rw-r--r-- | util.cpp | 125 | ||||
-rw-r--r-- | util.h | 19 |
21 files changed, 2637 insertions, 2893 deletions
diff --git a/configdialog.cpp b/configdialog.cpp index 6d61db86..bc6a3f12 100644 --- a/configdialog.cpp +++ b/configdialog.cpp @@ -13,440 +13,377 @@ * @brief ConfigDialog::ConfigDialog * @param parent */ -ConfigDialog::ConfigDialog(MainWindow *parent) : - QDialog(parent), - ui(new Ui::ConfigDialog) -{ - mainWindow = parent; - ui->setupUi(this); - ui->profileTable->verticalHeader()->hide(); - ui->profileTable->horizontalHeader()->setStretchLastSection(true); - ui->label->setText(ui->label->text() + VERSION); - ui->comboBoxClipboard->clear(); +ConfigDialog::ConfigDialog(MainWindow *parent) + : QDialog(parent), ui(new Ui::ConfigDialog) { + mainWindow = parent; + ui->setupUi(this); + ui->profileTable->verticalHeader()->hide(); + ui->profileTable->horizontalHeader()->setStretchLastSection(true); + ui->label->setText(ui->label->text() + VERSION); + ui->comboBoxClipboard->clear(); - ui->comboBoxClipboard->addItem(tr("No Clipboard")); - ui->comboBoxClipboard->addItem(tr("Always copy to clipboard")); - ui->comboBoxClipboard->addItem(tr("On-demand copy to clipboard")); - ui->comboBoxClipboard->setCurrentIndex(0); + ui->comboBoxClipboard->addItem(tr("No Clipboard")); + ui->comboBoxClipboard->addItem(tr("Always copy to clipboard")); + ui->comboBoxClipboard->addItem(tr("On-demand copy to clipboard")); + ui->comboBoxClipboard->setCurrentIndex(0); } /** * @brief ConfigDialog::~ConfigDialog */ -ConfigDialog::~ConfigDialog() -{ - mainWindow->setGitExecutable(ui->gitPath->text()); - mainWindow->setGpgExecutable(ui->gpgPath->text()); - mainWindow->setPassExecutable(ui->passPath->text()); +ConfigDialog::~ConfigDialog() { + mainWindow->setGitExecutable(ui->gitPath->text()); + mainWindow->setGpgExecutable(ui->gpgPath->text()); + mainWindow->setPassExecutable(ui->passPath->text()); } /** * @brief ConfigDialog::setPassPath * @param path */ -void ConfigDialog::setPassPath(QString path) -{ - ui->passPath->setText(path); -} +void ConfigDialog::setPassPath(QString path) { ui->passPath->setText(path); } /** * @brief ConfigDialog::setGitPath * @param path */ -void ConfigDialog::setGitPath(QString path) -{ - ui->gitPath->setText(path); - if (path.isEmpty()) { - useGit(false); - ui->checkBoxUseGit->setEnabled(false); - } else { - ui->checkBoxUseGit->setEnabled(true); - } +void ConfigDialog::setGitPath(QString path) { + ui->gitPath->setText(path); + if (path.isEmpty()) { + useGit(false); + ui->checkBoxUseGit->setEnabled(false); + } else { + ui->checkBoxUseGit->setEnabled(true); + } } /** * @brief ConfigDialog::setGpgPath * @param path */ -void ConfigDialog::setGpgPath(QString path) -{ - ui->gpgPath->setText(path); -} +void ConfigDialog::setGpgPath(QString path) { ui->gpgPath->setText(path); } /** * @brief ConfigDialog::setStorePath * @param path */ -void ConfigDialog::setStorePath(QString path) -{ - ui->storePath->setText(path); -} +void ConfigDialog::setStorePath(QString path) { ui->storePath->setText(path); } /** * @brief ConfigDialog::getPassPath * @return */ -QString ConfigDialog::getPassPath() -{ - return ui->passPath->text(); -} +QString ConfigDialog::getPassPath() { return ui->passPath->text(); } /** * @brief ConfigDialog::getGitPath * @return */ -QString ConfigDialog::getGitPath() -{ - return ui->gitPath->text(); -} +QString ConfigDialog::getGitPath() { return ui->gitPath->text(); } /** * @brief ConfigDialog::getGpgPath * @return */ -QString ConfigDialog::getGpgPath() -{ - return ui->gpgPath->text(); -} +QString ConfigDialog::getGpgPath() { return ui->gpgPath->text(); } /** * @brief ConfigDialog::getStorePath * @return */ -QString ConfigDialog::getStorePath() -{ - return ui->storePath->text(); -} +QString ConfigDialog::getStorePath() { return ui->storePath->text(); } /** * @brief ConfigDialog::usePass * @return */ -bool ConfigDialog::usePass() -{ - return ui->radioButtonPass->isChecked(); -} +bool ConfigDialog::usePass() { return ui->radioButtonPass->isChecked(); } /** * @brief ConfigDialog::usePass * @param pass */ -void ConfigDialog::usePass(bool usePass) -{ - if (usePass) { - ui->radioButtonNative->setChecked(false); - ui->radioButtonPass->setChecked(true); - } else { - ui->radioButtonNative->setChecked(true); - ui->radioButtonPass->setChecked(false); - } - setGroupBoxState(); +void ConfigDialog::usePass(bool usePass) { + if (usePass) { + ui->radioButtonNative->setChecked(false); + ui->radioButtonPass->setChecked(true); + } else { + ui->radioButtonNative->setChecked(true); + ui->radioButtonPass->setChecked(false); + } + setGroupBoxState(); } /** * @brief ConfigDialog::on_radioButtonNative_clicked */ -void ConfigDialog::on_radioButtonNative_clicked() -{ - setGroupBoxState(); -} +void ConfigDialog::on_radioButtonNative_clicked() { setGroupBoxState(); } /** * @brief ConfigDialog::on_radioButtonPass_clicked */ -void ConfigDialog::on_radioButtonPass_clicked() -{ - setGroupBoxState(); -} +void ConfigDialog::on_radioButtonPass_clicked() { setGroupBoxState(); } /** * @brief ConfigDialog::setGroupBoxState */ -void ConfigDialog::setGroupBoxState() -{ - if (ui->radioButtonPass->isChecked()) { - ui->groupBoxNative->setEnabled(false); - ui->groupBoxPass->setEnabled(true); - } else { - ui->groupBoxNative->setEnabled(true); - ui->groupBoxPass->setEnabled(false); - } +void ConfigDialog::setGroupBoxState() { + if (ui->radioButtonPass->isChecked()) { + ui->groupBoxNative->setEnabled(false); + ui->groupBoxPass->setEnabled(true); + } else { + ui->groupBoxNative->setEnabled(true); + ui->groupBoxPass->setEnabled(false); + } } /** * @brief ConfigDialog::selectExecutable * @return */ -QString ConfigDialog::selectExecutable() -{ - QFileDialog dialog(this); - dialog.setFileMode(QFileDialog::ExistingFile); - dialog.setOption(QFileDialog::ReadOnly); - if (dialog.exec()) - return dialog.selectedFiles().first(); - else return ""; +QString ConfigDialog::selectExecutable() { + QFileDialog dialog(this); + dialog.setFileMode(QFileDialog::ExistingFile); + dialog.setOption(QFileDialog::ReadOnly); + if (dialog.exec()) + return dialog.selectedFiles().first(); + else + return ""; } /** * @brief ConfigDialog::selectFolder * @return */ -QString ConfigDialog::selectFolder() -{ - QFileDialog dialog(this); - dialog.setFileMode(QFileDialog::Directory); - dialog.setFilter(QDir::NoFilter); - dialog.setOption(QFileDialog::ShowDirsOnly); - if (dialog.exec()) - return dialog.selectedFiles().first(); - else return ""; +QString ConfigDialog::selectFolder() { + QFileDialog dialog(this); + dialog.setFileMode(QFileDialog::Directory); + dialog.setFilter(QDir::NoFilter); + dialog.setOption(QFileDialog::ShowDirsOnly); + if (dialog.exec()) + return dialog.selectedFiles().first(); + else + return ""; } /** * @brief ConfigDialog::on_toolButtonGit_clicked */ -void ConfigDialog::on_toolButtonGit_clicked() -{ - QString git = selectExecutable(); - if (!git.isEmpty()) { - ui->gitPath->setText(git); - ui->checkBoxUseGit->setEnabled(true); - } else { - useGit(false); - ui->checkBoxUseGit->setEnabled(false); - } +void ConfigDialog::on_toolButtonGit_clicked() { + QString git = selectExecutable(); + if (!git.isEmpty()) { + ui->gitPath->setText(git); + ui->checkBoxUseGit->setEnabled(true); + } else { + useGit(false); + ui->checkBoxUseGit->setEnabled(false); + } } /** * @brief ConfigDialog::on_toolButtonGpg_clicked */ -void ConfigDialog::on_toolButtonGpg_clicked() -{ - QString gpg = selectExecutable(); - if (!gpg.isEmpty()) - ui->gpgPath->setText(gpg); +void ConfigDialog::on_toolButtonGpg_clicked() { + QString gpg = selectExecutable(); + if (!gpg.isEmpty()) + ui->gpgPath->setText(gpg); } /** * @brief ConfigDialog::on_toolButtonPass_clicked */ -void ConfigDialog::on_toolButtonPass_clicked() -{ - QString pass = selectExecutable(); - if (!pass.isEmpty()) - ui->passPath->setText(pass); +void ConfigDialog::on_toolButtonPass_clicked() { + QString pass = selectExecutable(); + if (!pass.isEmpty()) + ui->passPath->setText(pass); } /** * @brief ConfigDialog::on_toolButtonStore_clicked */ -void ConfigDialog::on_toolButtonStore_clicked() -{ - QString store = selectFolder(); - if (!store.isEmpty()) // TODO call check - ui->storePath->setText(store); +void ConfigDialog::on_toolButtonStore_clicked() { + QString store = selectFolder(); + if (!store.isEmpty()) // TODO call check + ui->storePath->setText(store); } /** * @brief ConfigDialog::on_comboBoxClipboard_activated */ -void ConfigDialog::on_comboBoxClipboard_activated() -{ - if (ui->comboBoxClipboard->currentIndex() > 0) { - ui->checkBoxAutoclear->setEnabled(true); - ui->checkBoxHidePassword->setEnabled(true); - ui->checkBoxHideContent->setEnabled(true); - if (ui->checkBoxAutoclear->isChecked()) { - ui->spinBoxAutoclearSeconds->setEnabled(true); - ui->labelSeconds->setEnabled(true); - } else { - ui->spinBoxAutoclearSeconds->setEnabled(false); - ui->labelSeconds->setEnabled(false); - } +void ConfigDialog::on_comboBoxClipboard_activated() { + if (ui->comboBoxClipboard->currentIndex() > 0) { + ui->checkBoxAutoclear->setEnabled(true); + ui->checkBoxHidePassword->setEnabled(true); + ui->checkBoxHideContent->setEnabled(true); + if (ui->checkBoxAutoclear->isChecked()) { + ui->spinBoxAutoclearSeconds->setEnabled(true); + ui->labelSeconds->setEnabled(true); } else { - ui->checkBoxAutoclear->setEnabled(false); - ui->spinBoxAutoclearSeconds->setEnabled(false); - ui->labelSeconds->setEnabled(false); - ui->checkBoxHidePassword->setEnabled(false); - ui->checkBoxHideContent->setEnabled(false); + ui->spinBoxAutoclearSeconds->setEnabled(false); + ui->labelSeconds->setEnabled(false); } + } else { + ui->checkBoxAutoclear->setEnabled(false); + ui->spinBoxAutoclearSeconds->setEnabled(false); + ui->labelSeconds->setEnabled(false); + ui->checkBoxHidePassword->setEnabled(false); + ui->checkBoxHideContent->setEnabled(false); + } } /** * @brief ConfigDialog::on_checkBoxAutoclearPanel_clicked */ -void ConfigDialog::on_checkBoxAutoclearPanel_clicked() -{ - if (ui->checkBoxAutoclearPanel->isChecked()) { - ui->spinBoxAutoclearPanelSeconds->setEnabled(true); - ui->labelPanelSeconds->setEnabled(true); - } else { - ui->spinBoxAutoclearPanelSeconds->setEnabled(false); - ui->labelPanelSeconds->setEnabled(false); - } +void ConfigDialog::on_checkBoxAutoclearPanel_clicked() { + if (ui->checkBoxAutoclearPanel->isChecked()) { + ui->spinBoxAutoclearPanelSeconds->setEnabled(true); + ui->labelPanelSeconds->setEnabled(true); + } else { + ui->spinBoxAutoclearPanelSeconds->setEnabled(false); + ui->labelPanelSeconds->setEnabled(false); + } } /** * @brief ConfigDialog::useClipboard */ -void ConfigDialog::useClipboard(MainWindow::clipBoardType useClipboard) -{ - ui->comboBoxClipboard->setCurrentIndex(static_cast<int>(useClipboard)); - on_comboBoxClipboard_activated(); +void ConfigDialog::useClipboard(MainWindow::clipBoardType useClipboard) { + ui->comboBoxClipboard->setCurrentIndex(static_cast<int>(useClipboard)); + on_comboBoxClipboard_activated(); } /** * @brief ConfigDialog::useAutoclear * @param useAutoclear */ -void ConfigDialog::useAutoclear(bool useAutoclear) -{ - ui->checkBoxAutoclear->setChecked(useAutoclear); - on_checkBoxAutoclear_clicked(); +void ConfigDialog::useAutoclear(bool useAutoclear) { + ui->checkBoxAutoclear->setChecked(useAutoclear); + on_checkBoxAutoclear_clicked(); } /** * @brief ConfigDialog::setAutoclear * @param seconds */ -void ConfigDialog::setAutoclear(int seconds) -{ - ui->spinBoxAutoclearSeconds->setValue(seconds); +void ConfigDialog::setAutoclear(int seconds) { + ui->spinBoxAutoclearSeconds->setValue(seconds); } /** * @brief ConfigDialog::useAutoclearPanel * @param useAutoclearPanel */ -void ConfigDialog::useAutoclearPanel(bool useAutoclearPanel) -{ - ui->checkBoxAutoclearPanel->setChecked(useAutoclearPanel); - on_checkBoxAutoclearPanel_clicked(); +void ConfigDialog::useAutoclearPanel(bool useAutoclearPanel) { + ui->checkBoxAutoclearPanel->setChecked(useAutoclearPanel); + on_checkBoxAutoclearPanel_clicked(); } /** * @brief ConfigDialog::setAutoclearPanel * @param seconds */ -void ConfigDialog::setAutoclearPanel(int seconds) -{ - ui->spinBoxAutoclearPanelSeconds->setValue(seconds); +void ConfigDialog::setAutoclearPanel(int seconds) { + ui->spinBoxAutoclearPanelSeconds->setValue(seconds); } /** * @brief ConfigDialog::useClipboard * @return */ -MainWindow::clipBoardType ConfigDialog::useClipboard() -{ - return static_cast<MainWindow::clipBoardType>(ui->comboBoxClipboard->currentIndex()); +MainWindow::clipBoardType ConfigDialog::useClipboard() { + return static_cast<MainWindow::clipBoardType>( + ui->comboBoxClipboard->currentIndex()); } /** * @brief ConfigDialog::useAutoclear * @return */ -bool ConfigDialog::useAutoclear() -{ - return ui->checkBoxAutoclear->isChecked(); -} +bool ConfigDialog::useAutoclear() { return ui->checkBoxAutoclear->isChecked(); } /** * @brief ConfigDialog::getAutoclear * @return */ -int ConfigDialog::getAutoclear() -{ - return ui->spinBoxAutoclearSeconds->value(); +int ConfigDialog::getAutoclear() { + return ui->spinBoxAutoclearSeconds->value(); } /** * @brief ConfigDialog::on_checkBoxAutoclear_clicked */ -void ConfigDialog::on_checkBoxAutoclear_clicked() -{ - on_comboBoxClipboard_activated(); +void ConfigDialog::on_checkBoxAutoclear_clicked() { + on_comboBoxClipboard_activated(); } /** * @brief ConfigDialog::useAutoclearPanel * @return */ -bool ConfigDialog::useAutoclearPanel() -{ - return ui->checkBoxAutoclearPanel->isChecked(); +bool ConfigDialog::useAutoclearPanel() { + return ui->checkBoxAutoclearPanel->isChecked(); } /** * @brief ConfigDialog::getAutoclearPanel * @return */ -int ConfigDialog::getAutoclearPanel() -{ - return ui->spinBoxAutoclearPanelSeconds->value(); +int ConfigDialog::getAutoclearPanel() { + return ui->spinBoxAutoclearPanelSeconds->value(); } /** * @brief ConfigDialog::hidePassword * @return */ -bool ConfigDialog::hidePassword() -{ - return ui->checkBoxHidePassword->isChecked(); +bool ConfigDialog::hidePassword() { + return ui->checkBoxHidePassword->isChecked(); } /** * @brief ConfigDialog::hideContent * @return */ -bool ConfigDialog::hideContent() -{ - return ui->checkBoxHideContent->isChecked(); +bool ConfigDialog::hideContent() { + return ui->checkBoxHideContent->isChecked(); } /** * @brief ConfigDialog::hidePassword * @param hidePassword */ -void ConfigDialog::hidePassword(bool hidePassword) -{ - ui->checkBoxHidePassword->setChecked(hidePassword); +void ConfigDialog::hidePassword(bool hidePassword) { + ui->checkBoxHidePassword->setChecked(hidePassword); } /** * @brief ConfigDialog::hideContent * @param hideContent */ -void ConfigDialog::hideContent(bool hideContent) -{ - ui->checkBoxHideContent->setChecked(hideContent); +void ConfigDialog::hideContent(bool hideContent) { + ui->checkBoxHideContent->setChecked(hideContent); } /** * @brief ConfigDialog::addGPGId * @return */ -bool ConfigDialog::addGPGId() -{ - return ui->checkBoxAddGPGId->isChecked(); -} +bool ConfigDialog::addGPGId() { return ui->checkBoxAddGPGId->isChecked(); } /** * @brief ConfigDialog::addGPGId * @param addGPGId */ -void ConfigDialog::addGPGId(bool addGPGId) -{ - ui->checkBoxAddGPGId->setChecked(addGPGId); +void ConfigDialog::addGPGId(bool addGPGId) { + ui->checkBoxAddGPGId->setChecked(addGPGId); } /** * @brief ConfigDialog::genKey * @param QString batch */ -void ConfigDialog::genKey(QString batch, QDialog *dialog) -{ - mainWindow->generateKeyPair(batch, dialog); +void ConfigDialog::genKey(QString batch, QDialog *dialog) { + mainWindow->generateKeyPair(batch, dialog); } /** @@ -454,491 +391,446 @@ void ConfigDialog::genKey(QString batch, QDialog *dialog) * @param profiles * @param profile */ -void ConfigDialog::setProfiles(QHash<QString, QString> profiles, QString profile) -{ - // qDebug() << profiles; - if (profiles.contains("")) { - profiles.remove(""); - // remove weird "" key value pairs - } - - ui->profileTable->setRowCount(profiles.count()); - QHashIterator<QString, QString> i(profiles); - int n = 0; - while (i.hasNext()) { - i.next(); - if (!i.value().isEmpty() && !i.key().isEmpty()) { - ui->profileTable->setItem(n, 0, new QTableWidgetItem(i.key())); - ui->profileTable->setItem(n, 1, new QTableWidgetItem(i.value())); - // qDebug() << "naam:" + i.key(); - if (i.key() == profile) - ui->profileTable->selectRow(n); - } - n++; +void ConfigDialog::setProfiles(QHash<QString, QString> profiles, + QString profile) { + // qDebug() << profiles; + if (profiles.contains("")) { + profiles.remove(""); + // remove weird "" key value pairs + } + + ui->profileTable->setRowCount(profiles.count()); + QHashIterator<QString, QString> i(profiles); + int n = 0; + while (i.hasNext()) { + i.next(); + if (!i.value().isEmpty() && !i.key().isEmpty()) { + ui->profileTable->setItem(n, 0, new QTableWidgetItem(i.key())); + ui->profileTable->setItem(n, 1, new QTableWidgetItem(i.value())); + // qDebug() << "naam:" + i.key(); + if (i.key() == profile) + ui->profileTable->selectRow(n); } + n++; + } } /** * @brief ConfigDialog::getProfiles * @return */ -QHash<QString, QString> ConfigDialog::getProfiles() -{ - QHash<QString, QString> profiles; - // Check? - for (int i = 0; i < ui->profileTable->rowCount(); i++) { - QTableWidgetItem *pathItem = ui->profileTable->item(i, 1); - if (0 != pathItem) { - QTableWidgetItem *item = ui->profileTable->item(i, 0); - if (item == 0) { - qDebug() << "empty name, shoud fix in frontend"; - continue; - } - profiles.insert(item->text(), - pathItem->text()); - } +QHash<QString, QString> ConfigDialog::getProfiles() { + QHash<QString, QString> profiles; + // Check? + for (int i = 0; i < ui->profileTable->rowCount(); i++) { + QTableWidgetItem *pathItem = ui->profileTable->item(i, 1); + if (0 != pathItem) { + QTableWidgetItem *item = ui->profileTable->item(i, 0); + if (item == 0) { + qDebug() << "empty name, shoud fix in frontend"; + continue; + } + profiles.insert(item->text(), pathItem->text()); } - return profiles; + } + return profiles; } /** * @brief ConfigDialog::on_addButton_clicked */ -void ConfigDialog::on_addButton_clicked() -{ - int n = ui->profileTable->rowCount(); - ui->profileTable->insertRow(n); - ui->profileTable->setItem(n, 1, new QTableWidgetItem(ui->storePath->text())); - ui->profileTable->selectRow(n); - ui->deleteButton->setEnabled(true); +void ConfigDialog::on_addButton_clicked() { + int n = ui->profileTable->rowCount(); + ui->profileTable->insertRow(n); + ui->profileTable->setItem(n, 1, new QTableWidgetItem(ui->storePath->text())); + ui->profileTable->selectRow(n); + ui->deleteButton->setEnabled(true); } /** * @brief ConfigDialog::on_deleteButton_clicked */ -void ConfigDialog::on_deleteButton_clicked() -{ - QSet<int> selectedRows; // we use a set to prevent doubles - QList<QTableWidgetItem *> itemList = ui->profileTable->selectedItems(); - if (itemList.count() == 0) { - QMessageBox::warning(this, tr("No profile selected"), - tr("No profile selected to delete")); - return; - } - QTableWidgetItem *item; - foreach (item, itemList) - selectedRows.insert(item->row()); - // get a list, and sort it big to small - QList<int> rows = selectedRows.toList(); - qSort(rows.begin(), rows.end()); - // now actually do the removing: - foreach (int row, rows) - ui->profileTable->removeRow(row); - if (ui->profileTable->rowCount() < 1) - ui->deleteButton->setEnabled(false); +void ConfigDialog::on_deleteButton_clicked() { + QSet<int> selectedRows; // we use a set to prevent doubles + QList<QTableWidgetItem *> itemList = ui->profileTable->selectedItems(); + if (itemList.count() == 0) { + QMessageBox::warning(this, tr("No profile selected"), + tr("No profile selected to delete")); + return; + } + QTableWidgetItem *item; + foreach (item, itemList) + selectedRows.insert(item->row()); + // get a list, and sort it big to small + QList<int> rows = selectedRows.toList(); + qSort(rows.begin(), rows.end()); + // now actually do the removing: + foreach (int row, rows) + ui->profileTable->removeRow(row); + if (ui->profileTable->rowCount() < 1) + ui->deleteButton->setEnabled(false); } -void ConfigDialog::criticalMessage(const QString &title, const QString &text) -{ - QMessageBox::critical(this, title, text, QMessageBox::Ok, QMessageBox::Ok); +void ConfigDialog::criticalMessage(const QString &title, const QString &text) { + QMessageBox::critical(this, title, text, QMessageBox::Ok, QMessageBox::Ok); } /** * @brief ConfigDialog::wizard */ -void ConfigDialog::wizard() -{ - // mainWindow->checkConfig(); - bool clean = false; - - QString gpg = ui->gpgPath->text(); - // QString gpg = mainWindow->getGpgExecutable(); - if (!QFile(gpg).exists()) { - criticalMessage(tr("GnuPG not found"), - tr( - "Please install GnuPG on your system.<br>Install <strong>gpg</strong> using your favorite package manager<br>or <a href=\"https://www.gnupg.org/download/#sec-1-2\">download</a> it from GnuPG.org")); - clean = true; - } - - QStringList names = mainWindow->getSecretKeys(); - qDebug() << names; - if (QFile(gpg).exists() && names.empty()) { - KeygenDialog d(this); - if (!d.exec()) - return; - } - - QString passStore = ui->storePath->text(); - - if (!QFile(passStore).exists()) { - // TODO pass version? - if (QMessageBox::question(this, tr("Create password-store?"), - tr("Would you like to create a password-store at %1?").arg( - passStore), - QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) { - QDir().mkdir(passStore); +void ConfigDialog::wizard() { + // mainWindow->checkConfig(); + bool clean = false; + + QString gpg = ui->gpgPath->text(); + // QString gpg = mainWindow->getGpgExecutable(); + if (!QFile(gpg).exists()) { + criticalMessage( + tr("GnuPG not found"), + tr("Please install GnuPG on your system.<br>Install " + "<strong>gpg</strong> using your favorite package manager<br>or <a " + "href=\"https://www.gnupg.org/download/#sec-1-2\">download</a> it " + "from GnuPG.org")); + clean = true; + } + + QStringList names = mainWindow->getSecretKeys(); + qDebug() << names; + if (QFile(gpg).exists() && names.empty()) { + KeygenDialog d(this); + if (!d.exec()) + return; + } + + QString passStore = ui->storePath->text(); + + if (!QFile(passStore).exists()) { + // TODO pass version? + if (QMessageBox::question( + this, tr("Create password-store?"), + tr("Would you like to create a password-store at %1?") + .arg(passStore), + QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) { + QDir().mkdir(passStore); #ifdef Q_OS_WIN - SetFileAttributes(passStore.toStdWString().c_str(), FILE_ATTRIBUTE_HIDDEN); + SetFileAttributes(passStore.toStdWString().c_str(), + FILE_ATTRIBUTE_HIDDEN); #endif - if (useGit()) - mainWindow->executePassGitInit(); - mainWindow->userDialog(passStore); - } + if (useGit()) + mainWindow->executePassGitInit(); + mainWindow->userDialog(passStore); } + } + if (!QFile(passStore + ".gpg-id").exists()) { + qDebug() << ".gpg-id file does not exist"; + + if (!clean) { + criticalMessage(tr("Password store not initialised"), + tr("The folder %1 doesn't seem to be a password store or " + "is not yet initialised.") + .arg(passStore)); + } + while (!QFile(passStore).exists()) { + on_toolButtonStore_clicked(); + // allow user to cancel + if (passStore == ui->storePath->text()) + return; + passStore = ui->storePath->text(); + } if (!QFile(passStore + ".gpg-id").exists()) { - qDebug() << ".gpg-id file does not exist"; - - if (!clean) { - criticalMessage(tr("Password store not initialised"), - tr( - "The folder %1 doesn't seem to be a password store or is not yet initialised.").arg( - passStore)); - } - while (!QFile(passStore).exists()) { - on_toolButtonStore_clicked(); - // allow user to cancel - if (passStore == ui->storePath->text()) - return; - passStore = ui->storePath->text(); - } - if (!QFile(passStore + ".gpg-id").exists()) { - qDebug() << ".gpg-id file still does not exist :/"; - // appears not to be store - // init yes / no ? - mainWindow->userDialog(passStore); - } + qDebug() << ".gpg-id file still does not exist :/"; + // appears not to be store + // init yes / no ? + mainWindow->userDialog(passStore); } + } } /** * @brief ConfigDialog::useTrayIcon * @return */ -bool ConfigDialog::useTrayIcon() -{ - return ui->checkBoxUseTrayIcon->isChecked(); +bool ConfigDialog::useTrayIcon() { + return ui->checkBoxUseTrayIcon->isChecked(); } /** * @brief ConfigDialog::hideOnClose * @return */ -bool ConfigDialog::hideOnClose() -{ - return ui->checkBoxHideOnClose->isEnabled() && ui->checkBoxHideOnClose->isChecked(); +bool ConfigDialog::hideOnClose() { + return ui->checkBoxHideOnClose->isEnabled() && + ui->checkBoxHideOnClose->isChecked(); } /** * @brief ConfigDialog::useTrayIcon * @param useSystray */ -void ConfigDialog::useTrayIcon(bool useSystray) -{ - ui->checkBoxUseTrayIcon->setChecked(useSystray); - ui->checkBoxHideOnClose->setEnabled(useSystray); - ui->checkBoxStartMinimized->setEnabled(useSystray); - if (!useSystray) { - ui->checkBoxHideOnClose->setChecked(false); - ui->checkBoxStartMinimized->setChecked(false); - } +void ConfigDialog::useTrayIcon(bool useSystray) { + ui->checkBoxUseTrayIcon->setChecked(useSystray); + ui->checkBoxHideOnClose->setEnabled(useSystray); + ui->checkBoxStartMinimized->setEnabled(useSystray); + if (!useSystray) { + ui->checkBoxHideOnClose->setChecked(false); + ui->checkBoxStartMinimized->setChecked(false); + } } /** * @brief ConfigDialog::hideOnClose * @param hideOnClose */ -void ConfigDialog::hideOnClose(bool hideOnClose) -{ - ui->checkBoxHideOnClose->setChecked(hideOnClose); +void ConfigDialog::hideOnClose(bool hideOnClose) { + ui->checkBoxHideOnClose->setChecked(hideOnClose); } /** * @brief ConfigDialog::on_checkBoxUseTrayIcon_clicked */ -void ConfigDialog::on_checkBoxUseTrayIcon_clicked() -{ - if (ui->checkBoxUseTrayIcon->isChecked()) { - ui->checkBoxHideOnClose->setEnabled(true); - ui->checkBoxStartMinimized->setEnabled(true); - } else { - ui->checkBoxStartMinimized->setEnabled(false); - ui->checkBoxHideOnClose->setEnabled(false); - } +void ConfigDialog::on_checkBoxUseTrayIcon_clicked() { + if (ui->checkBoxUseTrayIcon->isChecked( |