Add files via upload

#44

dialogconfig.cpp

@@ -216,9 +216,9 @@ void DialogConfig::on_buttonBox_accepted()
         {
             rigCom.netRigctl = false;
             rigCom.rigPort = ui->comboBox_comPort->currentText();
-            rigCom.serialSpeed = ui->comboBox_serialSpeed->currentText().toInt();
+            //rigCom.serialSpeed = ui->comboBox_serialSpeed->currentText().toInt();
-            rigCom.civAddr = ui->lineEdit_civAddr->text().toInt(&civAddrConv,16);
+            //rigCom.civAddr = ui->lineEdit_civAddr->text().toInt(&civAddrConv,16);
-            setRigSerialConfigFromDialog();
+            //setRigSerialConfigFromDialog();
 
             if (rigCom.rigPort == "" && rigCom.rigModel != 1 && rigCom.rigModel != 6)
             {
@@ -230,6 +230,10 @@ void DialogConfig::on_buttonBox_accepted()
                 msgBox.exec();
             }
         }
+
+        rigCom.serialSpeed = ui->comboBox_serialSpeed->currentText().toInt();
+        rigCom.civAddr = ui->lineEdit_civAddr->text().toInt(&civAddrConv,16);
+        setRigSerialConfigFromDialog();
     }
 
     rigCom.rigRefresh = ui->spinBox_RefreshRate->value();
@@ -286,11 +290,11 @@ void DialogConfig::on_checkBox_netRigctl_toggled(bool checked)
 {
     if (checked)    //TCP port
     {
-        ui->comboBox_comPort->setCurrentText("");   //clear COM port
+        //ui->comboBox_comPort->setCurrentText("");   //clear COM port
     }
     else    //COM port
     {
-        ui->lineEdit_ip->setText("");   //clear IP address
+        //ui->lineEdit_ip->setText("");   //clear IP address
     }
 }
 
@@ -310,7 +314,7 @@ void DialogConfig::on_comboBox_rigModel_currentIndexChanged(int index)
         rig = rig_init(currentRig);
         if (rig->caps->port_type == RIG_PORT_SERIAL)
         {
-            ui->checkBox_netRigctl->setChecked(false);
+            //ui->checkBox_netRigctl->setChecked(false);
             ui->tabWidget_Config->setCurrentIndex(0);
             setDialogSerialConfig(rig->caps->serial_data_bits, rig->caps->serial_parity, rig->caps->serial_stop_bits, rig->caps->serial_handshake);
             //qDebug() << rig->caps->serial_data_bits << rig->caps->serial_parity << rig->caps->serial_stop_bits << rig->caps->serial_handshake;