diff --git a/owrx/controllers/settings/backgrounddecoding.py b/owrx/controllers/settings/backgrounddecoding.py
index 9ee9596..2951de7 100644
--- a/owrx/controllers/settings/backgrounddecoding.py
+++ b/owrx/controllers/settings/backgrounddecoding.py
@@ -12,8 +12,7 @@ class BackgroundDecodingController(SettingsFormController):
"Background decoding",
CheckboxInput(
"services_enabled",
- "Service",
- checkboxText="Enable background decoding services",
+ "Enable background decoding services",
),
ServicesCheckboxInput("services_decoders", "Enabled services"),
),
diff --git a/owrx/controllers/settings/decoding.py b/owrx/controllers/settings/decoding.py
index 92427b8..105304f 100644
--- a/owrx/controllers/settings/decoding.py
+++ b/owrx/controllers/settings/decoding.py
@@ -37,14 +37,13 @@ class DecodingSettingsController(SettingsFormController):
),
CheckboxInput(
"digital_voice_dmr_id_lookup",
- "DMR id lookup",
- checkboxText='Enable lookup of DMR ids in the '
+ 'Enable lookup of DMR ids in the '
+ "radioid database to show callsigns and names",
),
),
Section(
"Digimodes",
- CheckboxInput("digimodes_enable", "", checkboxText="Enable Digimodes"),
+ CheckboxInput("digimodes_enable", "Enable Digimodes"),
NumberInput("digimodes_fft_size", "Digimodes FFT size", append="bins"),
),
Section(
diff --git a/owrx/controllers/settings/reporting.py b/owrx/controllers/settings/reporting.py
index dfd8c3c..1ae6a40 100644
--- a/owrx/controllers/settings/reporting.py
+++ b/owrx/controllers/settings/reporting.py
@@ -14,8 +14,7 @@ class ReportingController(SettingsFormController):
"APRS-IS reporting",
CheckboxInput(
"aprs_igate_enabled",
- "APRS I-Gate",
- checkboxText="Send received APRS data to APRS-IS",
+ "Send received APRS data to APRS-IS",
),
TextInput(
"aprs_callsign",
@@ -26,8 +25,7 @@ class ReportingController(SettingsFormController):
TextInput("aprs_igate_password", "APRS-IS network password"),
CheckboxInput(
"aprs_igate_beacon",
- "APRS beacon",
- checkboxText="Send the receiver position to the APRS-IS network",
+ "Send the receiver position to the APRS-IS network",
infotext="Please check that your receiver location is setup correctly before enabling the beacon",
),
DropdownInput(
@@ -60,8 +58,7 @@ class ReportingController(SettingsFormController):
"pskreporter settings",
CheckboxInput(
"pskreporter_enabled",
- "Reporting",
- checkboxText="Enable sending spots to pskreporter.info",
+ "Enable sending spots to pskreporter.info",
),
TextInput(
"pskreporter_callsign",
@@ -79,8 +76,7 @@ class ReportingController(SettingsFormController):
"WSPRnet settings",
CheckboxInput(
"wsprnet_enabled",
- "Reporting",
- checkboxText="Enable sending spots to wsprnet.org",
+ "Enable sending spots to wsprnet.org",
),
TextInput(
"wsprnet_callsign",
diff --git a/owrx/form/__init__.py b/owrx/form/__init__.py
index 27ad9ed..fbbbc42 100644
--- a/owrx/form/__init__.py
+++ b/owrx/form/__init__.py
@@ -139,8 +139,8 @@ class TextAreaInput(Input):
class CheckboxInput(Input):
- def __init__(self, id, label, checkboxText, infotext=None, converter: Converter = None):
- super().__init__(id, label, infotext=infotext, converter=converter)
+ def __init__(self, id, checkboxText, infotext=None, converter: Converter = None):
+ super().__init__(id, "", infotext=infotext, converter=converter)
self.checkboxText = checkboxText
def render_input(self, value):
diff --git a/owrx/form/device.py b/owrx/form/device.py
index 627e38b..cd987f1 100644
--- a/owrx/form/device.py
+++ b/owrx/form/device.py
@@ -124,7 +124,7 @@ class GainInput(Input):
class BiasTeeInput(CheckboxInput):
def __init__(self):
super().__init__(
- "bias_tee", "", "Enable Bias-Tee power supply", converter=OptionalConverter(defaultFormValue=False)
+ "bias_tee", "Enable Bias-Tee power supply", converter=OptionalConverter(defaultFormValue=False)
)
diff --git a/owrx/source/__init__.py b/owrx/source/__init__.py
index ecea90d..46be223 100644
--- a/owrx/source/__init__.py
+++ b/owrx/source/__init__.py
@@ -392,7 +392,7 @@ class SdrDeviceDescription(object):
def getInputs(self) -> List[Input]:
return [
TextInput("name", "Device name"),
- CheckboxInput("enabled", "", "Enable this device", converter=OptionalConverter(defaultFormValue=True)),
+ CheckboxInput("enabled", "Enable this device", converter=OptionalConverter(defaultFormValue=True)),
NumberInput(
"ppm",
"Frequency correction",
@@ -401,8 +401,7 @@ class SdrDeviceDescription(object):
),
CheckboxInput(
"always-on",
- "",
- checkboxText="Keep device running at all times",
+ "Keep device running at all times",
infotext="Prevents shutdown of the device when idle. Useful for devices with unreliable startup.",
converter=OptionalConverter(defaultFormValue=False),
),
diff --git a/owrx/source/airspy.py b/owrx/source/airspy.py
index 70005be..5a907ff 100644
--- a/owrx/source/airspy.py
+++ b/owrx/source/airspy.py
@@ -26,8 +26,7 @@ class AirspyDeviceDescription(SoapyConnectorDeviceDescription):
BiasTeeInput(),
CheckboxInput(
"bitpack",
- "",
- checkboxText="Enable bit-packing",
+ "Enable bit-packing",
infotext="Packs two 12-bit samples into 3 bytes."
+ " Lowers USB bandwidth consumption, increases CPU load",
converter=OptionalConverter(defaultFormValue=False),
diff --git a/owrx/source/connector.py b/owrx/source/connector.py
index 10d6bcb..e4b5a1a 100644
--- a/owrx/source/connector.py
+++ b/owrx/source/connector.py
@@ -87,8 +87,7 @@ class ConnectorDeviceDescription(SdrDeviceDescription):
),
CheckboxInput(
"iqswap",
- "",
- checkboxText="Swap I and Q channels",
+ "Swap I and Q channels",
infotext="Swapping inverts the spectrum, so this is useful in combination with an inverting mixer",
converter=OptionalConverter(defaultFormValue=False),
),
diff --git a/owrx/source/sdrplay.py b/owrx/source/sdrplay.py
index 63b0cef..dbf6d7d 100644
--- a/owrx/source/sdrplay.py
+++ b/owrx/source/sdrplay.py
@@ -42,14 +42,12 @@ class SdrplayDeviceDescription(SoapyConnectorDeviceDescription):
BiasTeeInput(),
CheckboxInput(
"rf_notch",
- "",
- checkboxText="Enable RF notch filter",
+ "Enable RF notch filter",
converter=OptionalConverter(defaultFormValue=True),
),
CheckboxInput(
"dab_notch",
- "",
- checkboxText="Enable DAB notch filter",
+ "Enable DAB notch filter",
converter=OptionalConverter(defaultFormValue=True),
),
DropdownInput(