From 5b6966b5334f39859a6b364762e0d8ad1d369e1a Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 9 Apr 2014 14:16:16 +0200 Subject: [PATCH] Some some... --- CMakeLists.txt | 2 ++ src/gui/messagessearchlineedit.cpp | 11 +++++++++++ src/gui/messagessearchlineedit.h | 18 ++++++++++++++++++ src/gui/messagestoolbar.cpp | 3 ++- src/gui/messagestoolbar.h | 7 ++++--- src/gui/messagesview.cpp | 2 +- 6 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 src/gui/messagessearchlineedit.cpp create mode 100644 src/gui/messagessearchlineedit.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 501974c32..23d9529a2 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -296,6 +296,7 @@ set(APP_SOURCES src/gui/messagestoolbar.cpp src/gui/feedstoolbar.cpp src/gui/toolbareditor.cpp + src/gui/messagessearchlineedit.cpp # DYNAMIC-SHORTCUTS sources. src/dynamic-shortcuts/shortcutcatcher.cpp @@ -374,6 +375,7 @@ set(APP_HEADERS src/gui/messagestoolbar.h src/gui/feedstoolbar.h src/gui/toolbareditor.h + src/gui/messagessearchlineedit.h # DYNAMIC-SHORTCUTS headers. src/dynamic-shortcuts/dynamicshortcutswidget.h diff --git a/src/gui/messagessearchlineedit.cpp b/src/gui/messagessearchlineedit.cpp new file mode 100644 index 000000000..80e4ba95b --- /dev/null +++ b/src/gui/messagessearchlineedit.cpp @@ -0,0 +1,11 @@ +#include "gui/messagessearchlineedit.h" + + +MessagesSearchLineEdit::MessagesSearchLineEdit(QWidget *parent) : BaseLineEdit(parent) { + // TODO: ke standardnimu contextovemu menu (metoda createStandardContextMenu() + // pridat submenu "Search type" = fixed string, wildcard, regexp + // a vic neresit asi na strane tohodle kontrolu +} + +MessagesSearchLineEdit::~MessagesSearchLineEdit() { +} diff --git a/src/gui/messagessearchlineedit.h b/src/gui/messagessearchlineedit.h new file mode 100644 index 000000000..033ff33c5 --- /dev/null +++ b/src/gui/messagessearchlineedit.h @@ -0,0 +1,18 @@ +#ifndef MESSAGESEARCHLINEEDIT_H +#define MESSAGESEARCHLINEEDIT_H + +#include "gui/baselineedit.h" + + +class PlainToolButton; + +class MessagesSearchLineEdit : public BaseLineEdit { + Q_OBJECT + + public: + // Constructors and destructors. + explicit MessagesSearchLineEdit(QWidget *parent = 0); + virtual ~MessagesSearchLineEdit(); +}; + +#endif // MESSAGESEARCHLINEEDIT_H diff --git a/src/gui/messagestoolbar.cpp b/src/gui/messagestoolbar.cpp index cd32d1f2c..f7c7d67c7 100644 --- a/src/gui/messagestoolbar.cpp +++ b/src/gui/messagestoolbar.cpp @@ -3,6 +3,7 @@ #include "definitions/definitions.h" #include "gui/baselineedit.h" #include "gui/formmain.h" +#include "gui/messagessearchlineedit.h" #include "miscellaneous/iconfactory.h" #include "miscellaneous/settings.h" @@ -13,7 +14,7 @@ MessagesToolBar::MessagesToolBar(const QString &title, QWidget *parent) : BaseToolBar(title, parent), - m_txtSearchMessages(new BaseLineEdit(this)) { + m_txtSearchMessages(new MessagesSearchLineEdit(this)) { m_txtSearchMessages->setFixedWidth(FILTER_WIDTH); m_txtSearchMessages->setPlaceholderText(tr("Search messages")); diff --git a/src/gui/messagestoolbar.h b/src/gui/messagestoolbar.h index 3dc8dfd8c..51f130fae 100644 --- a/src/gui/messagestoolbar.h +++ b/src/gui/messagestoolbar.h @@ -6,7 +6,7 @@ #include "core/messagesmodel.h" -class BaseLineEdit; +class MessagesSearchLineEdit; class QWidgetAction; class QToolButton; class QMenu; @@ -19,7 +19,8 @@ class MessagesToolBar : public BaseToolBar { explicit MessagesToolBar(const QString &title, QWidget *parent = 0); virtual ~MessagesToolBar(); - inline BaseLineEdit *searchLineEdit() { + // External access to search line edit. + inline MessagesSearchLineEdit *searchLineEdit() { return m_txtSearchMessages; } @@ -51,7 +52,7 @@ class MessagesToolBar : public BaseToolBar { QMenu *m_menuFilterMessages; QWidgetAction *m_actionSearchMessages; - BaseLineEdit *m_txtSearchMessages; + MessagesSearchLineEdit *m_txtSearchMessages; }; #endif // NEWSTOOLBAR_H diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp index e102662ad..9f2634b7c 100644 --- a/src/gui/messagesview.cpp +++ b/src/gui/messagesview.cpp @@ -404,7 +404,7 @@ void MessagesView::selectPreviousItem() { } void MessagesView::searchMessages(const QString &pattern) { - m_proxyModel->setFilterWildcard(pattern); + m_proxyModel->setFilterRegExp(pattern); if (selectionModel()->selectedRows().size() == 0) { emit currentMessagesRemoved();