feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Merge FilterLineEdit into FancyLineEdit

Browse Source 
Change-Id: Ic53836dade3985c36b0f6767e43b5af0ddb80d72
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-02-13 13:54:39 +01:00
parent 5fd7c0bcec
commit a74de6af81
32 changed files with 109 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/git/gerrit/gerritdialog.cpp
View File

@@ -57,11 +57,12 @@ static const int layoutSpacing = 5;
static const int maxTitleWidth = 350;
QueryValidatingLineEdit::QueryValidatingLineEdit(QWidget *parent)
: Utils::FilterLineEdit(parent)
: Utils::FancyLineEdit(parent)
, m_valid(true)
, m_okTextColor(palette().color(QPalette::Active, QPalette::Text))
, m_errorTextColor(Qt::red)
{
setFiltering(true);
connect(this, SIGNAL(textChanged(QString)), this, SLOT(setValid()));
}
@@ -98,7 +99,7 @@ GerritDialog::GerritDialog(const QSharedPointer<GerritParameters> &p,
, m_treeView(new QTreeView)
, m_detailsBrowser(new QTextBrowser)
, m_queryLineEdit(new QueryValidatingLineEdit)
, m_filterLineEdit(new Utils::FilterLineEdit)
, m_filterLineEdit(new Utils::FancyLineEdit)
, m_repositoryChooser(new Utils::PathChooser)
, m_buttonBox(new QDialogButtonBox(QDialogButtonBox::Close))
, m_repositoryChooserLabel(new QLabel(tr("Apply in:") + QLatin1Char(' '), this))
@@ -123,6 +124,7 @@ GerritDialog::GerritDialog(const QSharedPointer<GerritParameters> &p,
filterLayout->addWidget(m_queryLineEdit);
filterLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::MinimumExpanding, QSizePolicy::Ignored));
m_filterLineEdit->setFixedWidth(300);
m_filterLineEdit->setFiltering(true);
filterLayout->addWidget(m_filterLineEdit);
connect(m_filterLineEdit, SIGNAL(filterChanged(QString)),
m_filterModel, SLOT(setFilterFixedString(QString)));

6
src/plugins/git/gerrit/gerritdialog.h
View File

@@ -30,7 +30,7 @@
#ifndef GERRIT_INTERNAL_GERRITDIALOG_H
#define GERRIT_INTERNAL_GERRITDIALOG_H
#include <utils/filterlineedit.h>
#include <utils/fancylineedit.h>
#include <utils/pathchooser.h>
#include <QDialog>
@@ -54,7 +54,7 @@ class GerritParameters;
class GerritModel;
class GerritChange;
class QueryValidatingLineEdit : public Utils::FilterLineEdit
class QueryValidatingLineEdit : public Utils::FancyLineEdit
{
Q_OBJECT
@@ -117,7 +117,7 @@ private:
QTreeView *m_treeView;
QTextBrowser *m_detailsBrowser;
QueryValidatingLineEdit *m_queryLineEdit;
Utils::FilterLineEdit *m_filterLineEdit;
Utils::FancyLineEdit *m_filterLineEdit;
Utils::PathChooser *m_repositoryChooser;
QDialogButtonBox *m_buttonBox;
QPushButton *m_displayButton;

7
src/plugins/git/gitorious/gitoriousprojectwidget.ui
View File

@@ -49,7 +49,7 @@
</widget>
</item>
<item row="0" column="0">
<widget class="Utils::FilterLineEdit" name="filterLineEdit"/>
<widget class="Utils::FancyLineEdit" name="filterLineEdit"/>
</item>
</layout>
</widget>
@@ -59,11 +59,6 @@
<extends>QLineEdit</extends>
<header location="global">utils/fancylineedit.h</header>
</customwidget>
<customwidget>
<class>Utils::FilterLineEdit</class>
<extends>Utils::FancyLineEdit</extends>
<header location="global">utils/filterlineedit.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>

7
src/plugins/git/gitorious/gitoriousrepositorywizardpage.ui
View File

@@ -15,7 +15,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="Utils::FilterLineEdit" name="filterLineEdit">
<widget class="Utils::FancyLineEdit" name="filterLineEdit">
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
@@ -32,11 +32,6 @@
<extends>QLineEdit</extends>
<header location="global">utils/fancylineedit.h</header>
</customwidget>
<customwidget>
<class>Utils::FilterLineEdit</class>
<extends>Utils::FancyLineEdit</extends>
<header location="global">utils/filterlineedit.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>filterLineEdit</tabstop>

1
src/plugins/git/stashdialog.cpp
View File

@@ -115,6 +115,7 @@ StashDialog::StashDialog(QWidget *parent) :
setAttribute(Qt::WA_DeleteOnClose, true); // Do not update unnecessarily
ui->setupUi(this);
ui->filterLineEdit->setFiltering(true);
// Buttons
ui->buttonBox->addButton(m_showCurrentButton, QDialogButtonBox::ActionRole);
connect(m_showCurrentButton, SIGNAL(clicked()), this, SLOT(showCurrent()));

7
src/plugins/git/stashdialog.ui
View File

@@ -24,7 +24,7 @@
</widget>
</item>
<item>
<widget class="Utils::FilterLineEdit" name="filterLineEdit"/>
<widget class="Utils::FancyLineEdit" name="filterLineEdit"/>
</item>
<item>
<widget class="QTreeView" name="stashView"/>
@@ -49,11 +49,6 @@
<extends>QLineEdit</extends>
<header location="global">utils/fancylineedit.h</header>
</customwidget>
<customwidget>
<class>Utils::FilterLineEdit</class>
<extends>Utils::FancyLineEdit</extends>
<header location="global">utils/filterlineedit.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections>