From 1a7c11f49c4318ad0f801af9898df37dc4f766a6 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 26 Dec 2016 22:01:56 +0100 Subject: [PATCH] refs #506, allow to set dialog or filter widget for log component Added filter widget, dialog and filter can be toggled --- src/blackgui/components/logcomponent.cpp | 13 ++++++++++++- src/blackgui/components/logcomponent.h | 6 ++++++ src/blackgui/components/logcomponent.ui | 16 ++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/blackgui/components/logcomponent.cpp b/src/blackgui/components/logcomponent.cpp index 83171d0c6..f2d87f949 100644 --- a/src/blackgui/components/logcomponent.cpp +++ b/src/blackgui/components/logcomponent.cpp @@ -53,7 +53,6 @@ namespace BlackGui connect(ui->tvp_StatusMessages, &CStatusMessageView::objectSelected, ui->form_StatusMessage, &CStatusMessageForm::setVariant); connect(ui->tvp_StatusMessages, &CStatusMessageView::modelDataChangedDigest, this, &CLogComponent::onStatusMessageDataChanged); ui->tvp_StatusMessages->setAutoResizeFrequency(3); - ui->tvp_StatusMessages->addFilterDialog(); ui->tvp_StatusMessages->setCustomMenu(new CLogMenu(this)); ui->tvp_StatusMessages->menuAddItems(CStatusMessageView::MenuSave); } @@ -78,6 +77,18 @@ namespace BlackGui ui->form_StatusMessage->setVisible(details); } + void CLogComponent::showFilterDialog() + { + ui->tvp_StatusMessages->addFilterDialog(); + ui->filter_LogMessages->hide(); + } + + void CLogComponent::showFilterBar() + { + ui->tvp_StatusMessages->setFilterWidget(ui->filter_LogMessages); + ui->filter_LogMessages->show(); + } + void CLogComponent::clear() { ui->tvp_StatusMessages->clear(); diff --git a/src/blackgui/components/logcomponent.h b/src/blackgui/components/logcomponent.h index b7e8c13bf..7003d4826 100644 --- a/src/blackgui/components/logcomponent.h +++ b/src/blackgui/components/logcomponent.h @@ -69,6 +69,12 @@ namespace BlackGui //! Show log details void showDetails(bool details); + //! Show filter dialog and disable bar + void showFilterDialog(); + + //! Show a filter bar + void showFilterBar(); + //! Clear void clear(); diff --git a/src/blackgui/components/logcomponent.ui b/src/blackgui/components/logcomponent.ui index 65ada6749..af764ee04 100644 --- a/src/blackgui/components/logcomponent.ui +++ b/src/blackgui/components/logcomponent.ui @@ -69,6 +69,16 @@ 0 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + @@ -181,6 +191,12 @@ QPlainTextEdit
blackgui/components/logcomponent.h
+ + BlackGui::Filters::CStatusMessageFilterBar + QFrame +
blackgui/filters/statusmessagefilterbar.h
+ 1 +