From a04f7f57d363988ac7e508509f7b36046816bf22 Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@m0vse.uk>
Date: Sun, 18 Sep 2022 14:59:03 +0100
Subject: [PATCH] Fix server user handling

---
 wfmain.cpp             | 137 ++++++++++++++++++++++++++---------------
 wfmain.h               |   6 +-
 wfmain.ui              |  35 ++++++++++-
 wfview.vcxproj         |  38 ++++++++++--
 wfview.vcxproj.filters |  15 +++++
 wfview.vcxproj.user    |   4 +-
 6 files changed, 171 insertions(+), 64 deletions(-)

diff --git a/wfmain.cpp b/wfmain.cpp
index d030d8d..fbdb8dd 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -1738,17 +1738,24 @@ void wfmain::loadSettings()
     int row = 0;
     ui->serverUsersTable->setRowCount(0);
 
-    foreach(SERVERUSER user, serverConfig.users)
+    QList<SERVERUSER>::iterator user = serverConfig.users.begin();
+
+    while (user != serverConfig.users.end())
     {
-        if (user.username != "" && user.password != "")
+        if (user->username != "" && user->password != "")
         {
-            serverAddUserLine(user.username, user.password, user.userType);
+            serverAddUserLine(user->username, user->password, user->userType);
             row++;
+            user++;
+        }
+        else {
+            user = serverConfig.users.erase(user);
         }
     }
 
     if (row == 0) {
         serverAddUserLine("", "", 0);
+        ui->serverAddUserBtn->setEnabled(false);
     }
 
     settings->endGroup();
@@ -1794,58 +1801,110 @@ void wfmain::serverAddUserLine(const QString& user, const QString& pass, const i
     ui->serverUsersTable->blockSignals(true);
 
     ui->serverUsersTable->insertRow(ui->serverUsersTable->rowCount());
-    ui->serverUsersTable->setItem(ui->serverUsersTable->rowCount() - 1, 0, new QTableWidgetItem(user));
+
+    ui->serverUsersTable->setItem(ui->serverUsersTable->rowCount() - 1, 0, new QTableWidgetItem());
     ui->serverUsersTable->setItem(ui->serverUsersTable->rowCount() - 1, 1, new QTableWidgetItem());
     ui->serverUsersTable->setItem(ui->serverUsersTable->rowCount() - 1, 2, new QTableWidgetItem());
+    ui->serverUsersTable->setItem(ui->serverUsersTable->rowCount() - 1, 3, new QTableWidgetItem());
+
+
+
+    QLineEdit* username = new QLineEdit();
+    username->setProperty("row", (int)ui->serverUsersTable->rowCount() - 1);
+    username->setProperty("col", (int)0);
+    username->setText(user);
+    connect(username, SIGNAL(editingFinished()), this, SLOT(onServerUserFieldChanged()));
+    ui->serverUsersTable->setCellWidget(ui->serverUsersTable->rowCount() - 1, 0, username);
 
     QLineEdit* password = new QLineEdit();
     password->setProperty("row", (int)ui->serverUsersTable->rowCount() - 1);
+    password->setProperty("col", (int)1);
     password->setEchoMode(QLineEdit::PasswordEchoOnEdit);
     password->setText(pass);
-    connect(password, SIGNAL(editingFinished()), this, SLOT(onServerPasswordChanged()));
+    connect(password, SIGNAL(editingFinished()), this, SLOT(onServerUserFieldChanged()));
     ui->serverUsersTable->setCellWidget(ui->serverUsersTable->rowCount() - 1, 1, password);
 
     QComboBox* comboBox = new QComboBox();
     comboBox->insertItems(0, { "Full User","Full with no TX","Monitor only" });
+    comboBox->setProperty("row", (int)ui->serverUsersTable->rowCount() - 1);
+    comboBox->setProperty("col", (int)2);
     comboBox->setCurrentIndex(type);
+    connect(comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(onServerUserFieldChanged()));
     ui->serverUsersTable->setCellWidget(ui->serverUsersTable->rowCount() - 1, 2, comboBox);
+
+    QPushButton* button = new QPushButton();
+    button->setText("Delete");
+    button->setProperty("row", (int)ui->serverUsersTable->rowCount() - 1);
+    button->setProperty("col", (int)3);
+    connect(button, SIGNAL(clicked()), this, SLOT(onServerUserFieldChanged()));
+    ui->serverUsersTable->setCellWidget(ui->serverUsersTable->rowCount() - 1, 3, button);
+
     ui->serverUsersTable->blockSignals(false);
 
 }
 
