flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 04:25:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

CTextMessage: fromCallsign and toCallsign become sender and recipient (to and from looked like conversion methods)

Browse Source 
refs #81
This commit is contained in:
Mathew Sutcliffe
2014-01-08 22:12:58 +00:00
parent 4f4b77f2b2
commit 784d93139b
6 changed files with 65 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
samples/blackgui/mainwindow_textmessages.cpp
View File

@@ -64,7 +64,7 @@ QWidget *MainWindow::addNewTextMessageTab(const QString &tabName)
void MainWindow::addPrivateChannelTextMessage(const CTextMessage &textMessage, bool sending)
{
if (!textMessage.isPrivateMessage()) return;
CCallsign cs = sending ? textMessage.getToCallsign() : textMessage.getFromCallsign();
CCallsign cs = sending ? textMessage.getRecipient() : textMessage.getSender();
if (cs.isEmpty()) return;
QWidget *tab = this->findTextMessageTabByName(cs.getStringAsSet());
if (tab == nullptr) tab = this->findTextMessageTabByName(cs.asString());
@@ -104,7 +104,7 @@ CTextMessage MainWindow::getTextMessageStubForChannel()
if (index == this->ui->tw_TextMessages->indexOf(this->ui->tb_TextMessagesAll)) return tm;
// from
tm.setFromCallsign(this->m_ownAircraft.getCallsign());
tm.setSender(this->m_ownAircraft.getCallsign());
if (index == this->ui->tw_TextMessages->indexOf(this->ui->tb_TextMessagesCOM1) ||
index == this->ui->tw_TextMessages->indexOf(this->ui->tb_TextMessagesCOM2) ||
@@ -138,14 +138,14 @@ CTextMessage MainWindow::getTextMessageStubForChannel()
}
else
{
CCallsign toCallsign(selectedTabText);
tm.setToCallsign(toCallsign);
CCallsign recipient(selectedTabText);
tm.setRecipient(recipient);
}
}
else
{
CCallsign toCallsign(selectedTabText);
tm.setToCallsign(toCallsign);
CCallsign recipient(selectedTabText);
tm.setRecipient(recipient);
}
}
return tm; // now valid message stub with receiver
@@ -215,7 +215,7 @@ void MainWindow::commandEntered()
this->ui->tw_TextMessages->setCurrentWidget(tab);
}
CTextMessage tm = this->getTextMessageStubForChannel();
int index = cmdLine.indexOf(tm.getToCallsign().getStringAsSet(), 0, Qt::CaseInsensitive);
int index = cmdLine.indexOf(tm.getRecipient().getStringAsSet(), 0, Qt::CaseInsensitive);
if (index < 0)
{
this->displayStatusMessage(
@@ -224,7 +224,7 @@ void MainWindow::commandEntered()
);
return;
}
QString msg(cmdLine.mid(index + tm.getToCallsign().asString().length() + 1));
QString msg(cmdLine.mid(index + tm.getRecipient().asString().length() + 1));
tm.setMessage(msg);
if (tm.isEmpty()) return;
if (!this->isContextNetworkAvailableCheck()) return;