Merge commit '755241df5c' into bug-116-autotype-single-keycode

This commit is contained in:
Albert Weichselbraun 2013-11-23 09:37:09 +01:00
commit c83579ecdb
15 changed files with 115 additions and 18 deletions

View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>438</width>
<height>242</height>
<height>249</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@ -154,8 +154,8 @@
<tabstops>
<tabstop>passwordGroup</tabstop>
<tabstop>enterPasswordEdit</tabstop>
<tabstop>repeatPasswordEdit</tabstop>
<tabstop>togglePasswordButton</tabstop>
<tabstop>repeatPasswordEdit</tabstop>
<tabstop>keyFileGroup</tabstop>
<tabstop>keyFileCombo</tabstop>
<tabstop>browseKeyFileButton</tabstop>

View File

@ -188,8 +188,14 @@
<tabstops>
<tabstop>dbNameEdit</tabstop>
<tabstop>dbDescriptionEdit</tabstop>
<tabstop>transformRoundsSpinBox</tabstop>
<tabstop>transformBenchmarkButton</tabstop>
<tabstop>defaultUsernameEdit</tabstop>
<tabstop>recycleBinEnabledCheckBox</tabstop>
<tabstop>historyMaxItemsCheckBox</tabstop>
<tabstop>historyMaxItemsSpinBox</tabstop>
<tabstop>historyMaxSizeCheckBox</tabstop>
<tabstop>historyMaxSizeSpinBox</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources/>

View File

@ -155,6 +155,7 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
connect(m_searchUi->caseSensitiveCheckBox, SIGNAL(toggled(bool)), this, SLOT(startSearch()));
connect(m_searchUi->searchCurrentRadioButton, SIGNAL(toggled(bool)), this, SLOT(startSearch()));
connect(m_searchUi->searchRootRadioButton, SIGNAL(toggled(bool)), this, SLOT(startSearch()));
connect(m_searchUi->searchEdit, SIGNAL(returnPressed()), m_entryView, SLOT(setFocus()));
connect(m_searchTimer, SIGNAL(timeout()), this, SLOT(search()));
connect(closeAction, SIGNAL(triggered()), this, SLOT(closeSearch()));

View File

@ -64,6 +64,10 @@
<header>gui/entry/EditEntryWidget_p.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>categoryList</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>

View File

@ -95,6 +95,14 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>defaultIconsRadio</tabstop>
<tabstop>defaultIconsView</tabstop>
<tabstop>customIconsRadio</tabstop>
<tabstop>customIconsView</tabstop>
<tabstop>addButton</tabstop>
<tabstop>deleteButton</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>

View File

@ -84,6 +84,12 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>createdEdit</tabstop>
<tabstop>modifiedEdit</tabstop>
<tabstop>accessedEdit</tabstop>
<tabstop>uuidEdit</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>

View File

@ -171,6 +171,19 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>checkBoxLower</tabstop>
<tabstop>checkBoxNumbers</tabstop>
<tabstop>checkBoxUpper</tabstop>
<tabstop>checkBoxSpecialChars</tabstop>
<tabstop>checkBoxExcludeAlike</tabstop>
<tabstop>checkBoxEnsureEvery</tabstop>
<tabstop>spinBoxLength</tabstop>
<tabstop>editNewPassword</tabstop>
<tabstop>togglePasswordButton</tabstop>
<tabstop>buttonGenerate</tabstop>
<tabstop>buttonApply</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>

View File

@ -93,6 +93,13 @@
<header>gui/LineEdit.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>closeSearchButton</tabstop>
<tabstop>searchEdit</tabstop>
<tabstop>caseSensitiveCheckBox</tabstop>
<tabstop>searchCurrentRadioButton</tabstop>
<tabstop>searchRootRadioButton</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>

View File

