refs #205, added selection for DBus server to intro window

* changed init of main window to CRuntimeConfig, btw. makes 8 in https://dev.vatsim-germany.org/issues/199 redundant
* coreMode in main window gone
* mode for external / local audio
This commit is contained in:
Klaus Basan
2014-04-12 03:05:36 +02:00
parent 9f2e3a7c9d
commit b2acd3e476
9 changed files with 102 additions and 58 deletions

View File

@@ -27,10 +27,9 @@ using namespace BlackGui;
/*
* Init data
*/
void MainWindow::init(GuiModes::CoreMode coreMode)
void MainWindow::init(const CRuntimeConfig &runtimeConfig)
{
if (this->m_init) return;
this->m_coreMode = coreMode;
// with frameless window, we shift menu and statusbar into central widget
// http://stackoverflow.com/questions/18316710/frameless-and-transparent-window-qt5
@@ -168,11 +167,7 @@ void MainWindow::init(GuiModes::CoreMode coreMode)
if (this->m_timerSimulator == nullptr) this->m_timerSimulator = new QTimer(this);
// context
this->m_rt.reset(
this->m_coreMode != GuiModes::CoreInGuiProcess ?
new CRuntime(CRuntimeConfig::remote(), this) :
new CRuntime(CRuntimeConfig::local(), this)
);
this->m_rt.reset(new CRuntime(runtimeConfig, this));
// wire GUI signals
this->initGuiSignals();