-void wfmain::onServerPasswordChanged()
+void wfmain::onServerUserFieldChanged()
 {
+
     int row = sender()->property("row").toInt();
-    QLineEdit* password = (QLineEdit*)ui->serverUsersTable->cellWidget(row, 1);
-    QByteArray pass;
-    passcode(password->text(), pass);
-    password->setText(pass);
-    qInfo() << "password row" << row << "changed";
-    serverConfig.users.clear();
-    for (int rows = 0; rows < ui->serverUsersTable->model()->rowCount(); rows++)
+    int col = sender()->property("col").toInt();
+    qInfo() << "User field col" << col << "row" << row << "changed";
+
+    // This is a new user line so add to serverUsersTable
+    if (serverConfig.users.length() <= row)
     {
-        if (ui->serverUsersTable->item(rows, 0) != NULL)
+        qInfo() << "Something bad has happened, serverConfig.users is shorter than table!";
+    }
+    else
+    {
+        if (col == 0)
         {
-            SERVERUSER user;
-            user.username = ui->serverUsersTable->item(rows, 0)->text();
-            QLineEdit* password = (QLineEdit*)ui->serverUsersTable->cellWidget(rows, 1);
-            user.password = password->text();
-            QComboBox* comboBox = (QComboBox*)ui->serverUsersTable->cellWidget(rows, 2);
-            user.userType = comboBox->currentIndex();
-            serverConfig.users.append(user);
+            QLineEdit* username = (QLineEdit*)ui->serverUsersTable->cellWidget(row, 0);
+            if (username->text() != serverConfig.users[row].username) {
+                serverConfig.users[row].username = username->text();
+            }
         }
-        else {
-            ui->serverUsersTable->removeRow(rows);
+        else if (col == 1)
+        {
+            QLineEdit* password = (QLineEdit*)ui->serverUsersTable->cellWidget(row, 1);
+            QByteArray pass;
+            passcode(password->text(), pass);
+            if (QString(pass) != serverConfig.users[row].password) {
+                serverConfig.users[row].password = pass;
+                qDebug() << "New Password" << password->text() << "New Password" << serverConfig.users[row].password;
+            }
         }
+        else if (col == 2)
+        {
+            QComboBox* comboBox = (QComboBox*)ui->serverUsersTable->cellWidget(row, 2);
+            serverConfig.users[row].userType = comboBox->currentIndex();
+        }
+        else if (col == 3)
+        {          
+            serverConfig.users.removeAt(row);
+            ui->serverUsersTable->setRowCount(0);
+            foreach(SERVERUSER user, serverConfig.users)
+            {
+                serverAddUserLine(user.username, user.password, user.userType);
+            }
+        }
+        if (row == ui->serverUsersTable->rowCount() - 1) {
+            ui->serverAddUserBtn->setEnabled(true);
+        }
+
     }
 }
 
-void wfmain::on_serverUsersTable_cellClicked(int row, int col)
+void wfmain::on_serverAddUserBtn_clicked()
 {
-    qInfo() << "Clicked on " << row << "," << col;
-    if (row == ui->serverUsersTable->model()->rowCount() - 1 && ui->serverUsersTable->item(row, 0) != NULL) {
-        serverAddUserLine("", "", 0);
-    }
+    serverAddUserLine("", "", 0);
+    SERVERUSER user;
+    user.username = "";
+    user.password = "";
+    user.userType = 0;
+    serverConfig.users.append(user);
+
+    ui->serverAddUserBtn->setEnabled(false);
 }
 
 
@@ -1909,28 +1968,6 @@ void wfmain::on_serverTXAudioOutputCombo_currentIndexChanged(int value)
 
 }
 
