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

Merge remote-tracking branch 'origin/develop' into feature/autoreload-db

Browse source 
# Conflicts:
#	src/gui/DatabaseWidget.cpp
#	src/gui/DatabaseWidget.h
This commit is contained in:
Jonathan White 2016-11-11 16:47:01 -05:00
commit 20c3ca7d37
No known key found for this signature in database
GPG key ID: 506BDC439519BC13
33 changed files with 1682 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/gui/DatabaseWidget.h
View file

@ -43,6 +43,7 @@ class QMenu;
class QSplitter;
class QLabel;
class UnlockDatabaseWidget;
class UnlockDatabaseDialog;
class QFileSystemWatcher;
class DatabaseWidget : public QStackedWidget
@ -89,6 +90,8 @@ public:
bool currentEntryHasNotes();
GroupView* groupView();
EntryView* entryView();
void showUnlockDialog();
void closeUnlockDialog();
Q_SIGNALS:
void closeRequest();
@ -174,6 +177,7 @@ private:
DatabaseOpenWidget* m_databaseOpenMergeWidget;
KeePass1OpenWidget* m_keepass1OpenWidget;
UnlockDatabaseWidget* m_unlockDatabaseWidget;
UnlockDatabaseDialog* m_unlockDatabaseDialog;
QSplitter* m_splitter;
GroupView* m_groupView;
EntryView* m_entryView;