flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-22 13:15:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #250, updated cockpit component for voice room updates

Browse Source
This commit is contained in:
Klaus Basan
2014-05-31 02:28:24 +02:00
parent 035575870b
commit cfbee4a55f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackgui/cockpitv1component.cpp
View File

@@ -193,7 +193,6 @@ namespace BlackGui
CAircraft CCockpitV1Component::cockpitValuesToObject() CAircraft CCockpitV1Component::cockpitValuesToObject()
{ {
CAircraft ownAircraft = this->getOwnAircraft(); CAircraft ownAircraft = this->getOwnAircraft();
CTransponder transponder = ownAircraft.getTransponder(); CTransponder transponder = ownAircraft.getTransponder();
CComSystem com1 = ownAircraft.getCom1System(); CComSystem com1 = ownAircraft.getCom1System();
@@ -340,6 +339,7 @@ namespace BlackGui
// remark // remark
// isAudioPlaying() is not set, as this is only a temporary value when really "something is playing" // isAudioPlaying() is not set, as this is only a temporary value when really "something is playing"
bool changedUrl1 = (room1.getVoiceRoomUrl() == this->ui->le_CockpitVoiceRoomCom1->text());
this->ui->le_CockpitVoiceRoomCom1->setText(room1.getVoiceRoomUrl()); this->ui->le_CockpitVoiceRoomCom1->setText(room1.getVoiceRoomUrl());
if (room1.isConnected()) if (room1.isConnected())
{ {
@@ -352,6 +352,7 @@ namespace BlackGui
this->ui->tvp_CockpitVoiceRoom1->clear(); this->ui->tvp_CockpitVoiceRoom1->clear();
} }
bool changedUrl2 = (room2.getVoiceRoomUrl() == this->ui->le_CockpitVoiceRoomCom2->text());
this->ui->le_CockpitVoiceRoomCom2->setText(room2.getVoiceRoomUrl()); this->ui->le_CockpitVoiceRoomCom2->setText(room2.getVoiceRoomUrl());
if (room2.isConnected()) if (room2.isConnected())
{ {
@@ -362,6 +363,7 @@ namespace BlackGui
this->ui->le_CockpitVoiceRoomCom2->setStyleSheet(""); this->ui->le_CockpitVoiceRoomCom2->setStyleSheet("");
this->ui->tvp_CockpitVoiceRoom2->clear(); this->ui->tvp_CockpitVoiceRoom2->clear();
} }
if (changedUrl1 || changedUrl2) this->updateVoiceRoomMembers();
} }
void CCockpitV1Component::updateVoiceRoomMembers() void CCockpitV1Component::updateVoiceRoomMembers()
@@ -376,7 +378,6 @@ namespace BlackGui
this->ui->tvp_CockpitVoiceRoom2->update(this->getIContextAudio()->getCom2RoomUsers()); this->ui->tvp_CockpitVoiceRoom2->update(this->getIContextAudio()->getCom2RoomUsers());
else else
this->ui->tvp_CockpitVoiceRoom2->clear(); this->ui->tvp_CockpitVoiceRoom2->clear();
} }
void CCockpitV1Component::testSelcal() void CCockpitV1Component::testSelcal()
@@ -384,7 +385,7 @@ namespace BlackGui
QString selcalCode = this->getSelcalCode(); QString selcalCode = this->getSelcalCode();
if (!CSelcal::isValidCode(selcalCode)) if (!CSelcal::isValidCode(selcalCode))
{ {
this->sendStatusMessage(CStatusMessage(CStatusMessage::TypeValidation, CStatusMessage::SeverityWarning, "invalid SELCAL codde")); this->sendStatusMessage(CStatusMessage(CStatusMessage::TypeValidation, CStatusMessage::SeverityWarning, "Invalid SELCAL codde"));
} }
else if (this->getIContextAudio()) else if (this->getIContextAudio())
{ {
@@ -393,7 +394,7 @@ namespace BlackGui
} }
else else
{ {
this->sendStatusMessage(CStatusMessage(CStatusMessage::TypeAudio, CStatusMessage::SeverityError, "No audi available")); this->sendStatusMessage(CStatusMessage(CStatusMessage::TypeAudio, CStatusMessage::SeverityError, "No audio available"));
} }
} }