-void wfmain::on_serverUsersTable_cellChanged(int row, int column)
-{
-    qInfo() << "Cell Changed:" << row << "," << column;
-
-    serverConfig.users.clear();
-    for (int rows = 0; rows < ui->serverUsersTable->model()->rowCount(); rows++)
-    {
-        if (ui->serverUsersTable->item(rows, 0) != NULL)
-        {
-            SERVERUSER user;
-            user.username = ui->serverUsersTable->item(rows, 0)->text();
-            QLineEdit* password = (QLineEdit*)ui->serverUsersTable->cellWidget(rows, 1);
-            user.password = password->text();
-            QComboBox* comboBox = (QComboBox*)ui->serverUsersTable->cellWidget(rows, 2);
-            user.userType = comboBox->currentIndex();
-            serverConfig.users.append(user);
-        }
-        else {
-            ui->serverUsersTable->removeRow(rows);
-        }
-    }
-}
 
 
 void wfmain::saveSettings()
diff --git a/wfmain.h b/wfmain.h
index e52bdb5..c96965f 100644
--- a/wfmain.h
+++ b/wfmain.h
@@ -526,14 +526,14 @@ private slots:
     void on_setClockBtn_clicked();
 
     void on_serverEnableCheckbox_clicked(bool checked);
-    void on_serverUsersTable_cellClicked(int row, int col);
     void on_serverControlPortText_textChanged(QString text);
     void on_serverCivPortText_textChanged(QString text);
     void on_serverAudioPortText_textChanged(QString text);
     void on_serverTXAudioOutputCombo_currentIndexChanged(int value);
     void on_serverRXAudioInputCombo_currentIndexChanged(int value);
-    void onServerPasswordChanged();
-    void on_serverUsersTable_cellChanged(int row, int column);
+    void onServerUserFieldChanged();
+
+    void on_serverAddUserBtn_clicked();
 
     void on_useRTSforPTTchk_clicked(bool checked);
 
diff --git a/wfmain.ui b/wfmain.ui
index 3ac271b..dffab18 100644
--- a/wfmain.ui
+++ b/wfmain.ui
@@ -2213,7 +2213,7 @@
           <item>
            <widget class="QStackedWidget" name="settingsStack">
             <property name="currentIndex">
-             <number>0</number>
+             <number>3</number>
             </property>
             <widget class="QWidget" name="radioAccess">
              <layout class="QVBoxLayout" name="verticalLayout_21">
@@ -4310,7 +4310,7 @@
                         <number>0</number>
                        </property>
                        <property name="columnCount">
-                        <number>3</number>
+                        <number>4</number>
                        </property>
                        <attribute name="horizontalHeaderCascadingSectionResizes">
                         <bool>false</bool>
@@ -4348,6 +4348,11 @@
                          <string>Admin</string>
                         </property>
                        </column>
+                       <column>
+                        <property name="text">
+                         <string>Delete?</string>
+                        </property>
+                       </column>
                       </widget>
                      </item>
                      <item>
@@ -4365,6 +4370,30 @@
                      </item>
                     </layout>
                    </item>
+                   <item>
+                    <layout class="QHBoxLayout" name="horizontalLayout_6">
+                     <item>
+                      <widget class="QPushButton" name="serverAddUserBtn">
+                       <property name="text">
+                        <string>Add User</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item>
+                      <spacer name="horizontalSpacer_33">
+                       <property name="orientation">
+                        <enum>Qt::Horizontal</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>40</width>
+                         <height>20</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
+                    </layout>
+                   </item>
                    <item>
                     <spacer name="verticalSpacer_7">
                      <property name="orientation">
