Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-04 08:55:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Disable 'Cancel' button on ChangeMasterKeyWidget when setting an initial password for a new database, follow-up to #302

Browse Source
This commit is contained in:
Janek Bevendorff 2017-02-16 23:18:04 +01:00
parent daf0b72eed
commit 6dcb83f913
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/ChangeMasterKeyWidget.cpp
View File

@ -136,3 +136,8 @@ void ChangeMasterKeyWidget::reject()
{ {
Q_EMIT editFinished(false); Q_EMIT editFinished(false);
} }
void ChangeMasterKeyWidget::setCancelEnabled(bool enabled)
{
m_ui->buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(enabled);
}

1
src/gui/ChangeMasterKeyWidget.h
View File

@ -38,6 +38,7 @@ public:
void clearForms(); void clearForms();
CompositeKey newMasterKey(); CompositeKey newMasterKey();
QLabel* headlineLabel(); QLabel* headlineLabel();
void setCancelEnabled(bool enabled);
Q_SIGNALS: Q_SIGNALS:
void editFinished(bool accepted); void editFinished(bool accepted);

2
src/gui/DatabaseTabWidget.cpp
View File

@ -100,7 +100,7 @@ void DatabaseTabWidget::newDatabase()
return; return;
} }
dbStruct.dbWidget->switchToMasterKeyChange(); dbStruct.dbWidget->switchToMasterKeyChange(true);
} }
void DatabaseTabWidget::openDatabase() void DatabaseTabWidget::openDatabase()

3
src/gui/DatabaseWidget.cpp
View File

@ -810,9 +810,10 @@ void DatabaseWidget::switchToGroupEdit()
switchToGroupEdit(group, false); switchToGroupEdit(group, false);
} }
void DatabaseWidget::switchToMasterKeyChange() void DatabaseWidget::switchToMasterKeyChange(bool disableCancel)
{ {
m_changeMasterKeyWidget->clearForms(); m_changeMasterKeyWidget->clearForms();
m_changeMasterKeyWidget->setCancelEnabled(!disableCancel);
setCurrentWidget(m_changeMasterKeyWidget); setCurrentWidget(m_changeMasterKeyWidget);
} }

2
src/gui/DatabaseWidget.h
View File

@ -132,7 +132,7 @@ public Q_SLOTS:
void switchToView(bool accepted); void switchToView(bool accepted);
void switchToEntryEdit(); void switchToEntryEdit();
void switchToGroupEdit(); void switchToGroupEdit();
void switchToMasterKeyChange(); void switchToMasterKeyChange(bool disableCancel = false);
void switchToDatabaseSettings(); void switchToDatabaseSettings();
void switchToOpenDatabase(const QString& fileName); void switchToOpenDatabase(const QString& fileName);
void switchToOpenDatabase(const QString& fileName, const QString& password, const QString& keyFile); void switchToOpenDatabase(const QString& fileName, const QString& password, const QString& keyFile);