From a9768566e6debce00f7ed086442ef89677d8a458 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 22 Oct 2014 15:06:37 +0200 Subject: [PATCH] refs #335, adjusted main window * info areas in main window * renaming --- src/swiftgui_standard/mainwindow.cpp | 2 +- src/swiftgui_standard/mainwindow.h | 8 ++++-- src/swiftgui_standard/mainwindow.ui | 28 +++++++++++++++++-- src/swiftgui_standard/mainwindow_aircraft.cpp | 2 +- src/swiftgui_standard/mainwindow_init.cpp | 3 +- src/swiftgui_standard/mainwindow_menus.cpp | 9 +++++- src/swiftgui_standard/mainwindow_voice.cpp | 1 - 7 files changed, 44 insertions(+), 9 deletions(-) diff --git a/src/swiftgui_standard/mainwindow.cpp b/src/swiftgui_standard/mainwindow.cpp index 1cf023da4..a95cc1cc7 100644 --- a/src/swiftgui_standard/mainwindow.cpp +++ b/src/swiftgui_standard/mainwindow.cpp @@ -233,7 +233,7 @@ void MainWindow::ps_toggleNetworkConnection() this->m_ownAircraft.setIcaoInfo(icao); // set latest aircraft - this->getIContextOwnAircraft()->updateOwnAircraft(this->m_ownAircraft, MainWindow::sampleBlackGuiOriginator()); + this->getIContextOwnAircraft()->updateOwnAircraft(this->m_ownAircraft, MainWindow::swiftGuiStandardOriginator()); // flight plan this->ui->comp_MainInfoArea->getFlightPlanComponent()->prefillWithAircraftData(this->m_ownAircraft); diff --git a/src/swiftgui_standard/mainwindow.h b/src/swiftgui_standard/mainwindow.h index bbcacf365..f8b6ca14e 100644 --- a/src/swiftgui_standard/mainwindow.h +++ b/src/swiftgui_standard/mainwindow.h @@ -123,6 +123,9 @@ private: //! Init GUI signals void initGuiSignals(); + //! Init dynamic menus + void initDynamicMenus(); + //! Context network availability check, otherwise status message bool isContextNetworkAvailableCheck(); @@ -169,9 +172,10 @@ private: void updateSimulatorData(); //! Originator for aircraft context - static const QString &sampleBlackGuiOriginator() + static const QString &swiftGuiStandardOriginator() { - static const QString o = QString("GUISAMPLE1:").append(QString::number(QDateTime::currentMSecsSinceEpoch())); + // one time init, timestamp allows "multiple swift GUIs" + static const QString o = QString("SWIFTGUISTANDARD:").append(QString::number(QDateTime::currentMSecsSinceEpoch())); return o; } diff --git a/src/swiftgui_standard/mainwindow.ui b/src/swiftgui_standard/mainwindow.ui index 439ff841b..e79108d67 100644 --- a/src/swiftgui_standard/mainwindow.ui +++ b/src/swiftgui_standard/mainwindow.ui @@ -256,7 +256,7 @@ - Aircrafts + &Aircrafts @@ -275,7 +275,10 @@ - ATC + A&TC + + + Ctrl+K @@ -284,6 +287,9 @@ Users + + Ctrl+I, U + @@ -303,6 +309,9 @@ Cockpit + + Ctrl+I, C + @@ -329,6 +338,9 @@ Text/Chat + + Ctrl+I, T + @@ -336,6 +348,9 @@ Simulator + + Ctrl+I, S + @@ -374,6 +389,9 @@ Flightplan + + Ctrl+I, F + @@ -582,7 +600,13 @@ + + + Info areas + + + diff --git a/src/swiftgui_standard/mainwindow_aircraft.cpp b/src/swiftgui_standard/mainwindow_aircraft.cpp index 04238afbc..dc8306c8d 100644 --- a/src/swiftgui_standard/mainwindow_aircraft.cpp +++ b/src/swiftgui_standard/mainwindow_aircraft.cpp @@ -45,5 +45,5 @@ void MainWindow::setTestPosition(const QString &wgsLatitude, const QString &wgsL this->m_ownAircraft.setPosition(coordinate); this->m_ownAircraft.setAltitude(altitude); - this->getIContextOwnAircraft()->updateOwnPosition(coordinate, altitude, MainWindow::sampleBlackGuiOriginator()); + this->getIContextOwnAircraft()->updateOwnPosition(coordinate, altitude, MainWindow::swiftGuiStandardOriginator()); } diff --git a/src/swiftgui_standard/mainwindow_init.cpp b/src/swiftgui_standard/mainwindow_init.cpp index fb8714e55..e6e24c67e 100644 --- a/src/swiftgui_standard/mainwindow_init.cpp +++ b/src/swiftgui_standard/mainwindow_init.cpp @@ -128,8 +128,9 @@ void MainWindow::init(const CRuntimeConfig &runtimeConfig) // data this->initialDataReads(); - // start screen + // start screen and complete menu this->ps_setMainPage(true); + this->initDynamicMenus(); // starting this->getIContextApplication()->notifyAboutComponentChange(IContextApplication::ApplicationGui, IContextApplication::ApplicationStarts); diff --git a/src/swiftgui_standard/mainwindow_menus.cpp b/src/swiftgui_standard/mainwindow_menus.cpp index a93678d50..b643bd09d 100644 --- a/src/swiftgui_standard/mainwindow_menus.cpp +++ b/src/swiftgui_standard/mainwindow_menus.cpp @@ -21,7 +21,6 @@ using namespace BlackMisc::Aviation; void MainWindow::ps_onMenuClicked() { QObject *sender = QObject::sender(); - if (sender == this->ui->menu_TestLocationsEDRY) { this->setTestPosition("N 049° 18' 17", "E 008° 27' 05", CAltitude(312, CAltitude::MeanSeaLevel, CLengthUnit::ft())); @@ -68,3 +67,11 @@ void MainWindow::ps_onMenuClicked() this->getIContextSettings()->reset(true); } } + + +void MainWindow::initDynamicMenus() +{ + Q_ASSERT(this->ui->menu_InfoAreas); + Q_ASSERT(this->ui->comp_MainInfoArea); + this->ui->menu_InfoAreas->addActions(this->ui->comp_MainInfoArea->getInfoAreaSelectActions(this->ui->menu_InfoAreas)); +} diff --git a/src/swiftgui_standard/mainwindow_voice.cpp b/src/swiftgui_standard/mainwindow_voice.cpp index 537470e18..a331ad9fb 100644 --- a/src/swiftgui_standard/mainwindow_voice.cpp +++ b/src/swiftgui_standard/mainwindow_voice.cpp @@ -76,7 +76,6 @@ void MainWindow::ps_setAudioVolumes() com1.setEnabled(!muted); com2.setEnabled(!muted); this->ui->pb_SoundMute->setText(muted ? "Unmute" : "Mute"); - this->ui->comp_InfoBarStatus->setVolume(muted ? 0 : 66); // TODO this->ui->comp_Cockpit->setCockpitVoiceStatusPixmap(muted ? CIcons::volumeMuted16() : CIcons::volumeHigh16()); this->ui->pb_SoundMute->setStyleSheet(muted ? "background-color: red;" : ""); if (muted) this->m_compInfoWindow->displayStringMessage("Sound is muted!");