Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-09 06:52:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix enabled state of group actions.

Browse source
This commit is contained in:
Florian Geyer 2012-05-27 16:53:07 +02:00
parent 3e72cd11a3
commit 56509eab5f
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/gui/DatabaseWidget.cpp
View file

@ -141,8 +141,9 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
m_actionGroupDelete = m_menuGroup->addAction(tr("Delete group"), this, SLOT(deleteGroup())); m_actionGroupDelete = m_menuGroup->addAction(tr("Delete group"), this, SLOT(deleteGroup()));
m_actionGroupDelete->setEnabled(false); m_actionGroupDelete->setEnabled(false);
connect(m_groupView, SIGNAL(groupChanged(Group*)), m_entryView, SLOT(setGroup(Group*)));
connect(m_groupView, SIGNAL(groupChanged(Group*)), this, SLOT(clearLastGroup(Group*))); connect(m_groupView, SIGNAL(groupChanged(Group*)), this, SLOT(clearLastGroup(Group*)));
connect(m_groupView, SIGNAL(groupChanged(Group*)), SLOT(updateGroupActions(Group*)));
connect(m_groupView, SIGNAL(groupChanged(Group*)), m_entryView, SLOT(setGroup(Group*)));
connect(m_entryView, SIGNAL(entryActivated(Entry*)), SLOT(switchToEntryEdit(Entry*))); connect(m_entryView, SIGNAL(entryActivated(Entry*)), SLOT(switchToEntryEdit(Entry*)));
connect(m_editEntryWidget, SIGNAL(editFinished(bool)), SLOT(switchToView(bool))); connect(m_editEntryWidget, SIGNAL(editFinished(bool)), SLOT(switchToView(bool)));
connect(m_editEntryWidget, SIGNAL(historyEntryActivated(Entry*)), SLOT(switchToHistoryView(Entry*))); connect(m_editEntryWidget, SIGNAL(historyEntryActivated(Entry*)), SLOT(switchToHistoryView(Entry*)));
@ -158,7 +159,6 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
connect(m_searchTimer, SIGNAL(timeout()), this, SLOT(search())); connect(m_searchTimer, SIGNAL(timeout()), this, SLOT(search()));
connect(closeAction, SIGNAL(triggered()), this, SLOT(closeSearch())); connect(closeAction, SIGNAL(triggered()), this, SLOT(closeSearch()));
connect(m_entryView, SIGNAL(entrySelectionChanged()), SLOT(updateEntryActions())); connect(m_entryView, SIGNAL(entrySelectionChanged()), SLOT(updateEntryActions()));
connect(m_groupView, SIGNAL(groupChanged(Group*)), SLOT(updateGroupActions()));
setCurrentIndex(0); setCurrentIndex(0);
} }
@ -596,9 +596,12 @@ void DatabaseWidget::clearLastGroup(Group* group)
} }
} }
void DatabaseWidget::updateGroupActions() void DatabaseWidget::updateGroupActions(Group* group)
{ {
m_actionGroupDelete->setEnabled(canDeleteCurrentGoup()); bool inSearch = m_lastGroup;
m_actionGroupNew->setEnabled(group && !inSearch);
m_actionGroupEdit->setEnabled(group && !inSearch);
m_actionGroupDelete->setEnabled(group && !inSearch && canDeleteCurrentGoup());
} }
void DatabaseWidget::updateEntryActions() void DatabaseWidget::updateEntryActions()

2
src/gui/DatabaseWidget.h
View file

@ -104,7 +104,7 @@ private Q_SLOTS:
void startSearchTimer(); void startSearchTimer();
void showSearch(); void showSearch();
void closeSearch(); void closeSearch();
void updateGroupActions(); void updateGroupActions(Group* group);
void updateEntryActions(); void updateEntryActions();
void showGroupContextMenu(const QPoint& pos); void showGroupContextMenu(const QPoint& pos);
void showEntryContextMenu(const QPoint& pos); void showEntryContextMenu(const QPoint& pos);