Merge branch 'develop' into feature/yubikey

2017-02-20 20:24:38 +01:00
parent 37c7318097 a37a90c8c7
commit a27147a75e
79 changed files with 8006 additions and 758 deletions
--- a/src/gui/DatabaseOpenWidget.cpp
+++ b/src/gui/DatabaseOpenWidget.cpp
@@ -70,6 +70,13 @@ DatabaseOpenWidget::DatabaseOpenWidget(QWidget* parent)
    connect(YubiKey::instance(), SIGNAL(detected(int,bool)),
                                 SLOT(ykDetected(int,bool)),
                                 Qt::QueuedConnection);
+
+#ifdef Q_OS_MACOS
+    // add random padding to layouts to align widgets properly
+    m_ui->dialogButtonsLayout->setContentsMargins(10, 0, 15, 0);
+    m_ui->gridLayout->setContentsMargins(10, 0, 0, 0);
+    m_ui->labelLayout->setContentsMargins(10, 0, 10, 0);
+#endif
 }

 DatabaseOpenWidget::~DatabaseOpenWidget()