Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-21 20:49:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix edit entry form alignment and autotype settings '+'/'-' buttons

Browse source
This commit is contained in:
Janek Bevendorff 2017-02-12 23:05:48 +01:00
parent 35788f8654
commit a37b98d95d
4 changed files with 153 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/gui/PasswordGeneratorWidget.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>500</width> <width>575</width>
<height>278</height> <height>284</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -16,10 +16,25 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize">
<size>
<width>0</width>
<height>284</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string/> <string/>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,1">
<property name="sizeConstraint">
<enum>QLayout::SetMinimumSize</enum>
</property>
<item> <item>
<layout class="QGridLayout" name="passwordFieldLayout"> <layout class="QGridLayout" name="passwordFieldLayout">
<property name="bottomMargin"> <property name="bottomMargin">
@ -235,12 +250,6 @@ QProgressBar::chunk {
<layout class="QHBoxLayout" name="alphabetLayout"> <layout class="QHBoxLayout" name="alphabetLayout">
<item> <item>
<widget class="QToolButton" name="checkBoxUpper"> <widget class="QToolButton" name="checkBoxUpper">
<property name="minimumSize">
<size>
<width>0</width>
<height>26</height>
</size>
</property>
<property name="focusPolicy"> <property name="focusPolicy">
<enum>Qt::StrongFocus</enum> <enum>Qt::StrongFocus</enum>
</property> </property>
@ -260,12 +269,6 @@ QProgressBar::chunk {
</item> </item>
<item> <item>
<widget class="QToolButton" name="checkBoxLower"> <widget class="QToolButton" name="checkBoxLower">
<property name="minimumSize">
<size>
<width>0</width>
<height>26</height>
</size>
</property>
<property name="focusPolicy"> <property name="focusPolicy">
<enum>Qt::StrongFocus</enum> <enum>Qt::StrongFocus</enum>
</property> </property>
@ -285,12 +288,6 @@ QProgressBar::chunk {
</item> </item>
<item> <item>
<widget class="QToolButton" name="checkBoxNumbers"> <widget class="QToolButton" name="checkBoxNumbers">
<property name="minimumSize">
<size>
<width>0</width>
<height>26</height>
</size>
</property>
<property name="focusPolicy"> <property name="focusPolicy">
<enum>Qt::StrongFocus</enum> <enum>Qt::StrongFocus</enum>
</property> </property>
@ -310,12 +307,6 @@ QProgressBar::chunk {
</item> </item>
<item> <item>
<widget class="QToolButton" name="checkBoxSpecialChars"> <widget class="QToolButton" name="checkBoxSpecialChars">
<property name="minimumSize">
<size>
<width>0</width>
<height>26</height>
</size>
</property>
<property name="focusPolicy"> <property name="focusPolicy">
<enum>Qt::StrongFocus</enum> <enum>Qt::StrongFocus</enum>
</property> </property>

2
src/gui/entry/EditEntryWidget.cpp
View file

@ -77,6 +77,8 @@ EditEntryWidget::EditEntryWidget(QWidget* parent)
connect(this, SIGNAL(accepted()), SLOT(saveEntry())); connect(this, SIGNAL(accepted()), SLOT(saveEntry()));
connect(this, SIGNAL(rejected()), SLOT(cancel())); connect(this, SIGNAL(rejected()), SLOT(cancel()));
m_mainUi->passwordGenerator->layout()->setContentsMargins(0, 0, 0, 0);
} }
EditEntryWidget::~EditEntryWidget() EditEntryWidget::~EditEntryWidget()

82
src/gui/entry/EditEntryWidgetAutoType.ui
View file

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>567</width> <width>567</width>
<height>347</height> <height>348</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
@ -37,14 +37,14 @@
<item> <item>
<widget class="QRadioButton" name="inheritSequenceButton"> <widget class="QRadioButton" name="inheritSequenceButton">
<property name="text"> <property name="text">
<string>Inherit default Auto-Type sequence from the group</string> <string>Inherit default Auto-Type sequence from the &amp;group</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QRadioButton" name="customSequenceButton"> <widget class="QRadioButton" name="customSequenceButton">
<property name="text"> <property name="text">
<string>Use custom Auto-Type sequence:</string> <string>&amp;Use custom Auto-Type sequence:</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -90,39 +90,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4" stretch="2,1,1">
<item>
<widget class="QPushButton" name="assocAddButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>+</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="assocRemoveButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>-</string>
</property>
</widget>
</item>
<item> <item>
<spacer name="horizontalSpacer_3"> <spacer name="horizontalSpacer_3">
<property name="orientation"> <property name="orientation">
@ -136,6 +104,44 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item>
<widget class="QToolButton" name="assocAddButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>1</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>35</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>+</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="assocRemoveButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>-</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>
@ -171,14 +177,14 @@
<item> <item>
<widget class="QRadioButton" name="defaultWindowSequenceButton"> <widget class="QRadioButton" name="defaultWindowSequenceButton">
<property name="text"> <property name="text">
<string>Use default sequence</string> <string>Use default se&amp;quence</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QRadioButton" name="customWindowSequenceButton"> <widget class="QRadioButton" name="customWindowSequenceButton">
<property name="text"> <property name="text">
<string>Set custom sequence:</string> <string>Set custo&amp;m sequence:</string>
</property> </property>
</widget> </widget>
</item> </item>

155
src/gui/entry/EditEntryWidgetMain.ui
View file

@ -6,35 +6,41 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>372</width> <width>692</width>
<height>364</height> <height>323</height>
</rect> </rect>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <property name="sizePolicy">
<property name="fieldGrowthPolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<enum>QFormLayout::ExpandingFieldsGrow</enum> <horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<item row="0" column="0"> <layout class="QGridLayout" name="gridLayout_3">
<widget class="QLabel" name="titleLabel"> <item row="5" column="0" alignment="Qt::AlignRight">
<widget class="QLabel" name="urlLabel">
<property name="text"> <property name="text">
<string>Title:</string> <string>URL:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="4" column="1">
<widget class="QLineEdit" name="titleEdit"/> <widget class="PasswordGeneratorWidget" name="passwordGenerator" native="true">
</item> <property name="sizePolicy">
<item row="1" column="0"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<widget class="QLabel" name="usernameLabel"> <horstretch>0</horstretch>
<property name="text"> <verstretch>0</verstretch>
<string>Username:</string> </sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="2" column="0" alignment="Qt::AlignRight">
<widget class="QLineEdit" name="usernameEdit"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="passwordLabel"> <widget class="QLabel" name="passwordLabel">
<property name="text"> <property name="text">
<string>Password:</string> <string>Password:</string>
@ -42,31 +48,6 @@
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="PasswordEdit" name="passwordEdit">
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="togglePasswordButton">
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="5" column="0">
<widget class="QLabel" name="passwordRepeatLabel">
<property name="text">
<string>Repeat:</string>
</property>
</widget>
</item>
<item row="5" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<item> <item>
<widget class="PasswordEdit" name="passwordRepeatEdit"> <widget class="PasswordEdit" name="passwordRepeatEdit">
@ -84,24 +65,46 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="7" column="0"> <item row="2" column="1">
<widget class="QLabel" name="urlLabel"> <layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="PasswordEdit" name="passwordEdit">
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="togglePasswordButton">
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="0" alignment="Qt::AlignRight">
<widget class="QLabel" name="passwordRepeatLabel">
<property name="text"> <property name="text">
<string>URL:</string> <string>Repeat:</string>
</property>
</widget>
</item>
<item row="0" column="0" alignment="Qt::AlignRight">
<widget class="QLabel" name="titleLabel">
<property name="text">
<string>Title:</string>
</property>
</widget>
</item>
<item row="9" column="0" alignment="Qt::AlignRight|Qt::AlignTop">
<widget class="QLabel" name="notesLabel">
<property name="text">
<string>Notes:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="1"> <item row="7" column="1">
<widget class="QLineEdit" name="urlEdit"/>
</item>
<item row="8" column="0">
<widget class="QCheckBox" name="expireCheck">
<property name="text">
<string>Expires</string>
</property>
</widget>
</item>
<item row="8" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="QDateTimeEdit" name="expireDatePicker"> <widget class="QDateTimeEdit" name="expireDatePicker">
@ -115,6 +118,12 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="expirePresets"> <widget class="QPushButton" name="expirePresets">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Presets</string> <string>Presets</string>
</property> </property>
@ -122,13 +131,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="9" column="0">
<widget class="QLabel" name="notesLabel">
<property name="text">
<string>Notes:</string>
</property>
</widget>
</item>
<item row="9" column="1"> <item row="9" column="1">
<widget class="QPlainTextEdit" name="notesEdit"> <widget class="QPlainTextEdit" name="notesEdit">
<property name="sizePolicy"> <property name="sizePolicy">
@ -139,8 +141,28 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1"> <item row="1" column="0" alignment="Qt::AlignRight">
<widget class="PasswordGeneratorWidget" name="passwordGenerator" native="true"/> <widget class="QLabel" name="usernameLabel">
<property name="text">
<string>Username:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="titleEdit"/>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="usernameEdit"/>
</item>
<item row="5" column="1">
<widget class="QLineEdit" name="urlEdit"/>
</item>
<item row="7" column="0">
<widget class="QCheckBox" name="expireCheck">
<property name="text">
<string>Expires</string>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -165,7 +187,6 @@
<tabstop>togglePasswordButton</tabstop> <tabstop>togglePasswordButton</tabstop>
<tabstop>togglePasswordGeneratorButton</tabstop> <tabstop>togglePasswordGeneratorButton</tabstop>
<tabstop>urlEdit</tabstop> <tabstop>urlEdit</tabstop>
<tabstop>expireCheck</tabstop>
<tabstop>expireDatePicker</tabstop> <tabstop>expireDatePicker</tabstop>
<tabstop>expirePresets</tabstop> <tabstop>expirePresets</tabstop>
<tabstop>notesEdit</tabstop> <tabstop>notesEdit</tabstop>