mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-03 22:55:04 -04:00
Added new basic class for a QLineEdit with a clear button - LineEditClear.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5080 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
1df5582e1c
commit
7756b093bf
34 changed files with 413 additions and 962 deletions
|
@ -172,8 +172,7 @@ MessagesDialog::MessagesDialog(QWidget *parent)
|
|||
ui.actionIconOnly->setData(Qt::ToolButtonIconOnly);
|
||||
ui.actionTextUnderIcon->setData(Qt::ToolButtonTextUnderIcon);
|
||||
|
||||
connect(ui.clearButton, SIGNAL(clicked()), this, SLOT(clearFilter()));
|
||||
connect(ui.filterPatternLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(filterRegExpChanged()));
|
||||
connect(ui.filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged(QString)));
|
||||
|
||||
connect(ui.filterColumnComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(filterColumnChanged()));
|
||||
|
||||
|
@ -258,13 +257,9 @@ MessagesDialog::MessagesDialog(QWidget *parent)
|
|||
//viewmenu->addAction(ui.actionTextUnderIcon);
|
||||
ui.viewtoolButton->setMenu(viewmenu);
|
||||
|
||||
ui.filterPatternLineEdit->setMinimumWidth(20);
|
||||
|
||||
//setting default filter by column as subject
|
||||
proxyModel->setFilterKeyColumn(FilterColumnFromComboBox(ui.filterColumnComboBox->currentIndex()));
|
||||
|
||||
ui.clearButton->hide();
|
||||
|
||||
// load settings
|
||||
processSettings(true);
|
||||
|
||||
|
@ -1568,21 +1563,10 @@ void MessagesDialog::buttonStyle()
|
|||
setToolbarButtonStyle((Qt::ToolButtonStyle) dynamic_cast<QAction*>(sender())->data().toInt());
|
||||
}
|
||||
|
||||
void MessagesDialog::filterRegExpChanged()
|
||||
void MessagesDialog::filterChanged(const QString& text)
|
||||
{
|
||||
QRegExp regExp(ui.filterPatternLineEdit->text(), Qt::CaseInsensitive , QRegExp::FixedString);
|
||||
QRegExp regExp(text, Qt::CaseInsensitive, QRegExp::FixedString);
|
||||
proxyModel->setFilterRegExp(regExp);
|
||||
|
||||
QString text = ui.filterPatternLineEdit->text();
|
||||
|
||||
if (text.isEmpty())
|
||||
{
|
||||
ui.clearButton->hide();
|
||||
}
|
||||
else
|
||||
{
|
||||
ui.clearButton->show();
|
||||
}
|
||||
}
|
||||
|
||||
void MessagesDialog::filterColumnChanged()
|
||||
|
@ -1802,13 +1786,6 @@ void MessagesDialog::updateMessageSummaryList()
|
|||
}
|
||||
}
|
||||
|
||||
/** clear Filter **/
|
||||
void MessagesDialog::clearFilter()
|
||||
{
|
||||
ui.filterPatternLineEdit->clear();
|
||||
ui.filterPatternLineEdit->setFocus();
|
||||
}
|
||||
|
||||
void MessagesDialog::tagAboutToShow()
|
||||
{
|
||||
TagsMenu *menu = dynamic_cast<TagsMenu*>(ui.tagButton->menu());
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue