Simplify the Q65W GUI.

q65w/mainwindow.cpp

@@ -43,7 +43,6 @@ MainWindow::MainWindow(QWidget *parent) :
   ui->labTol1->setStyleSheet( \
         "QLabel { background-color : white; color : black; }");
   ui->labTol1->setFrameStyle(QFrame::Panel | QFrame::Sunken);
-  ui->dxStationGroupBox->setStyleSheet("QFrame{border: 5px groove red}");
 
   QActionGroup* paletteGroup = new QActionGroup(this);
   ui->actionCuteSDR->setActionGroup(paletteGroup);
@@ -212,8 +211,6 @@ void MainWindow::writeSettings()
     SettingsGroup g {&settings, "MainWindow"};
     settings.setValue("geometry", saveGeometry());
     settings.setValue("MRUdir", m_path);
-    settings.setValue("DXcall",ui->dxCallEntry->text());
-    settings.setValue("DXgrid",ui->dxGridEntry->text());
   }
 
   SettingsGroup g {&settings, "Common"};
@@ -257,8 +254,6 @@ void MainWindow::readSettings()
   {
     SettingsGroup g {&settings, "MainWindow"};
     restoreGeometry(settings.value("geometry").toByteArray());
-    ui->dxCallEntry->setText(settings.value("DXcall","").toString());
-    ui->dxGridEntry->setText(settings.value("DXgrid","").toString());
     m_path = settings.value("MRUdir", m_appDir + "/save").toString();
   }
 
