Fixed ContactDialog to disable DMR ID on AllCall.

hmatuschek · Dec 22, 2019 · e6f6107 · e6f6107
1 parent cd892a6
commit e6f6107
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,7 +37,7 @@ ENDIF(UNIX AND APPLE)
 
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 2)
-set(VERSION_PATCH 2)
+set(VERSION_PATCH 3)
 set(VERSION_STRING "\"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}\"")
 message(STATUS "Build version ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 

diff --git a/examples/kw.conf b/examples/kw.conf
@@ -1,5 +1,5 @@
 #
-# Configuration generated Sa. Dez. 21 22:44:14 2019 by qdrm, version 0.2.2
+# Configuration generated So. Dez. 22 12:56:19 2019 by qdrm, version 0.2.2
 # see https://dm3mat.darc.de/qdmr for details.
 #
 
@@ -39,10 +39,10 @@ Digital Name                Receive   Transmit  Power Scan TOT RO Admit  CC SS R
 3       "TG8 DB0LDS TS2"    439.5630  -7.6010   High  -    45  -  Color  1  2  2    5   -   # Regional
 4       "TG9 DB0LDS TS2"    439.5630  -7.6010   High  -    45  -  Color  1  2  2    6   1   # Lokal
 5       "BB DB0LDS TS2"     439.5630  -7.6010   High  -    45  -  Color  1  2  2    7   1   # Bln/Brb
-6       "DM0TZN TS1"        439.8250  -7.6000   High  -    45  -  Color  1  1  1    1   -   # WW
-7       "TG8 DM0TZN TS2"    439.8250  -7.6000   High  -    45  -  Color  1  2  2    5   -   # Regional
-8       "TG9 DM0TZN TS2"    439.8250  -7.6000   High  -    45  -  Color  1  2  2    6   -   # Lokal
-9       "BB DM0TZN TS2"     439.8250  -7.6000   High  -    45  -  Color  1  2  2    7   -   # Bln/Brb
+6       "DM0TZN TS1"        438.8250  -7.6000   High  -    45  -  Color  1  1  1    1   -   # WW
+7       "TG8 DM0TZN TS2"    438.8250  -7.6000   High  -    45  -  Color  1  2  2    5   -   # Regional
+8       "TG9 DM0TZN TS2"    438.8250  -7.6000   High  -    45  -  Color  1  2  2    6   -   # Lokal
+9       "BB DM0TZN TS2"     438.8250  -7.6000   High  -    45  -  Color  1  2  2    7   -   # Bln/Brb
 10      "DB0LOS TS1"        438.4750  -7.6000   High  -    45  -  Color  1  1  1    -   -   
 11      "R/TG9 DB0LOS TS2"  438.4750  -7.6000   High  -    45  -  Color  1  2  2    6   -   # Lokal
 12      "R/TG9 DM0TT TS1"   439.0870  -7.6000   High  -    45  -  Color  1  1  2    6   -   # Lokal

diff --git a/src/contactdialog.cc b/src/contactdialog.cc
@@ -74,10 +74,16 @@ ContactDialog::construct() {
 
 void
 ContactDialog::onTypeChanged(int idx) {
-  if (3 == idx)
+  if (3 == idx) {
     contactNumber->setValidator(new QRegExpValidator(QRegExp("[0-9a-dA-D\\*#]+")));
-  else
+    contactNumber->setEnabled(true);
+  } else if (2 == idx) {
+    contactNumber->setText("16777215");
+    contactNumber->setEnabled(false);
+  } else {
     contactNumber->setValidator(new QRegExpValidator(QRegExp("[0-9]+")));
+    contactNumber->setEnabled(true);
+  }
 }
 
 Contact *