flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 20:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use CStatusMessagesDetail in log component

Browse Source
This commit is contained in:
Klaus Basan
2018-01-20 17:11:25 +01:00
parent 9bbef8cc28
commit cbcafe2021
3 changed files with 39 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/blackgui/components/logcomponent.cpp
View File

@@ -33,13 +33,13 @@ namespace BlackGui
{ {
CConsoleTextEdit::CConsoleTextEdit(QWidget *parent) : QPlainTextEdit(parent) CConsoleTextEdit::CConsoleTextEdit(QWidget *parent) : QPlainTextEdit(parent)
{ {
bool c = connect(this, &CConsoleTextEdit::customContextMenuRequested, this, &CConsoleTextEdit::ps_customMenuRequested); bool c = connect(this, &CConsoleTextEdit::customContextMenuRequested, this, &CConsoleTextEdit::customMenuRequested);
Q_ASSERT_X(c, Q_FUNC_INFO, "Custom menu"); Q_ASSERT_X(c, Q_FUNC_INFO, "Custom menu");
Q_UNUSED(c); Q_UNUSED(c);
this->setContextMenuPolicy(Qt::CustomContextMenu); this->setContextMenuPolicy(Qt::CustomContextMenu);
} }
void CConsoleTextEdit::ps_customMenuRequested(const QPoint &pos) void CConsoleTextEdit::customMenuRequested(const QPoint &pos)
{ {
QMenu *menu = QPlainTextEdit::createStandardContextMenu(); QMenu *menu = QPlainTextEdit::createStandardContextMenu();
menu->addAction(CIcons::delete16(), "Clear console", this, SLOT(clear())); menu->addAction(CIcons::delete16(), "Clear console", this, SLOT(clear()));
@@ -50,12 +50,7 @@ namespace BlackGui
QFrame(parent), ui(new Ui::CLogComponent) QFrame(parent), ui(new Ui::CLogComponent)
{ {
ui->setupUi(this); ui->setupUi(this);
connect(ui->tvp_StatusMessages, &CStatusMessageView::objectSelected, ui->form_StatusMessage, &CStatusMessageForm::setVariant); connect(ui->comp_StatusMessages, &CStatusMessagesDetail::modelDataChangedDigest, this, &CLogComponent::onStatusMessageDataChanged);
connect(ui->tvp_StatusMessages, &CStatusMessageView::modelDataChangedDigest, this, &CLogComponent::onStatusMessageDataChanged);
ui->tvp_StatusMessages->setAutoResizeFrequency(3);
ui->tvp_StatusMessages->setCustomMenu(new CLogMenu(this));
ui->tvp_StatusMessages->menuAddItems(CStatusMessageView::MenuSave);
this->showFilterBar(); // default
} }
CLogComponent::~CLogComponent() CLogComponent::~CLogComponent()
@@ -64,47 +59,44 @@ namespace BlackGui
void CLogComponent::displayLog(bool attention) void CLogComponent::displayLog(bool attention)
{ {
ui->tw_StatusPage->setCurrentIndex(0); ui->tw_StatusPage->setCurrentIndex(0);
if (attention) { emit requestAttention(); } if (attention) { emit this->requestAttention(); }
} }
void CLogComponent::displayConsole(bool attention) void CLogComponent::displayConsole(bool attention)
{ {
ui->tw_StatusPage->setCurrentIndex(1); ui->tw_StatusPage->setCurrentIndex(1);
if (attention) { emit requestAttention(); } if (attention) { emit this->requestAttention(); }
} }
void CLogComponent::showDetails(bool details) void CLogComponent::filterUseRadioButtonDescriptiveIcons(bool oneLetterText)
{ {
ui->form_StatusMessage->setVisible(details); ui->comp_StatusMessages->filterUseRadioButtonDescriptiveIcons(oneLetterText);
} }
void CLogComponent::showFilterDialog() void CLogComponent::showFilterDialog()
{ {
ui->tvp_StatusMessages->addFilterDialog(); ui->comp_StatusMessages->showFilterDialog();
ui->filter_LogMessages->hide();
} }
void CLogComponent::showFilterBar() void CLogComponent::showFilterBar()
{ {
ui->tvp_StatusMessages->setFilterWidget(ui->filter_LogMessages); ui->comp_StatusMessages->showFilterBar();
ui->filter_LogMessages->show();
} }
void CLogComponent::filterUseRadioButtonDescriptiveIcons(bool oneCharacterText) void CLogComponent::showDetails(bool details)
{ {
ui->filter_LogMessages->useRadioButtonDescriptiveIcons(oneCharacterText); ui->comp_StatusMessages->showDetails(details);
}
void CLogComponent::setMaxLogMessages(int max)
{
ui->comp_StatusMessages->setMaxLogMessages(max);
} }
void CLogComponent::clear() void CLogComponent::clear()
{ {
ui->tvp_StatusMessages->clear();
ui->form_StatusMessage->clear();
ui->tep_StatusPageConsole->clear(); ui->tep_StatusPageConsole->clear();
} ui->comp_StatusMessages->clear();
int CLogComponent::rowCount() const
{
return ui->tvp_StatusMessages->rowCount();
} }
void CLogComponent::appendStatusMessageToConsole(const CStatusMessage &statusMessage) void CLogComponent::appendStatusMessageToConsole(const CStatusMessage &statusMessage)
@@ -120,16 +112,12 @@ namespace BlackGui
void CLogComponent::appendStatusMessageToList(const CStatusMessage &statusMessage) void CLogComponent::appendStatusMessageToList(const CStatusMessage &statusMessage)
{ {
if (statusMessage.isEmpty()) { return; } ui->comp_StatusMessages->appendStatusMessageToList(statusMessage);
ui->tvp_StatusMessages->insert(statusMessage);
this->removeOldest();
} }
void CLogComponent::appendStatusMessagesToList(const CStatusMessageList &statusMessages) void CLogComponent::appendStatusMessagesToList(const CStatusMessageList &statusMessages)
{ {
if (statusMessages.isEmpty()) { return; } ui->comp_StatusMessages->appendStatusMessagesToList(statusMessages);
ui->tvp_StatusMessages->insert(statusMessages);
this->removeOldest();
} }
void CLogComponent::onStatusMessageDataChanged(int count, bool withFilter) void CLogComponent::onStatusMessageDataChanged(int count, bool withFilter)
@@ -138,36 +126,9 @@ namespace BlackGui
Q_UNUSED(withFilter); Q_UNUSED(withFilter);
const int i = ui->tw_StatusPage->indexOf(ui->pg_LogPage); const int i = ui->tw_StatusPage->indexOf(ui->pg_LogPage);
QString o = ui->tw_StatusPage->tabText(i); QString o = ui->tw_StatusPage->tabText(i);
const QString f = ui->tvp_StatusMessages->hasFilter() ? "F" : ""; const QString f = withFilter ? "F" : "";
o = CGuiUtility::replaceTabCountValue(o, ui->tvp_StatusMessages->rowCount()) + f; o = CGuiUtility::replaceTabCountValue(o, ui->comp_StatusMessages->rowCount()) + f;
ui->tw_StatusPage->setTabText(i, o); ui->tw_StatusPage->setTabText(i, o);
} }
void CLogComponent::removeOldest()
{
// do not remove every time, but when a threshold is reached
if (m_maxLogMessages < 1) { return; }
if (m_maxLogMessages < 100 && ui->tvp_StatusMessages->rowCount() > (m_maxLogMessages + 10))
{
ui->tvp_StatusMessages->keepLatest(m_maxLogMessages);
}
else if (ui->tvp_StatusMessages->rowCount() > (m_maxLogMessages * 1.1))
{
ui->tvp_StatusMessages->keepLatest(m_maxLogMessages);
}
}
void CLogComponent::CLogMenu::customMenu(CMenuActions &menuActions)
{
CLogComponent *logComp = qobject_cast<CLogComponent *>(this->parent());
Q_ASSERT_X(logComp, Q_FUNC_INFO, "Missing parent");
bool v = logComp->ui->form_StatusMessage->isVisible();
QString formString(v ? "Hide log details" : "Show log details");
this->m_action = menuActions.addAction(this->m_action, BlackMisc::CIcons::databaseTable16(), formString,
CMenuAction::pathLog(), { logComp->ui->form_StatusMessage, &CStatusMessageForm::toggleVisibility});
this->m_action->setCheckable(true);
this->m_action->setChecked(v);
}
} }
} // namespace } // namespace

