mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-24 18:04:14 +08:00
refs #506, init log filter
This commit is contained in:
committed by
Mathew Sutcliffe
parent
1a7c11f49c
commit
eed9910e75
@@ -32,7 +32,7 @@ namespace BlackGui
|
|||||||
ui(new Ui::CDataMainInfoAreaComponent)
|
ui(new Ui::CDataMainInfoAreaComponent)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
initInfoArea(); // init base class
|
this->initInfoArea(); // init base class
|
||||||
this->setWindowIcon(CIcons::swiftDatabase24());
|
this->setWindowIcon(CIcons::swiftDatabase24());
|
||||||
|
|
||||||
connect(ui->comp_Mapping, &CDbMappingComponent::filterByLivery, ui->comp_DataInfoArea->getLiveryComponent(), &CDbLiveryComponent::filter);
|
connect(ui->comp_Mapping, &CDbMappingComponent::filterByLivery, ui->comp_DataInfoArea->getLiveryComponent(), &CDbLiveryComponent::filter);
|
||||||
@@ -41,6 +41,8 @@ namespace BlackGui
|
|||||||
|
|
||||||
connect(ui->comp_DataInfoArea->getModelComponent(), &CDbModelComponent::requestStash, ui->comp_Mapping, &CDbMappingComponent::stashModels);
|
connect(ui->comp_DataInfoArea->getModelComponent(), &CDbModelComponent::requestStash, ui->comp_Mapping, &CDbMappingComponent::stashModels);
|
||||||
connect(ui->comp_Log, &CLogComponent::requestAttention, this, &CDataMainInfoAreaComponent::selectLog);
|
connect(ui->comp_Log, &CLogComponent::requestAttention, this, &CDataMainInfoAreaComponent::selectLog);
|
||||||
|
|
||||||
|
ui->comp_Log->showFilterBar();
|
||||||
}
|
}
|
||||||
|
|
||||||
CDataMainInfoAreaComponent::~CDataMainInfoAreaComponent()
|
CDataMainInfoAreaComponent::~CDataMainInfoAreaComponent()
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ namespace BlackGui
|
|||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
CInfoArea::initInfoArea(); // init base class
|
CInfoArea::initInfoArea(); // init base class
|
||||||
this->setWindowIcon(CIcons::swift64());
|
this->setWindowIcon(CIcons::swift64());
|
||||||
|
this->getLogComponent()->showFilterDialog();
|
||||||
connect(this->getLogComponent(), &CLogComponent::requestAttention, this, &CMainInfoAreaComponent::selectLog);
|
connect(this->getLogComponent(), &CLogComponent::requestAttention, this, &CMainInfoAreaComponent::selectLog);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ namespace BlackGui
|
|||||||
|
|
||||||
void CStatusMessageView::addFilterDialog()
|
void CStatusMessageView::addFilterDialog()
|
||||||
{
|
{
|
||||||
|
if (this->getFilterDialog()) { return; } // already existing
|
||||||
this->setFilterDialog(new CStatusMessageFilterDialog(this));
|
this->setFilterDialog(new CStatusMessageFilterDialog(this));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -141,6 +141,7 @@ void CSwiftCore::initLogDisplay()
|
|||||||
CLogPattern().withSeverityAtOrAbove(CStatusMessage::SeverityInfo)
|
CLogPattern().withSeverityAtOrAbove(CStatusMessage::SeverityInfo)
|
||||||
);
|
);
|
||||||
logHandler->subscribe(this, &CSwiftCore::ps_appendLogMessage);
|
logHandler->subscribe(this, &CSwiftCore::ps_appendLogMessage);
|
||||||
|
ui->comp_InfoArea->getLogComponent()->showFilterDialog(); // add a filter dialog
|
||||||
}
|
}
|
||||||
|
|
||||||
void CSwiftCore::startCore(const QString &dBusAdress)
|
void CSwiftCore::startCore(const QString &dBusAdress)
|
||||||
|
|||||||
Reference in New Issue
Block a user