Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-05 01:15:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix DatabaseOpenWidget alignment on Mac OS X

Browse Source
This commit is contained in:
Janek Bevendorff 2017-02-12 16:57:01 +01:00
parent ec17199feb
commit 35788f8654
2 changed files with 60 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/DatabaseOpenWidget.cpp
View File

@ -52,6 +52,13 @@ DatabaseOpenWidget::DatabaseOpenWidget(QWidget* parent)
connect(m_ui->buttonBox, SIGNAL(accepted()), SLOT(openDatabase())); connect(m_ui->buttonBox, SIGNAL(accepted()), SLOT(openDatabase()));
connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(reject())); connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(reject()));
#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() DatabaseOpenWidget::~DatabaseOpenWidget()

52
src/gui/DatabaseOpenWidget.ui
View File

@ -10,7 +10,7 @@
<height>250</height> <height>250</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="1,0,0,1,0,0,3"> <layout class="QVBoxLayout" name="verticalLayout" stretch="1,0,1,0,0,3">
<property name="spacing"> <property name="spacing">
<number>8</number> <number>8</number>
</property> </property>
@ -27,6 +27,14 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item>
<layout class="QVBoxLayout" name="labelLayout">
<property name="leftMargin">
<number>5</number>
</property>
<property name="rightMargin">
<number>5</number>
</property>
<item> <item>
<widget class="QLabel" name="labelHeadline"> <widget class="QLabel" name="labelHeadline">
<property name="text"> <property name="text">
@ -37,6 +45,8 @@
<item> <item>
<widget class="QLabel" name="labelFilename"/> <widget class="QLabel" name="labelFilename"/>
</item> </item>
</layout>
</item>
<item> <item>
<spacer name="verticalSpacer_3"> <spacer name="verticalSpacer_3">
<property name="orientation"> <property name="orientation">
@ -52,17 +62,20 @@
</item> </item>
<item> <item>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>5</number>
</property>
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>8</number> <number>8</number>
</property> </property>
<item row="1" column="0"> <item row="1" column="0" alignment="Qt::AlignVCenter">
<widget class="QCheckBox" name="checkKeyFile"> <widget class="QCheckBox" name="checkKeyFile">
<property name="text"> <property name="text">
<string>Key File:</string> <string>Key File:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="0" column="0" alignment="Qt::AlignVCenter">
<widget class="QCheckBox" name="checkPassword"> <widget class="QCheckBox" name="checkPassword">
<property name="text"> <property name="text">
<string>Password:</string> <string>Password:</string>
@ -70,9 +83,18 @@
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="keyFileLayout">
<property name="leftMargin">
<number>5</number>
</property>
<property name="rightMargin">
<number>5</number>
</property>
<item> <item>
<widget class="QComboBox" name="comboKeyFile"> <widget class="QComboBox" name="comboKeyFile">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -94,7 +116,13 @@
</layout> </layout>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="passwordLayout">
<property name="leftMargin">
<number>5</number>
</property>
<property name="rightMargin">
<number>5</number>
</property>
<item> <item>
<widget class="PasswordEdit" name="editPassword"> <widget class="PasswordEdit" name="editPassword">
<property name="echoMode"> <property name="echoMode">
@ -114,15 +142,22 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QDialogButtonBox" name="buttonBox"> <layout class="QHBoxLayout" name="dialogButtonsLayout">
<property name="orientation"> <property name="leftMargin">
<enum>Qt::Horizontal</enum> <number>5</number>
</property> </property>
<property name="rightMargin">
<number>5</number>
</property>
<item alignment="Qt::AlignRight">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons"> <property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property> </property>
</widget> </widget>
</item> </item>
</layout>
</item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
@ -152,7 +187,6 @@
<tabstop>checkKeyFile</tabstop> <tabstop>checkKeyFile</tabstop>
<tabstop>comboKeyFile</tabstop> <tabstop>comboKeyFile</tabstop>
<tabstop>buttonBrowseFile</tabstop> <tabstop>buttonBrowseFile</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>