From 44141eee02cb79713b12b64c48e71e6dba41b4f7 Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Wed, 16 Oct 2024 14:09:25 +0200
Subject: [PATCH] Fixed problem with busy cursor in scan

---
 .vscode/settings.json |  3 ++-
 .vscode/tasks.json    | 14 +++++++-------
 src/cfrmnodescan.cpp  |  6 ++----
 src/mainwindow.cpp    |  3 ++-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 289ad585..565e0e85 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -126,5 +126,6 @@
     },
     "vcpkg.target.installDependencies": true,
     "vcpkg.target.preferSystemLibs": false,
-    "vcpkg.target.useManifest": false
+    "vcpkg.target.useManifest": false,
+    "debug.focusWindowOnBreak": false
 }
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 323b5e28..838c31ea 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -47,7 +47,7 @@
       {
         "taskName": "Clean & build all 5.15.2",
         "type": "shell",
-        "command": "cd build; make clean; export CMAKE_PREFIX_PATH=~/Qt/5.15.2/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug .. ;  make -j4 -Wall",
+        "command": "cd build; make clean; export CMAKE_PREFIX_PATH=~/Qt/5.15.2/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug -DQt6_DIR=~/Qt/5.15.2/gcc_64 .. ;  make -j4 -Wall",
         "args": [],
         "group": {
           "kind": "build"
@@ -70,9 +70,9 @@
         "label": "Clean & build all 5.15.2"
       },
       {
-        "taskName": "Clean & build all 6.6.2",
+        "taskName": "Clean & build all 6.8.0",
         "type": "shell",
-        "command": "cd build; make clean; export CMAKE_PREFIX_PATH=~/Qt/6.6.2/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug .. ;  make -j4",
+        "command": "cd build; make clean; export CMAKE_PREFIX_PATH=~/Qt/6.8.0/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug -DQt6_DIR=~/Qt/6.8.0/gcc_64 .. ;  make -j4",
         "args": [],
         "group": "build",
         "problemMatcher": {
@@ -90,12 +90,12 @@
             "message": 5
           }
         },
-        "label": "Clean & build all 6.6.2"
+        "label": "Clean & build all 6.8.0"
       },
       {
-        "taskName": "Clean & build all 6.7.2",
+        "taskName": "Clean & build all 6.7.3",
         "type": "shell",
-        "command": "cd build; make clean; export CMAKE_PREFIX_PATH=~/Qt/6.7.2/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug .. ;  make -j4",
+        "command": "cd build; make clean; export CMAKE_PREFIX_PATH=~/Qt/6.7.3/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug -DQt6_DIR=~/Qt/7.3.0/gcc_64 .. ;  make -j4",
         "args": [],
         "group": "build",
         "problemMatcher": {
@@ -113,7 +113,7 @@
             "message": 5
           }
         },
-        "label": "Clean & build all 6.7.2"
+        "label": "Clean & build all 6.7.3"
       },
       {
         "type": "shell",
diff --git a/src/cfrmnodescan.cpp b/src/cfrmnodescan.cpp
index aaa6fe85..b8c4ae67 100644
--- a/src/cfrmnodescan.cpp
+++ b/src/cfrmnodescan.cpp
@@ -711,7 +711,7 @@ CFrmNodeScan::doScan(void)
   }
 
   QApplication::setOverrideCursor(Qt::WaitCursor);
-  QApplication::processEvents();
+  //QApplication::processEvents();
 
   std::string interface = m_connObject["selected-interface"].toString().toStdString();
   cguid guidInterface(interface);
@@ -793,7 +793,7 @@ CFrmNodeScan::doScan(void)
     // Load mdf and standard registers if requested to do so
     if (ui->chkFetchInfo->isChecked()) {
       doLoadMdf(item);
-      QApplication::setOverrideCursor(Qt::WaitCursor);
+      //QApplication::setOverrideCursor(Qt::WaitCursor);
       ui->progressBarScan->setValue(ui->progressBarScan->value() + (int)additem);
     }
   }
@@ -810,8 +810,6 @@ CFrmNodeScan::doScan(void)
   ui->progressBarScan->setValue(100);
 
   QApplication::restoreOverrideCursor();
-  QApplication::restoreOverrideCursor();
-  //QApplication::processEvents();
 
   ui->actionScan->setEnabled(true);
 }
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index b0858205..1d487a69 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -90,6 +90,7 @@ treeWidgetItemConn::treeWidgetItemConn(QTreeWidgetItem* topItem,
 {
   assert(nullptr != topItem);
 
+
   setText(0, conn["name"].toString());
   m_conn = conn;
 
@@ -97,7 +98,7 @@ treeWidgetItemConn::treeWidgetItemConn(QTreeWidgetItem* topItem,
     QIcon::fromTheme("network-transmit-receive", QIcon(":add.png"));
 
   setIcon(0, icon);
-  // item_test->setToolTip(0, "This is just a test connection from a snowy
+  // item_test->setToolTip(0, "This is just a te1st connection from a snowy
   // country named Sweden.");
   // m_connTreeTable->addTopLevelItem(item_test);
   // topItem->addChild(this);