diff --git a/src/blackgui/blackgui.pro b/src/blackgui/blackgui.pro index cb0f0423c..cafa536ba 100644 --- a/src/blackgui/blackgui.pro +++ b/src/blackgui/blackgui.pro @@ -1,6 +1,6 @@ load(common_pre) -QT += core dbus gui network svg widgets multimedia quickwidgets +QT += core dbus gui network svg widgets multimedia TARGET = blackgui TEMPLATE = lib @@ -61,7 +61,6 @@ HEADERS += $$PWD/graphs/*.h SOURCES += $$PWD/graphs/*.cpp FORMS += $$PWD/*.ui -RESOURCES += qml/qml.qrc win32 { HEADERS += $$PWD/win/*.h diff --git a/src/blackgui/components/afvmapdialog.cpp b/src/blackgui/components/afvmapdialog.cpp index 16e9bb58f..f40814358 100644 --- a/src/blackgui/components/afvmapdialog.cpp +++ b/src/blackgui/components/afvmapdialog.cpp @@ -13,8 +13,8 @@ #include "afvmapdialog.h" #include "ui_afvmapdialog.h" -#include -#include +//#include +//#include 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() { } diff --git a/src/blackgui/components/afvmapdialog.ui b/src/blackgui/components/afvmapdialog.ui index a9c384638..3466d0d11 100644 --- a/src/blackgui/components/afvmapdialog.ui +++ b/src/blackgui/components/afvmapdialog.ui @@ -14,13 +14,13 @@ AFV map - + @@ -34,11 +34,11 @@ - +