Merge branch 'release/2.1.2' into develop

This commit is contained in:
Janek Bevendorff 2017-02-17 04:03:12 +01:00
commit e0e6f2b8e9
No known key found for this signature in database
GPG key ID: CFEC2F6850BFFA53
70 changed files with 7701 additions and 723 deletions

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()