mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-06 14:07:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Return gracefully from actions if they shouldn't have been enabled.

Browse source
This commit is contained in:
Felix Geyer 2012-05-25 13:40:17 +02:00
parent 3834531488
commit bbd039e487
1 changed files with 34 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/gui/DatabaseWidget.cpp
View file

@ -187,6 +187,11 @@ EntryView* DatabaseWidget::entryView()
void DatabaseWidget::createEntry() void DatabaseWidget::createEntry()
{ {
if (!m_groupView->currentGroup()) {
Q_ASSERT(false);
return;
}
m_newEntry = new Entry(); m_newEntry = new Entry();
m_newEntry->setUuid(Uuid::random()); m_newEntry->setUuid(Uuid::random());
m_newEntry->setUsername(m_db->metadata()->defaultUserName()); m_newEntry->setUsername(m_db->metadata()->defaultUserName());
@ -197,6 +202,11 @@ void DatabaseWidget::createEntry()
void DatabaseWidget::cloneEntry() void DatabaseWidget::cloneEntry()
{ {
Entry* currentEntry = m_entryView->currentEntry(); Entry* currentEntry = m_entryView->currentEntry();
if (!currentEntry) {
Q_ASSERT(false);
return;
}
Entry* entry = currentEntry->clone(); Entry* entry = currentEntry->clone();
entry->setUuid(Uuid::random()); entry->setUuid(Uuid::random());
entry->setGroup(currentEntry->group()); entry->setGroup(currentEntry->group());
@ -206,24 +216,35 @@ void DatabaseWidget::cloneEntry()
void DatabaseWidget::deleteEntry() void DatabaseWidget::deleteEntry()
{ {
bool inRecylceBin = Tools::hasChild(m_db->metadata()->recycleBin(), m_entryView->currentEntry()); Entry* currentEntry = m_entryView->currentEntry();
if (!currentEntry) {
Q_ASSERT(false);
return;
}
bool inRecylceBin = Tools::hasChild(m_db->metadata()->recycleBin(), currentEntry);
if (inRecylceBin || !m_db->metadata()->recycleBinEnabled()) { if (inRecylceBin || !m_db->metadata()->recycleBinEnabled()) {
QMessageBox::StandardButton result = QMessageBox::question( QMessageBox::StandardButton result = QMessageBox::question(
this, tr("Delete entry?"), this, tr("Delete entry?"),
tr("Do you really want to delete the entry \"%1\" for good?") tr("Do you really want to delete the entry \"%1\" for good?")
.arg(m_entryView->currentEntry()->title()), .arg(currentEntry->title()),
QMessageBox::Yes | QMessageBox::No); QMessageBox::Yes | QMessageBox::No);
if (result == QMessageBox::Yes) { if (result == QMessageBox::Yes) {
delete m_entryView->currentEntry(); delete currentEntry;
} }
} }
else { else {
m_db->recycleEntry(m_entryView->currentEntry()); m_db->recycleEntry(currentEntry);
} }
} }
void DatabaseWidget::createGroup() void DatabaseWidget::createGroup()
{ {
if (!m_groupView->currentGroup()) {
Q_ASSERT(false);
return;
}
m_newGroup = new Group(); m_newGroup = new Group();
m_newGroup->setUuid(Uuid::random()); m_newGroup->setUuid(Uuid::random());
m_newParent = m_groupView->currentGroup(); m_newParent = m_groupView->currentGroup();
@ -232,21 +253,25 @@ void DatabaseWidget::createGroup()
void DatabaseWidget::deleteGroup() void DatabaseWidget::deleteGroup()
{ {
Q_ASSERT(canDeleteCurrentGoup()); Group* currentGroup = m_groupView->currentGroup();
if (!currentGroup || !canDeleteCurrentGoup()) {
Q_ASSERT(false);
return;
}
bool inRecylceBin = Tools::hasChild(m_db->metadata()->recycleBin(), m_groupView->currentGroup()); bool inRecylceBin = Tools::hasChild(m_db->metadata()->recycleBin(), currentGroup);
if (inRecylceBin || !m_db->metadata()->recycleBinEnabled()) { if (inRecylceBin || !m_db->metadata()->recycleBinEnabled()) {
QMessageBox::StandardButton result = QMessageBox::question( QMessageBox::StandardButton result = QMessageBox::question(
this, tr("Delete group?"), this, tr("Delete group?"),
tr("Do you really want to delete the group \"%1\" for good?") tr("Do you really want to delete the group \"%1\" for good?")
.arg(m_groupView->currentGroup()->name()), .arg(currentGroup->name()),
QMessageBox::Yes | QMessageBox::No); QMessageBox::Yes | QMessageBox::No);
if (result == QMessageBox::Yes) { if (result == QMessageBox::Yes) {
delete m_groupView->currentGroup(); delete currentGroup;
} }
} }
else { else {
m_db->recycleGroup(m_groupView->currentGroup()); m_db->recycleGroup(currentGroup);
} }
} }