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

16
src/gui/EditWidget.ui
View File

@@ -52,11 +52,18 @@
</layout>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="topMargin">
<number>5</number>
</property>
</widget>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
@@ -75,7 +82,6 @@
</customwidgets>
<tabstops>
<tabstop>categoryList</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources/>
<connections/>