Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tidied up layout of the search field.

Browse Source
This commit is contained in:
Keith Bennett 2014-03-22 16:24:11 +00:00
parent 61ada66e3a
commit b953ea9042
3 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/MainWindow.cpp
View File

@ -128,6 +128,7 @@ MainWindow::MainWindow()
? QKeySequence::Find ? QKeySequence::Find
: QKeySequence(Qt::CTRL + Qt::Key_F); : QKeySequence(Qt::CTRL + Qt::Key_F);
connect(new QShortcut(seq, this), SIGNAL(activated()), m_ui->searchField, SLOT(setFocus())); connect(new QShortcut(seq, this), SIGNAL(activated()), m_ui->searchField, SLOT(setFocus()));
m_ui->searchField->setContentsMargins(5,0,5,0);
m_ui->actionEntryNew->setShortcut(Qt::CTRL + Qt::Key_N); m_ui->actionEntryNew->setShortcut(Qt::CTRL + Qt::Key_N);
m_ui->actionEntryEdit->setShortcut(Qt::CTRL + Qt::Key_E); m_ui->actionEntryEdit->setShortcut(Qt::CTRL + Qt::Key_E);
m_ui->actionEntryDelete->setShortcut(Qt::CTRL + Qt::Key_D); m_ui->actionEntryDelete->setShortcut(Qt::CTRL + Qt::Key_D);
@ -248,7 +249,8 @@ MainWindow::MainWindow()
m_ui->searchField->setPlaceholderText(tr("Type to search")); m_ui->searchField->setPlaceholderText(tr("Type to search"));
m_ui->searchField->setEnabled(false); m_ui->searchField->setEnabled(false);
m_ui->toolBar->addWidget(m_ui->searchPanel); m_ui->toolBar->addWidget(m_ui->mySpacer);
m_ui->toolBar->addWidget(m_ui->searchField);
m_actionMultiplexer.connect(m_ui->searchField, SIGNAL(textChanged(QString)), m_actionMultiplexer.connect(m_ui->searchField, SIGNAL(textChanged(QString)),
SLOT(search(QString))); SLOT(search(QString)));
QMenu* searchMenu = new QMenu(this); QMenu* searchMenu = new QMenu(this);

39
src/gui/MainWindow.ui
View File

@ -55,34 +55,6 @@
</widget> </widget>
<widget class="QWidget" name="pageWelcome"> <widget class="QWidget" name="pageWelcome">
<layout class="QVBoxLayout" name="verticalLayout_5"> <layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QWidget" name="searchPanel" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QSearchField" name="searchField" native="true"/>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="WelcomeWidget" name="welcomeWidget" native="true"/> <widget class="WelcomeWidget" name="welcomeWidget" native="true"/>
</item> </item>
@ -214,6 +186,17 @@
<addaction name="actionEntryCopyPassword"/> <addaction name="actionEntryCopyPassword"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionLockDatabases"/> <addaction name="actionLockDatabases"/>
<widget class="QWidget" name="mySpacer">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
<widget class="QWidget" name="searchPanel">
<widget class="QSearchField" name="searchField" native="true"/>
</widget>
</widget> </widget>
<action name="actionQuit"> <action name="actionQuit">
<property name="text"> <property name="text">

6
src/gui/SearchWidget.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>630</width> <width>630</width>
<height>34</height> <height>16</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
@ -32,10 +32,6 @@
</widget> </widget>
<tabstops> <tabstops>
<tabstop>closeSearchButton</tabstop> <tabstop>closeSearchButton</tabstop>
<tabstop>searchEdit</tabstop>
<tabstop>caseSensitiveCheckBox</tabstop>
<tabstop>searchCurrentRadioButton</tabstop>
<tabstop>searchRootRadioButton</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>