Merge branch 'translations' into creator-widgets

bandbuttons.cpp

@@ -50,6 +50,9 @@ void bandbuttons::receiveCache(cacheItem item)
         case funcFreqGet:
             // Here we will process incoming frequency.
             {
+            if(!rigCaps) {
+                return;
+            }
                 if (ui->SubBandCheck->isChecked() == sub) {
                     quint64 freq = quint64(item.value.value<freqt>().Hz);
                     for (auto &b: rigCaps->bands)

freqctrl.cpp

@@ -709,8 +709,15 @@ void freqCtrl::drawBkGround(QPainter &Painter)
                 else
                     dgsep = gsep;
             }
-            Painter.drawText(m_SepRect[i], Qt::AlignHCenter | Qt::AlignVCenter,
+            if( (i==m_NumDigits-1) && (m_DigitInfo[i].val==0) ) {
-                             dgsep);
+                Painter.drawText(m_SepRect[i], Qt::AlignHCenter | Qt::AlignVCenter,
+                                                 " ");
+            } else {
+                // Only draw the digit separator if we are within a number.
+                // This eliminates drawing a comma after the last (MSB) digit.
+                Painter.drawText(m_SepRect[i], Qt::AlignHCenter | Qt::AlignVCenter,
+                                 dgsep);
+            }
         }
         else
         {

loggingwindow.cpp

@@ -225,6 +225,11 @@ void loggingWindow::on_debugBtn_clicked(bool checked)
     emit setDebugMode(checked);
 }
 
