Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-09-20 16:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify DatabaseSettingsWidget by passing a Database pointer to it.

Browse Source
This commit is contained in:
Felix Geyer 2012-05-19 14:52:00 +02:00
parent 7425771c78
commit fef931392f
4 changed files with 38 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
src/gui/DatabaseSettingsWidget.cpp
View File

@ -18,21 +18,23 @@
#include "DatabaseSettingsWidget.h"
#include "ui_DatabaseSettingsWidget.h"
#include "core/Database.h"
#include "core/Metadata.h"
#include "keys/CompositeKey.h"
DatabaseSettingsWidget::DatabaseSettingsWidget(QWidget* parent)
: DialogyWidget(parent)
, m_ui(new Ui::DatabaseSettingsWidget())
, m_db(0)
{
m_ui->setupUi(this);
connect(m_ui->buttonBox, SIGNAL(accepted()), SLOT(changeSettings()));
connect(m_ui->buttonBox, SIGNAL(accepted()), SLOT(save()));
connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(reject()));
connect(m_ui->historyMaxItemsCheckBox, SIGNAL(stateChanged(int)),
this, SLOT(toggleHistoryMaxItemsSpinBox(int)));
connect(m_ui->historyMaxSizeCheckBox, SIGNAL(stateChanged(int)),
this, SLOT(toggleHistoryMaxSizeSpinBox(int)));
connect(m_ui->historyMaxItemsCheckBox, SIGNAL(toggled(bool)),
m_ui->historyMaxItemsSpinBox, SLOT(setEnabled(bool)));
connect(m_ui->historyMaxSizeCheckBox, SIGNAL(toggled(bool)),
m_ui->historyMaxSizeSpinBox, SLOT(setEnabled(bool)));
connect(m_ui->transformBenchmarkButton, SIGNAL(clicked()), SLOT(transformRoundsBenchmark()));
}
@ -40,31 +42,27 @@ DatabaseSettingsWidget::~DatabaseSettingsWidget()
{
}
void DatabaseSettingsWidget::setForms(const QString& dbName, const QString& dbDescription,
const QString& defaultUsername, bool recylceBinEnabled,
int transformRounds, int historyMaxItems,
int historyMaxSize)
void DatabaseSettingsWidget::load(Database* db)
{
m_ui->dbNameEdit->setText(dbName);
m_ui->dbDescriptionEdit->setText(dbDescription);
if (recylceBinEnabled) {
m_ui->recycleBinEnabledCheckBox->setCheckState(Qt::Checked);
}
else {
m_ui->recycleBinEnabledCheckBox->setCheckState(Qt::Unchecked);
}
m_ui->defaultUsernameEdit->setText(defaultUsername);
m_ui->transformRoundsSpinBox->setValue(transformRounds);
if (historyMaxItems > -1) {
m_ui->historyMaxItemsSpinBox->setValue(historyMaxItems);
m_db = db;
Metadata* meta = m_db->metadata();
m_ui->dbNameEdit->setText(meta->name());
m_ui->dbDescriptionEdit->setText(meta->description());
m_ui->recycleBinEnabledCheckBox->setChecked(meta->recycleBinEnabled());
m_ui->defaultUsernameEdit->setText(meta->defaultUserName());
m_ui->transformRoundsSpinBox->setValue(m_db->transformRounds());
if (meta->historyMaxItems() > -1) {
m_ui->historyMaxItemsSpinBox->setValue(meta->historyMaxItems());
m_ui->historyMaxItemsCheckBox->setChecked(true);
}
else {
m_ui->historyMaxItemsSpinBox->setValue(Metadata::DefaultHistoryMaxItems);
m_ui->historyMaxItemsCheckBox->setChecked(false);
}
if (historyMaxSize > -1) {
m_ui->historyMaxSizeSpinBox->setValue(historyMaxSize);
if (meta->historyMaxSize() > -1) {
m_ui->historyMaxSizeSpinBox->setValue(meta->historyMaxSize());
m_ui->historyMaxSizeCheckBox->setChecked(true);
}
else {
@ -75,67 +73,29 @@ void DatabaseSettingsWidget::setForms(const QString& dbName, const QString& dbDe
m_ui->dbNameEdit->setFocus();
}
quint64 DatabaseSettingsWidget::transformRounds()
void DatabaseSettingsWidget::save()
{
return m_transformRounds;
}
Metadata* meta = m_db->metadata();
QString DatabaseSettingsWidget::dbName()
{
return m_dbName;
}
meta->setName(m_ui->dbNameEdit->text());
meta->setDescription(m_ui->dbDescriptionEdit->text());
meta->setDefaultUserName(m_ui->defaultUsernameEdit->text());
meta->setRecycleBinEnabled(m_ui->recycleBinEnabledCheckBox->isChecked());
m_db->setTransformRounds(m_ui->transformRoundsSpinBox->value());
QString DatabaseSettingsWidget::dbDescription()
{
return m_dbDescription;
}
QString DatabaseSettingsWidget::defaultUsername()
{
return m_defaultUsername;
}
bool DatabaseSettingsWidget::recylceBinEnabled()
{
return m_recylceBinEnabled;
}
int DatabaseSettingsWidget::historyMaxItems()
{
return m_historyMaxItems;
}
int DatabaseSettingsWidget::historyMaxSize()
{
return m_historyMaxSize;
}
void DatabaseSettingsWidget::changeSettings()
{
m_dbName = m_ui->dbNameEdit->text();
m_dbDescription = m_ui->dbDescriptionEdit->text();
m_defaultUsername = m_ui->defaultUsernameEdit->text();
if (m_ui->recycleBinEnabledCheckBox->checkState() == Qt::Checked) {
m_recylceBinEnabled = true;
}
else {
m_recylceBinEnabled = false;
}
m_transformRounds = m_ui->transformRoundsSpinBox->value();
if (m_ui->historyMaxItemsCheckBox->isChecked()) {
m_historyMaxItems = m_ui->historyMaxItemsSpinBox->value();
meta->setHistoryMaxItems(m_ui->historyMaxItemsSpinBox->value());
}
else {
m_historyMaxItems = -1;
meta->setHistoryMaxItems(-1);
}
if (m_ui->historyMaxSizeCheckBox->isChecked()) {
m_historyMaxSize = m_ui->historyMaxSizeSpinBox->value();
meta->setHistoryMaxSize(m_ui->historyMaxSizeSpinBox->value());
}
else {
m_historyMaxSize = -1;
meta->setHistoryMaxSize(-1);
}
Q_EMIT editFinished(true);
}
@ -144,26 +104,6 @@ void DatabaseSettingsWidget::reject()
Q_EMIT editFinished(false);
}
void DatabaseSettingsWidget::toggleHistoryMaxItemsSpinBox(int state)
{
if (state == Qt::Checked) {
m_ui->historyMaxItemsSpinBox->setEnabled(true);
}
else {
m_ui->historyMaxItemsSpinBox->setEnabled(false);
}
}
void DatabaseSettingsWidget::toggleHistoryMaxSizeSpinBox(int state)
{
if (state == Qt::Checked) {
m_ui->historyMaxSizeSpinBox->setEnabled(true);
}
else {
m_ui->historyMaxSizeSpinBox->setEnabled(false);
}
}
void DatabaseSettingsWidget::transformRoundsBenchmark()
{
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));

27
src/gui/DatabaseSettingsWidget.h
View File

@ -22,7 +22,7 @@
#include "gui/DialogyWidget.h"
class QAbstractButton;
class Database;
namespace Ui {
class DatabaseSettingsWidget;
@ -36,38 +36,19 @@ public:
explicit DatabaseSettingsWidget(QWidget* parent = 0);
~DatabaseSettingsWidget();
void setForms(const QString& dbName, const QString& dbDescription,
const QString& defaultUsername, bool recylceBinEnabled,
int transformRounds, int historyMaxItems,
int historyMaxSize);
quint64 transformRounds();
QString dbName();
QString dbDescription();
QString defaultUsername();
bool recylceBinEnabled();
int historyMaxItems();
int historyMaxSize();
void load(Database* db);
Q_SIGNALS:
void editFinished(bool accepted);
private Q_SLOTS:
void changeSettings();
void save();
void reject();
void toggleHistoryMaxItemsSpinBox(int state);
void toggleHistoryMaxSizeSpinBox(int state);
void transformRoundsBenchmark();
private:
const QScopedPointer<Ui::DatabaseSettingsWidget> m_ui;
QString m_dbName;
QString m_dbDescription;
QString m_defaultUsername;
bool m_recylceBinEnabled;
quint64 m_transformRounds;
int m_historyMaxItems;
int m_historyMaxSize;
Database* m_db;
Q_DISABLE_COPY(DatabaseSettingsWidget)
};

29
src/gui/DatabaseWidget.cpp
View File

@ -110,7 +110,7 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
connect(m_historyEditEntryWidget, SIGNAL(editFinished(bool)), SLOT(switchBackToEntryEdit()));
connect(m_editGroupWidget, SIGNAL(editFinished(bool)), SLOT(switchToView(bool)));
connect(m_changeMasterKeyWidget, SIGNAL(editFinished(bool)), SLOT(updateMasterKey(bool)));
connect(m_databaseSettingsWidget, SIGNAL(editFinished(bool)), SLOT(updateSettings(bool)));
connect(m_databaseSettingsWidget, SIGNAL(editFinished(bool)), SLOT(switchToView(bool)));
connect(this, SIGNAL(currentChanged(int)), this, SLOT(emitCurrentModeChanged()));
connect(m_searchEdit, SIGNAL(returnPressed()), this, SLOT(search()));
connect(m_clearSearchButton, SIGNAL(clicked()), this, SLOT(clearSearchEdit()));
@ -323,25 +323,6 @@ void DatabaseWidget::updateMasterKey(bool accepted)
setCurrentIndex(0);
}
void DatabaseWidget::updateSettings(bool accepted)
{
if (accepted) {
m_db->updateKey(m_databaseSettingsWidget->transformRounds());
m_db->metadata()->setDescription(m_databaseSettingsWidget->dbDescription());
m_db->metadata()->setDefaultUserName(m_databaseSettingsWidget->defaultUsername());
m_db->metadata()->setRecycleBinEnabled(m_databaseSettingsWidget->recylceBinEnabled());
m_db->metadata()->setName(m_databaseSettingsWidget->dbName());
if (m_db->metadata()->historyMaxItems() != m_databaseSettingsWidget->historyMaxItems() ||
m_db->metadata()->historyMaxSize() != m_databaseSettingsWidget->historyMaxSize()) {
m_db->metadata()->setHistoryMaxItems(m_databaseSettingsWidget->historyMaxItems());
m_db->metadata()->setHistoryMaxSize(m_databaseSettingsWidget->historyMaxSize());
truncateHistories();
}
}
setCurrentIndex(0);
}
void DatabaseWidget::switchToEntryEdit()
{
switchToEntryEdit(m_entryView->currentEntry(), false);
@ -360,13 +341,7 @@ void DatabaseWidget::switchToMasterKeyChange()
void DatabaseWidget::switchToDatabaseSettings()
{
m_databaseSettingsWidget->setForms(m_db->metadata()->name(),
m_db->metadata()->description(),
m_db->metadata()->defaultUserName(),
m_db->metadata()->recycleBinEnabled(),
m_db->transformRounds(),
m_db->metadata()->historyMaxItems(),
m_db->metadata()->historyMaxSize());
m_databaseSettingsWidget->load(m_db);
setCurrentIndex(4);
}

1
src/gui/DatabaseWidget.h
View File

@ -79,7 +79,6 @@ private Q_SLOTS:
void switchToEntryEdit(Entry* entry, bool create);
void switchToGroupEdit(Group* entry, bool create);
void updateMasterKey(bool accepted);
void updateSettings(bool accepted);
void emitCurrentModeChanged();
void clearLastGroup(Group* group);
void clearSearchEdit();