From: gg Date: Tue, 13 Jan 2026 07:15:32 +0000 (-0500) Subject: rename to FeatherWallet; UI fixes X-Git-Url: https://git.nutra.tk/v2?a=commitdiff_plain;h=a17258c59336cba9269be8272d8033db1b811d6e;p=gamesguru%2Ffeather.git rename to FeatherWallet; UI fixes --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d7727b2d..9031e144 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -369,13 +369,13 @@ else() if (UNIX AND NOT APPLE) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/feather.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/images/appicons/32x32.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/apps RENAME "feather.png") - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/images/appicons/48x48.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps RENAME "feather.png") - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/images/appicons/64x64.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/64x64/apps RENAME "feather.png") - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/images/appicons/96x96.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/96x96/apps RENAME "feather.png") - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/images/appicons/128x128.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/128x128/apps RENAME "feather.png") - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/images/appicons/256x256.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps RENAME "feather.png") - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/images/appicons/512x512.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/512x512/apps RENAME "feather.png") + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/images/appicons/32x32.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/apps RENAME "FeatherWallet.png") + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/images/appicons/48x48.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps RENAME "FeatherWallet.png") + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/images/appicons/64x64.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/64x64/apps RENAME "FeatherWallet.png") + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/images/appicons/96x96.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/96x96/apps RENAME "FeatherWallet.png") + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/images/appicons/128x128.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/128x128/apps RENAME "FeatherWallet.png") + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/images/appicons/256x256.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps RENAME "FeatherWallet.png") + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/images/appicons/512x512.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/512x512/apps RENAME "FeatherWallet.png") endif() endif() diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 364d8ef2..314c2a7b 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -7,6 +7,8 @@ #include #include #include +#include +#include #include #include #include @@ -909,7 +911,7 @@ void MainWindow::onBalanceUpdated(quint64 balance, quint64 spendable) { QString fiatCurrency = conf()->get(Config::preferredFiatCurrency).toString(); double balanceFiatAmount = appData()->prices.convert("XMR", fiatCurrency, balance / constants::cdiv); if (balance > 0 && balanceFiatAmount == 0.0) { - suffixStr += " (---)"; + suffixStr += " (unknown)"; } else { suffixStr += QString(" (%1)").arg(Utils::amountToCurrencyString(balanceFiatAmount, fiatCurrency)); } @@ -1120,6 +1122,23 @@ void MainWindow::onConnectionStatusChanged(int status) } } + this->setStatusText(statusStr); + + if (m_wallet) { + quint64 walletHeight = m_wallet->blockChainHeight(); + quint64 daemonHeight = m_wallet->daemonBlockChainHeight(); + quint64 targetHeight = m_wallet->daemonBlockChainTargetHeight(); + + if (walletHeight > 0) { + statusStr += QString("\nWallet %1. Daemon %2. Network %3") + .arg(QLocale::system().toString(walletHeight)) + .arg(QLocale::system().toString(daemonHeight)) + .arg(QLocale::system().toString(targetHeight)); + } + } + + m_statusBtnConnectionStatusIndicator->setToolTip(statusStr); + if (conf()->get(Config::syncPaused).toBool() && !conf()->get(Config::offlineMode).toBool()) { if (status == Wallet::ConnectionStatus_Synchronizing || status == Wallet::ConnectionStatus_Synchronized diff --git a/src/assets/feather.desktop b/src/assets/feather.desktop index 4f5737aa..9542b6a8 100644 --- a/src/assets/feather.desktop +++ b/src/assets/feather.desktop @@ -3,7 +3,7 @@ Type=Application Name=Feather Wallet GenericName=Monero Wallet Comment=A free Monero desktop wallet -Icon=feather +Icon=FeatherWallet Exec=feather Terminal=false Categories=Network; diff --git a/src/main.cpp b/src/main.cpp index 5a7eb134..05b1bfd9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,6 +3,8 @@ #include #include +#include +#include #include "Application.h" #include "constants.h" @@ -105,6 +107,12 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) { QApplication::setApplicationName("FeatherWallet"); QApplication::setApplicationVersion(FEATHER_VERSION); +#if defined(Q_OS_LINUX) + QGuiApplication::setDesktopFileName("feather"); +#endif + + QApplication::setWindowIcon(QIcon(":/assets/images/appicons/64x64.png")); + QCommandLineParser parser; parser.setApplicationDescription("Feather - a free Monero desktop wallet"); QCommandLineOption helpOption = parser.addHelpOption();