@@ -525,10 +520,6 @@ void MainWindow::keyPressEvent( QKeyEvent *e )                //keyPressEvent
 {
   switch(e->key())
   {
-  case Qt::Key_F4:
-    ui->dxCallEntry->setText("");
-    ui->dxGridEntry->setText("");
-    break;
   case Qt::Key_F6:
     if(e->modifiers() & Qt::ShiftModifier) {
       on_actionDecode_remaining_files_in_directory_triggered();
@@ -882,13 +873,9 @@ void MainWindow::decode()                                       //decode()
 
   QString mcall=(m_myCall+"            ").mid(0,12);
   QString mgrid=(m_myGrid+"            ").mid(0,6);
-  QString hcall=(ui->dxCallEntry->text()+"            ").mid(0,12);
-  QString hgrid=(ui->dxGridEntry->text()+"      ").mid(0,6);
 
   memcpy(datcom_.mycall, mcall.toLatin1(), 12);
   memcpy(datcom_.mygrid, mgrid.toLatin1(), 6);
-  memcpy(datcom_.hiscall, hcall.toLatin1(), 12);
-  memcpy(datcom_.hisgrid, hgrid.toLatin1(), 6);
   if(m_diskData) {
     memcpy(datcom_.datetime, fname.toLatin1(), 11);
   } else {
@@ -1022,157 +1009,6 @@ void MainWindow::guiUpdate()
   }
 }
 
-void MainWindow::lookup()                                       //lookup()
-{
-  QString hiscall=ui->dxCallEntry->text().toUpper().trimmed();
-  ui->dxCallEntry->setText(hiscall);
-  QString call3File = m_appDir + "/CALL3.TXT";
-  QFile f(call3File);
-  if(!f.open(QIODevice::ReadOnly | QIODevice::Text)) {
-    msgBox("Cannot open " + call3File);
-    return;
-  }
-  char c[132];
-  qint64 n=0;
-  for(int i=0; i<999999; i++) {
-    n=f.readLine(c,sizeof(c));
-    if(n <= 0) {
-      ui->dxGridEntry->setText("");
-      break;
-     }
-    QString t=QString(c);
-    if(t.indexOf(hiscall)==0) {
-      int i1=t.indexOf(",");
-      QString hisgrid=t.mid(i1+1,6);
-      i1=hisgrid.indexOf(",");
-      if(i1>0) {
-        hisgrid=hisgrid.mid(0,4);
-      } else {
-        hisgrid=hisgrid.mid(0,4) + hisgrid.mid(4,2).toLower();
-      }
-      ui->dxGridEntry->setText(hisgrid);
-      break;
-    }
-  }
-  f.close();
-}
-
-void MainWindow::on_lookupButton_clicked()                    //Lookup button
-{
-  lookup();
-}
-
-void MainWindow::on_addButton_clicked()                       //Add button
-{
-  if(ui->dxGridEntry->text()=="") {
-    msgBox("Please enter a valid grid locator.");
-    return;
-  }
-  m_call3Modified=false;
-  QString hiscall=ui->dxCallEntry->text().toUpper().trimmed();
-  QString hisgrid=ui->dxGridEntry->text().trimmed();
-  QString newEntry=hiscall + "," + hisgrid;
-
-  int ret = QMessageBox::warning(this, "Add",
-       newEntry + "\n" + "Is this station known to be active on EME?",
-       QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
-  if(ret==QMessageBox::Yes) {
-    newEntry += ",EME,,";
-  } else {
-    newEntry += ",,,";
-  }
-  QString call3File = m_appDir + "/CALL3.TXT";
-  QFile f1(call3File);
-  if(!f1.open(QIODevice::ReadWrite | QIODevice::Text)) {
-    msgBox("Cannot open " + call3File);
-    return;
-  }
-
-  if(f1.size()==0) {
-    QTextStream out(&f1);
-    out << "ZZZZZZ"
-#if QT_VERSION >= QT_VERSION_CHECK (5, 15, 0)
-        << Qt::endl
-#else
-        << endl
-#endif
-      ;
-    f1.seek (0);
-  }
-
-  QString tmpFile = m_appDir + "/CALL3.TMP";
-  QFile f2(tmpFile);
-  if(!f2.open(QIODevice::ReadWrite | QIODevice::Truncate | QIODevice::Text)) {
-    msgBox("Cannot open " + tmpFile);
-    return;
-  }
-  {
-    QTextStream in(&f1);
-    QTextStream out(&f2);
-    QString hc=hiscall;
-    QString hc1="";
-    QString hc2="000000";
-    QString s;
-    do {
-      s=in.readLine();
-      hc1=hc2;
-      if(s.mid(0,2)=="//") {
-        out << s + "\n";
-      } else {
-        int i1=s.indexOf(",");
-        hc2=s.mid(0,i1);
-        if(hc>hc1 && hc<hc2) {
-          out << newEntry + "\n";
-          out << s + "\n";
-          m_call3Modified=true;
-        } else if(hc==hc2) {
-          QString t=s + "\n\n is already in CALL3.TXT\n" +
-            "Do you wish to replace it?";
-          int ret = QMessageBox::warning(this, "Add",t,
-                                         QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
-          if(ret==QMessageBox::Yes) {
-            out << newEntry + "\n";
-            m_call3Modified=true;
-          }
-        } else {
-          if(s!="") out << s + "\n";
-        }
-      }
-    } while(!s.isNull());
-    if(hc>hc1 && !m_call3Modified) out << newEntry + "\n";
-  }
-
-  if(m_call3Modified) {
-    auto const& old_path = m_appDir + "/CALL3.OLD";
-    QFile f0 {old_path};
-    if (f0.exists ()) f0.remove ();
-    f1.copy (old_path);         // copying as we want to preserve
-                                // symlinks
-    f1.open (QFile::WriteOnly | QFile::Text); // truncates
-    f2.seek (0);
-    f1.write (f2.readAll ());   // copy contents
-    f2.remove ();
-  }
-}
-
-void MainWindow::on_dxCallEntry_textChanged(const QString &t) //dxCall changed
-{
-  m_hisCall=t.toUpper().trimmed();
-  ui->dxCallEntry->setText(m_hisCall);
-}
-
-void MainWindow::on_dxGridEntry_textChanged(const QString &t) //dxGrid changed
-{
-  int n=t.length();
-  if(n!=4 and n!=6) return;
-  if(!t[0].isLetter() or !t[1].isLetter()) return;
-  if(!t[2].isDigit() or !t[3].isDigit()) return;
-  if(n==4) m_hisGrid=t.mid(0,2).toUpper() + t.mid(2,2);
-  if(n==6) m_hisGrid=t.mid(0,2).toUpper() + t.mid(2,2) +
-      t.mid(4,2).toLower();
-  ui->dxGridEntry->setText(m_hisGrid);
-}
-
 void MainWindow::on_actionQ65A_triggered()
 {
   m_modeQ65=1;

q65w/mainwindow.h

@@ -69,10 +69,6 @@ private slots:
   void decode();
   void decodeBusy(bool b);
   void on_EraseButton_clicked();
-  void on_lookupButton_clicked();
-  void on_addButton_clicked();
-  void on_dxCallEntry_textChanged(const QString &arg1);
-  void on_dxGridEntry_textChanged(const QString &arg1);
   void bumpDF(int n);
   void on_actionSettings_triggered();
   void on_NBcheckBox_toggled(bool checked);
@@ -173,7 +169,6 @@ private:
   QString m_hisGrid;
   QString m_saveDir;
   QString m_azelDir;
-  QString m_dxccPfx;
   QString m_palette;
   QString m_dateTime;
   QString m_mode;
@@ -193,7 +188,6 @@ private:
   void createStatusBar();
   void updateStatusBar();
   void msgBox(QString t);
-  void lookup();
   bool isGrid4(QString g);
 };
 

q65w/mainwindow.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>472</width>
-    <height>523</height>
+    <height>431</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -35,10 +35,10 @@
    <string notr="true"/>
   </property>
   <widget class="QWidget" name="centralWidget">
-   <layout class="QVBoxLayout" name="verticalLayout_8">
+   <layout class="QVBoxLayout" name="verticalLayout">
-    <item>
-     <layout class="QVBoxLayout" name="verticalLayout_7">
     <item>
+     <layout class="QFormLayout" name="formLayout">
+      <item row="0" column="0">
        <widget class="QGroupBox" name="groupBox">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
@@ -61,8 +61,8 @@
         <property name="title">
          <string>     UTC                Freq               DT           dB       Message</string>
         </property>
-        <layout class="QVBoxLayout" name="verticalLayout_9">
+        <layout class="QFormLayout" name="formLayout_2">
-         <item>
+         <item row="0" column="0">
           <widget class="DisplayText" name="decodedTextBrowser">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Maximum" vsizetype="Expanding">
@@ -109,69 +109,14 @@ p, li { white-space: pre-wrap; }
         </layout>
        </widget>
       </item>
-      <item>
+      <item row="1" column="0">
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <layout class="QGridLayout" name="gridLayout">
-        <item>
+        <item row="0" column="0" rowspan="3">
-         <widget class="QPushButton" name="monitorButton">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>50</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16777215</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>&amp;Monitor</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="EraseButton">
-          <property name="minimumSize">
-           <size>
-            <width>50</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>&amp;Erase</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="DecodeButton">
-          <property name="minimumSize">
-           <size>
-            <width>50</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>&amp;Decode</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_5">
-        <item>
          <widget class="QFrame" name="xMeterFrame">
           <property name="minimumSize">
            <size>
             <width>50</width>
-            <height>0</height>
+            <height>150</height>
            </size>
           </property>
           <property name="frameShape">
@@ -182,176 +127,7 @@ p, li { white-space: pre-wrap; }
           </property>
          </widget>
         </item>
-        <item>
+        <item row="0" column="1" rowspan="2">
-         <layout class="QVBoxLayout" name="verticalLayout">
-          <item>
-           <widget class="QGroupBox" name="dxStationGroupBox">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="minimumSize">
-             <size>
-              <width>164</width>
-              <height>40</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>290</width>
-              <height>16777215</height>
-             </size>
-            </property>
-            <property name="styleSheet">
-             <string notr="true"/>
-            </property>
-            <property name="title">
-             <string>       DX Call             DX Grid     </string>
-            </property>
-            <widget class="QPushButton" name="pushButton">
-             <property name="geometry">
-              <rect>
-               <x>231</x>
-               <y>13</y>
-               <width>50</width>
-               <height>23</height>
-              </rect>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>50</width>
-               <height>16777215</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>SetMsgs</string>
-             </property>
-            </widget>
-            <widget class="QWidget" name="layoutWidget_2">
-             <property name="geometry">
-              <rect>
-               <x>7</x>
-               <y>13</y>
-               <width>150</width>
-               <height>64</height>
-              </rect>
-             </property>
-             <layout class="QVBoxLayout" name="verticalLayout_6">
-              <item>
-               <layout class="QHBoxLayout" name="horizontalLayout_3">
-                <item>
-                 <widget class="QLineEdit" name="dxCallEntry">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="minimumSize">
-                   <size>
-                    <width>0</width>
-                    <height>23</height>
-                   </size>
-                  </property>
-                  <property name="maximumSize">
-                   <size>
-                    <width>70</width>
-                    <height>16777215</height>
-                   </size>
-                  </property>
-                  <property name="text">
-                   <string/>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QLineEdit" name="dxGridEntry">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="minimumSize">
-                   <size>
-                    <width>0</width>
-                    <height>23</height>
-                   </size>
-                  </property>
-                  <property name="maximumSize">
-                   <size>
-                    <width>70</width>
-                    <height>16777215</height>
-                   </size>
-                  </property>
-                  <property name="text">
-                   <string/>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignCenter</set>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-              <item>
-               <layout class="QHBoxLayout" name="horizontalLayout_4">
-                <item>
-                 <widget class="QPushButton" name="lookupButton">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="minimumSize">
-                   <size>
-                    <width>70</width>
-                    <height>0</height>
-                   </size>
-                  </property>
-                  <property name="maximumSize">
-                   <size>
-                    <width>50</width>
-                    <height>16777215</height>
-                   </size>
-                  </property>
-                  <property name="text">
-                   <string>&amp;Lookup</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QPushButton" name="addButton">
-                  <property name="minimumSize">
-                   <size>
-                    <width>70</width>
-                    <height>0</height>
-                   </size>
-                  </property>
-                  <property name="maximumSize">
-                   <size>
-                    <width>50</width>
-                    <height>16777215</height>
-                   </size>
-                  </property>
-                  <property name="text">
-                   <string>Add</string>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
-           </widget>
-          </item>
-          <item>
          <widget class="QLabel" name="labUTC">
           <property name="minimumSize">
            <size>
@@ -382,116 +158,58 @@ p, li { white-space: pre-wrap; }
           </property>
          </widget>
         </item>
-         </layout>
+        <item row="0" column="2">
-        </item>
+         <widget class="QPushButton" name="monitorButton">
-        <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Minimum</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <layout class="QVBoxLayout" name="verticalLayout_5">
-          <item>
-           <spacer name="verticalSpacer_3">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="QSpinBox" name="sbMaxDrift">
-            <property name="toolTip">
-             <string>Maximum drift rate in units of symbol rate per transmissiion.</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
-            <property name="prefix">
-             <string>Max Drift  </string>
-            </property>
-            <property name="maximum">
-             <number>50</number>
-            </property>
-            <property name="singleStep">
-             <number>5</number>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="verticalSpacer">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="NBcheckBox">
-            <property name="text">
-             <string>NB</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QSlider" name="NBslider">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
           <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
+          <property name="minimumSize">
+           <size>
+            <width>50</width>
+            <height>0</height>
+           </size>
+          </property>
           <property name="maximumSize">
            <size>
-              <width>80</width>
+            <width>16777215</width>
             <height>16777215</height>
            </size>
           </property>
-            <property name="minimum">
+          <property name="text">
-             <number>0</number>
+           <string>&amp;Monitor</string>
-            </property>
-            <property name="maximum">
-             <number>100</number>
-            </property>
-            <property name="value">
-             <number>40</number>
-            </property>
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
           </property>
          </widget>
         </item>
-          <item>
+        <item row="0" column="3" colspan="2">
+         <widget class="QPushButton" name="EraseButton">
+          <property name="minimumSize">
+           <size>
+            <width>50</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>&amp;Erase</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="5">
+         <widget class="QPushButton" name="DecodeButton">
+          <property name="minimumSize">
+           <size>
+            <width>50</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>&amp;Decode</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="2" colspan="2">
          <layout class="QHBoxLayout" name="horizontalLayout">
           <item>
            <widget class="QLabel" name="labTol1">
@@ -576,20 +294,62 @@ p, li { white-space: pre-wrap; }
           </item>
          </layout>
         </item>
-         </layout>
+        <item row="1" column="4" colspan="2">
+         <widget class="QSpinBox" name="sbMaxDrift">
+          <property name="toolTip">
+           <string>Maximum drift rate in units of symbol rate per transmissiion.</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+          <property name="prefix">
+           <string>Max Drift  </string>
+          </property>
+          <property name="maximum">
+           <number>50</number>
+          </property>
+          <property name="singleStep">
+           <number>5</number>
+          </property>
+         </widget>
         </item>
-        <item>
+        <item row="2" column="4" colspan="2">
-         <spacer name="horizontalSpacer_2">
+         <widget class="QSlider" name="NBslider">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>80</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="minimum">
+           <number>0</number>
+          </property>
+          <property name="maximum">
+           <number>100</number>
+          </property>
+          <property name="value">
+           <number>40</number>
+          </property>
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" stdset="0">
+         </widget>
-           <size>
+        </item>
-            <width>40</width>
+        <item row="2" column="3">
-            <height>20</height>
+         <widget class="QCheckBox" name="NBcheckBox">
-           </size>
+          <property name="text">
+           <string>NB</string>
           </property>
-         </spacer>
+         </widget>
         </item>
        </layout>
       </item>