From 8ab7c01e162a9e3185b6ef77748f2a662b60b409 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 24 May 2013 15:41:33 +0000 Subject: [PATCH] 1. Added Tool Tips for most on-screen controls. 2. Removed all vestiges of NB code and controls. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3314 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- devsetup.ui | 57 ++++++++- mainwindow.cpp | 20 ---- mainwindow.h | 4 - mainwindow.ui | 310 ++++++++++++++++++++++++++----------------------- widegraph.ui | 21 ++++ 5 files changed, 241 insertions(+), 171 deletions(-) diff --git a/devsetup.ui b/devsetup.ui index 3ac96f61f..b32ad8a5b 100644 --- a/devsetup.ui +++ b/devsetup.ui @@ -83,6 +83,9 @@ 16777215 + + Station callsign + @@ -152,6 +155,9 @@ 16777215 + + Maidenhead locator + @@ -206,6 +212,9 @@ 16777215 + + Select method for T/R switching + 1 @@ -292,6 +301,9 @@ 16777215 + + Select port for hardware T/R switching + None @@ -327,6 +339,9 @@ 16777215 + + Select CW ID interval (0 for none) + 0 @@ -350,6 +365,9 @@ + + Send CW ID after a message with 73 or free text + ID after 73 @@ -388,6 +406,9 @@ 16777215 + + Send spots to PSK Reporter web site + Enable PSK Reporter @@ -430,6 +451,9 @@ 16777215 + + Enable computer control of transceiver + Enable CAT @@ -474,6 +498,9 @@ 0 + + Select radio type + @@ -525,6 +552,9 @@ 16777215 + + Select port for CAT control + 0 @@ -872,6 +902,9 @@ + + Use special Tx command for "data" + Data @@ -879,6 +912,9 @@ + + Use normal Tx command + Mic @@ -924,6 +960,9 @@ 16777215 + + Check to see if CAT control is working + Test CAT Control @@ -949,6 +988,9 @@ 16777215 + + Test to see if T/R switching is working + Test PTT @@ -994,6 +1036,9 @@ 0 + + Select interval for reading dial frequency + 60 @@ -1087,6 +1132,9 @@ true + + Select audio input device and driver API + @@ -1119,7 +1167,11 @@ - + + + select audio output device and driver API + + @@ -1146,6 +1198,9 @@ + + Directory for saved audio files + C:\Users\joe\wsjt\map65\save diff --git a/mainwindow.cpp b/mainwindow.cpp index 087022b61..d5fe97f75 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -161,7 +161,6 @@ MainWindow::MainWindow(QSharedMemory *shdmem, QWidget *parent) : m_palette="CuteSDR"; m_RxLog=1; //Write Date and Time to RxLog m_nutc0=9999; - m_NB=false; m_mode="JT9-1"; m_rpt="-15"; m_TRperiod=60; @@ -309,7 +308,6 @@ MainWindow::MainWindow(QSharedMemory *shdmem, QWidget *parent) : "QLabel { background-color : black; color : yellow; }"); ui->labDialFreq->setStyleSheet( \ "QLabel { background-color : black; color : yellow; }"); - ui->frame->hide(); QFile f2("ALL.TXT"); f2.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append); @@ -379,8 +377,6 @@ void MainWindow::writeSettings() settings.setValue("NDepth",m_ndepth); settings.setValue("KB8RQ",m_kb8rq); settings.setValue("MonitorOFF",m_monitorStartOFF); - settings.setValue("NB",m_NB); - settings.setValue("NBslider",m_NBslider); settings.setValue("DialFreq",m_dialFreq); settings.setValue("TxFreq",m_txFreq); settings.setValue("InGain",m_inGain); @@ -466,10 +462,6 @@ void MainWindow::readSettings() ui->actionSave_decoded->setChecked(settings.value( "SaveDecoded",false).toBool()); ui->actionSave_all->setChecked(settings.value("SaveAll",false).toBool()); - m_NB=settings.value("NB",false).toBool(); - ui->NBcheckBox->setChecked(m_NB); - m_NBslider=settings.value("NBslider",40).toInt(); - ui->NBslider->setValue(m_NBslider); m_dialFreq=settings.value("DialFreq",14.078).toDouble(); m_txFreq=settings.value("TxFreq",1500).toInt(); ui->TxFreqSpinBox->setValue(m_txFreq); @@ -2458,18 +2450,6 @@ void MainWindow::on_actionJT9_30_triggered() g_pWideGraph->setfMax(1050); } -void MainWindow::on_NBcheckBox_toggled(bool checked) -{ - m_NB=checked; - ui->NBslider->setEnabled(m_NB); -} - -void MainWindow::on_NBslider_valueChanged(int n) -{ - m_NBslider=n; - ui->NBcheckBox->setText("NB: " + QString::number(n)); -} - void MainWindow::on_TxFreqSpinBox_valueChanged(int n) { m_txFreq=n; diff --git a/mainwindow.h b/mainwindow.h index 0013721ba..015875871 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -102,8 +102,6 @@ private slots: void on_actionJT9_5_triggered(); void on_actionJT9_30_triggered(); void on_actionJT9_10_triggered(); - void on_NBcheckBox_toggled(bool checked); - void on_NBslider_valueChanged(int value); void on_TxFreqSpinBox_valueChanged(int arg1); void on_actionSave_synced_triggered(); void on_actionSave_decoded_triggered(); @@ -187,7 +185,6 @@ private: qint32 m_hsym0; qint32 m_paInDevice; qint32 m_paOutDevice; - qint32 m_NBslider; qint32 m_TRperiod; qint32 m_nsps; qint32 m_hsymStop; @@ -227,7 +224,6 @@ private: bool m_saveAll; bool m_widebandDecode; bool m_kb8rq; - bool m_NB; bool m_call3Modified; bool m_dataAvailable; bool m_killAll; diff --git a/mainwindow.ui b/mainwindow.ui index c2cdc926c..8a1e2885e 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -389,6 +389,9 @@ p, li { white-space: pre-wrap; } 0 + + Enter this QSO in ADIF log + Log &QSO @@ -402,6 +405,9 @@ p, li { white-space: pre-wrap; } 0 + + Stop monitoring + &Stop @@ -427,6 +433,9 @@ p, li { white-space: pre-wrap; } 16777215 + + Start monitoring + &Monitor @@ -440,6 +449,9 @@ p, li { white-space: pre-wrap; } 0 + + Decode most recent Rx period at QSO Frequency (use shift for all freqs) + &Decode @@ -453,6 +465,9 @@ p, li { white-space: pre-wrap; } 0 + + Erase QSO Frequency window. Double-click for both windows + &Erase @@ -472,6 +487,9 @@ p, li { white-space: pre-wrap; } 0 + + Toggle Tx Enable On/Off + E&nable Tx @@ -491,6 +509,9 @@ p, li { white-space: pre-wrap; } 0 + + Set Tx Enable OFF + &Halt Tx @@ -498,6 +519,9 @@ p, li { white-space: pre-wrap; } + + Assert PTT and emit a pure tone + &Tune @@ -537,7 +561,16 @@ p, li { white-space: pre-wrap; } 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -599,6 +632,9 @@ p, li { white-space: pre-wrap; } 16777215 + + Switch to this Tx message NOW + Qt::LeftToRight @@ -627,11 +663,14 @@ p, li { white-space: pre-wrap; } 16777215 + + Send this message in next Tx interval + - buttonGroup + buttonGroup @@ -655,6 +694,9 @@ p, li { white-space: pre-wrap; } 16777215 + + Send this message in next Tx interval + @@ -662,7 +704,7 @@ p, li { white-space: pre-wrap; } true - buttonGroup + buttonGroup @@ -686,11 +728,14 @@ p, li { white-space: pre-wrap; } 16777215 + + Send this message in next Tx interval + - buttonGroup + buttonGroup @@ -734,6 +779,9 @@ p, li { white-space: pre-wrap; } 16777215 + + Switch to this Tx message NOW + Tx 3 @@ -747,6 +795,9 @@ p, li { white-space: pre-wrap; } 16777215 + + Switch to this Tx message NOW + Tx 4 @@ -754,6 +805,9 @@ p, li { white-space: pre-wrap; } + + Queue up the next Tx message + Next @@ -801,6 +855,9 @@ p, li { white-space: pre-wrap; } 16777215 + + Right-click to select a macro message + @@ -811,6 +868,9 @@ p, li { white-space: pre-wrap; } 16777215 + + Switch to this Tx message NOW + Tx 5 @@ -836,16 +896,22 @@ p, li { white-space: pre-wrap; } 16777215 + + Send this message in next Tx interval + - buttonGroup + buttonGroup + + Switch to this Tx message NOW + Now @@ -874,6 +940,9 @@ p, li { white-space: pre-wrap; } 16777215 + + Generate standard messages for minimal QSO + Generate Std Msgs @@ -931,6 +1000,9 @@ p, li { white-space: pre-wrap; } 16777215 + + Switch to this Tx message NOW + Tx 6 @@ -944,6 +1016,9 @@ p, li { white-space: pre-wrap; } 16777215 + + Switch to this Tx message NOW + Tx 2 @@ -969,11 +1044,14 @@ p, li { white-space: pre-wrap; } 16777215 + + Send this message in next Tx interval + - buttonGroup + buttonGroup @@ -997,11 +1075,14 @@ p, li { white-space: pre-wrap; } 16777215 + + Send this message in next Tx interval + - buttonGroup + buttonGroup @@ -1039,7 +1120,16 @@ p, li { white-space: pre-wrap; } 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -1082,6 +1172,9 @@ p, li { white-space: pre-wrap; } + + Generate a CQ message + CQ @@ -1089,6 +1182,9 @@ p, li { white-space: pre-wrap; } + + Generate message with RRR + RRR @@ -1096,6 +1192,9 @@ p, li { white-space: pre-wrap; } + + Generate message with report + dB @@ -1125,6 +1224,9 @@ p, li { white-space: pre-wrap; } + + Generate message for replying to a CQ + Grid @@ -1132,6 +1234,9 @@ p, li { white-space: pre-wrap; } + + Generate message with R+report + R+dB @@ -1139,6 +1244,9 @@ p, li { white-space: pre-wrap; } + + Generate message with 73 + 73 @@ -1181,6 +1289,9 @@ p, li { white-space: pre-wrap; } 26 + + Send this standard (generated) message + Gen msg @@ -1223,6 +1334,9 @@ p, li { white-space: pre-wrap; } 26 + + Send this free-text message (max 13 characters) + Free msg @@ -1339,6 +1453,9 @@ p, li { white-space: pre-wrap; } + + Select operating band + 7 @@ -1468,6 +1585,9 @@ p, li { white-space: pre-wrap; } 16777215 + + Signal report (dB0 + -50 @@ -1508,6 +1628,9 @@ p, li { white-space: pre-wrap; } false + + USB dial frequency + 14.078 @@ -1530,6 +1653,9 @@ p, li { white-space: pre-wrap; } 16777215 + + Check to Tx in even minutes, uncheck for odd minutes + Tx even @@ -1555,6 +1681,9 @@ p, li { white-space: pre-wrap; } 180 + + dB above one bit in A/D samples + 1 @@ -1592,6 +1721,9 @@ p, li { white-space: pre-wrap; } 180 + + Digital gain for audio input + -50 @@ -1623,6 +1755,9 @@ p, li { white-space: pre-wrap; } 16777215 + + Audio Tx frequency + Hz @@ -1694,6 +1829,9 @@ p, li { white-space: pre-wrap; } 16777215 + + Set Tx frequency to Rx Frequency + Tx=Rx @@ -1713,6 +1851,9 @@ p, li { white-space: pre-wrap; } 16777215 + + Set Rx frequency to Tx Frequency + Rx=Tx @@ -1815,6 +1956,9 @@ p, li { white-space: pre-wrap; } 16777215 + + Search for callsign in database + &Lookup @@ -1834,6 +1978,9 @@ p, li { white-space: pre-wrap; } 16777215 + + Add callsign and locator to database + Add @@ -1884,142 +2031,6 @@ p, li { white-space: pre-wrap; } - - - - - 0 - 0 - - - - - 105 - 60 - - - - - 105 - 60 - - - - - - - - - 252 - 252 - 252 - - - - - - - 172 - 191 - 166 - - - - - - - - - 252 - 252 - 252 - - - - - - - 172 - 191 - 166 - - - - - - - - - 172 - 191 - 166 - - - - - - - 172 - 191 - 166 - - - - - - - - true - - - QFrame::StyledPanel - - - QFrame::Plain - - - - 0 - - - 0 - - - - - 6 - - - - - - 100 - 16777215 - - - - NB - - - - - - - - 100 - 16777215 - - - - Qt::Horizontal - - - - - - - - @@ -2132,6 +2143,9 @@ p, li { white-space: pre-wrap; } 16777215 + + Locator of station to be worked + @@ -2160,6 +2174,9 @@ p, li { white-space: pre-wrap; } 16777215 + + Callsign of station to be worked + @@ -2192,6 +2209,9 @@ p, li { white-space: pre-wrap; } 15 + + If orange, click to read dial frequency once + @@ -2887,8 +2907,6 @@ p, li { white-space: pre-wrap; } inGain decodedTextBrowser2 decodedTextBrowser - NBcheckBox - NBslider diff --git a/widegraph.ui b/widegraph.ui index 80f1957a8..70f7b0aa8 100644 --- a/widegraph.ui +++ b/widegraph.ui @@ -107,6 +107,9 @@ 16777215 + + Compression factor for frequency scale + @@ -179,6 +182,9 @@ 16777215 + + Number of FFTs averaged (controls waterfall scrolling rate) + 1 @@ -230,6 +236,9 @@ 16777215 + + Scaling (dB) applied to spectra before plotting + -20 @@ -281,6 +290,9 @@ 16777215 + + Constant offset applied to waterfall data + -100 @@ -332,6 +344,9 @@ 0 + + Minimum frequency for wideband decodes + 1000 @@ -386,6 +401,9 @@ 0 + + Maximum frequency for wideband decodes + 1000 @@ -418,6 +436,9 @@ + + Select data for display curve + 1