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

@@ -13,6 +13,7 @@
#define SWIFTDATA_H
#include "blackcore/context_runtime.h"
#include "blackcore/data/globalsetup.h"
#include "blackgui/systemtraywindow.h"
#include "blackgui/managedstatusbar.h"
#include "blackmisc/statusmessage.h"
@@ -61,9 +62,13 @@ private:
void initDynamicMenus();
void performGracefulShutdown();
void displayConsole();
void displayLog();
QScopedPointer<Ui::CSwiftData> ui;
BlackGui::CManagedStatusBar m_statusBar;
BlackCore::CWebDataServices *m_webDataReader = nullptr;
BlackCore::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< setup cache
};
#endif // guard