Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor parts of EditEntryWidget::saveEntry() into updateEntryData().

Browse Source
This commit is contained in:
Felix Geyer 2016-08-01 00:04:09 +02:00 committed by Jonathan White
parent 8f87b5cfd4
commit cf8186312a
2 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/gui/entry/EditEntryWidget.cpp
View File

@ -414,55 +414,60 @@ void EditEntryWidget::saveEntry()
// we don't want to create a new history item, if only the history has changed // we don't want to create a new history item, if only the history has changed
m_entry->removeHistoryItems(m_historyModel->deletedEntries()); m_entry->removeHistoryItems(m_historyModel->deletedEntries());
m_autoTypeAssoc->removeEmpty();
if (!m_create) { if (!m_create) {
m_entry->beginUpdate(); m_entry->beginUpdate();
} }
m_entry->setTitle(m_mainUi->titleEdit->text()); updateEntryData(m_entry);
m_entry->setUsername(m_mainUi->usernameEdit->text());
m_entry->setUrl(m_mainUi->urlEdit->text());
m_entry->setPassword(m_mainUi->passwordEdit->text());
m_entry->setExpires(m_mainUi->expireCheck->isChecked());
m_entry->setExpiryTime(m_mainUi->expireDatePicker->dateTime().toUTC());
m_entry->setNotes(m_mainUi->notesEdit->toPlainText());
m_entry->attributes()->copyCustomKeysFrom(m_entryAttributes);
m_entry->attachments()->copyDataFrom(m_entryAttachments);
IconStruct iconStruct = m_iconsWidget->state();
if (iconStruct.number < 0) {
m_entry->setIcon(Entry::DefaultIconNumber);
}
else if (iconStruct.uuid.isNull()) {
m_entry->setIcon(iconStruct.number);
}
else {
m_entry->setIcon(iconStruct.uuid);
}
m_entry->setAutoTypeEnabled(m_autoTypeUi->enableButton->isChecked());
if (m_autoTypeUi->inheritSequenceButton->isChecked()) {
m_entry->setDefaultAutoTypeSequence(QString());
}
else {
m_entry->setDefaultAutoTypeSequence(m_autoTypeUi->sequenceEdit->text());
}
m_autoTypeAssoc->removeEmpty();
m_entry->autoTypeAssociations()->copyDataFrom(m_autoTypeAssoc);
if (!m_create) { if (!m_create) {
m_entry->endUpdate(); m_entry->endUpdate();
} }
clear(); clear();
Q_EMIT editFinished(true); Q_EMIT editFinished(true);
} }
void EditEntryWidget::updateEntryData(Entry* entry) const
{
entry->setTitle(m_mainUi->titleEdit->text());
entry->setUsername(m_mainUi->usernameEdit->text());
entry->setUrl(m_mainUi->urlEdit->text());
entry->setPassword(m_mainUi->passwordEdit->text());
entry->setExpires(m_mainUi->expireCheck->isChecked());
entry->setExpiryTime(m_mainUi->expireDatePicker->dateTime().toUTC());
entry->setNotes(m_mainUi->notesEdit->toPlainText());
entry->attributes()->copyCustomKeysFrom(m_entryAttributes);
entry->attachments()->copyDataFrom(m_entryAttachments);
IconStruct iconStruct = m_iconsWidget->state();
if (iconStruct.number < 0) {
entry->setIcon(Entry::DefaultIconNumber);
}
else if (iconStruct.uuid.isNull()) {
entry->setIcon(iconStruct.number);
}
else {
entry->setIcon(iconStruct.uuid);
}
entry->setAutoTypeEnabled(m_autoTypeUi->enableButton->isChecked());
if (m_autoTypeUi->inheritSequenceButton->isChecked()) {
entry->setDefaultAutoTypeSequence(QString());
}
else {
entry->setDefaultAutoTypeSequence(m_autoTypeUi->sequenceEdit->text());
}
entry->autoTypeAssociations()->copyDataFrom(m_autoTypeAssoc);
}
void EditEntryWidget::cancel() void EditEntryWidget::cancel()
{ {
if (m_history) { if (m_history) {

1
src/gui/entry/EditEntryWidget.h
View File

@ -107,6 +107,7 @@ private:
bool passwordsEqual(); bool passwordsEqual();
void setForms(const Entry* entry, bool restore = false); void setForms(const Entry* entry, bool restore = false);
QMenu* createPresetsMenu(); QMenu* createPresetsMenu();
void updateEntryData(Entry* entry) const;
Entry* m_entry; Entry* m_entry;
Database* m_database; Database* m_database;