mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed search line edit clearing when a modifier is present

Browse Source
This commit is contained in:
Luis Ángel San Martín 2014-10-28 10:16:31 +01:00
parent 10436200ac
commit b0d944e6b6
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
custom_widgets/yacreader_search_line_edit.cpp
View File

@ -70,6 +70,15 @@ YACReaderSearchLineEdit::YACReaderSearchLineEdit(QWidget *parent)
connect(this,SIGNAL(textChanged(QString)),this,SLOT(processText(QString))); connect(this,SIGNAL(textChanged(QString)),this,SLOT(processText(QString)));
} }
//modifiers are not returned
const QString YACReaderSearchLineEdit::text()
{
QString text = QLineEdit::text();
QRegExp regExp("\\[.*\\]");
return text.remove(regExp).trimmed();
}
void YACReaderSearchLineEdit::resizeEvent(QResizeEvent *) void YACReaderSearchLineEdit::resizeEvent(QResizeEvent *)
{ {
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
@ -108,11 +117,10 @@ void YACReaderSearchLineEdit::processText(const QString &text)
QString modifier = regExp.cap(1); QString modifier = regExp.cap(1);
QString searchText = regExp.cap(2).trimmed(); QString searchText = regExp.cap(2).trimmed();
QLOG_INFO() << "modifier : " << modifier << "text : " << searchText;
int indexOfModifier = modifiers.indexOf(modifier); int indexOfModifier = modifiers.indexOf(modifier);
if(indexOfModifier != -1) if(indexOfModifier != -1)
{ {
QLOG_INFO() << "modifier : " << modifier << "text : " << searchText;
emit filterChanged(static_cast<YACReader::SearchModifiers>(indexOfModifier+1), searchText); //TODO, do not use on indexOF emit filterChanged(static_cast<YACReader::SearchModifiers>(indexOfModifier+1), searchText); //TODO, do not use on indexOF
} }
else else

1
custom_widgets/yacreader_search_line_edit.h
View File

@ -15,6 +15,7 @@ class YACReaderSearchLineEdit : public QLineEdit
public: public:
YACReaderSearchLineEdit(QWidget *parent = 0); YACReaderSearchLineEdit(QWidget *parent = 0);
const QString text();
protected: protected:
void resizeEvent(QResizeEvent *); void resizeEvent(QResizeEvent *);