mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-15 17:55:34 +08:00
Ref T731, simplified form of ATC station map
This commit is contained in:
committed by
Mat Sutcliffe
parent
b26cde4ed5
commit
840633749e
@@ -6,14 +6,15 @@
|
||||
* or distributed except according to the terms contained in the LICENSE file.
|
||||
*/
|
||||
|
||||
//! \file
|
||||
|
||||
#include "blackgui/guiapplication.h"
|
||||
#include "blackcore/context/contextaudioimpl.h"
|
||||
#include "blackcore/afv/clients/afvclient.h"
|
||||
#include "blackcore/afv/model/afvmapreader.h"
|
||||
|
||||
#include "afvmapdialog.h"
|
||||
#include "ui_afvmapdialog.h"
|
||||
#include <QQmlContext>
|
||||
#include <QQmlEngine>
|
||||
|
||||
using namespace BlackCore::Afv::Model;
|
||||
using namespace BlackCore::Afv::Clients;
|
||||
@@ -26,14 +27,28 @@ namespace BlackGui
|
||||
QDialog(parent),
|
||||
ui(new Ui::CAfvMapDialog)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
m_afvMapReader = new CAfvMapReader(this);
|
||||
m_afvMapReader->updateFromMap();
|
||||
m_afvClient = new CAfvClient("https://voice1.vatsim.uk");
|
||||
|
||||
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);
|
||||
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"));
|
||||
}
|
||||
|
||||
CAfvMapDialog::~CAfvMapDialog() { }
|
||||
|
||||
@@ -11,19 +11,14 @@
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Dialog</string>
|
||||
<string>AFV map</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<layout class="QVBoxLayout" name="vl_AfvMap">
|
||||
<item>
|
||||
<widget class="QQuickWidget" name="qw_AfvMap">
|
||||
<property name="resizeMode">
|
||||
<enum>QQuickWidget::SizeRootObjectToView</enum>
|
||||
</property>
|
||||
<property name="source">
|
||||
<url>
|
||||
<string>qrc:/blackgui/qml/AFVMap.qml</string>
|
||||
</url>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
@@ -32,7 +27,7 @@
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="standardButtons">
|
||||
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
|
||||
<set>QDialogButtonBox::Close</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
Reference in New Issue
Block a user