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

Update auto-type association editing.

Browse Source 
Correctly set enabled status of all elements.
Fix crash when clicking on the view and the entry has no auto-type associations.
This commit is contained in:
Felix Geyer 2012-07-20 10:28:18 +02:00
parent ef579cbe3c
commit b5c3873cfd
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,7 +112,7 @@ EditEntryWidget::EditEntryWidget(QWidget* parent)
m_autoTypeAssocModel->setAutoTypeAssociations(m_autoTypeAssoc); m_autoTypeAssocModel->setAutoTypeAssociations(m_autoTypeAssoc);
m_autoTypeUi->assocView->setModel(m_autoTypeAssocModel); m_autoTypeUi->assocView->setModel(m_autoTypeAssocModel);
m_autoTypeUi->assocView->setColumnHidden(1, true); m_autoTypeUi->assocView->setColumnHidden(1, true);
connect(m_autoTypeUi->enableButton, SIGNAL(toggled(bool)), SLOT(autoTypeEnableToggled(bool))); connect(m_autoTypeUi->enableButton, SIGNAL(toggled(bool)), SLOT(updateAutoTypeEnabled()));
connect(m_autoTypeUi->customSequenceButton, SIGNAL(toggled(bool)), connect(m_autoTypeUi->customSequenceButton, SIGNAL(toggled(bool)),
m_autoTypeUi->sequenceEdit, SLOT(setEnabled(bool))); m_autoTypeUi->sequenceEdit, SLOT(setEnabled(bool)));
connect(m_autoTypeUi->customWindowSequenceButton, SIGNAL(toggled(bool)), connect(m_autoTypeUi->customWindowSequenceButton, SIGNAL(toggled(bool)),
@ -120,8 +120,8 @@ EditEntryWidget::EditEntryWidget(QWidget* parent)
connect(m_autoTypeUi->assocAddButton, SIGNAL(clicked()), SLOT(insertAutoTypeAssoc())); connect(m_autoTypeUi->assocAddButton, SIGNAL(clicked()), SLOT(insertAutoTypeAssoc()));
connect(m_autoTypeUi->assocRemoveButton, SIGNAL(clicked()), SLOT(removeAutoTypeAssoc())); connect(m_autoTypeUi->assocRemoveButton, SIGNAL(clicked()), SLOT(removeAutoTypeAssoc()));
connect(m_autoTypeUi->assocView->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)), connect(m_autoTypeUi->assocView->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),
SLOT(updateAssocRemoveButton())); SLOT(updateAutoTypeEnabled()));
connect(m_autoTypeAssocModel, SIGNAL(modelReset()), SLOT(updateAssocRemoveButton())); connect(m_autoTypeAssocModel, SIGNAL(modelReset()), SLOT(updateAutoTypeEnabled()));
connect(m_autoTypeUi->assocView->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)), connect(m_autoTypeUi->assocView->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),
SLOT(loadCurrentAssoc(QModelIndex))); SLOT(loadCurrentAssoc(QModelIndex)));
connect(m_autoTypeAssocModel, SIGNAL(modelReset()), SLOT(clearCurrentAssoc())); connect(m_autoTypeAssocModel, SIGNAL(modelReset()), SLOT(clearCurrentAssoc()));
@ -247,15 +247,8 @@ void EditEntryWidget::setForms(const Entry* entry, bool restore)
} }
m_advancedUi->attributesView->setEditTriggers(editTriggers); m_advancedUi->attributesView->setEditTriggers(editTriggers);
m_iconsWidget->setEnabled(!m_history); m_iconsWidget->setEnabled(!m_history);
m_autoTypeUi->enableButton->setEnabled(!m_history);
m_autoTypeUi->inheritSequenceButton->setEnabled(!m_history);
m_autoTypeUi->customSequenceButton->setEnabled(!m_history);
m_autoTypeUi->sequenceEdit->setReadOnly(!m_history); m_autoTypeUi->sequenceEdit->setReadOnly(!m_history);
m_autoTypeUi->assocAddButton->setEnabled(!m_history);
m_autoTypeUi->assocRemoveButton->setEnabled(false);
m_autoTypeUi->windowTitleCombo->lineEdit()->setReadOnly(m_history); m_autoTypeUi->windowTitleCombo->lineEdit()->setReadOnly(m_history);
m_autoTypeUi->defaultWindowSequenceButton->setEnabled(!m_history);
m_autoTypeUi->customWindowSequenceButton->setEnabled(!m_history);
m_autoTypeUi->windowSequenceEdit->setReadOnly(m_history); m_autoTypeUi->windowSequenceEdit->setReadOnly(m_history);
m_historyWidget->setEnabled(!m_history); m_historyWidget->setEnabled(!m_history);
@ -291,6 +284,7 @@ void EditEntryWidget::setForms(const Entry* entry, bool restore)
if (!m_history) { if (!m_history) {
m_autoTypeUi->windowTitleCombo->insertItems(0, autoType()->windowTitles()); m_autoTypeUi->windowTitleCombo->insertItems(0, autoType()->windowTitles());
} }
m_autoTypeUi->windowTitleCombo->lineEdit()->clear();
m_autoTypeAssoc->copyDataFrom(entry->autoTypeAssociations()); m_autoTypeAssoc->copyDataFrom(entry->autoTypeAssociations());
m_autoTypeUi->enableButton->setChecked(entry->autoTypeEnabled()); m_autoTypeUi->enableButton->setChecked(entry->autoTypeEnabled());
if (entry->defaultAutoTypeSequence().isEmpty()) { if (entry->defaultAutoTypeSequence().isEmpty()) {
@ -303,6 +297,7 @@ void EditEntryWidget::setForms(const Entry* entry, bool restore)
if (m_autoTypeAssoc->size() != 0) { if (m_autoTypeAssoc->size() != 0) {
m_autoTypeUi->assocView->setCurrentIndex(m_autoTypeAssocModel->index(0, 0)); m_autoTypeUi->assocView->setCurrentIndex(m_autoTypeAssocModel->index(0, 0));
} }
updateAutoTypeEnabled();
if (!m_history && !restore) { if (!m_history && !restore) {
m_historyModel->setEntries(entry->historyItems()); m_historyModel->setEntries(entry->historyItems());
@ -601,23 +596,36 @@ void EditEntryWidget::removeCurrentAttachment()
m_entryAttachments->remove(key); m_entryAttachments->remove(key);
} }
void EditEntryWidget::autoTypeEnableToggled(bool checked) void EditEntryWidget::updateAutoTypeEnabled()
{ {
m_autoTypeUi->inheritSequenceButton->setEnabled(checked); bool autoTypeEnabled = m_autoTypeUi->enableButton->isChecked();
m_autoTypeUi->customSequenceButton->setEnabled(checked); bool validIndex = m_autoTypeUi->assocView->currentIndex().isValid() && m_autoTypeAssoc->size() != 0;
m_autoTypeUi->sequenceEdit->setEnabled(checked && m_autoTypeUi->customSequenceButton->isChecked());
m_autoTypeUi->windowTitleLabel->setEnabled(checked); m_autoTypeUi->enableButton->setEnabled(!m_history);
m_autoTypeUi->windowTitleCombo->setEnabled(checked); m_autoTypeUi->inheritSequenceButton->setEnabled(!m_history && autoTypeEnabled);
m_autoTypeUi->defaultWindowSequenceButton->setEnabled(checked); m_autoTypeUi->customSequenceButton->setEnabled(!m_history && autoTypeEnabled);
m_autoTypeUi->customWindowSequenceButton->setEnabled(checked); m_autoTypeUi->sequenceEdit->setEnabled(autoTypeEnabled && m_autoTypeUi->customSequenceButton->isChecked());
m_autoTypeUi->windowSequenceEdit->setEnabled(checked && m_autoTypeUi->customWindowSequenceButton->isChecked());
m_autoTypeUi->assocView->setEnabled(autoTypeEnabled);
m_autoTypeUi->assocAddButton->setEnabled(!m_history);
m_autoTypeUi->assocRemoveButton->setEnabled(!m_history && validIndex);
m_autoTypeUi->windowTitleLabel->setEnabled(autoTypeEnabled && validIndex);
m_autoTypeUi->windowTitleCombo->setEnabled(autoTypeEnabled && validIndex);
m_autoTypeUi->defaultWindowSequenceButton->setEnabled(!m_history && autoTypeEnabled && validIndex);
m_autoTypeUi->customWindowSequenceButton->setEnabled(!m_history && autoTypeEnabled && validIndex);
m_autoTypeUi->windowSequenceEdit->setEnabled(autoTypeEnabled && validIndex
&& m_autoTypeUi->customWindowSequenceButton->isChecked());
} }
void EditEntryWidget::insertAutoTypeAssoc() void EditEntryWidget::insertAutoTypeAssoc()
{ {
AutoTypeAssociations::Association assoc; AutoTypeAssociations::Association assoc;
m_autoTypeAssoc->add(assoc); m_autoTypeAssoc->add(assoc);
m_autoTypeUi->assocView->setCurrentIndex(m_autoTypeAssocModel->index(m_autoTypeAssoc->size() - 1, 0)); QModelIndex newIndex = m_autoTypeAssocModel->index(m_autoTypeAssoc->size() - 1, 0);
m_autoTypeUi->assocView->setCurrentIndex(newIndex);
loadCurrentAssoc(newIndex);
m_autoTypeUi->windowTitleCombo->setFocus();
} }
void EditEntryWidget::removeAutoTypeAssoc() void EditEntryWidget::removeAutoTypeAssoc()
@ -629,14 +637,9 @@ void EditEntryWidget::removeAutoTypeAssoc()
} }
} }
void EditEntryWidget::updateAssocRemoveButton()
{
m_autoTypeUi->assocRemoveButton->setEnabled(!m_history && m_autoTypeUi->assocView->currentIndex().isValid());
}
void EditEntryWidget::loadCurrentAssoc(const QModelIndex& current) void EditEntryWidget::loadCurrentAssoc(const QModelIndex& current)
{ {
if (current.isValid()) { if (current.isValid() && current.row() < m_autoTypeAssoc->size()) {
AutoTypeAssociations::Association assoc = m_autoTypeAssoc->get(current.row()); AutoTypeAssociations::Association assoc = m_autoTypeAssoc->get(current.row());
m_autoTypeUi->windowTitleCombo->setEditText(assoc.window); m_autoTypeUi->windowTitleCombo->setEditText(assoc.window);
if (assoc.sequence.isEmpty()) { if (assoc.sequence.isEmpty()) {
@ -646,6 +649,8 @@ void EditEntryWidget::loadCurrentAssoc(const QModelIndex& current)
m_autoTypeUi->customWindowSequenceButton->setChecked(true); m_autoTypeUi->customWindowSequenceButton->setChecked(true);
} }
m_autoTypeUi->windowSequenceEdit->setText(assoc.sequence); m_autoTypeUi->windowSequenceEdit->setText(assoc.sequence);
updateAutoTypeEnabled();
} }
else { else {
clearCurrentAssoc(); clearCurrentAssoc();
@ -655,8 +660,11 @@ void EditEntryWidget::loadCurrentAssoc(const QModelIndex& current)
void EditEntryWidget::clearCurrentAssoc() void EditEntryWidget::clearCurrentAssoc()
{ {
m_autoTypeUi->windowTitleCombo->setEditText(""); m_autoTypeUi->windowTitleCombo->setEditText("");
m_autoTypeUi->defaultWindowSequenceButton->setChecked(true); m_autoTypeUi->defaultWindowSequenceButton->setChecked(true);
m_autoTypeUi->windowSequenceEdit->setText(""); m_autoTypeUi->windowSequenceEdit->setText("");
updateAutoTypeEnabled();
} }
void EditEntryWidget::applyCurrentAssoc() void EditEntryWidget::applyCurrentAssoc()

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

@ -76,10 +76,9 @@ private Q_SLOTS:
void insertAttachment(); void insertAttachment();
void saveCurrentAttachment(); void saveCurrentAttachment();
void removeCurrentAttachment(); void removeCurrentAttachment();
void autoTypeEnableToggled(bool checked); void updateAutoTypeEnabled();
void insertAutoTypeAssoc(); void insertAutoTypeAssoc();
void removeAutoTypeAssoc(); void removeAutoTypeAssoc();
void updateAssocRemoveButton();
void loadCurrentAssoc(const QModelIndex& current); void loadCurrentAssoc(const QModelIndex& current);
void clearCurrentAssoc(); void clearCurrentAssoc();
void applyCurrentAssoc(); void applyCurrentAssoc();