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

Merge branch 'release/2.1.2' into develop

Browse Source
This commit is contained in:
Janek Bevendorff
2017-02-17 04:03:12 +01:00
parent 79bd1f8121 ebdb10e7f9
commit e0e6f2b8e9
70 changed files with 7701 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,9 +77,10 @@ EditEntryWidget::EditEntryWidget(QWidget* parent)
connect(this, SIGNAL(accepted()), SLOT(saveEntry()));
connect(this, SIGNAL(rejected()), SLOT(cancel()));
connect(m_iconsWidget, SIGNAL(messageEditEntry(QString, MessageWidget::MessageType)), SLOT(showMessage(QString, MessageWidget::MessageType)));
connect(m_iconsWidget, SIGNAL(messageEditEntryDismiss()), SLOT(hideMessage()));
m_mainUi->passwordGenerator->layout()->setContentsMargins(0, 0, 0, 0);
}
EditEntryWidget::~EditEntryWidget()