jacobpascual/keepassxc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve selection when adding/removing a custom icon.

Browse Source
This commit is contained in:
Florian Geyer
2012-05-13 21:02:39 +02:00
parent a57e8f9864
commit a197cdcce5
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/EditEntryWidget.cpp
View File

@@ -436,9 +436,12 @@ void EditEntryWidget::addCustomIcon()
if (!filename.isEmpty()) { if (!filename.isEmpty()) {
QImage image(filename); QImage image(filename);
if (!image.isNull()) { if (!image.isNull()) {
m_database->metadata()->addCustomIcon(Uuid::random(), image.scaled(16, 16)); Uuid uuid = Uuid::random();
m_database->metadata()->addCustomIcon(uuid, image.scaled(16, 16));
m_customIconModel->setIcons(m_database->metadata()->customIcons(), m_customIconModel->setIcons(m_database->metadata()->customIcons(),
m_database->metadata()->customIconsOrder()); m_database->metadata()->customIconsOrder());
QModelIndex index = m_customIconModel->indexFromUuid(uuid);
m_iconsUi->customIconsView->setCurrentIndex(index);
} }
else { else {
// TODO: show error // TODO: show error
@@ -477,6 +480,12 @@ void EditEntryWidget::removeCustomIcon()
m_database->metadata()->removeCustomIcon(iconUuid); m_database->metadata()->removeCustomIcon(iconUuid);
m_customIconModel->setIcons(m_database->metadata()->customIcons(), m_customIconModel->setIcons(m_database->metadata()->customIcons(),
m_database->metadata()->customIconsOrder()); m_database->metadata()->customIconsOrder());
if (m_customIconModel->rowCount() > 0) {
m_iconsUi->customIconsView->setCurrentIndex(m_customIconModel->index(0, 0));
}
else {
updateRadioButtonDefaultIcons();
}
} }
else { else {
QMessageBox::information(this, tr("Can't delete icon!"), QMessageBox::information(this, tr("Can't delete icon!"),
@@ -495,8 +504,7 @@ void EditEntryWidget::updateWidgetsDefaultIcons(bool check)
m_iconsUi->defaultIconsView->setCurrentIndex(m_defaultIconModel->index(0, 0)); m_iconsUi->defaultIconsView->setCurrentIndex(m_defaultIconModel->index(0, 0));
} }
else { else {
m_iconsUi->defaultIconsView->selectionModel()-> m_iconsUi->defaultIconsView->setCurrentIndex(index);
setCurrentIndex(index, QItemSelectionModel::ClearAndSelect);
} }
m_iconsUi->customIconsView->selectionModel()->clearSelection(); m_iconsUi->customIconsView->selectionModel()->clearSelection();
m_iconsUi->addButton->setEnabled(false); m_iconsUi->addButton->setEnabled(false);
@@ -512,8 +520,7 @@ void EditEntryWidget::updateWidgetsCustomIcons(bool check)
m_iconsUi->customIconsView->setCurrentIndex(m_customIconModel->index(0, 0)); m_iconsUi->customIconsView->setCurrentIndex(m_customIconModel->index(0, 0));
} }
else { else {
m_iconsUi->customIconsView->selectionModel()-> m_iconsUi->customIconsView->setCurrentIndex(index);
setCurrentIndex(index, QItemSelectionModel::ClearAndSelect);
} }
m_iconsUi->defaultIconsView->selectionModel()->clearSelection(); m_iconsUi->defaultIconsView->selectionModel()->clearSelection();
m_iconsUi->addButton->setEnabled(true); m_iconsUi->addButton->setEnabled(true);