diff --git a/src/blackgui/components/aircraftpartshistory.ui b/src/blackgui/components/aircraftpartshistory.ui
index 2da6a253b..599681926 100644
--- a/src/blackgui/components/aircraftpartshistory.ui
+++ b/src/blackgui/components/aircraftpartshistory.ui
@@ -61,14 +61,7 @@
-
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
+
-
diff --git a/src/blackgui/components/datamaininfoareacomponent.cpp b/src/blackgui/components/datamaininfoareacomponent.cpp
index 1f04fc89f..f84231bb5 100644
--- a/src/blackgui/components/datamaininfoareacomponent.cpp
+++ b/src/blackgui/components/datamaininfoareacomponent.cpp
@@ -91,7 +91,7 @@ namespace BlackGui
QSize CDataMainInfoAreaComponent::getPreferredSizeWhenFloating(int areaIndex) const
{
- InfoArea area = static_cast(areaIndex);
+ const InfoArea area = static_cast(areaIndex);
switch (area)
{
case InfoAreaData:
@@ -105,19 +105,14 @@ namespace BlackGui
const QPixmap &CDataMainInfoAreaComponent::indexToPixmap(int areaIndex) const
{
- InfoArea area = static_cast(areaIndex);
+ const InfoArea area = static_cast(areaIndex);
switch (area)
{
- case InfoAreaData:
- return CIcons::appDatabase16();
- case InfoAreaMapping:
- return CIcons::appMappings16();
- case InfoAreaSettings:
- return CIcons::appSettings16();
- case InfoAreaLog:
- return CIcons::appLog16();
- default:
- return CIcons::empty();
+ case InfoAreaData: return CIcons::appDatabase16();
+ case InfoAreaMapping: return CIcons::appMappings16();
+ case InfoAreaSettings: return CIcons::appSettings16();
+ case InfoAreaLog: return CIcons::appLog16();
+ default: return CIcons::empty();
}
}
} // ns
diff --git a/src/blackgui/components/internalscomponent.cpp b/src/blackgui/components/internalscomponent.cpp
index 9cdfb7f07..4ac47d713 100644
--- a/src/blackgui/components/internalscomponent.cpp
+++ b/src/blackgui/components/internalscomponent.cpp
@@ -69,10 +69,6 @@ namespace BlackGui
connect(ui->cb_DebugContextOwnAircraft, &QCheckBox::stateChanged, this, &CInternalsComponent::enableDebug);
connect(ui->cb_DebugContextSimulator, &QCheckBox::stateChanged, this, &CInternalsComponent::enableDebug);
- connect(ui->cb_DebugDriver, &QCheckBox::stateChanged, this, &CInternalsComponent::enableDebug);
- connect(ui->cb_ForceFullInterpolation, &QCheckBox::stateChanged, this, &CInternalsComponent::enableDebug);
- connect(ui->cb_EnableParts, &QCheckBox::stateChanged, this, &CInternalsComponent::enableDebug);
-
connect(ui->pb_SendTextMessage, &QPushButton::pressed, this, &CInternalsComponent::sendTextMessage);
connect(ui->tb_LogStatusMessage, &QPushButton::pressed, this, &CInternalsComponent::logStatusMessage);
connect(ui->le_StatusMessage, &QLineEdit::returnPressed, this, &CInternalsComponent::logStatusMessage);
@@ -82,7 +78,6 @@ namespace BlackGui
connect(ui->pb_RequestFromNetwork, &QPushButton::pressed, this, &CInternalsComponent::requestPartsFromNetwork);
connect(ui->comp_RemoteAircraftSelector, &CRemoteAircraftSelector::changedCallsign, this, &CInternalsComponent::selectorChanged);
-
contextFlagsToGui();
}
@@ -154,14 +149,6 @@ namespace BlackGui
else if (sender == ui->cb_DebugContextNetwork) { sGui->getIContextNetwork()->setDebugEnabled(debug);}
else if (sender == ui->cb_DebugContextOwnAircraft) { sGui->getIContextOwnAircraft()->setDebugEnabled(debug); }
else if (sender == ui->cb_DebugContextSimulator) { sGui->getIContextSimulator()->setDebugEnabled(debug);}
- else if (sender == ui->cb_DebugDriver || sender == ui->cb_EnableParts || sender == ui->cb_ForceFullInterpolation)
- {
- CInterpolationAndRenderingSetup setup;
- setup.setForceFullInterpolation(ui->cb_ForceFullInterpolation->isChecked());
- setup.setDriverDebuggingMessages(ui->cb_DebugDriver->isChecked());
- setup.setEnabledAircraftParts(ui->cb_EnableParts->isChecked());
- sGui->getIContextSimulator()->setInterpolationAndRenderingSetup(setup);
- }
}
void CInternalsComponent::sendTextMessage()
diff --git a/src/blackgui/components/internalscomponent.ui b/src/blackgui/components/internalscomponent.ui
index 546ca60a6..bc1b21e22 100644
--- a/src/blackgui/components/internalscomponent.ui
+++ b/src/blackgui/components/internalscomponent.ui
@@ -29,7 +29,7 @@
-
- 3
+ 0
@@ -104,51 +104,6 @@
- -
-
-
- Driver plugin and interpolator
-
-
-
- 4
-
-
- 4
-
-
- 4
-
-
- 4
-
-
-
-
-
- driver dbg. msgs.
-
-
-
- -
-
-
- force full interpolation
-
-
-
- -
-
-
- enable parts
-
-
- true
-
-
-
-
-
-
-
diff --git a/src/blackgui/components/maininfoareacomponent.cpp b/src/blackgui/components/maininfoareacomponent.cpp
index 977d43302..e00f2117a 100644
--- a/src/blackgui/components/maininfoareacomponent.cpp
+++ b/src/blackgui/components/maininfoareacomponent.cpp
@@ -46,11 +46,16 @@ namespace BlackGui
return ui->comp_Aircraft;
}
- CMappingComponent *CMainInfoAreaComponent::getMappingComponet()
+ CMappingComponent *CMainInfoAreaComponent::getMappingComponent()
{
return ui->comp_Mappings;
}
+ CInterpolationComponent *CMainInfoAreaComponent::getInterpolationComponent()
+ {
+ return ui->comp_Interpolation;
+ }
+
CUserComponent *CMainInfoAreaComponent::getUserComponent()
{
return ui->comp_Users;
@@ -110,7 +115,7 @@ namespace BlackGui
QSize CMainInfoAreaComponent::getPreferredSizeWhenFloating(int areaIndex) const
{
- InfoArea area = static_cast(areaIndex);
+ const InfoArea area = static_cast(areaIndex);
switch (area)
{
case InfoAreaCockpit:
@@ -120,7 +125,8 @@ namespace BlackGui
case InfoAreaLog:
case InfoAreaSimulator:
return QSize(400, 300);
- case InfoAreaMappings:
+ case InfoAreaMapping:
+ case InfoAreaInterpolation:
case InfoAreaSettings:
case InfoAreaTextMessages:
case InfoAreaWeather:
@@ -140,33 +146,22 @@ namespace BlackGui
const QPixmap &CMainInfoAreaComponent::indexToPixmap(int areaIndex) const
{
- InfoArea area = static_cast(areaIndex);
+ const InfoArea area = static_cast(areaIndex);
switch (area)
{
- case InfoAreaCockpit:
- return CIcons::appCockpit16();
- case InfoAreaUsers:
- return CIcons::appUsers16();
- case InfoAreaWeather:
- return CIcons::appWeather16();
- case InfoAreaAtc:
- return CIcons::appAtc16();
- case InfoAreaAircraft:
- return CIcons::appAircraft16();
- case InfoAreaSettings:
- return CIcons::appSettings16();
- case InfoAreaFlightPlan:
- return CIcons::appFlightPlan16();
- case InfoAreaTextMessages:
- return CIcons::appTextMessages16();
- case InfoAreaSimulator:
- return CIcons::appSimulator16();
- case InfoAreaMappings:
- return CIcons::appMappings16();
- case InfoAreaLog:
- return CIcons::appLog16();
- default:
- return CIcons::empty();
+ case InfoAreaCockpit: return CIcons::appCockpit16();
+ case InfoAreaUsers: return CIcons::appUsers16();
+ case InfoAreaWeather: return CIcons::appWeather16();
+ case InfoAreaAtc: return CIcons::appAtc16();
+ case InfoAreaAircraft: return CIcons::appAircraft16();
+ case InfoAreaSettings: return CIcons::appSettings16();
+ case InfoAreaFlightPlan: return CIcons::appFlightPlan16();
+ case InfoAreaTextMessages: return CIcons::appTextMessages16();
+ case InfoAreaSimulator: return CIcons::appSimulator16();
+ case InfoAreaMapping: return CIcons::appMappings16();
+ case InfoAreaLog: return CIcons::appLog16();
+ case InfoAreaInterpolation: return CIcons::appInterpolation16();
+ default: return CIcons::empty();
}
}
} // namespace
diff --git a/src/blackgui/components/maininfoareacomponent.h b/src/blackgui/components/maininfoareacomponent.h
index 107879484..431222b5e 100644
--- a/src/blackgui/components/maininfoareacomponent.h
+++ b/src/blackgui/components/maininfoareacomponent.h
@@ -14,7 +14,6 @@
#include "blackgui/blackguiexport.h"
#include "blackgui/infoarea.h"
-
#include
#include
#include
@@ -23,7 +22,6 @@ class QPixmap;
class QWidget;
namespace Ui { class CMainInfoAreaComponent; }
-
namespace BlackGui
{
namespace Components
@@ -35,6 +33,7 @@ namespace BlackGui
class CFlightPlanComponent;
class CLogComponent;
class CMappingComponent;
+ class CInterpolationComponent;
class CSettingsComponent;
class CSimulatorComponent;
class CTextMessageComponent;
@@ -57,18 +56,19 @@ namespace BlackGui
enum InfoArea
{
// index must match tab index!
- InfoAreaCockpit = 0,
- InfoAreaAircraft = 1,
- InfoAreaAtc = 2,
- InfoAreaUsers = 3,
- InfoAreaTextMessages = 4,
- InfoAreaSimulator = 5,
- InfoAreaFlightPlan = 6,
- InfoAreaWeather = 7,
- InfoAreaMappings = 8,
- InfoAreaLog = 9,
- InfoAreaSettings = 10,
- InfoAreaNone = -1
+ InfoAreaCockpit = 0,
+ InfoAreaAircraft = 1,
+ InfoAreaAtc = 2,
+ InfoAreaUsers = 3,
+ InfoAreaTextMessages = 4,
+ InfoAreaSimulator = 5,
+ InfoAreaFlightPlan = 6,
+ InfoAreaWeather = 7,
+ InfoAreaMapping = 8, //!< aka rendering, models
+ InfoAreaInterpolation = 9,
+ InfoAreaSettings = 10,
+ InfoAreaLog = 11,
+ InfoAreaNone = -1
};
//! Cockpit
@@ -81,7 +81,10 @@ namespace BlackGui
CAircraftComponent *getAircraftComponent();
//! Mappings
- CMappingComponent *getMappingComponet();
+ CMappingComponent *getMappingComponent();
+
+ //! Interpolation
+ CInterpolationComponent *getInterpolationComponent();
//! User component
CUserComponent *getUserComponent();
diff --git a/src/blackgui/components/maininfoareacomponent.ui b/src/blackgui/components/maininfoareacomponent.ui
index b915ffba3..393b609b5 100644
--- a/src/blackgui/components/maininfoareacomponent.ui
+++ b/src/blackgui/components/maininfoareacomponent.ui
@@ -6,32 +6,13 @@
0
0
- 1630
+ 1779
79
Main info area
-
-
- :/own/icons/own/swift/swift24.png:/own/icons/own/swift/swift24.png
-
-
-
-
-
- false
-
-
- false
-
-
- false
-
-
- QMainWindow::AllowTabbedDocks|QMainWindow::ForceTabbedDocks
-
false
@@ -44,10 +25,10 @@
-
+
- 524287
- 524287
+ 125
+ 33
@@ -577,7 +558,7 @@
Qt::TopDockWidgetArea
- Rendering
+ Models
4
@@ -626,27 +607,18 @@
-
-
-
- 125
- 70
-
-
+
Qt::TopDockWidgetArea
- Log
+ Interpolation
4
-
-
-
- 0
-
+
+
0
@@ -660,11 +632,8 @@
0
-
-
-
-
- 0
-
+
+
0
@@ -678,7 +647,14 @@
0
-
-
+
+
+
+ 125
+ 0
+
+
+
@@ -755,6 +731,66 @@
+
+
+
+ 125
+ 70
+
+
+
+ Qt::TopDockWidgetArea
+
+
+ Log
+
+
+ 4
+
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+ -
+
+
+
+ 0
+
+
+ 0
+
+
+ 2
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+
+
+
+
+
+
@@ -829,6 +865,12 @@
blackgui/components/weathercomponent.h
1
+
+ BlackGui::Components::CInterpolationComponent
+ QFrame
+ blackgui/components/interpolationcomponent.h
+ 1
+
diff --git a/src/blackgui/components/mainkeypadareacomponent.cpp b/src/blackgui/components/mainkeypadareacomponent.cpp
index 74a6fa31d..124ddfafb 100644
--- a/src/blackgui/components/mainkeypadareacomponent.cpp
+++ b/src/blackgui/components/mainkeypadareacomponent.cpp
@@ -47,6 +47,7 @@ namespace BlackGui
connect(ui->pb_MainFlightplan, &QPushButton::released, this, &CMainKeypadAreaComponent::buttonSelected);
connect(ui->pb_MainLog, &QPushButton::released, this, &CMainKeypadAreaComponent::buttonSelected);
connect(ui->pb_MainMappings, &QPushButton::released, this, &CMainKeypadAreaComponent::buttonSelected);
+ connect(ui->pb_MainInterpolation, &QPushButton::released, this, &CMainKeypadAreaComponent::buttonSelected);
connect(ui->pb_MainSettings, &QPushButton::released, this, &CMainKeypadAreaComponent::buttonSelected);
connect(ui->pb_MainSimulator, &QPushButton::released, this, &CMainKeypadAreaComponent::buttonSelected);
connect(ui->pb_MainTextMessages, &QPushButton::released, this, &CMainKeypadAreaComponent::buttonSelected);
@@ -109,7 +110,7 @@ namespace BlackGui
if (ia != CMainInfoAreaComponent::InfoAreaNone)
{
Q_ASSERT(senderButton->isCheckable());
- emit selectedMainInfoAreaDockWidget(ia);
+ emit this->selectedMainInfoAreaDockWidget(ia);
senderButton->setChecked(true); // re-check if got unchecked, we use checked buttons like normal buttons
return;
}
@@ -189,7 +190,8 @@ namespace BlackGui
if (button == ui->pb_MainCockpit) return CMainInfoAreaComponent::InfoAreaCockpit;
if (button == ui->pb_MainFlightplan) return CMainInfoAreaComponent::InfoAreaFlightPlan;
if (button == ui->pb_MainLog) return CMainInfoAreaComponent::InfoAreaLog;
- if (button == ui->pb_MainMappings) return CMainInfoAreaComponent::InfoAreaMappings;
+ if (button == ui->pb_MainMappings) return CMainInfoAreaComponent::InfoAreaMapping;
+ if (button == ui->pb_MainInterpolation) return CMainInfoAreaComponent::InfoAreaInterpolation;
if (button == ui->pb_MainSettings) return CMainInfoAreaComponent::InfoAreaSettings;
if (button == ui->pb_MainSimulator) return CMainInfoAreaComponent::InfoAreaSimulator;
if (button == ui->pb_MainTextMessages) return CMainInfoAreaComponent::InfoAreaTextMessages;
@@ -207,7 +209,8 @@ namespace BlackGui
case CMainInfoAreaComponent::InfoAreaCockpit: return ui->pb_MainCockpit;
case CMainInfoAreaComponent::InfoAreaFlightPlan: return ui->pb_MainFlightplan;
case CMainInfoAreaComponent::InfoAreaLog: return ui->pb_MainLog;
- case CMainInfoAreaComponent::InfoAreaMappings: return ui->pb_MainMappings;
+ case CMainInfoAreaComponent::InfoAreaMapping: return ui->pb_MainMappings;
+ case CMainInfoAreaComponent::InfoAreaInterpolation: return ui->pb_MainInterpolation;
case CMainInfoAreaComponent::InfoAreaSettings: return ui->pb_MainSettings;
case CMainInfoAreaComponent::InfoAreaSimulator: return ui->pb_MainSimulator;
case CMainInfoAreaComponent::InfoAreaTextMessages: return ui->pb_MainTextMessages;
@@ -226,6 +229,7 @@ namespace BlackGui
ui->pb_MainFlightplan->setChecked(false);
ui->pb_MainLog->setChecked(false);
ui->pb_MainMappings->setChecked(false);
+ ui->pb_MainInterpolation->setChecked(false);
ui->pb_MainSettings->setChecked(false);
ui->pb_MainSimulator->setChecked(false);
ui->pb_MainTextMessages->setChecked(false);
diff --git a/src/blackgui/components/mainkeypadareacomponent.ui b/src/blackgui/components/mainkeypadareacomponent.ui
index 87d18f87d..ea88e66cc 100644
--- a/src/blackgui/components/mainkeypadareacomponent.ui
+++ b/src/blackgui/components/mainkeypadareacomponent.ui
@@ -62,8 +62,21 @@
2
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Ident
+
+
+
-
-
+
false
@@ -78,6 +91,35 @@
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Audio
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Log
+
+
+ true
+
+
+
-
@@ -97,8 +139,8 @@
- -
-
+
-
+
0
@@ -106,39 +148,7 @@
- Log
-
-
- true
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Audio
-
-
-
- -
-
-
- false
-
-
-
- 0
- 0
-
-
-
-
+ Connect
@@ -150,6 +160,9 @@
0
+
+ Models and rendering
+
Models
@@ -158,8 +171,8 @@
- -
-
+
-
+
0
@@ -167,7 +180,7 @@
- Cockpit
+ Aircraft
true
@@ -190,8 +203,8 @@
- -
-
+
-
+
0
@@ -199,74 +212,7 @@
- Connect
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Aircraft
-
-
- true
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- ATC
-
-
- true
-
-
- false
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 62
- 22
-
-
-
- 100%
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Weather
+ Cockpit
true
@@ -289,6 +235,41 @@
+ -
+
+
+
+ 0
+ 0
+
+
+
+ ATC
+
+
+ true
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 62
+ 22
+
+
+
+ 100%
+
+
+
-
@@ -305,8 +286,8 @@
- -
-
+
-
+
0
@@ -314,7 +295,26 @@
- Ident
+ Mute
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::LeftToRight
+
+
+ Settings
+
+
+ true
@@ -353,8 +353,8 @@
- -
-
+
-
+
0
@@ -362,23 +362,26 @@
- Mute
+ Weather
+
+
+ true
- -
-
+
-
+
0
0
-
- Qt::LeftToRight
+
+ Interpolation
- Settings
+ Interpol.
true
@@ -421,7 +424,6 @@
pb_MainAtc
pb_MainUsers
pb_MainSimulator
- pb_MainWeather
diff --git a/src/blackgui/infoarea.cpp b/src/blackgui/infoarea.cpp
index ad2883c21..6fea2d44c 100644
--- a/src/blackgui/infoarea.cpp
+++ b/src/blackgui/infoarea.cpp
@@ -660,7 +660,7 @@ namespace BlackGui
int CInfoArea::countDockedWidgetInfoAreas() const
{
- if (!m_tabBar) return 0;
+ if (!m_tabBar) { return 0; }
return m_tabBar->count();
}
@@ -671,7 +671,7 @@ namespace BlackGui
const QString t(m_tabBar->tabText(tabBarIndex));
// we have a title and search by that (best option, as order does not matter)
- if (!t.isEmpty()) { return getDockWidgetInfoAreaByWindowTitle(t); }
+ if (!t.isEmpty()) { return this->getDockWidgetInfoAreaByWindowTitle(t); }
// no title, we assume the n-th not floating tab is correct
// this will work if the order in m_dockWidgetInfoAreas matches
diff --git a/src/blackmisc/icons.cpp b/src/blackmisc/icons.cpp
index 70503df1e..6af7732f7 100644
--- a/src/blackmisc/icons.cpp
+++ b/src/blackmisc/icons.cpp
@@ -773,6 +773,11 @@ namespace BlackMisc
return tableRelationship16();
}
+ const QPixmap &CIcons::appInterpolation16()
+ {
+ return paperPlane16();
+ }
+
const QPixmap &CIcons::appLog16()
{
return monitorError16();
diff --git a/src/blackmisc/icons.h b/src/blackmisc/icons.h
index 4d0231b1d..24933d0b9 100644
--- a/src/blackmisc/icons.h
+++ b/src/blackmisc/icons.h
@@ -551,6 +551,9 @@ namespace BlackMisc
//! Application mappings
static const QPixmap &appMappings16();
+ //! Application interpolation
+ static const QPixmap &appInterpolation16();
+
//! Application log/status messages
static const QPixmap &appLog16();
diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp
index f4fbc626e..9fcba20af 100644
--- a/src/swiftguistandard/swiftguistd.cpp
+++ b/src/swiftguistandard/swiftguistd.cpp
@@ -201,6 +201,13 @@ void SwiftGuiStd::setMainPageInfoArea(CMainInfoAreaComponent::InfoArea infoArea)
ui->comp_MainInfoArea->selectArea(infoArea);
}
+void SwiftGuiStd::setSettingsPage(int settingsTabIndex)
+{
+ this->setMainPageInfoArea(CMainInfoAreaComponent::InfoAreaSettings);
+ if (settingsTabIndex < 0) { return; }
+ ui->comp_MainInfoArea->getSettingsComponent()->setCurrentIndex(settingsTabIndex);
+}
+
bool SwiftGuiStd::isMainPageSelected(SwiftGuiStd::MainPageIndex mainPage) const
{
return ui->sw_MainMiddle->currentIndex() == static_cast(mainPage);
diff --git a/src/swiftguistandard/swiftguistd.h b/src/swiftguistandard/swiftguistd.h
index b5f5425bd..c9a9a27aa 100644
--- a/src/swiftguistandard/swiftguistd.h
+++ b/src/swiftguistandard/swiftguistd.h
@@ -199,6 +199,9 @@ private:
//! Set the main info area
void setMainPageInfoArea(BlackGui::Components::CMainInfoAreaComponent::InfoArea infoArea);
+ //! Display the settings page
+ void setSettingsPage(int settingsTabIndex = -1);
+
//! Login requested
void loginRequested();
diff --git a/src/swiftguistandard/swiftguistdinit.cpp b/src/swiftguistandard/swiftguistdinit.cpp
index c41b3ff9c..7c1e59ea5 100644
--- a/src/swiftguistandard/swiftguistdinit.cpp
+++ b/src/swiftguistandard/swiftguistdinit.cpp
@@ -15,6 +15,7 @@
#include "blackgui/components/flightplancomponent.h"
#include "blackgui/components/logcomponent.h"
#include "blackgui/components/logincomponent.h"
+#include "blackgui/components/interpolationcomponent.h"
#include "blackgui/components/maininfoareacomponent.h"
#include "blackgui/components/mainkeypadareacomponent.h"
#include "blackgui/components/mappingcomponent.h"
@@ -138,7 +139,8 @@ void SwiftGuiStd::init()
Q_ASSERT_X(log, Q_FUNC_INFO, "Missing log component");
if (clear) { log->clearConsole(); }
log->appendPlainTextToConsole(logMsg);
- }, Qt::QueuedConnection);
+ },
+ Qt::QueuedConnection);
Q_ASSERT(s);
s = connect(&m_timerContextWatchdog, &QTimer::timeout, this, &SwiftGuiStd::handleTimerBasedUpdates);
Q_ASSERT(s);
@@ -201,7 +203,7 @@ void SwiftGuiStd::initGuiSignals()
// main keypad
connect(ui->comp_MainKeypadArea, &CMainKeypadAreaComponent::selectedMainInfoAreaDockWidget, this, &SwiftGuiStd::setMainPageInfoArea);
connect(ui->comp_MainKeypadArea, &CMainKeypadAreaComponent::connectPressed, this, &SwiftGuiStd::loginRequested);
- connect(ui->comp_MainKeypadArea, &CMainKeypadAreaComponent::changedOpacity, this , &SwiftGuiStd::onChangedWindowOpacity);
+ connect(ui->comp_MainKeypadArea, &CMainKeypadAreaComponent::changedOpacity, this, &SwiftGuiStd::onChangedWindowOpacity);
connect(ui->comp_MainKeypadArea, &CMainKeypadAreaComponent::identPressed, ui->comp_MainInfoArea->getCockpitComponent(), &CCockpitComponent::setSelectedTransponderModeStateIdent);
connect(ui->comp_MainKeypadArea, &CMainKeypadAreaComponent::textEntered, ui->comp_MainInfoArea->getTextMessageComponent(), &CTextMessageComponent::handleGlobalCommandLineText);
connect(ui->comp_MainKeypadArea, &CMainKeypadAreaComponent::audioPressed, [ = ]
@@ -247,9 +249,15 @@ void SwiftGuiStd::initGuiSignals()
// text messages
connect(ui->comp_MainInfoArea->getAtcStationComponent(), &CAtcStationComponent::requestTextMessageWidget, ui->comp_MainInfoArea->getTextMessageComponent(), &CTextMessageComponent::showCorrespondingTab);
- connect(ui->comp_MainInfoArea->getMappingComponet(), &CMappingComponent::requestTextMessageWidget, ui->comp_MainInfoArea->getTextMessageComponent(), &CTextMessageComponent::showCorrespondingTab);
+ connect(ui->comp_MainInfoArea->getMappingComponent(), &CMappingComponent::requestTextMessageWidget, ui->comp_MainInfoArea->getTextMessageComponent(), &CTextMessageComponent::showCorrespondingTab);
connect(ui->comp_MainInfoArea->getAircraftComponent(), &CAircraftComponent::requestTextMessageWidget, ui->comp_MainInfoArea->getTextMessageComponent(), &CTextMessageComponent::showCorrespondingTab);
+ // interpolation
+ connect(ui->comp_MainInfoArea->getInterpolationComponent(), &CInterpolationComponent::requestRenderingRestrictionsWidget, [ = ]
+ {
+ this->setSettingsPage(CSettingsComponent::SettingTabSimulator);
+ });
+
// main info area
connect(ui->comp_MainInfoArea, &CMainInfoAreaComponent::changedWholeInfoAreaFloating, this, &SwiftGuiStd::onChangedMainInfoAreaFloating);
}