flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-17 02:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

[AFV] Temporarily disable AFV Map in swiftguistd

Browse Source
This commit is contained in:
Roland Rossgotterer
2019-10-08 20:36:43 +02:00
committed by Mat Sutcliffe
parent 18821c2a30
commit 139690457d
3 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/blackgui/components/afvmapdialog.cpp
View File

@@ -13,8 +13,8 @@
#include "afvmapdialog.h"
#include "ui_afvmapdialog.h"
#include <QQmlContext>
#include <QQmlEngine>
//#include <QQmlContext>
//#include <QQmlEngine>
using namespace BlackCore::Afv::Model;
using namespace BlackCore::Afv::Clients;
@@ -30,25 +30,25 @@ namespace BlackGui
m_afvMapReader = new CAfvMapReader(this);
m_afvMapReader->updateFromMap();
if (sGui && !sGui->isShuttingDown() && sGui->getIContextAudio())
{
if (sGui->getIContextAudio()->isUsingImplementingObject())
{
m_afvClient = &sGui->getCoreFacade()->getCContextAudio()->voiceClient();
}
}
// if (sGui && !sGui->isShuttingDown() && sGui->getIContextAudio())
// {
// if (sGui->getIContextAudio()->isUsingImplementingObject())
// {
// m_afvClient = &sGui->getCoreFacade()->getCContextAudio()->voiceClient();
// }
// }
ui->setupUi(this);
QQmlContext *ctxt = ui->qw_AfvMap->rootContext();
ctxt->setContextProperty("afvMapReader", m_afvMapReader);
// QQmlContext *ctxt = ui->qw_AfvMap->rootContext();
// ctxt->setContextProperty("afvMapReader", m_afvMapReader);
if (m_afvClient)
{
ctxt->setContextProperty("voiceClient", m_afvClient);
}
// if (m_afvClient)
// {
// ctxt->setContextProperty("voiceClient", m_afvClient);
// }
// ui->qw_AfvMap->engine()->setBaseUrl(":/blackgui/qml");
ui->qw_AfvMap->setSource(QUrl("qrc:/blackgui/qml/AFVMap.qml"));
// // ui->qw_AfvMap->engine()->setBaseUrl(":/blackgui/qml");
// ui->qw_AfvMap->setSource(QUrl("qrc:/blackgui/qml/AFVMap.qml"));
}
CAfvMapDialog::~CAfvMapDialog() { }

8
src/blackgui/components/afvmapdialog.ui
View File

@@ -14,13 +14,13 @@
<string>AFV map</string>
</property>
<layout class="QVBoxLayout" name="vl_AfvMap">
<item>
<!-- <item>
<widget class="QQuickWidget" name="qw_AfvMap">
<property name="resizeMode">
<enum>QQuickWidget::SizeRootObjectToView</enum>
</property>
</widget>
</item>
</item> -->
<item>
<widget class="QDialogButtonBox" name="bb_AfvMap">
<property name="orientation">
@@ -34,11 +34,11 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<!-- <customwidget>
<class>QQuickWidget</class>
<extends>QWidget</extends>
<header location="global">QtQuickWidgets/QQuickWidget</header>
</customwidget>
</customwidget> -->
</customwidgets>
<resources/>
<connections>