Skip to content

Commit ecfe9fc

Browse files
committed
Merge branch 'master' of https://github.com/mbridak/not1mm into just_testing_an_idea
2 parents 655c713 + 5e31d3e commit ecfe9fc

File tree

8 files changed

+37
-15
lines changed

8 files changed

+37
-15
lines changed

not1mm/lib/new_contest.py

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,15 @@ def store(self):
1818

1919
def add_exchange_hint(self):
2020
"""add hint"""
21+
self.soapbox.setPlaceholderText("")
22+
self.exchange.setPlaceholderText("")
2123
contest_name = self.contest.currentText().lower().replace(" ", "_")
22-
try:
23-
temp = importlib.import_module(f"not1mm.plugins.{contest_name}")
24-
if hasattr(temp, "EXCHANGE_HINT"):
25-
self.exchange.setPlaceholderText(temp.EXCHANGE_HINT)
26-
else:
27-
self.exchange.setPlaceholderText("")
28-
if hasattr(temp, "SOAPBOX_HINT"):
29-
self.soapbox.setPlaceholderText(temp.SOPHBOX_HINT)
30-
else:
31-
self.soapbox.setPlaceholderText("")
32-
except ModuleNotFoundError:
24+
temp = importlib.import_module(f"not1mm.plugins.{contest_name}")
25+
if hasattr(temp, "EXCHANGE_HINT"):
26+
self.exchange.setPlaceholderText(temp.EXCHANGE_HINT)
27+
else:
3328
self.exchange.setPlaceholderText("")
34-
35-
def fill_contest_list(self, contest_list: list):
36-
for item in contest_list:
37-
self.contest.addItem(item.get("DisplayName"))
29+
if hasattr(temp, "SOAPBOX_HINT"):
30+
self.soapbox.setPlaceholderText(temp.SOAPBOX_HINT)
31+
else:
32+
self.soapbox.setPlaceholderText("")

not1mm/plugins/arrl_10m.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@
5858
logger = logging.getLogger(__name__)
5959

6060
EXCHANGE_HINT = "State/Province"
61+
SOAPBOX_HINT = """If you’re exchange is (RST + Serial No.) You should edit your exchange macro keys to be '{SNT} {SENTNR}' and a '#' character in the sent exchange field above.
62+
63+
If you’re exchange is (RST + State/Province/ITU), you should edit your exchange macro keys to be '{SNT} {EXCH}' and your state/prov/itu in the sent exchange field above.
64+
"""
6165

6266
name = "ARRL 10M"
6367
mode = "BOTH" # CW SSB BOTH RTTY

not1mm/plugins/arrl_ss_cw.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@
1616

1717
EXCHANGE_HINT = "Prec Call Check Section"
1818

19+
SOAPBOX_HINT = """For the Run Exchange macro I’d put:
20+
{HISCALL} {SENTNR} {EXCH}
21+
22+
See the Contest Specific Notes section of the manual for more info.
23+
"""
24+
1925
name = "ARRL Sweepstakes CW"
2026
cabrillo_name = "ARRL-SS-CW"
2127
mode = "CW" # CW SSB BOTH RTTY

not1mm/plugins/arrl_ss_phone.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@
1616

1717
EXCHANGE_HINT = "Prec Call Check Section"
1818

19+
SOAPBOX_HINT = """For the Run Exchange macro I’d put:
20+
{HISCALL} {SENTNR} {EXCH}
21+
22+
See the Contest Specific Notes section of the manual for more info.
23+
"""
24+
1925
name = "ARRL Sweepstakes Phone"
2026
cabrillo_name = "ARRL-SS-SSB"
2127
mode = "SSB" # CW SSB BOTH RTTY

not1mm/plugins/cwo.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@
3737
logger = logging.getLogger(__name__)
3838

3939
EXCHANGE_HINT = "# Name"
40+
SOAPBOX_HINT = """When completing the "Recd Number and Name" field, place a space between the received serial number
41+
and the name of the other operator. eg. "123 Fred". (Advance on spacebar is disabled for this field.)
42+
"""
4043

4144
name = "CWOPS - Open"
4245
mode = "CW" # CW SSB BOTH RTTY

not1mm/plugins/raem.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@
5757

5858
EXCHANGE_HINT = "33N117W"
5959

60+
SOAPBOX_HINT = """
61+
In the exchange field put just your Lat and Lon. for me 33N117W.
62+
And in the exchange macro put ‘# {EXCH}‘.
63+
"""
6064
name = "RAEM"
6165
cabrillo_name = "RAEM"
6266
mode = "CW" # CW SSB BOTH RTTY

not1mm/plugins/randomgram.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
logger = logging.getLogger(__name__)
1414
EXCHANGE_HINT = ""
15+
SOAPBOX_HINT = """This plugin was submitted by @alduhoo.
16+
It reads a rg.txt file if it exists in the user’s home directory to populate the next group in the sent exchange field.
17+
"""
1518
name = "RandomGram"
1619
cabrillo_name = "RANDOMGRAM"
1720
mode = "CW" # CW SSB BOTH RTTY

not1mm/plugins/ukeidx.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
logger = logging.getLogger(__name__)
1515

1616
EXCHANGE_HINT = "# or # And Dist"
17+
SOAPBOX_HINT = """For the Run exchange macro I’d put ’{SNT} # {EXCH}’"""
1718

1819
ukei_pfx = [
1920
"G",

0 commit comments

Comments
 (0)