fix bug in m_updateNetworkInfoAction; add buld num to app

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09fd8a860ef629ce3693e5acfa1b4319a7685534..1d0a960d5fb72934b9e44fa11472f0a5ac03303d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.16)
 # Configurable options
 option(FEATHER_VERSION_DEBUG_BUILD "Enable git describe version string" OFF)
 
-if(FEATHER_VERSION_DEBUG_BUILD AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
+if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
     find_package(Git)
     if(GIT_FOUND)
         execute_process(
@@ -12,11 +12,17 @@ if(FEATHER_VERSION_DEBUG_BUILD AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
             OUTPUT_VARIABLE GIT_DESCRIBE_VERSION
             OUTPUT_STRIP_TRAILING_WHITESPACE
         )
-        message(STATUS "Feather DEBUG BUILD version (git): ${GIT_DESCRIBE_VERSION}")
-        set(DETECTED_FEATHER_VERSION ${GIT_DESCRIBE_VERSION})
+        if(GIT_DESCRIBE_VERSION)
+            message(STATUS "Feather build version (git): ${GIT_DESCRIBE_VERSION}")
+            add_compile_definitions(FEATHER_BUILD_TAG="${GIT_DESCRIBE_VERSION}")
+        endif()
     endif()
 endif()
 
+if(FEATHER_VERSION_DEBUG_BUILD AND GIT_DESCRIBE_VERSION)
+    set(DETECTED_FEATHER_VERSION ${GIT_DESCRIBE_VERSION})
+endif()
+
 if(NOT DETECTED_FEATHER_VERSION)
     set(DETECTED_FEATHER_VERSION "2.8.1")
 endif()
@@ -43,6 +49,7 @@ set(COPYRIGHT_YEAR "2025")
 set(COPYRIGHT_HOLDERS "The Monero Project")
 
 cmake_policy(SET CMP0074 NEW)
+cmake_policy(SET CMP0148 OLD)
 
 # Configurable options
 option(STATIC "Link libraries statically, requires static Qt" OFF)

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index ade9db553122d0e3c576877c57298e118104979a..848c2cf3e7a03a5bd01700d8cb5c019cede2294e 100644 (file)
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -1055,7 +1055,8 @@ void MainWindow::onConnectionStatusChanged(int status)
     qDebug() << "Wallet connection status changed " << Utils::QtEnumToString(static_cast<Wallet::ConnectionStatus>(status));
 
     if (m_updateNetworkInfoAction) {  // Maybe not initialized on first function call
-        m_updateNetworkInfoAction->setEnabled(status != Wallet::ConnectionStatus_Disconnected);
+        bool syncPaused = conf()->get(Config::syncPaused).toBool();
+        m_updateNetworkInfoAction->setEnabled(status != Wallet::ConnectionStatus_Disconnected && !syncPaused);
     }
 
     // Update connection info in status bar.

diff --git a/src/dialog/AboutDialog.cpp b/src/dialog/AboutDialog.cpp
index bf8c7cf1d3fe087d8f8a94d473a72547cfa8adf7..079b9cd42475d4596cb29b54cd9f6316ae2c3311 100644 (file)
--- a/src/dialog/AboutDialog.cpp
+++ b/src/dialog/AboutDialog.cpp
@@ -29,6 +29,12 @@ AboutDialog::AboutDialog(QWidget *parent)
     ui->ackText->setText(ack_text);
 
     ui->label_featherVersion->setText(FEATHER_VERSION);
+#ifdef FEATHER_BUILD_TAG
+    ui->label_buildTag->setText(FEATHER_BUILD_TAG);
+#else
+    ui->label_buildTag->hide();
+    ui->label_30->hide();
+#endif
     ui->label_moneroVersion->setText(MONERO_VERSION);
     ui->label_qtVersion->setText(QT_VERSION_STR);
     ui->label_torVersion->setText(TOR_VERSION);

diff --git a/src/dialog/AboutDialog.ui b/src/dialog/AboutDialog.ui
index 4cf20a2539a16cfc9a632f50edf4ab3ab51d1560..f8ed38d89cb31364a87ac92f697b0ead28508924 100644 (file)
--- a/src/dialog/AboutDialog.ui
+++ b/src/dialog/AboutDialog.ui
@@ -234,55 +234,69 @@
         </widget>
        </item>
        <item row="1" column="0">
+        <widget class="QLabel" name="label_30">
+         <property name="text">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:700;&quot;&gt;Build:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QLabel" name="label_buildTag">
+         <property name="text">
+          <string>TextLabel</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0">
         <widget class="QLabel" name="label_20">
          <property name="text">
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:700;&quot;&gt;Monero:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
+       <item row="2" column="1">
         <widget class="QLabel" name="label_moneroVersion">
          <property name="text">
           <string>TextLabel</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
+       <item row="3" column="0">
         <widget class="QLabel" name="label_22">
          <property name="text">
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:700;&quot;&gt;Qt:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="1">
+       <item row="3" column="1">
         <widget class="QLabel" name="label_qtVersion">
          <property name="text">
           <string>TextLabel</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="0">
+       <item row="5" column="0">
         <widget class="QLabel" name="label_24">
          <property name="text">
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:700;&quot;&gt;SSL:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="1">
+       <item row="5" column="1">
         <widget class="QLabel" name="label_sslVersion">
          <property name="text">
           <string>TextLabel</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
+       <item row="4" column="0">
         <widget class="QLabel" name="label_26">
          <property name="text">
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:700;&quot;&gt;Tor:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="1">
+       <item row="4" column="1">
         <widget class="QLabel" name="label_torVersion">
          <property name="text">
           <string>TextLabel</string>

diff --git a/src/main.cpp b/src/main.cpp
index 20af54e6a0ca7dd291d1e38a1857228961e268b7..15cd44f7c7331caa46e47273780c2bf83164a376 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -85,7 +85,11 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
 
     for (int i = 1; i < argc; i++) {
         if (QString(argv[i]) == "--version" || QString(argv[i]) == "-v") {
+#ifdef FEATHER_BUILD_TAG
+            qInfo() << QObject::tr("Feather Wallet") << FEATHER_VERSION << FEATHER_BUILD_TAG;
+#else
             qInfo() << QObject::tr("Feather Wallet") << FEATHER_VERSION;
+#endif
             return 0;
         }
     }