Some some...
This commit is contained in:
parent
e86d98fb37
commit
5b6966b533
6 changed files with 38 additions and 5 deletions
|
@ -296,6 +296,7 @@ set(APP_SOURCES
|
||||||
src/gui/messagestoolbar.cpp
|
src/gui/messagestoolbar.cpp
|
||||||
src/gui/feedstoolbar.cpp
|
src/gui/feedstoolbar.cpp
|
||||||
src/gui/toolbareditor.cpp
|
src/gui/toolbareditor.cpp
|
||||||
|
src/gui/messagessearchlineedit.cpp
|
||||||
|
|
||||||
# DYNAMIC-SHORTCUTS sources.
|
# DYNAMIC-SHORTCUTS sources.
|
||||||
src/dynamic-shortcuts/shortcutcatcher.cpp
|
src/dynamic-shortcuts/shortcutcatcher.cpp
|
||||||
|
@ -374,6 +375,7 @@ set(APP_HEADERS
|
||||||
src/gui/messagestoolbar.h
|
src/gui/messagestoolbar.h
|
||||||
src/gui/feedstoolbar.h
|
src/gui/feedstoolbar.h
|
||||||
src/gui/toolbareditor.h
|
src/gui/toolbareditor.h
|
||||||
|
src/gui/messagessearchlineedit.h
|
||||||
|
|
||||||
# DYNAMIC-SHORTCUTS headers.
|
# DYNAMIC-SHORTCUTS headers.
|
||||||
src/dynamic-shortcuts/dynamicshortcutswidget.h
|
src/dynamic-shortcuts/dynamicshortcutswidget.h
|
||||||
|
|
11
src/gui/messagessearchlineedit.cpp
Normal file
11
src/gui/messagessearchlineedit.cpp
Normal file
|
@ -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() {
|
||||||
|
}
|
18
src/gui/messagessearchlineedit.h
Normal file
18
src/gui/messagessearchlineedit.h
Normal file
|
@ -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
|
|
@ -3,6 +3,7 @@
|
||||||
#include "definitions/definitions.h"
|
#include "definitions/definitions.h"
|
||||||
#include "gui/baselineedit.h"
|
#include "gui/baselineedit.h"
|
||||||
#include "gui/formmain.h"
|
#include "gui/formmain.h"
|
||||||
|
#include "gui/messagessearchlineedit.h"
|
||||||
#include "miscellaneous/iconfactory.h"
|
#include "miscellaneous/iconfactory.h"
|
||||||
#include "miscellaneous/settings.h"
|
#include "miscellaneous/settings.h"
|
||||||
|
|
||||||
|
@ -13,7 +14,7 @@
|
||||||
|
|
||||||
MessagesToolBar::MessagesToolBar(const QString &title, QWidget *parent)
|
MessagesToolBar::MessagesToolBar(const QString &title, QWidget *parent)
|
||||||
: BaseToolBar(title, parent),
|
: BaseToolBar(title, parent),
|
||||||
m_txtSearchMessages(new BaseLineEdit(this)) {
|
m_txtSearchMessages(new MessagesSearchLineEdit(this)) {
|
||||||
|
|
||||||
m_txtSearchMessages->setFixedWidth(FILTER_WIDTH);
|
m_txtSearchMessages->setFixedWidth(FILTER_WIDTH);
|
||||||
m_txtSearchMessages->setPlaceholderText(tr("Search messages"));
|
m_txtSearchMessages->setPlaceholderText(tr("Search messages"));
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#include "core/messagesmodel.h"
|
#include "core/messagesmodel.h"
|
||||||
|
|
||||||
|
|
||||||
class BaseLineEdit;
|
class MessagesSearchLineEdit;
|
||||||
class QWidgetAction;
|
class QWidgetAction;
|
||||||
class QToolButton;
|
class QToolButton;
|
||||||
class QMenu;
|
class QMenu;
|
||||||
|
@ -19,7 +19,8 @@ class MessagesToolBar : public BaseToolBar {
|
||||||
explicit MessagesToolBar(const QString &title, QWidget *parent = 0);
|
explicit MessagesToolBar(const QString &title, QWidget *parent = 0);
|
||||||
virtual ~MessagesToolBar();
|
virtual ~MessagesToolBar();
|
||||||
|
|
||||||
inline BaseLineEdit *searchLineEdit() {
|
// External access to search line edit.
|
||||||
|
inline MessagesSearchLineEdit *searchLineEdit() {
|
||||||
return m_txtSearchMessages;
|
return m_txtSearchMessages;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -51,7 +52,7 @@ class MessagesToolBar : public BaseToolBar {
|
||||||
QMenu *m_menuFilterMessages;
|
QMenu *m_menuFilterMessages;
|
||||||
|
|
||||||
QWidgetAction *m_actionSearchMessages;
|
QWidgetAction *m_actionSearchMessages;
|
||||||
BaseLineEdit *m_txtSearchMessages;
|
MessagesSearchLineEdit *m_txtSearchMessages;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // NEWSTOOLBAR_H
|
#endif // NEWSTOOLBAR_H
|
||||||
|
|
|
@ -404,7 +404,7 @@ void MessagesView::selectPreviousItem() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void MessagesView::searchMessages(const QString &pattern) {
|
void MessagesView::searchMessages(const QString &pattern) {
|
||||||
m_proxyModel->setFilterWildcard(pattern);
|
m_proxyModel->setFilterRegExp(pattern);
|
||||||
|
|
||||||
if (selectionModel()->selectedRows().size() == 0) {
|
if (selectionModel()->selectedRows().size() == 0) {
|
||||||
emit currentMessagesRemoved();
|
emit currentMessagesRemoved();
|
||||||
|
|
Loading…
Add table
Reference in a new issue