Little cleanup of the new widgets

bandbuttons.h

@@ -56,43 +56,24 @@ public slots:
 
 private slots:
     void on_band2200mbtn_clicked();
-
     void on_band630mbtn_clicked();
-
     void on_band160mbtn_clicked();
-
     void on_band80mbtn_clicked();
-
     void on_band60mbtn_clicked();
-
     void on_band40mbtn_clicked();
-
     void on_band30mbtn_clicked();
-
     void on_band20mbtn_clicked();
-
     void on_band17mbtn_clicked();
-
     void on_band15mbtn_clicked();
-
     void on_band12mbtn_clicked();
-
     void on_band10mbtn_clicked();
-
     void on_band6mbtn_clicked();
-
     void on_band4mbtn_clicked();
-
     void on_band2mbtn_clicked();
-
     void on_band70cmbtn_clicked();
-
     void on_band23cmbtn_clicked();
-
     void on_bandWFMbtn_clicked();
-
     void on_bandAirbtn_clicked();
-
     void on_bandGenbtn_clicked();
 
 private:

frequencyinputwidget.cpp

@@ -14,6 +14,12 @@ frequencyinputwidget::~frequencyinputwidget()
     delete ui;
 }
 
+void frequencyinputwidget::showEvent(QShowEvent *event)
+{
+    ui->freqMhzLineEdit->setFocus();
+    QWidget::showEvent(event);
+}
+
 void frequencyinputwidget::setAutomaticSidebandSwitching(bool autossb)
 {
     this->automaticSidebandSwitching = autossb;
@@ -124,6 +130,7 @@ void frequencyinputwidget::on_fStoBtn_clicked()
     } else {
         //showStatusBarText(QString("Could not store preset to %1. Valid preset numbers are 0 to 99").arg(preset_number));
     }
+    ui->freqMhzLineEdit->clear();
 }
 
 void frequencyinputwidget::on_fRclBtn_clicked()
@@ -148,6 +155,7 @@ void frequencyinputwidget::on_fRclBtn_clicked()
     } else {
         qInfo(logSystem()) << "Could not recall preset. Valid presets are 0 through 99.";
     }
+    ui->freqMhzLineEdit->clear();
 }
 
 void frequencyinputwidget::on_fEnterBtn_clicked()
@@ -204,8 +212,12 @@ void frequencyinputwidget::on_goFreqBtn_clicked()
         f.MHzDouble = (float)f.Hz / 1E6;
         emit updateUIFrequency(f);
         currentFrequency = f;
+    } else {
+        qWarning(logGui()) << "Could not understand frequency" << ui->freqMhzLineEdit->text();
+        ui->freqMhzLineEdit->clear();
     }
 
+    //ui->freqMhzLineEdit->clear();
     ui->freqMhzLineEdit->selectAll();
     freqTextSelected = true;
     //ui->tabWidget->setCurrentIndex(0);

frequencyinputwidget.h

@@ -33,40 +33,24 @@ public slots:
     void setAutomaticSidebandSwitching(bool autossb);
 
 private slots:
+    void showEvent(QShowEvent *event);
     void on_f1btn_clicked();
-
     void on_f2btn_clicked();
-
     void on_f3btn_clicked();
-
     void on_f4btn_clicked();
-
     void on_f5btn_clicked();
-
     void on_f6btn_clicked();
-
     void on_f7btn_clicked();
-
     void on_f8btn_clicked();
-
     void on_f9btn_clicked();
-
     void on_fDotbtn_clicked();
-
     void on_f0btn_clicked();
-
     void on_fCEbtn_clicked();
-
     void on_fStoBtn_clicked();
-
     void on_fRclBtn_clicked();
-
     void on_fEnterBtn_clicked();
-
     void on_fBackbtn_clicked();
-
     void on_goFreqBtn_clicked();
-
     void on_freqMhzLineEdit_returnPressed();
 
 private:

repeatersetup.cpp

@@ -446,7 +446,7 @@ void repeaterSetup::showEvent(QShowEvent *event)
     if(rig.hasRepeaterModes)
         emit getRptDuplexOffset();
 
-    QMainWindow::showEvent(event);
+    QWidget::showEvent(event);
 }
 
 void repeaterSetup::on_splitEnableChk_clicked()

repeatersetup.h

@@ -74,41 +74,23 @@ private slots:
     void on_toneDTCS_clicked();    
     void on_splitPlusButton_clicked();
     void on_splitMinusBtn_clicked();
-
     void on_splitTxFreqSetBtn_clicked();
-
     void on_selABtn_clicked();
-
     void on_selBBtn_clicked();
-
     void on_aEqBBtn_clicked();
-
     void on_swapABBtn_clicked();
-
     void on_selMainBtn_clicked();
-
     void on_selSubBtn_clicked();
-
     void on_mEqSBtn_clicked();
-
     void on_swapMSBtn_clicked();
-
     void on_setToneSubVFOBtn_clicked();
-
     void on_setRptrSubVFOBtn_clicked();
-
     void on_rptrOffsetSetBtn_clicked();
-
     void on_splitOffBtn_clicked();
-
     void on_splitEnableChk_clicked();
-
     void on_rptrOffsetEdit_returnPressed();
-
     void on_splitTransmitFreqEdit_returnPressed();
-
     void on_setSplitRptrToneChk_clicked(bool checked);
-
     void on_quickSplitChk_clicked(bool checked);
 
 private:

wfmain.cpp

@@ -3151,14 +3151,12 @@ void wfmain::shortcutF1()
 
 void wfmain::shortcutF2()
 {
-    ui->tabWidget->setCurrentIndex(1);
+    showAndRaiseWidget(bandbtns);
 }
 
 void wfmain::shortcutF3()
 {
-    ui->tabWidget->setCurrentIndex(2);
-    ui->freqMhzLineEdit->clear();
-    ui->freqMhzLineEdit->setFocus();
+    showAndRaiseWidget(finputbtns);
 }
 
 void wfmain::shortcutF4()
@@ -3240,9 +3238,7 @@ void wfmain::shortcutControlU()
 void wfmain::shortcutStar()
 {
     // Jump to frequency tab from Asterisk key on keypad
-    ui->tabWidget->setCurrentIndex(2);
-    ui->freqMhzLineEdit->clear();
-    ui->freqMhzLineEdit->setFocus();
+    showAndRaiseWidget(finputbtns);
 }
 
 void wfmain::shortcutSlash()