refs #478, refs #470 updated swift / mapping GUI

* allow to display project, env. vars etc. in console
* use setup data cache
* adjust to relocated CNetworkUtils
* remove console for data GUI (noticed during installer tests)
This commit is contained in:
Klaus Basan
2015-10-14 02:51:52 +02:00
committed by Mathew Sutcliffe
parent 008792d95b
commit ad146069ef
16 changed files with 281 additions and 62 deletions

View File

@@ -66,6 +66,18 @@ namespace BlackGui
this->ui->comp_Stash->setProvider(provider);
}
void CDataMainInfoAreaComponent::displayLog()
{
this->selectArea(InfoAreaLog);
this->getLogComponent()->displayLog();
}
void CDataMainInfoAreaComponent::displayConsole()
{
this->selectArea(InfoAreaLog);
this->getLogComponent()->displayConsole();
}
QSize CDataMainInfoAreaComponent::getPreferredSizeWhenFloating(int areaIndex) const
{
InfoArea area = static_cast<InfoArea>(areaIndex);

View File

@@ -72,6 +72,12 @@ namespace BlackGui
//! Set data reader
virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *provider) override;
//! Display the log
void displayLog();
//! Display console
void displayConsole();
protected:
//! \copydoc CInfoArea::getPreferredSizeWhenFloating
virtual QSize getPreferredSizeWhenFloating(int areaIndex) const override;

View File

@@ -32,7 +32,7 @@
<item>
<widget class="QTabWidget" name="tw_Internals">
<property name="currentIndex">
<number>2</number>
<number>0</number>
</property>
<widget class="QWidget" name="tb_Debug">
<attribute name="title">

View File

@@ -83,6 +83,16 @@ namespace BlackGui
return this->ui->comp_TextMessages;
}
void CMainInfoAreaComponent::displayLog()
{
this->ui->comp_Log->displayLog();
}
void CMainInfoAreaComponent::displayConsole()
{
this->ui->comp_Log->displayConsole();
}
QSize CMainInfoAreaComponent::getPreferredSizeWhenFloating(int areaIndex) const
{
InfoArea area = static_cast<InfoArea>(areaIndex);

View File

@@ -96,6 +96,12 @@ namespace BlackGui
//! Text messages
CTextMessageComponent *getTextMessageComponent();
//! Display the log
void displayLog();
//! Display console
void displayConsole();
public slots:
//! Toggle floating of given area
void toggleFloating(InfoArea infoArea) { CInfoArea::toggleFloatingByIndex(static_cast<int>(infoArea)); }