@@ -4797,7 +4826,7 @@
  <resources/>
  <connections/>
  <buttongroups>
-  <buttongroup name="buttonGroup"/>
   <buttongroup name="underlayButtonGroup"/>
+  <buttongroup name="buttonGroup"/>
  </buttongroups>
 </ui>
diff --git a/wfview.vcxproj b/wfview.vcxproj
index 3ca575a..69b22ec 100644
--- a/wfview.vcxproj
+++ b/wfview.vcxproj
@@ -57,7 +57,7 @@
       <ExceptionHandling>Sync</ExceptionHandling>
       <ObjectFileName>release\</ObjectFileName>
       <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION="1.2e";BUILD_WFVIEW;__WINDOWS_WASAPI__;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;EIGEN_MPL2_ONLY;EIGEN_DONT_VECTORIZE;EIGEN_VECTORIZE_SSE3;PREFIX="/usr/local";GITSHORT="1aa45dc";HOST="wfview.org";UNAME="build";NDEBUG;QT_NO_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION="1.45";BUILD_WFVIEW;__WINDOWS_WASAPI__;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;EIGEN_MPL2_ONLY;EIGEN_DONT_VECTORIZE;EIGEN_VECTORIZE_SSE3;PREFIX="/usr/local";GITSHORT="8638086";HOST="wfview.org";UNAME="build";NDEBUG;QT_NO_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessToFile>false</PreprocessToFile>
       <ProgramDataBaseFileName></ProgramDataBaseFileName>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -66,7 +66,7 @@
       <WarningLevel>Level3</WarningLevel>
     <MultiProcessorCompilation>true</MultiProcessorCompilation></ClCompile>
     <Link>
-      <AdditionalDependencies>..\portaudio\msvc\Win32\Release\portaudio_x86.lib;..\opus\win32\VS2015\Win32\Release\opus.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\portaudio\msvc\Win32\Release\portaudio_x86.lib;ole32.lib;..\opus\win32\VS2015\Win32\Release\opus.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\portaudio\msvc\Win32\Release;..\opus\win32\VS2015\Win32\Release;C:\opensslx86\lib;C:\Utils\my_sql\mysql-5.7.25-win32\lib;C:\Utils\postgresqlx86\pgsql\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)</AdditionalOptions>
       <DataExecutionPrevention>true</DataExecutionPrevention>
@@ -85,7 +85,7 @@
       <WarningLevel>0</WarningLevel>
     </Midl>
     <ResourceCompile>
