mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-06 05:57:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/yubikey

Browse source
This commit is contained in:
Janek Bevendorff 2017-03-01 23:37:52 +01:00
commit 7eb7dbe0be
No known key found for this signature in database
GPG key ID: CFEC2F6850BFFA53
11 changed files with 69 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/gui/MainWindow.cpp
View file

@ -301,6 +301,10 @@ MainWindow::MainWindow()
connect(m_ui->welcomeWidget, SIGNAL(importKeePass1Database()), SLOT(switchToKeePass1Database()));
connect(m_ui->actionAbout, SIGNAL(triggered()), SLOT(showAboutDialog()));
#ifdef Q_OS_MAC
setUnifiedTitleAndToolBarOnMac(true);
#endif
connect(m_ui->tabWidget, SIGNAL(messageGlobal(QString,MessageWidget::MessageType)), this, SLOT(displayGlobalMessage(QString, MessageWidget::MessageType)));
connect(m_ui->tabWidget, SIGNAL(messageDismissGlobal()), this, SLOT(hideGlobalMessage()));