Bump to 2.0.1

Configuration.cpp

@@ -1010,6 +1010,14 @@ QSet<QString> Configuration::my_groups() const {
 }
 
 void Configuration::addGroup(QString const &group){
+    if(!Varicode::isGroupAllowed(group)){
+        MessageBox::critical_message (m_->window(), QString("%1 is a group that cannot be joined").arg(group));
+        return;
+    }
+    if(!Varicode::isCompoundCallsign(group)){
+        MessageBox::critical_message (m_->window(), QString("%1 is not a valid group").arg(group));
+        return;
+    }
     QSet<QString> groups = my_groups();
     groups.insert(group.trimmed());
     m_->my_groups_ = groups.toList();
@@ -2401,7 +2409,7 @@ bool Configuration::impl::validate ()
 
   foreach(auto group, splitGroups(ui_->groups_line_edit->text().toUpper().trimmed(), false)){
       if(!Varicode::isGroupAllowed(group)){
-          MessageBox::critical_message (this, QString("%1 is not an available group").arg(group));
+          MessageBox::critical_message (this, QString("%1 is a group that cannot be joined").arg(group));
           return false;
       }
       if(!Varicode::isCompoundCallsign(group)){

Versions.cmake

@@ -1,6 +1,6 @@
 # Version number components
 set (WSJTX_VERSION_MAJOR 2)
 set (WSJTX_VERSION_MINOR 0)
-set (WSJTX_VERSION_PATCH 0)
+set (WSJTX_VERSION_PATCH 1)
 set (WSJTX_RC 0) # release candidate number, comment out or zero for development versions
 set (WSJTX_VERSION_IS_RELEASE 1) # set to 1 for final release build

mainwindow.cpp

@@ -278,6 +278,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
   m_WSPR_tx_next {false},
   m_rigErrorMessageBox {MessageBox::Critical, tr ("Rig Control Error")
       , MessageBox::Cancel | MessageBox::Ok | MessageBox::Retry},
+  m_isWideGraphMDI {false},
   m_wideGraph (new WideGraph(m_settings)),
   // no parent so that it has a taskbar icon
   m_logDlg (new LogQSO (program_title (), m_settings, &m_config, nullptr)),
@@ -864,7 +865,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
 
   morse_(const_cast<char *> (m_config.my_callsign ().toLatin1().constData()),
          const_cast<int *> (icw), &m_ncw, m_config.my_callsign ().length());
-  on_actionWide_Waterfall_triggered();
   ui->cbShMsgs->setChecked(m_bShMsgs);
   ui->cbSWL->setChecked(m_bSWL);
 
@@ -935,6 +935,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
   //UI Customizations & Tweaks
   m_wideGraph.data()->installEventFilter(new EscapeKeyPressEater());
   ui->mdiArea->addSubWindow(m_wideGraph.data(), Qt::Dialog | Qt::FramelessWindowHint | Qt::CustomizeWindowHint | Qt::Tool)->showMaximized();
+  m_isWideGraphMDI = true;
   ui->menuMode->setVisible(false);
   ui->menuSave->setEnabled(false);
   ui->menuTools->setEnabled(false);
@@ -3626,11 +3627,6 @@ void MainWindow::on_actionLocal_User_Guide_triggered()
 {
 }
 
-void MainWindow::on_actionWide_Waterfall_triggered()      //Display Waterfalls
-{
-  m_wideGraph->show();
-}
-
 void MainWindow::on_actionSolve_FreqCal_triggered()
 {
   QString dpath{QDir::toNativeSeparators(m_config.writeable_data_dir().absolutePath()+"/")};
@@ -7495,7 +7491,7 @@ void MainWindow::on_actionJS8_triggered()
   VHF_features_enabled(bVHF);
   ui->cbAutoSeq->setChecked(true);
   m_TRperiod = computePeriodForSubmode(m_nSubMode);
-  m_wideGraph->show();
+  if(m_isWideGraphMDI) m_wideGraph->show();
   ui->decodedTextLabel2->setText("  UTC   dB   DT Freq    Message");
   m_modulator->setTRPeriod(m_TRperiod); // TODO - not thread safe
 #if JS8_RING_BUFFER

mainwindow.h

@@ -219,7 +219,6 @@ private slots:
   void on_actionFT8_DXpedition_Mode_User_Guide_triggered();
   void on_actionOnline_User_Guide_triggered();
   void on_actionLocal_User_Guide_triggered();
-  void on_actionWide_Waterfall_triggered();
   void on_actionOpen_triggered();
   void on_actionOpen_next_in_directory_triggered();
   void on_actionDecode_remaining_files_in_directory_triggered();
@@ -483,6 +482,7 @@ private:
   MessageBox m_rigErrorMessageBox;
   QScopedPointer<EqualizationToolsDialog> m_equalizationToolsDialog;
 
+  bool m_isWideGraphMDI;
   QScopedPointer<WideGraph> m_wideGraph;
   QScopedPointer<LogQSO> m_logDlg;
   QScopedPointer<Astro> m_astroWidget;

varicode.cpp

@@ -1278,7 +1278,8 @@ bool Varicode::isCompoundCallsign(const QString &callsign){
 
 bool Varicode::isGroupAllowed(const QString &group){
     const QSet<QString> disallowed = {
-        "@APRSIS"
+        "@APRSIS",
+        "@JS8NET",
     };
     return !disallowed.contains(group);
 }