@ -78,6 +78,15 @@
<header>autotype/ShortcutWidget.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>rememberLastDatabasesCheckBox</tabstop>
<tabstop>openPreviousDatabasesOnStartupCheckBox</tabstop>
<tabstop>modifiedExpandedChangedCheckBox</tabstop>
<tabstop>autoSaveOnExitCheckBox</tabstop>
<tabstop>autoSaveAfterEveryChangeCheckBox</tabstop>
<tabstop>minimizeOnCopyCheckBox</tabstop>
<tabstop>autoTypeShortcutWidget</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>

View File

@ -36,6 +36,10 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>clearClipboardCheckBox</tabstop>
<tabstop>clearClipboardSpinBox</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>

View File

@ -140,6 +140,17 @@
<header>gui/entry/EditEntryWidget_p.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>attributesView</tabstop>
<tabstop>attributesEdit</tabstop>
<tabstop>addAttributeButton</tabstop>
<tabstop>editAttributeButton</tabstop>
<tabstop>removeAttributeButton</tabstop>
<tabstop>attachmentsView</tabstop>
<tabstop>addAttachmentButton</tabstop>
<tabstop>removeAttachmentButton</tabstop>
<tabstop>saveAttachmentButton</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>

View File

@ -235,6 +235,19 @@
<header>autotype/WindowSelectComboBox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>enableButton</tabstop>
<tabstop>inheritSequenceButton</tabstop>
<tabstop>customSequenceButton</tabstop>
<tabstop>sequenceEdit</tabstop>
<tabstop>assocView</tabstop>
<tabstop>windowTitleCombo</tabstop>
<tabstop>defaultWindowSequenceButton</tabstop>
<tabstop>customWindowSequenceButton</tabstop>
<tabstop>windowSequenceEdit</tabstop>
<tabstop>assocAddButton</tabstop>
<tabstop>assocRemoveButton</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>

View File

@ -64,6 +64,13 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>historyView</tabstop>
<tabstop>showButton</tabstop>
<tabstop>restoreButton</tabstop>
<tabstop>deleteButton</tabstop>
<tabstop>deleteAllButton</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>

View File

@ -34,16 +34,6 @@
<item row="1" column="1">
<widget class="QLineEdit" name="usernameEdit"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="urlLabel">
<property name="text">
<string>URL:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="urlEdit"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="passwordLabel">
<property name="text">
@ -104,16 +94,26 @@
</layout>
</item>
<item row="6" column="1">
<widget class="QLineEdit" name="urlEdit"/>
</item>
<item row="6" column="0">
<widget class="QLabel" name="urlLabel">
<property name="text">
<string>URL:</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="PasswordGeneratorWidget" name="passwordGenerator" native="true"/>
</item>
<item row="7" column="0">
<item row="8" column="0">
<widget class="QCheckBox" name="expireCheck">
<property name="text">
<string>Expires</string>
</property>
</widget>
</item>
<item row="7" column="1">
<item row="8" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QDateTimeEdit" name="expireDatePicker">
@ -134,14 +134,14 @@
</item>
</layout>
</item>
<item row="8" column="0">
<item row="9" column="0">
<widget class="QLabel" name="notesLabel">
<property name="text">
<string>Notes:</string>
</property>
</widget>
</item>
<item row="8" column="1">
<item row="9" column="1">
<widget class="QPlainTextEdit" name="notesEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@ -164,11 +164,11 @@
<tabstops>
<tabstop>titleEdit</tabstop>
<tabstop>usernameEdit</tabstop>
<tabstop>urlEdit</tabstop>
<tabstop>passwordEdit</tabstop>
<tabstop>passwordRepeatEdit</tabstop>
<tabstop>togglePasswordButton</tabstop>
<tabstop>passwordRepeatEdit</tabstop>
<tabstop>tooglePasswordGeneratorButton</tabstop>
<tabstop>urlEdit</tabstop>
<tabstop>expireCheck</tabstop>
<tabstop>expireDatePicker</tabstop>
<tabstop>expirePresets</tabstop>

View File

@ -77,6 +77,14 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>editName</tabstop>
<tabstop>editNotes</tabstop>
<tabstop>expireCheck</tabstop>
<tabstop>expireDatePicker</tabstop>
<tabstop>searchComboBox</tabstop>
<tabstop>autotypeComboBox</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>