-      <PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION=\"1.2e\";BUILD_WFVIEW;__WINDOWS_WASAPI__;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;EIGEN_MPL2_ONLY;EIGEN_DONT_VECTORIZE;EIGEN_VECTORIZE_SSE3;PREFIX=\"/usr/local\";GITSHORT=\"1aa45dc\";HOST=\"wfview.org\";UNAME=\"build\";NDEBUG;QT_NO_DEBUG;QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION=\"1.45\";BUILD_WFVIEW;__WINDOWS_WASAPI__;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;EIGEN_MPL2_ONLY;EIGEN_DONT_VECTORIZE;EIGEN_VECTORIZE_SSE3;PREFIX=\"/usr/local\";GITSHORT=\"8638086\";HOST=\"wfview.org\";UNAME=\"build\";NDEBUG;QT_NO_DEBUG;QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   <QtMoc><CompilerFlavor>msvc</CompilerFlavor><Include>./$(Configuration)/moc_predefs.h</Include><ExecutionDescription>Moc'ing %(Identity)...</ExecutionDescription><DynamicSource>output</DynamicSource><QtMocDir>$(Configuration)</QtMocDir><QtMocFileName>moc_%(Filename).cpp</QtMocFileName></QtMoc><QtRcc><Compression>default</Compression><ExecutionDescription>Rcc'ing %(Identity)...</ExecutionDescription><QtRccDir>$(Configuration)</QtRccDir><QtRccFileName>qrc_%(Filename).cpp</QtRccFileName></QtRcc><QtUic><ExecutionDescription>Uic'ing %(Identity)...</ExecutionDescription><QtUicDir>$(ProjectDir)</QtUicDir><QtUicFileName>ui_%(Filename).h</QtUicFileName></QtUic></ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -99,7 +99,7 @@
       <ExceptionHandling>Sync</ExceptionHandling>
       <ObjectFileName>debug\</ObjectFileName>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION="1.2e";BUILD_WFVIEW;__WINDOWS_WASAPI__;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;EIGEN_MPL2_ONLY;EIGEN_DONT_VECTORIZE;EIGEN_VECTORIZE_SSE3;PREFIX="/usr/local";GITSHORT="1aa45dc";HOST="wfview.org";UNAME="build";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION="1.45";BUILD_WFVIEW;__WINDOWS_WASAPI__;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;EIGEN_MPL2_ONLY;EIGEN_DONT_VECTORIZE;EIGEN_VECTORIZE_SSE3;PREFIX="/usr/local";GITSHORT="8638086";HOST="wfview.org";UNAME="build";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessToFile>false</PreprocessToFile>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -107,7 +107,7 @@
       <WarningLevel>Level3</WarningLevel>
     <MultiProcessorCompilation>true</MultiProcessorCompilation></ClCompile>
     <Link>
-      <AdditionalDependencies>..\portaudio\msvc\Win32\Debug\portaudio_x86.lib;..\opus\win32\VS2015\Win32\Debug\opus.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\portaudio\msvc\Win32\Debug\portaudio_x86.lib;ole32.lib;..\opus\win32\VS2015\Win32\Debug\opus.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\portaudio\msvc\Win32\Debug;..\opus\win32\VS2015\Win32\Debug;C:\opensslx86\lib;C:\Utils\my_sql\mysql-5.7.25-win32\lib;C:\Utils\postgresqlx86\pgsql\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)</AdditionalOptions>
       <DataExecutionPrevention>true</DataExecutionPrevention>
@@ -124,7 +124,7 @@
       <WarningLevel>0</WarningLevel>
     </Midl>
     <ResourceCompile>
-      <PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION=\"1.2e\";BUILD_WFVIEW;__WINDOWS_WASAPI__;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;EIGEN_MPL2_ONLY;EIGEN_DONT_VECTORIZE;EIGEN_VECTORIZE_SSE3;PREFIX=\"/usr/local\";GITSHORT=\"1aa45dc\";HOST=\"wfview.org\";UNAME=\"build\";QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION=\"1.45\";BUILD_WFVIEW;__WINDOWS_WASAPI__;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;EIGEN_MPL2_ONLY;EIGEN_DONT_VECTORIZE;EIGEN_VECTORIZE_SSE3;PREFIX=\"/usr/local\";GITSHORT=\"8638086\";HOST=\"wfview.org\";UNAME=\"build\";QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   <QtMoc><CompilerFlavor>msvc</CompilerFlavor><Include>./$(Configuration)/moc_predefs.h</Include><ExecutionDescription>Moc'ing %(Identity)...</ExecutionDescription><DynamicSource>output</DynamicSource><QtMocDir>$(Configuration)</QtMocDir><QtMocFileName>moc_%(Filename).cpp</QtMocFileName></QtMoc><QtRcc><Compression>default</Compression><ExecutionDescription>Rcc'ing %(Identity)...</ExecutionDescription><QtRccDir>$(Configuration)</QtRccDir><QtRccFileName>qrc_%(Filename).cpp</QtRccFileName></QtRcc><QtUic><ExecutionDescription>Uic'ing %(Identity)...</ExecutionDescription><QtUicDir>$(ProjectDir)</QtUicDir><QtUicFileName>ui_%(Filename).h</QtUicFileName></QtUic></ItemDefinitionGroup>
   <ItemGroup>
