From 31d80a9b1d4ec2c86a00a500379c8732e19723ad Mon Sep 17 00:00:00 2001
From: Jordan Sherer <jordan@widefido.com>
Date: Sat, 27 Oct 2018 12:41:30 -0400
Subject: [PATCH] Updated configuration tooltip and validation

---
 Configuration.cpp | 3 ++-
 Configuration.ui  | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Configuration.cpp b/Configuration.cpp
index 2cf6c32..9a0bc4b 100644
--- a/Configuration.cpp
+++ b/Configuration.cpp
@@ -1977,7 +1977,8 @@ QStringList splitGroups(QString groupsString, bool filter){
 
 bool Configuration::impl::validate ()
 {
-  if(!Varicode::isValidCallsign(ui_->callsign_line_edit->text(), nullptr)){
+  auto callsign = ui_->callsign_line_edit->text().trimmed();
+  if(!Varicode::isValidCallsign(callsign, nullptr) || callsign.startsWith("@")){
       MessageBox::critical_message (this, tr ("The callsign format you provided is not supported"));
       return false;
   }
diff --git a/Configuration.ui b/Configuration.ui
index 44ec3a7..77065e5 100644
--- a/Configuration.ui
+++ b/Configuration.ui
@@ -240,17 +240,20 @@
              <item row="5" column="0">
               <widget class="QLabel" name="label_23">
                <property name="text">
-                <string>Groups (comma separated):</string>
+                <string>Callsign Groups (comma separated):</string>
                </property>
               </widget>
              </item>
              <item row="5" column="1">
               <widget class="QLineEdit" name="groups_line_edit">
+               <property name="toolTip">
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter a comma separated list of callsign groups (e.g., @GROUP/1, @ARES, @RACES, etc). &lt;br/&gt;&lt;br/&gt;Each group behaves similarly to @ALLCALL. Messages that are directed to the group are printed at all participating stations.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               </property>
                <property name="text">
                 <string/>
                </property>
                <property name="placeholderText">
-                <string/>
+                <string>@ALLCALL, ...</string>
                </property>
               </widget>
              </item>