update satus label stuff more

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 1f11f77a81b09fc7144198180a453491d808f991..ce2d67e25b1642c5d78f72f85a1b7c96e58aa713 100644 (file)
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -651,6 +651,7 @@ void MainWindow::initOffline() {
 
     connect(m_updateNetworkInfoAction, &QAction::triggered, this, [this]() {
         if (!m_wallet) return;
+        this->setStatusText(tr("Fetching network info..."));
         m_wallet->updateNetworkStatus();
     });
 

diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp
index 4c0f40ef4f0d70cc084b7acb27f85ebc33a7801f..81e85fae679409ce392df8f070a19f43c716ac61 100644 (file)
--- a/src/SettingsDialog.cpp
+++ b/src/SettingsDialog.cpp
@@ -247,7 +247,7 @@ void Settings::setupStorageTab() {
 
     // [Log level]
     ui->comboBox_logLevel->clear();
-    ui->comboBox_logLevel->addItems({"Error", "Warning", "Info", "Debug", "Trace"});
+    ui->comboBox_logLevel->addItems({"Fatal", "Warning", "Info", "Debug"});
     ui->comboBox_logLevel->setCurrentIndex(conf()->get(Config::logLevel).toInt());
 
     connect(ui->comboBox_logLevel, QOverload<int>::of(&QComboBox::currentIndexChanged), [](int index){
@@ -329,7 +329,7 @@ void Settings::setupDisplayTab() {
     connect(ui->checkBox_showTrayIcon, &QCheckBox::toggled, [this](bool toggled) {
         conf()->set(Config::showTrayIcon, toggled);
         ui->checkBox_minimizeToTray->setEnabled(toggled);
-        ui->checkBox_trayLeftClickToggles->setEnabled(toggled);
+        ui->checkBox_trayLeftClickTogglesFocus->setEnabled(toggled);
         emit showTrayIcon(toggled);
     });
 
@@ -341,11 +341,10 @@ void Settings::setupDisplayTab() {
     });
 
     // [Left click system tray icon to toggle focus]
-    ui->checkBox_trayLeftClickToggles->setEnabled(ui->checkBox_showTrayIcon->isChecked());
-    ui->checkBox_trayLeftClickToggles->setChecked(conf()->get(Config::trayLeftClickToggles).toBool());
-    connect(ui->checkBox_trayLeftClickToggles, &QCheckBox::toggled, [this](bool toggled) {
-        conf()->set(Config::trayLeftClickToggles, toggled);
-    });
+    ui->checkBox_trayLeftClickTogglesFocus->setEnabled(ui->checkBox_showTrayIcon->isChecked());
+    ui->checkBox_trayLeftClickTogglesFocus->setChecked(conf()->get(Config::trayLeftClickTogglesFocus).toBool());
+    connect(ui->checkBox_trayLeftClickTogglesFocus, &QCheckBox::toggled,
+            [this](bool toggled) { conf()->set(Config::trayLeftClickTogglesFocus, toggled); });
 }
 
 void Settings::setupMemoryTab() {

diff --git a/src/SettingsDialog.ui b/src/SettingsDialog.ui
index f4f01107eb8d65a7f8224237bf0a9d6f61360c35..4479a2359c9aafd25720022db0e9c76eabc22002 100644 (file)
--- a/src/SettingsDialog.ui
+++ b/src/SettingsDialog.ui
@@ -857,7 +857,7 @@
                  </spacer>
                 </item>
                 <item>
-                 <widget class="QCheckBox" name="checkBox_trayLeftClickToggles">
+                 <widget class="QCheckBox" name="checkBox_trayLeftClickTogglesFocus">
                   <property name="enabled">
                    <bool>false</bool>
                   </property>

diff --git a/src/WindowManager.cpp b/src/WindowManager.cpp
index 5a6afb0b5c7f4b45d03b2dc1045508443462829e..7587b17af5b2a358f33c746a3c0a8bd5b0fbd7b5 100644 (file)
--- a/src/WindowManager.cpp
+++ b/src/WindowManager.cpp
@@ -49,7 +49,7 @@ WindowManager::WindowManager(QObject *parent)
 
     connect(m_tray, &QSystemTrayIcon::activated, [this](QSystemTrayIcon::ActivationReason reason) {
         if (reason == QSystemTrayIcon::Trigger) {
-            if (conf()->get(Config::trayLeftClickToggles).toBool()) {
+            if (conf()->get(Config::trayLeftClickTogglesFocus).toBool()) {
                 for (const auto &window : m_windows) {
                     if (window->isVisible()) {
                         window->hide();

diff --git a/src/dialog/DebugInfoDialog.cpp b/src/dialog/DebugInfoDialog.cpp
index 3d1ad59f66632c8a38b8105b6ce81bb5ea8bacfa..dd1d050b3b6c1e915c635c65868ca12f1d1d73cf 100644 (file)
--- a/src/dialog/DebugInfoDialog.cpp
+++ b/src/dialog/DebugInfoDialog.cpp
@@ -57,7 +57,11 @@ void DebugInfoDialog::updateInfo() {
 
     auto node = m_nodes->connection();
     ui->label_remoteNode->setText(node.toAddress());
-    ui->label_walletStatus->setText(this->statusToString(m_wallet->connectionStatus()));
+    QString statusStr = this->statusToString(m_wallet->connectionStatus());
+    if (conf()->get(Config::syncPaused).toBool()) {
+        statusStr += " (Paused)";
+    }
+    ui->label_walletStatus->setText(statusStr);
     QString websocketStatus = Utils::QtEnumToString(websocketNotifier()->websocketClient->webSocket->state()).remove("State");
     if (conf()->get(Config::disableWebsocket).toBool()) {
         websocketStatus = "Disabled";

diff --git a/src/dialog/PaymentRequestDialog.cpp b/src/dialog/PaymentRequestDialog.cpp
index 9f4527de1d18874301aa11be621f19c40e232f5e..f3b4f50b6d082e2a8d7422e4a51a3ec029f5aa94 100644 (file)
--- a/src/dialog/PaymentRequestDialog.cpp
+++ b/src/dialog/PaymentRequestDialog.cpp
@@ -118,7 +118,11 @@ void PaymentRequestDialog::saveImage() {
     }
 
     QFile file(filename);
-    file.open(QIODevice::WriteOnly);
+    if (!file.open(QIODevice::WriteOnly)) {
+        QMessageBox::warning(this, tr("Error"), tr("Could not save image to file: %1").arg(file.errorString()));
+        qWarning() << "Could not save image to file: " << file.errorString();
+        return;
+    }
     m_qrCode->toPixmap(1).scaled(500, 500, Qt::KeepAspectRatio).save(&file, "PNG");
     QMessageBox::information(this, "Information", "QR code saved to file");
 }

diff --git a/src/utils/config.cpp b/src/utils/config.cpp
index 67a6efadc026c93c6267f03b420ea32aa254e613..01848d4d2679e3a28b2d55ab5346e1a99d6eb5bd 100644 (file)
--- a/src/utils/config.cpp
+++ b/src/utils/config.cpp
@@ -74,8 +74,8 @@ static const QHash<Config::ConfigKey, ConfigDirective> configStrings = {
         {Config::inactivityLockTimeout, {QS("inactivityLockTimeout"), 10}},
         {Config::lockOnMinimize, {QS("lockOnMinimize"), false}},
         {Config::showTrayIcon, {QS("showTrayIcon"), true}},
-        {Config::minimizeToTray, {QS("minimizeToTray"), false}},
-        {Config::trayLeftClickToggles, {QS("trayLeftClickToggles"), false}},
+        {Config::minimizeToTray, {QS("minimizeToTray"), true}},
+        {Config::trayLeftClickTogglesFocus, {QS("trayLeftClickTogglesFocus"), true}},
         {Config::disableWebsocket, {QS("disableWebsocket"), false}},
         {Config::disableAutoRefresh, {QS("disableAutoRefresh"), false}},
         {Config::offlineMode, {QS("offlineMode"), false}},

diff --git a/src/utils/config.h b/src/utils/config.h
index 3bd7224c921855b1a9edd7e1db949894561c5cb7..beaa02d44a7cb9113314d357a8279d3cc6cc0d80 100644 (file)
--- a/src/utils/config.h
+++ b/src/utils/config.h
@@ -110,7 +110,7 @@ public:
         lockOnMinimize,
         showTrayIcon,
         minimizeToTray,
-        trayLeftClickToggles,
+        trayLeftClickTogglesFocus,
 
         // Transactions
         multiBroadcast,