From 71a395c1c2a0d6c2f0742485b70868ff5edd3b17 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 18 Dec 2017 21:50:00 +0000 Subject: [PATCH] Bewars: displayWidgets() stuff is not yet complete! git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8343 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 16 +++++++++------- mainwindow.h | 6 +++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index b9083495c..f5fe6db56 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -899,7 +899,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, splashTimer.setSingleShot (true); splashTimer.start (20 * 1000); - /* + if(m_config.my_callsign()=="K1JT" or m_config.my_callsign()=="K9AN" or m_config.my_callsign()=="G4WJS" || m_config.my_callsign () == "W9XYZ") { ui->actionWSPR_LF->setEnabled(true); @@ -911,7 +911,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, "Please use WSJT-X v1.8.0\n", errorMsg); Q_EMIT finished (); } - */ + if(!ui->cbMenus->isChecked()) { ui->cbMenus->setChecked(true); @@ -4790,22 +4790,24 @@ void MainWindow::acceptQSO2(QDateTime const& QSO_date_off, QString const& call, m_dateTimeQSOOn = QDateTime {}; } -int MainWindow::nWidgets(QString t) +qint64 MainWindow::nWidgets(QString t) { +// qDebug() << t << N_WIDGETS << t.length(); Q_ASSERT(t.length()==N_WIDGETS); - int n=0; + qint64 n=0; for(int i=0; itxFirstCheckBox->setVisible(b); if(i==1) ui->TxFreqSpinBox->setVisible(b); if(i==2) ui->RxFreqSpinBox->setVisible(b); diff --git a/mainwindow.h b/mainwindow.h index 473ffaa17..2128f45d7 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -49,7 +49,7 @@ #define NUM_FT8_SYMBOLS 79 #define NUM_CW_SYMBOLS 250 #define TX_SAMPLE_RATE 48000 -#define N_WIDGETS 27 +#define N_WIDGETS 32 extern int volatile itone[NUM_ISCAT_SYMBOLS]; //Audio tones for all Tx symbols extern int volatile icw[NUM_CW_SYMBOLS]; //Dits for CW ID @@ -669,8 +669,8 @@ private: void remove_child_from_event_filter (QObject *); void setup_status_bar (bool vhf); void tx_watchdog (bool triggered); - int nWidgets(QString t); - void displayWidgets(int n); + qint64 nWidgets(QString t); + void displayWidgets(qint64 n); void vhfWarning(); QChar current_submode () const; // returns QChar {0} if sub mode is // not appropriate