Remove vestigial references to WSPR_2. Update wsjtx.pro. Add samples for all modes.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7208 ab8295b8-cf94-4d9e-aec4-7959e3be5d79

doc/user_guide/en/wsjtx-main.adoc

@@ -137,14 +137,14 @@ include::tutorial-example2.adoc[]
 == Making QSOs
 include::make-qso.adoc[]
 
-[[WSPR]]
-== WSPR Mode
-include::wspr.adoc[]
-
 [[VHF_AND_UP]]
 == VHF+ Features
 include::vhf-features.adoc[]
 
+[[WSPR]]
+== WSPR Mode
+include::wspr.adoc[]
+
 [[COMMAND_REF]]
 == On-Screen Controls
 

mainwindow.cpp

@@ -473,7 +473,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
   ui->actionJT65->setActionGroup(modeGroup);
   ui->actionJT9_JT65->setActionGroup(modeGroup);
   ui->actionJT4->setActionGroup(modeGroup);
-  ui->actionWSPR_2->setActionGroup(modeGroup);
+  ui->actionWSPR->setActionGroup(modeGroup);
   ui->actionEcho->setActionGroup(modeGroup);
   ui->actionISCAT->setActionGroup(modeGroup);
   ui->actionMSK144->setActionGroup(modeGroup);
@@ -776,7 +776,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
   if(m_mode=="JT9") on_actionJT9_triggered();
   if(m_mode=="JT65") on_actionJT65_triggered();
   if(m_mode=="JT9+JT65") on_actionJT9_JT65_triggered();
-  if(m_mode=="WSPR") on_actionWSPR_2_triggered();
+  if(m_mode=="WSPR") on_actionWSPR_triggered();
   if(m_mode=="Echo") on_actionEcho_triggered();
   if(m_mode=="ISCAT") on_actionISCAT_triggered();
   if(m_mode=="MSK144") on_actionMSK144_triggered();
@@ -4207,7 +4207,7 @@ void MainWindow::on_actionJT4_triggered()
   }
 }
 
-void MainWindow::on_actionWSPR_2_triggered()
+void MainWindow::on_actionWSPR_triggered()
 {
   m_mode="WSPR";
   WSPR_config(true);
@@ -4223,7 +4223,7 @@ void MainWindow::on_actionWSPR_2_triggered()
   m_hsymStop=396;
   m_toneSpacing=12000.0/8192.0;
   setup_status_bar (false);
-  ui->actionWSPR_2->setChecked(true);
+  ui->actionWSPR->setChecked(true);
   VHF_features_enabled(false);
   ui->ClrAvgButton->setVisible(false);
   m_wideGraph->setPeriod(m_TRperiod,m_nsps);

mainwindow.h

@@ -224,7 +224,7 @@ private slots:
   void on_cbTx6_toggled(bool b);
   void networkError (QString const&);
   void on_ClrAvgButton_clicked();
-  void on_actionWSPR_2_triggered();
+  void on_actionWSPR_triggered();
   void on_syncSpinBox_valueChanged(int n);
   void on_TxPowerComboBox_currentIndexChanged(const QString &arg1);
   void on_sbTxPercent_valueChanged(int n);

mainwindow.ui

@@ -2371,7 +2371,7 @@ QPushButton[state="ok"] {
     <addaction name="actionISCAT"/>
     <addaction name="actionMSK144"/>
     <addaction name="separator"/>
-    <addaction name="actionWSPR_2"/>
+    <addaction name="actionWSPR"/>
     <addaction name="separator"/>
     <addaction name="actionEcho"/>
    </widget>
@@ -2760,7 +2760,7 @@ QPushButton[state=&quot;ok&quot;] {
     <string>Enable deep search</string>
    </property>
   </action>
-  <action name="actionWSPR_2">
+  <action name="actionWSPR">
    <property name="checkable">
     <bool>true</bool>
    </property>

samples/CMakeLists.txt

@@ -1,6 +1,7 @@
 set (SAMPLE_FILES
   JT9+JT65/130610_2343.wav
   JT9/130418_1742.wav
+  JT65/JT65B/DL7UAE_040308_002400.wav
   )
 
 set (contents_file_name contents_${WSJTX_VERSION_MAJOR}.${WSJTX_VERSION_MINOR}.json)

wsjtx.pro

@@ -65,7 +65,7 @@ SOURCES += \
   WFPalette.cpp plotter.cpp widegraph.cpp about.cpp WsprTxScheduler.cpp mainwindow.cpp \
   main.cpp decodedtext.cpp wsprnet.cpp messageaveraging.cpp \
   echoplot.cpp echograph.cpp fastgraph.cpp fastplot.cpp Modes.cpp \
-  WSPRBandHopping.cpp MessageAggregator.cpp
+  WSPRBandHopping.cpp MessageAggregator.cpp SampleDownloader.cpp
 
 HEADERS  += qt_helpers.hpp \
   pimpl_h.hpp pimpl_impl.hpp \
@@ -80,7 +80,7 @@ HEADERS  += qt_helpers.hpp \
   Configuration.hpp wsprnet.h signalmeter.h meterwidget.h \
   logbook/logbook.h logbook/countrydat.h logbook/countriesworked.h logbook/adif.h \
   messageaveraging.h echoplot.h echograph.h fastgraph.h fastplot.h Modes.hpp WSPRBandHopping.hpp \
-  WsprTxScheduler.h
+  WsprTxScheduler.h SampleDownloader.hpp
 
 INCLUDEPATH += qmake_only