Fixed LAN preferences.

prefs.h

@@ -51,24 +51,24 @@ enum prefCtItem {
 
 enum prefLanItem {
 
-    l_enableLAN = 1 << 1,
-    l_enableRigCtlD = 1 << 2,
-    l_rigCtlPort = 1 << 3,
-    l_tcpPort = 1 << 4,
-    l_waterfallFormat = 1 << 5,
-    l_all = 1 << 6
+    l_enableLAN = 1 << 0,
+    l_enableRigCtlD = 1 << 1,
+    l_rigCtlPort = 1 << 2,
+    l_tcpPort = 1 << 3,
+    l_waterfallFormat = 1 << 4,
+    l_all = 1 << 5
 };
 
 enum prefClusterItem {
-    cl_clusterUdpEnable = 1 << 1,
-    cl_clusterTcpEnable = 1 << 2,
-    cl_clusterUdpPort = 1 << 3,
-    cl_clusterTcpServerName = 1 << 4,
-    cl_clusterTcpUserName = 1 << 5,
-    cl_clusterTcpPassword = 1 << 6,
-    cl_clusterTimeout = 1 << 7,
-    cl_clusterSkimmerSpotsEnable = 1 << 8,
-    cl_all = 1 << 9
+    cl_clusterUdpEnable = 1 << 0,
+    cl_clusterTcpEnable = 1 << 1,
+    cl_clusterUdpPort = 1 << 2,
+    cl_clusterTcpServerName = 1 << 3,
+    cl_clusterTcpUserName = 1 << 4,
+    cl_clusterTcpPassword = 1 << 5,
+    cl_clusterTimeout = 1 << 6,
+    cl_clusterSkimmerSpotsEnable = 1 << 7,
+    cl_all = 1 << 8
 };
 
 

settingswidget.cpp

@@ -312,7 +312,7 @@ void settingswidget::updateRaPref(prefRaItem pra)
         if (serialIndex != -1) {
             ui->serialDeviceListCombo->setCurrentIndex(serialIndex);
         } else {
-            // TODO
+            // TODO: load the combo box with the serial port choices first!
             qWarning(logGui()) << "Cannot find serial port in serial combo box.";
         }
         break;
@@ -403,7 +403,7 @@ void settingswidget::updateLanPref(prefLanItem plan)
         ui->waterfallFormatCombo->blockSignals(false);
         break;
     default:
-        qWarning(logGui()) << "Did not find matching preference for ui update:" << (int)plan;
+        qWarning(logGui()) << "Did not find matching preference for LAN ui update:" << (int)plan;
     }
     updatingUIFromPrefs = false;
 }

wfmain.cpp

@@ -2577,6 +2577,7 @@ void wfmain::loadSettings()
     setupui->updateRaPrefs((int)ra_all);
     setupui->updateCtPrefs((int)ct_all);
     setupui->updateClusterPrefs((int)cl_all);
+    setupui->updateLanPrefs((int)l_all);
 
     setupui->acceptUdpPreferencesPtr(&udpPrefs);
     setupui->updateUdpPrefs((int)u_all);