@@ -136,6 +136,7 @@
     <ClCompile Include="commhandler.cpp" />
     <ClCompile Include="freqmemory.cpp" />
     <ClCompile Include="logcategories.cpp" />
+    <ClCompile Include="loggingwindow.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="meter.cpp" />
     <ClCompile Include="pahandler.cpp" />
@@ -203,6 +204,7 @@
       
       
     </QtMoc>
+    <ClInclude Include="colorprefs.h" />
     <QtMoc Include="commhandler.h">
       
       
@@ -215,6 +217,16 @@
     </QtMoc>
     <ClInclude Include="freqmemory.h" />
     <ClInclude Include="logcategories.h" />
+    <QtMoc Include="loggingwindow.h">
+      
+      
+      
+      
+      
+      
+      
+      
+    </QtMoc>
     <QtMoc Include="meter.h">
       
       
@@ -418,6 +430,8 @@
     
     
     
+    
+    
     <CustomBuild Include="debug\moc_predefs.h.cbt">
       <FileType>Document</FileType>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -475,6 +489,7 @@
     
     
     
+    
     
     
   </ItemGroup>
@@ -500,6 +515,17 @@
       
       
       
+    </QtUic>
+    <QtUic Include="loggingwindow.ui">
+      
+      
+      
+      
+      
+      
+      
+      
+      
     </QtUic>
     <QtUic Include="repeatersetup.ui">
       
diff --git a/wfview.vcxproj.filters b/wfview.vcxproj.filters
index a8fca3d..52a8284 100644
--- a/wfview.vcxproj.filters
+++ b/wfview.vcxproj.filters
@@ -71,6 +71,9 @@
     <ClCompile Include="logcategories.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="loggingwindow.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -160,6 +163,9 @@
     <QtMoc Include="calibrationwindow.h">
       <Filter>Header Files</Filter>
     </QtMoc>
+    <ClInclude Include="colorprefs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <QtMoc Include="commhandler.h">
       <Filter>Header Files</Filter>
     </QtMoc>
@@ -169,6 +175,9 @@
     <ClInclude Include="logcategories.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <QtMoc Include="loggingwindow.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
     <QtMoc Include="meter.h">
       <Filter>Header Files</Filter>
     </QtMoc>
@@ -260,6 +269,8 @@
     
     
     
+    
+    
     <CustomBuild Include="debug\moc_predefs.h.cbt">
       <Filter>Generated Files</Filter>
     </CustomBuild>
@@ -307,6 +318,7 @@
     
     
     
+    
     
     
   </ItemGroup>
@@ -317,6 +329,9 @@
     <QtUic Include="calibrationwindow.ui">
       <Filter>Form Files</Filter>
     </QtUic>
+    <QtUic Include="loggingwindow.ui">
+      <Filter>Form Files</Filter>
+    </QtUic>
     <QtUic Include="repeatersetup.ui">
       <Filter>Form Files</Filter>
     </QtUic>
diff --git a/wfview.vcxproj.user b/wfview.vcxproj.user
index 2d805e3..71025e6 100644
--- a/wfview.vcxproj.user
+++ b/wfview.vcxproj.user
@@ -7,9 +7,9 @@
     <LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(PATH)</LocalDebuggerEnvironment>
   </PropertyGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <QtLastBackgroundBuild>2022-04-18T13:23:03.5252168Z</QtLastBackgroundBuild>
+    <QtLastBackgroundBuild>2022-09-18T13:19:41.5782674Z</QtLastBackgroundBuild>
   </PropertyGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <QtLastBackgroundBuild>2022-04-18T13:23:05.0598803Z</QtLastBackgroundBuild>
+    <QtLastBackgroundBuild>2022-09-18T13:19:41.9056515Z</QtLastBackgroundBuild>
   </PropertyGroup>
 </Project>
\ No newline at end of file