55
src/blackgui/components/logcomponent.h
View File

@@ -13,8 +13,6 @@
#define BLACKGUI_LOGCOMPONENT_H #define BLACKGUI_LOGCOMPONENT_H
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackgui/menus/menudelegate.h"
#include "blackmisc/statusmessage.h"
#include "blackmisc/statusmessagelist.h" #include "blackmisc/statusmessagelist.h"
#include <QFrame> #include <QFrame>
@@ -30,7 +28,6 @@ class QWidget;
namespace Ui { class CLogComponent; } namespace Ui { class CLogComponent; }
namespace BlackGui namespace BlackGui
{ {
namespace Menus { class CMenuActions; }
namespace Components namespace Components
{ {
//! Text edit for our log component //! Text edit for our log component
@@ -42,9 +39,9 @@ namespace BlackGui
//! Constructor //! Constructor
CConsoleTextEdit(QWidget *parent = nullptr); CConsoleTextEdit(QWidget *parent = nullptr);
protected slots: protected:
//! Custom menu //! Custom menu
void ps_customMenuRequested(const QPoint &pos); void customMenuRequested(const QPoint &pos);
}; };
//! GUI displaying log and status messages //! GUI displaying log and status messages
@@ -65,32 +62,24 @@ namespace BlackGui
//! Display console //! Display console
void displayConsole(bool attention = false); void displayConsole(bool attention = false);
//! Show log details //! \copydoc BlackGui::Components::CStatusMessagesDetail::filterUseRadioButtonDescriptiveIcons
void showDetails(bool details); void filterUseRadioButtonDescriptiveIcons(bool oneLetterText);
//! Show filter dialog and disable bar //! \copydoc BlackGui::Components::CStatusMessagesDetail::showFilterDialog
void showFilterDialog(); void showFilterDialog();
//! Show a filter bar //! \copydoc BlackGui::Components::CStatusMessagesDetail::showFilterBar
void showFilterBar(); void showFilterBar();
//! Set descriptive icons //! \copydoc BlackGui::Components::CStatusMessagesDetail::showDetails
void filterUseRadioButtonDescriptiveIcons(bool oneLetterText); void showDetails(bool details);
//! \copydoc BlackGui::Components::CStatusMessagesDetail::setMaxLogMessages
void setMaxLogMessages(int max);
//! Clear //! Clear
void clear(); void clear();
//! Number of status messages in log view
int rowCount() const;
//! Set max.log messages
void setMaxLogMessages(int desiredNumber) { m_maxLogMessages = desiredNumber; }
signals:
//! Make me visible
void requestAttention();
public slots:
//! Append status message to console //! Append status message to console
void appendStatusMessageToConsole(const BlackMisc::CStatusMessage &statusMessage); void appendStatusMessageToConsole(const BlackMisc::CStatusMessage &statusMessage);
@@ -103,29 +92,15 @@ namespace BlackGui
//! Append status messages to list //! Append status messages to list
void appendStatusMessagesToList(const BlackMisc::CStatusMessageList &statusMessages); void appendStatusMessagesToList(const BlackMisc::CStatusMessageList &statusMessages);
signals:
//! Make me visible
void requestAttention();
private: private:
QScopedPointer<Ui::CLogComponent> ui; QScopedPointer<Ui::CLogComponent> ui;
int m_maxLogMessages = -1;
//! Status messages changed //! Status messages changed
void onStatusMessageDataChanged(int count, bool withFilter); void onStatusMessageDataChanged(int count, bool withFilter);
//! Remove oldest messages
void removeOldest();
//! Custom menu for the log component
class CLogMenu : public BlackGui::Menus::IMenuDelegate
{
public:
//! Constructor
CLogMenu(CLogComponent *parent) : IMenuDelegate(parent) {}
//! \copydoc IMenuDelegate::customMenu
virtual void customMenu(BlackGui::Menus::CMenuActions &menuActions) override;
private:
QAction *m_action = nullptr;
};
}; };
} // ns } // ns
} // ns } // ns

