chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed #124: similar callsigns shouldn't hightlight

Browse Source
This commit is contained in:
Jordan Sherer 2019-02-16 11:47:54 -05:00
parent f1ed44f9e9
commit bb4b79d797
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mainwindow.cpp
View File

@ -1394,7 +1394,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
connect(historyAction, &QAction::triggered, this, [this](){ connect(historyAction, &QAction::triggered, this, [this](){
QString selectedCall = callsignSelected(); QString selectedCall = callsignSelected();
if(selectedCall.isEmpty()){ if(selectedCall.isEmpty()){
return; selectedCall = "%";
} }
Inbox inbox(inboxPath()); Inbox inbox(inboxPath());
@ -9317,7 +9317,11 @@ bool MainWindow::isMyCallIncluded(const QString &text){
return false; return false;
} }
return text.contains(myCall); if(!text.contains(myCall)){
return false;
}
return Varicode::parseCallsigns(text).contains(myCall);
} }
bool MainWindow::isAllCallIncluded(const QString &text){ bool MainWindow::isAllCallIncluded(const QString &text){
@ -10944,8 +10948,7 @@ void MainWindow::displayBandActivity() {
// TODO: jsherer - there's a potential here for a previous allcall to poison the highlight. // TODO: jsherer - there's a potential here for a previous allcall to poison the highlight.
if ( if (
(isDirectedOffset(offset, &isDirectedAllCall) && !isDirectedAllCall) || (isDirectedOffset(offset, &isDirectedAllCall) && !isDirectedAllCall) || isMyCallIncluded(text.last())
(text.last().contains(Radio::base_callsign(m_config.my_callsign())))
) { ) {
offsetItem->setBackground(QBrush(m_config.color_MyCall())); offsetItem->setBackground(QBrush(m_config.color_MyCall()));
tdriftItem->setBackground(QBrush(m_config.color_MyCall())); tdriftItem->setBackground(QBrush(m_config.color_MyCall()));