From b85c268f2c5f79d60ee8ec3044221b0c3b03600b Mon Sep 17 00:00:00 2001 From: Roeland Jansen Date: Wed, 12 Jan 2022 19:19:11 +0100 Subject: [PATCH] Revert "Added more pages." This reverts commit 700ac53b288fc987f009c9d421192f08ea63d1be. --- wfmain.cpp | 5 +- wfmain.ui | 237 +++-------------------------------------------------- 2 files changed, 13 insertions(+), 229 deletions(-) diff --git a/wfmain.cpp b/wfmain.cpp index 9deffe5..e7238db 100644 --- a/wfmain.cpp +++ b/wfmain.cpp @@ -221,8 +221,9 @@ void wfmain::createSettingsListItems() ui->settingsList->addItem("Radio Settings"); // 2 ui->settingsList->addItem("Radio Server"); // 3 ui->settingsList->addItem("External Control"); // 4 - ui->settingsList->addItem("Experimental"); // 5 - //ui->settingsList->addItem("Audio Processing"); // 6 + ui->settingsList->addItem("Audio Processing"); // 5 + ui->settingsList->addItem("Experimental"); // 6 + ui->settingsList->addItem("About"); // 7 } void wfmain::connectSettingsList() diff --git a/wfmain.ui b/wfmain.ui index 702f54f..1682cf3 100644 --- a/wfmain.ui +++ b/wfmain.ui @@ -2060,7 +2060,7 @@ - 2 + 3 @@ -2920,20 +2920,14 @@ - - - Press here to set the clock of the radio. The command will be sent to the radio when the seconds go to zero. - + Set Clock - - - Check this box to set the radio's clock to UTC. Otherwise, the clock will be set to the local timezone of this computer. - + Use UTC @@ -2970,238 +2964,27 @@ - - - - - - - <html><head/><body><p>Press here to set up the built-in rig server. The built-in server is intended to allow access over the network to a serial or USB-connected radio. </p></body></html> - - - Server Setup - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - 0 - - - 0 - - - - - Audio Sources here - - - - - - - - - Qt::Vertical - - - - 20 - 320 - - - - - - - - - - - - - - Rigctld Server - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Qt::LeftToRight - - - Enable RigCtld - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 40 - 20 - - - - - - - - Port - - - - - - - - 75 - 0 - - - - - 75 - 16777215 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - Virtual Serial Port - - - - - - - - 180 - 0 - - - - - 180 - 16777215 - - - - <html><head/><body><p>Use this to define a virtual serial port. </p><p><br/></p><p>On Windows, the virtual serial port can be used to connect to a serial port loopback device, through which other programs can connect to the radio. </p><p><br/></p><p>On Linux and macOS, the port defined here is a pseudo-terminal device, which may be connected to directly by any program designed for a serial connection. </p></body></html> - - - Virtual Serial Port Selector - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - + - 70 + 350 130 80 25 - <html><head/><body><p>This button runs debug functions, and is provided as a convenience for programmers. The functions executed are under:</p><p><span style=" color:#ffff55;">void</span><span style=" color:#55ff55;">wfmain</span><span style=" color:#aaaaaa;">::</span><span style=" font-weight:600;">on_debugBtn_clicked</span><span style=" color:#aaaaaa;">()</span></p><p>in wfmain.cpp.</p></body></html> + <html><head/><body><p>Press here to set up the built-in rig server. The built-in server is intended to allow access over the network to a serial or USB-connected radio. </p></body></html> - Debug - - - Ctrl+Alt+D + Server Setup + + +