IARU Maidenhead

Changes to documentation, alerts, and hints to reduce
  misunderstanding regarding terms IARU locator and
  Maidenhead locator.

doc/fldigi.1.txt

@@ -247,7 +247,7 @@ FLDIGI_MY_NAME::
   The operator's name.
 
 FLDIGI_MY_LOCATOR::
-  The operator's IARU locator.
+  The operator's IARU (Maidenhead) locator.
 
 FLDIGI_MODEM::
   The short modem name.
@@ -290,7 +290,7 @@ FLDIGI_LOG_QTH::
   The text (other station's QTH) contained in the 'QTH' log field.
 
 FLDIGI_LOG_LOCATOR::
-  The text (other station's IARU locator) contained in the 'Loc' log field.
+  The text (other station's Maidenhead locator) contained in the 'Loc' log field.
 
 FLDIGI_LOG_NOTES::
   The text (free-form notes) contained in the 'Notes' log field.

doc/guide.txt

@@ -330,10 +330,11 @@ It is generally not possible to distinguish between Operator and QTH names.  For
 this reason, Fldigi will use the first non-Call and non-Locator word to fill the
 'Name' field, and subsequent clicks will send text to the 'QTH' field.
 Likewise, a text string may be both a valid callsign and a valid
-http://en.wikipedia.org/wiki/Maidenhead_Locator_System[IARU locator].  For best
+http://en.wikipedia.org/wiki/Maidenhead_Locator_System[IARU (Maidenhead) locator].
-results, you should attempt to fill the log fields in the order in which they
+For best results, you should attempt to fill the log fields in the order in
-appear on the main window, and clear the log fields after logging the QSO.  Of
+which they appear on the main window, and clear the log fields after logging the
-course, text can always be manually typed or pasted into any of the log fields!
+QSO.  Of course, text can always be manually typed or pasted into any of the log
+fields!
 
 You can query online and local (e.g. CD) database systems for data regarding a
 callsign.  You make the query by either clicking on the globe button, or

src/dialogs/confdialog.cxx

@@ -5761,7 +5761,7 @@ d frequency"));
                 btnPSKRepInit->tooltip(_("Initialize the socket client"));
                 btnPSKRepInit->callback((Fl_Callback*)cb_btnPSKRepInit);
               } // Fl_Button* btnPSKRepInit
-              { boxPSKRepMsg = new Fl_Box(30, 236, 300, 24, _("<PSK Reporter error message>"));
+              { boxPSKRepMsg = new Fl_Box(15, 220, 300, 48, _("<PSK Reporter error message>"));
                 boxPSKRepMsg->labelfont(2);
                 boxPSKRepMsg->label(0);
               } // Fl_Box* boxPSKRepMsg

src/dialogs/confdialog.fl

@@ -101,7 +101,7 @@ static const char szProsigns[] = "~|%|&|+|=|{|}|<|>|[|]| ";} {}
     } {
       Fl_Group tabOperator {
         label Operator
-        callback {progdefaults.changed = true;} open selected
+        callback {progdefaults.changed = true;} selected
         tooltip {Operator information} xywh {0 25 500 345} when 1
       } {
         Fl_Group {} {
@@ -181,7 +181,7 @@ progdefaults.changed = true;}
         }
       }
       Fl_Group tabUI {
-        label UI open
+        label UI
         xywh {-3 25 508 345} hide
       } {
         Fl_Tabs tabsUI {open
@@ -2823,7 +2823,7 @@ progdefaults.changed = true;}
         }
       }
       Fl_Group tabID {
-        label ID open
+        label ID
         xywh {0 25 500 346} hide
       } {
         Fl_Group {} {
@@ -3011,7 +3011,7 @@ progdefaults.changed = true;}
         }
       }
       Fl_Group tabMisc {
-        label Misc
+        label Misc open
         xywh {0 25 500 345} hide
       } {
         Fl_Tabs tabsMisc {open
@@ -3062,7 +3062,7 @@ OFF - keep current wf cursor position} xywh {15 101 348 20} down_box DOWN_BOX va
             }
           }
           Fl_Group tabSpot {
-            label Spotting
+            label Spotting open
             xywh {0 50 500 320} hide
           } {
             Fl_Group {} {
@@ -3132,13 +3132,13 @@ progdefaults.changed = true;}
               }
               Fl_Box boxPSKRepMsg {
                 label {<PSK Reporter error message>}
-                xywh {30 236 300 24} labelfont 2
+                xywh {15 220 300 48} labelfont 2
                 code0 {boxPSKRepMsg->label(0);}
               }
             }
           }
           Fl_Group tabMacros {
-            label Macros open
+            label Macros
             xywh {0 50 500 320} hide
           } {
             Fl_Group {} {open
@@ -3323,7 +3323,7 @@ progdefaults.changed = true;}
         }
       }
       Fl_Group tabQRZ {
-        label {Callsign DB} open
+        label {Callsign DB}
         tooltip {Callsign database} xywh {0 25 500 345} hide
       } {
         Fl_Group {} {

src/dialogs/guide.cxx

@@ -907,7 +907,7 @@ then use some simple heuristics to decide which log field will receive the text.
 this reason, Fldigi will use the first non-Call and non-Locator word to fill the\n\
 <em>Name</em> field, and subsequent clicks will send text to the <em>QTH</em> field.\n\
 Likewise, a text string may be both a valid callsign and a valid\n\
-<a href=\"http://en.wikipedia.org/wiki/Maidenhead_Locator_System\">IARU locator</a>.  For best\n\
+<a href=\"http://en.wikipedia.org/wiki/Maidenhead_Locator_System\">IARU (Maidenhead) locator</a>.  For best\n\
 results, you should attempt to fill the log fields in the order in which they\n\
 appear on the main window, and clear the log fields after logging the QSO.  Of\n\
 course, text can always be manually typed or pasted into any of the log fields!</p></div>\n\

src/include/configuration.h

@@ -778,7 +778,7 @@
               "Operator name",                                                          \
               "")                                                                       \
         ELEM_(std::string, myLocator, "MYLOC",                                          \
-              "Operator IARU locator",                                                  \
+              "Operator Maidenhead locator",                                                  \
               "")                                                                       \
         ELEM_(std::string, myAntenna, "MYANTENNA",                                      \
               "Antenna description (keep short!)",                                      \

src/spot/pskrep.cxx

@@ -245,7 +245,7 @@ static bool pskrep_check(void)
 		}
 	}
 	if (!pskrep::locator_re.match(progdefaults.myLocator.c_str())) {
-		error_string = "Error: bad IARU locator";
+		error_string = "Error: bad Maidenhead locator\ncheck Configure->Operator->Locator";
 		return false;
 	}