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

Fixed #53: group callsign validation errors in configuration and from call activity menu

Browse Source
This commit is contained in:
Jordan Sherer 2018-12-20 20:36:33 -05:00
parent 5ca582a6b4
commit db5969fdc4
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Configuration.cpp
View File

@ -2014,7 +2014,7 @@ QStringList splitGroups(QString groupsString, bool filter){
if(filter && !g.startsWith("@")){ if(filter && !g.startsWith("@")){
continue; continue;
} }
groups.append(group.trimmed()); groups.append(group.trimmed().toUpper());
} }
return groups; return groups;
@ -2028,7 +2028,7 @@ bool Configuration::impl::validate ()
return false; return false;
} }
foreach(auto group, splitGroups(ui_->groups_line_edit->text(), false)){ foreach(auto group, splitGroups(ui_->groups_line_edit->text().toUpper().trimmed(), false)){
if(!Varicode::isCompoundCallsign(group)){ if(!Varicode::isCompoundCallsign(group)){
MessageBox::critical_message (this, QString("%1 is not a valid group").arg(group)); MessageBox::critical_message (this, QString("%1 is not a valid group").arg(group));
return false; return false;

5
mainwindow.cpp
View File

@ -1325,7 +1325,12 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
} }
if(callsign.startsWith("@")){ if(callsign.startsWith("@")){
if(Varicode::isCompoundCallsign(callsign)){
m_config.addGroup(callsign); m_config.addGroup(callsign);
} else {
MessageBox::critical_message (this, QString("%1 is not a valid group").arg(callsign));
}
} else { } else {
CallDetail cd = {}; CallDetail cd = {};
cd.call = callsign; cd.call = callsign;