flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-03 15:45:46 +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)
{
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_UNUSED(c);
this->setContextMenuPolicy(Qt::CustomContextMenu);
}
void CConsoleTextEdit::ps_customMenuRequested(const QPoint &pos)
void CConsoleTextEdit::customMenuRequested(const QPoint &pos)
{
QMenu *menu = QPlainTextEdit::createStandardContextMenu();
menu->addAction(CIcons::delete16(), "Clear console", this, SLOT(clear()));
@@ -50,12 +50,7 @@ namespace BlackGui
QFrame(parent), ui(new Ui::CLogComponent)
{
ui->setupUi(this);
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->setCustomMenu(new CLogMenu(this));
ui->tvp_StatusMessages->menuAddItems(CStatusMessageView::MenuSave);
this->showFilterBar(); // default
connect(ui->comp_StatusMessages, &CStatusMessagesDetail::modelDataChangedDigest, this, &CLogComponent::onStatusMessageDataChanged);
}
CLogComponent::~CLogComponent()
@@ -64,47 +59,44 @@ namespace BlackGui
void CLogComponent::displayLog(bool attention)
{
ui->tw_StatusPage->setCurrentIndex(0);
if (attention) { emit requestAttention(); }
if (attention) { emit this->requestAttention(); }
}
void CLogComponent::displayConsole(bool attention)
{
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()
{
ui->tvp_StatusMessages->addFilterDialog();
ui->filter_LogMessages->hide();
ui->comp_StatusMessages->showFilterDialog();
}
void CLogComponent::showFilterBar()
{
ui->tvp_StatusMessages->setFilterWidget(ui->filter_LogMessages);
ui->filter_LogMessages->show();
ui->comp_StatusMessages->showFilterBar();
}
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()
{
ui->tvp_StatusMessages->clear();
ui->form_StatusMessage->clear();
ui->tep_StatusPageConsole->clear();
}
int CLogComponent::rowCount() const
{
return ui->tvp_StatusMessages->rowCount();
ui->comp_StatusMessages->clear();
}
void CLogComponent::appendStatusMessageToConsole(const CStatusMessage &statusMessage)
@@ -120,16 +112,12 @@ namespace BlackGui
void CLogComponent::appendStatusMessageToList(const CStatusMessage &statusMessage)
{
if (statusMessage.isEmpty()) { return; }
ui->tvp_StatusMessages->insert(statusMessage);
this->removeOldest();
ui->comp_StatusMessages->appendStatusMessageToList(statusMessage);
}
void CLogComponent::appendStatusMessagesToList(const CStatusMessageList &statusMessages)
{
if (statusMessages.isEmpty()) { return; }
ui->tvp_StatusMessages->insert(statusMessages);
this->removeOldest();
ui->comp_StatusMessages->appendStatusMessagesToList(statusMessages);
}
void CLogComponent::onStatusMessageDataChanged(int count, bool withFilter)
@@ -138,36 +126,9 @@ namespace BlackGui
Q_UNUSED(withFilter);
const int i = ui->tw_StatusPage->indexOf(ui->pg_LogPage);
QString o = ui->tw_StatusPage->tabText(i);
const QString f = ui->tvp_StatusMessages->hasFilter() ? "F" : "";
o = CGuiUtility::replaceTabCountValue(o, ui->tvp_StatusMessages->rowCount()) + f;
const QString f = withFilter ? "F" : "";
o = CGuiUtility::replaceTabCountValue(o, ui->comp_StatusMessages->rowCount()) + f;
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