57
src/blackgui/components/logcomponent.ui
View File

@@ -64,47 +64,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="BlackGui::Filters::CStatusMessageFilterBar" name="filter_LogMessages"/> <widget class="BlackGui::Components::CStatusMessagesDetail" name="comp_StatusMessages">
</item>
<item>
<widget class="BlackGui::Views::CStatusMessageView" name="tvp_StatusMessages">
<property name="whatsThis">
<string>Status message log view</string>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOn</enum>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
</widget>
</item>
<item>
<widget class="BlackGui::Components::CStatusMessageForm" name="form_StatusMessage">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>100</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>100</height>
</size>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
@@ -162,26 +122,15 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>BlackGui::Views::CStatusMessageView</class>
<extends>QTableView</extends>
<header>blackgui/views/statusmessageview.h</header>
</customwidget>
<customwidget>
<class>BlackGui::Components::CStatusMessageForm</class>
<extends>QFrame</extends>
<header>blackgui/components/statusmessageform.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>BlackGui::Components::CConsoleTextEdit</class> <class>BlackGui::Components::CConsoleTextEdit</class>
<extends>QPlainTextEdit</extends> <extends>QPlainTextEdit</extends>
<header>blackgui/components/logcomponent.h</header> <header>blackgui/components/logcomponent.h</header>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>BlackGui::Filters::CStatusMessageFilterBar</class> <class>BlackGui::Components::CStatusMessagesDetail</class>
<extends>QFrame</extends> <extends>QFrame</extends>
<header>blackgui/filters/statusmessagefilterbar.h</header> <header>blackgui/components/statusmessagesdetail.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>