+void loggingWindow::on_commDebugChk_clicked(bool checked)
+{
+    emit setInsaneLoggingMode(checked);
+}
+
 void loggingWindow::on_toBottomBtn_clicked()
 {
     vertLogScroll->setValue(vertLogScroll->maximum());

loggingwindow.h

@@ -56,8 +56,11 @@ private slots:
 
     void on_toBottomBtn_clicked();
 
+    void on_commDebugChk_clicked(bool checked);
+
 signals:
     void setDebugMode(bool debugOn);
+    void setInsaneLoggingMode(bool insaneLoggingOn);
 
 private:
     Ui::loggingWindow* ui;

loggingwindow.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>625</width>
+    <width>819</width>
     <height>300</height>
    </rect>
   </property>
@@ -109,6 +109,16 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QCheckBox" name="commDebugChk">
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This enables the logging of nearly all CI-V traffic. &lt;span style=&quot; font-weight:600;&quot;&gt;Use with caution&lt;/span&gt;. It is a lot of data. Meter levels and scope data are not shown. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="text">
+        <string>CommDebug</string>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QPushButton" name="toBottomBtn">
        <property name="toolTip">

repeatersetup.cpp

@@ -24,9 +24,13 @@ repeaterSetup::~repeaterSetup()
 {
     // Trying this for more consistent destruction
     delete ui;
+    if(queue) {
+        qDebug() << "Deleting the queue from within repeaterSetup.";
+        queue->deleteLater();
+        queue=nullptr;
+    }
 }
 
-
 void repeaterSetup::populateTones()
 {
     ui->rptToneCombo->addItem("67.0", quint16(670));
@@ -405,25 +409,25 @@ void repeaterSetup::on_splitOffBtn_clicked()
 void repeaterSetup::on_rptSimplexBtn_clicked()
 {
     // Simplex
-    queue->add(priorityImmediate,queueItem(funcSplitStatus,QVariant::fromValue<duplexMode_t>(dmSplitOn),false));
+    //queue->add(priorityImmediate,queueItem(funcSplitStatus,QVariant::fromValue<duplexMode_t>(dmSplitOn),false));
-    if(rigCaps->commands.contains(funcToneSquelchType))
+    //if(rigCaps->commands.contains(funcToneSquelchType))
-    {
+    //{
-        queue->add(priorityImmediate,queueItem(funcSplitStatus,QVariant::fromValue<duplexMode_t>(dmDupAutoOff),false));
+        //queue->add(priorityImmediate,queueItem(funcSplitStatus,QVariant::fromValue<duplexMode_t>(dmDupAutoOff),false));
         queue->add(priorityImmediate,queueItem(funcSplitStatus,QVariant::fromValue<duplexMode_t>(dmSimplex),false));
-    }
+    //}
 }
 
 void repeaterSetup::on_rptDupPlusBtn_clicked()
 {
     // DUP+
-    queue->add(priorityImmediate,queueItem(funcSplitStatus,QVariant::fromValue<duplexMode_t>(dmDupAutoOff),false));
+    //queue->add(priorityImmediate,queueItem(funcSplitStatus,QVariant::fromValue<duplexMode_t>(dmDupAutoOff),false));
     queue->add(priorityImmediate,queueItem(funcSplitStatus,QVariant::fromValue<duplexMode_t>(dmDupPlus),false));
 }
 
 void repeaterSetup::on_rptDupMinusBtn_clicked()
 {
     // DUP-
-    queue->add(priorityImmediate,queueItem(funcSplitStatus,QVariant::fromValue<duplexMode_t>(dmDupAutoOff),false));
+    //queue->add(priorityImmediate,queueItem(funcSplitStatus,QVariant::fromValue<duplexMode_t>(dmDupAutoOff),false));
     queue->add(priorityImmediate,queueItem(funcSplitStatus,QVariant::fromValue<duplexMode_t>(dmDupMinus),false));
 }
 
@@ -796,6 +800,8 @@ void repeaterSetup::on_rptrOffsetSetBtn_clicked()
     if(f.Hz != 0)
     {
         queue->add(priorityImmediate,queueItem(funcSendFreqOffset,QVariant::fromValue<freqt>(f),false));
+    } else {
+        qWarning() << "Could not convert frequency text of repeater offset to integer.";
     }
     ui->rptrOffsetEdit->clearFocus();
 }
@@ -821,6 +827,7 @@ void repeaterSetup::on_quickSplitChk_clicked(bool checked)
 
 void repeaterSetup::receiveRigCaps(rigCapabilities* rig)
 {
+    qInfo() << "Receiving rigcaps into repeater setup.";
     this->rigCaps = rig;
     if (rig != Q_NULLPTR)
     {

settingswidget.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1020</width>
+    <width>1100</width>
     <height>606</height>
    </rect>
   </property>
@@ -1200,6 +1200,9 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
              <property name="maximum">
               <number>250</number>
              </property>
+             <property name="value">
+              <number>25</number>
+             </property>
             </widget>
            </item>
            <item>
@@ -1377,7 +1380,7 @@ ONLY use Manual CI-V when Transceive mode is not supported</string>
                 <rect>
                  <x>0</x>
                  <y>0</y>
-                 <width>804</width>
+                 <width>884</width>
                  <height>320</height>
                 </rect>
                </property>

wfmain.cpp

@@ -21,6 +21,8 @@ bool debugModeLogging = true;
 bool debugModeLogging = false;
 #endif
 
+bool insaneDebugLogging = false;
+
 wfmain::wfmain(const QString settingsFile, const QString logFile, bool debugMode, QWidget *parent ) :
     QMainWindow(parent),
     ui(new Ui::wfmain),
@@ -4937,6 +4939,7 @@ void wfmain::initLogging()
     qInstallMessageHandler(messageHandler);
 
     connect(logWindow, SIGNAL(setDebugMode(bool)), this, SLOT(setDebugLogging(bool)));
+    connect(logWindow, SIGNAL(setInsaneLoggingMode(bool)), this, SLOT(setInsaneDebugLogging(bool)));
 
     // Interval timer for log window updates:
     logCheckingTimer.setInterval(100);
@@ -4969,10 +4972,15 @@ void wfmain::setDebugLogging(bool debugModeOn)
     debugModeLogging = debugModeOn;
 }
 
+void wfmain::setInsaneDebugLogging(bool insaneLoggingOn)
+{
+    insaneDebugLogging = insaneLoggingOn;
+}
+
 void wfmain::messageHandler(QtMsgType type, const QMessageLogContext& context, const QString& msg)
 {
     // Open stream file writes
-    bool insaneDebugLogging = false;
+    // bool insaneDebugLogging = true;// global
     if (type == QtDebugMsg && !debugModeLogging)
     {
         return;

wfmain.h

@@ -425,6 +425,7 @@ private slots:
     void setRadioTimeDateSend();
     void logCheck();
     void setDebugLogging(bool debugModeOn);
+    void setInsaneDebugLogging(bool insaneLoggingOn);
 
     void buttonControl(const COMMAND* cmd);
 

wfview.pro

@@ -21,7 +21,7 @@ contains(DEFINES,USB_CONTROLLER){
 TARGET = wfview
 TEMPLATE = app
 
-DEFINES += WFVIEW_VERSION=\\\"1.91\\\"
+DEFINES += WFVIEW_VERSION=\\\"1.94\\\"
 
 DEFINES += BUILD_WFVIEW