From 11a589a61fecd5462b7b8deea69e621f0410c80e Mon Sep 17 00:00:00 2001 From: johnny9 <985648+johnny9@users.noreply.github.com> Date: Mon, 20 Jan 2025 14:45:04 -0500 Subject: [PATCH] qml: Rename to Block Status --- src/Makefile.qt.include | 18 +++---- src/qml/bitcoin.cpp | 4 +- src/qml/bitcoin_qml.qrc | 12 ++--- .../{BlockClock.qml => BlockStatus.qml} | 6 +-- ...layMode.qml => BlockStatusDisplayMode.qml} | 14 ++--- ...blockclockdial.cpp => blockstatusdial.cpp} | 48 +++++++++--------- .../{blockclockdial.h => blockstatusdial.h} | 4 +- src/qml/controls/Theme.qml | 4 +- src/qml/imageprovider.cpp | 8 +-- src/qml/pages/node/NodeRunner.qml | 2 +- ...ockclock.qml => OnboardingBlockStatus.qml} | 4 +- src/qml/pages/onboarding/OnboardingWizard.qml | 6 +-- ...qml => SettingsBlockStatusDisplayMode.qml} | 4 +- src/qml/pages/settings/SettingsDisplay.qml | 12 ++--- src/qml/pages/wallet/DesktopWallets.qml | 14 ++--- ...mpact.png => blockstatus-size-compact.png} | Bin ...case.png => blockstatus-size-showcase.png} | Bin ...mpact.svg => blockstatus-size-compact.svg} | 0 ...case.svg => blockstatus-size-showcase.svg} | 0 19 files changed, 80 insertions(+), 80 deletions(-) rename src/qml/components/{BlockClock.qml => BlockStatus.qml} (98%) rename src/qml/components/{BlockClockDisplayMode.qml => BlockStatusDisplayMode.qml} (66%) rename src/qml/components/{blockclockdial.cpp => blockstatusdial.cpp} (86%) rename src/qml/components/{blockclockdial.h => blockstatusdial.h} (96%) rename src/qml/pages/onboarding/{OnboardingBlockclock.qml => OnboardingBlockStatus.qml} (92%) rename src/qml/pages/settings/{SettingsBlockClockDisplayMode.qml => SettingsBlockStatusDisplayMode.qml} (91%) rename src/qml/res/icons/{blockclock-size-compact.png => blockstatus-size-compact.png} (100%) rename src/qml/res/icons/{blockclock-size-showcase.png => blockstatus-size-showcase.png} (100%) rename src/qml/res/src/{blockclock-size-compact.svg => blockstatus-size-compact.svg} (100%) rename src/qml/res/src/{blockclock-size-showcase.svg => blockstatus-size-showcase.svg} (100%) diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 8217d04798..1811ec95ed 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -35,7 +35,7 @@ QT_FORMS_UI = \ qt/forms/transactiondescdialog.ui QT_MOC_CPP = \ - qml/components/moc_blockclockdial.cpp \ + qml/components/moc_blockstatusdial.cpp \ qml/controls/moc_linegraph.cpp \ qml/models/moc_chainmodel.cpp \ qml/models/moc_networktraffictower.cpp \ @@ -118,7 +118,7 @@ QT_QRC_LOCALE_CPP = qt/qrc_bitcoin_locale.cpp QT_QRC_LOCALE = qt/bitcoin_locale.qrc BITCOIN_QT_H = \ - qml/components/blockclockdial.h \ + qml/components/blockstatusdial.h \ qml/controls/linegraph.h \ qml/models/chainmodel.h \ qml/models/networktraffictower.h \ @@ -310,7 +310,7 @@ BITCOIN_QT_WALLET_CPP = \ BITCOIN_QML_BASE_CPP = \ qml/bitcoin.cpp \ - qml/components/blockclockdial.cpp \ + qml/components/blockstatusdial.cpp \ qml/controls/linegraph.cpp \ qml/models/chainmodel.cpp \ qml/models/networktraffictower.cpp \ @@ -333,8 +333,8 @@ QML_RES_ICONS = \ qml/res/icons/arrow-down.png \ qml/res/icons/arrow-up.png \ qml/res/icons/bitcoin-circle.png \ - qml/res/icons/blockclock-size-compact.png \ - qml/res/icons/blockclock-size-showcase.png \ + qml/res/icons/blockstatus-size-compact.png \ + qml/res/icons/blockstatus-size-showcase.png \ qml/res/icons/blocktime-dark.png \ qml/res/icons/blocktime-light.png \ qml/res/icons/caret-left.png \ @@ -364,8 +364,8 @@ QML_QRC_CPP = qml/qrc_bitcoin.cpp QML_QRC = qml/bitcoin_qml.qrc QML_RES_QML = \ qml/components/AboutOptions.qml \ - qml/components/BlockClock.qml \ - qml/components/BlockClockDisplayMode.qml \ + qml/components/BlockStatus.qml \ + qml/components/BlockStatusDisplayMode.qml \ qml/components/BlockCounter.qml \ qml/components/ConnectionOptions.qml \ qml/components/ConnectionSettings.qml \ @@ -418,7 +418,7 @@ QML_RES_QML = \ qml/pages/node/Peers.qml \ qml/pages/node/PeerDetails.qml \ qml/pages/node/Shutdown.qml \ - qml/pages/onboarding/OnboardingBlockclock.qml \ + qml/pages/onboarding/OnboardingBlockStatus.qml \ qml/pages/onboarding/OnboardingConnection.qml \ qml/pages/onboarding/OnboardingCover.qml \ qml/pages/onboarding/OnboardingStorageAmount.qml \ @@ -426,7 +426,7 @@ QML_RES_QML = \ qml/pages/onboarding/OnboardingStrengthen.qml \ qml/pages/onboarding/OnboardingWizard.qml \ qml/pages/settings/SettingsAbout.qml \ - qml/pages/settings/SettingsBlockClockDisplayMode.qml \ + qml/pages/settings/SettingsBlockStatusDisplayMode.qml \ qml/pages/settings/SettingsConnection.qml \ qml/pages/settings/SettingsDeveloper.qml \ qml/pages/settings/SettingsDisplay.qml \ diff --git a/src/qml/bitcoin.cpp b/src/qml/bitcoin.cpp index 078f07e3c6..586fcda437 100644 --- a/src/qml/bitcoin.cpp +++ b/src/qml/bitcoin.cpp @@ -18,7 +18,7 @@ #ifdef __ANDROID__ #include #endif -#include +#include #include #include #include @@ -327,7 +327,7 @@ int QmlGuiMain(int argc, char* argv[]) AppMode app_mode = SetupAppMode(); qmlRegisterSingletonInstance("org.bitcoincore.qt", 1, 0, "AppMode", &app_mode); - qmlRegisterType("org.bitcoincore.qt", 1, 0, "BlockClockDial"); + qmlRegisterType("org.bitcoincore.qt", 1, 0, "BlockStatusDial"); qmlRegisterType("org.bitcoincore.qt", 1, 0, "LineGraph"); qmlRegisterUncreatableType("org.bitcoincore.qt", 1, 0, "PeerDetailsModel", ""); diff --git a/src/qml/bitcoin_qml.qrc b/src/qml/bitcoin_qml.qrc index 61d2607fca..b276188be2 100644 --- a/src/qml/bitcoin_qml.qrc +++ b/src/qml/bitcoin_qml.qrc @@ -1,8 +1,8 @@ components/AboutOptions.qml - components/BlockClock.qml - components/BlockClockDisplayMode.qml + components/BlockStatus.qml + components/BlockStatusDisplayMode.qml components/BlockCounter.qml controls/CaretRightIcon.qml components/ConnectionOptions.qml @@ -55,7 +55,7 @@ pages/node/Peers.qml pages/node/PeerDetails.qml pages/node/Shutdown.qml - pages/onboarding/OnboardingBlockclock.qml + pages/onboarding/OnboardingBlockStatus.qml pages/onboarding/OnboardingConnection.qml pages/onboarding/OnboardingCover.qml pages/onboarding/OnboardingStorageAmount.qml @@ -63,7 +63,7 @@ pages/onboarding/OnboardingStrengthen.qml pages/onboarding/OnboardingWizard.qml pages/settings/SettingsAbout.qml - pages/settings/SettingsBlockClockDisplayMode.qml + pages/settings/SettingsBlockStatusDisplayMode.qml pages/settings/SettingsConnection.qml pages/settings/SettingsDeveloper.qml pages/settings/SettingsDisplay.qml @@ -85,8 +85,8 @@ res/icons/arrow-down.png res/icons/arrow-up.png res/icons/bitcoin-circle.png - res/icons/blockclock-size-compact.png - res/icons/blockclock-size-showcase.png + res/icons/blockstatus-size-compact.png + res/icons/blockstatus-size-showcase.png res/icons/blocktime-dark.png res/icons/blocktime-light.png ../qt/res/icons/bitcoin.png diff --git a/src/qml/components/BlockClock.qml b/src/qml/components/BlockStatus.qml similarity index 98% rename from src/qml/components/BlockClock.qml rename to src/qml/components/BlockStatus.qml index 51b02afe51..0d878dcbd9 100644 --- a/src/qml/components/BlockClock.qml +++ b/src/qml/components/BlockStatus.qml @@ -38,13 +38,13 @@ Item { Settings { id: settings - property alias blockclocksize: dial.scale + property alias blockstatussize: dial.scale } - BlockClockDial { + BlockStatusDial { id: dial anchors.horizontalCenter: root.horizontalCenter - scale: Theme.blockclocksize + scale: Theme.blockstatussize width: {Math.max(Math.min(200, Math.min(root.parentWidth - 30, root.parentHeight - 30)), Math.min((root.parentWidth * dial.scale), (root.parentHeight * dial.scale)))} height: dial.width diff --git a/src/qml/components/BlockClockDisplayMode.qml b/src/qml/components/BlockStatusDisplayMode.qml similarity index 66% rename from src/qml/components/BlockClockDisplayMode.qml rename to src/qml/components/BlockStatusDisplayMode.qml index 87b2e65e3c..3db4279431 100644 --- a/src/qml/components/BlockClockDisplayMode.qml +++ b/src/qml/components/BlockStatusDisplayMode.qml @@ -21,10 +21,10 @@ ColumnLayout { ButtonGroup.group: group text: qsTr("Compact") description: qsTr("For personal use on a computer or smartphone.") - image: "image://images/blockclock-size-compact" - checked: Theme.blockclocksize == (1/3) + image: "image://images/blockstatus-size-compact" + checked: Theme.blockstatussize == (1/3) onClicked: { - Theme.blockclocksize = (1/3) + Theme.blockstatussize = (1/3) } } @@ -32,11 +32,11 @@ ColumnLayout { Layout.fillWidth: true ButtonGroup.group: group text: qsTr("Showcase") - description: qsTr("A larger block clock for public display on a tablet or other large screen.") - image: "image://images/blockclock-size-showcase" - checked: Theme.blockclocksize == (1/2) + description: qsTr("A larger block status for public display on a tablet or other large screen.") + image: "image://images/blockstatus-size-showcase" + checked: Theme.blockstatussize == (1/2) onClicked: { - Theme.blockclocksize = (1/2) + Theme.blockstatussize = (1/2) } } } diff --git a/src/qml/components/blockclockdial.cpp b/src/qml/components/blockstatusdial.cpp similarity index 86% rename from src/qml/components/blockclockdial.cpp rename to src/qml/components/blockstatusdial.cpp index a6842702ea..5f44f28d1a 100644 --- a/src/qml/components/blockclockdial.cpp +++ b/src/qml/components/blockstatusdial.cpp @@ -2,7 +2,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include +#include #include #include @@ -12,7 +12,7 @@ #include #include -BlockClockDial::BlockClockDial(QQuickItem *parent) +BlockStatusDial::BlockStatusDial(QQuickItem *parent) : QQuickPaintedItem(parent) { m_animation_timer.setTimerType(Qt::PreciseTimer); @@ -32,7 +32,7 @@ BlockClockDial::BlockClockDial(QQuickItem *parent) m_delay_timer.start(); } -void BlockClockDial::setupConnectingGradient(const QPen & pen) +void BlockStatusDial::setupConnectingGradient(const QPen & pen) { m_connecting_gradient.setCenter(getBoundsForPen(pen).center()); m_connecting_gradient.setAngle(m_connecting_start_angle); @@ -43,7 +43,7 @@ void BlockClockDial::setupConnectingGradient(const QPen & pen) m_connecting_gradient.setColorAt(1, "transparent"); } -qreal BlockClockDial::decrementGradientAngle(qreal angle) +qreal BlockStatusDial::decrementGradientAngle(qreal angle) { if (angle == -360) { return 0; @@ -52,7 +52,7 @@ qreal BlockClockDial::decrementGradientAngle(qreal angle) } } -qreal BlockClockDial::getTargetAnimationAngle() +qreal BlockStatusDial::getTargetAnimationAngle() { if (connected() && synced()) { return m_time_ratio_list[0].toDouble() * 360; @@ -63,7 +63,7 @@ qreal BlockClockDial::getTargetAnimationAngle() } } -qreal BlockClockDial::incrementAnimatingMaxAngle(qreal angle) +qreal BlockStatusDial::incrementAnimatingMaxAngle(qreal angle) { if (connected()) { return angle += (getTargetAnimationAngle() - angle) * 0.05; @@ -77,19 +77,19 @@ qreal BlockClockDial::incrementAnimatingMaxAngle(qreal angle) } } -void BlockClockDial::setTimeRatioList(QVariantList new_list) +void BlockStatusDial::setTimeRatioList(QVariantList new_list) { m_time_ratio_list = new_list; update(); } -void BlockClockDial::setVerificationProgress(double progress) +void BlockStatusDial::setVerificationProgress(double progress) { m_verification_progress = progress; update(); } -void BlockClockDial::setConnected(bool connected) +void BlockStatusDial::setConnected(bool connected) { if (m_is_connected != connected) { m_is_connected = connected; @@ -104,7 +104,7 @@ void BlockClockDial::setConnected(bool connected) } } -void BlockClockDial::setSynced(bool is_synced) +void BlockStatusDial::setSynced(bool is_synced) { if (m_is_synced != is_synced) { m_is_synced = is_synced; @@ -116,7 +116,7 @@ void BlockClockDial::setSynced(bool is_synced) } } -void BlockClockDial::setPaused(bool paused) +void BlockStatusDial::setPaused(bool paused) { if (m_is_paused != paused) { m_is_paused = paused; @@ -128,13 +128,13 @@ void BlockClockDial::setPaused(bool paused) } } -void BlockClockDial::setPenWidth(qreal width) +void BlockStatusDial::setPenWidth(qreal width) { m_pen_width = width; update(); } -void BlockClockDial::setScale(qreal scale) +void BlockStatusDial::setScale(qreal scale) { m_scale = scale; update(); @@ -142,25 +142,25 @@ void BlockClockDial::setScale(qreal scale) Q_EMIT scaleChanged(); } -void BlockClockDial::setBackgroundColor(QColor color) +void BlockStatusDial::setBackgroundColor(QColor color) { m_background_color = color; update(); } -void BlockClockDial::setConfirmationColors(QList colorList) +void BlockStatusDial::setConfirmationColors(QList colorList) { m_confirmation_colors = colorList; update(); } -void BlockClockDial::setTimeTickColor(QColor color) +void BlockStatusDial::setTimeTickColor(QColor color) { m_time_tick_color = color; update(); } -QRectF BlockClockDial::getBoundsForPen(const QPen & pen) +QRectF BlockStatusDial::getBoundsForPen(const QPen & pen) { const QRectF bounds = boundingRect(); const qreal smallest = qMin(bounds.width(), bounds.height()); @@ -185,7 +185,7 @@ QRectF BlockClockDial::getBoundsForPen(const QPen & pen) return rect; } -void BlockClockDial::paintBlocks(QPainter * painter) +void BlockStatusDial::paintBlocks(QPainter * painter) { int numberOfBlocks = m_time_ratio_list.length(); if (numberOfBlocks < 2) { @@ -234,7 +234,7 @@ void BlockClockDial::paintBlocks(QPainter * painter) } } -void BlockClockDial::paintProgress(QPainter * painter) +void BlockStatusDial::paintProgress(QPainter * painter) { QPen pen(m_confirmation_colors[5]); pen.setWidthF(m_pen_width); @@ -257,7 +257,7 @@ void BlockClockDial::paintProgress(QPainter * painter) painter->drawArc(bounds, startAngle * 16, spanAngle * 16); } -void BlockClockDial::paintConnectingAnimation(QPainter * painter) +void BlockStatusDial::paintConnectingAnimation(QPainter * painter) { QPen pen; pen.setWidthF(m_pen_width); @@ -274,7 +274,7 @@ void BlockClockDial::paintConnectingAnimation(QPainter * painter) } } -void BlockClockDial::paintBackground(QPainter * painter) +void BlockStatusDial::paintBackground(QPainter * painter) { QPen pen(m_background_color); pen.setWidthF(m_pen_width); @@ -284,13 +284,13 @@ void BlockClockDial::paintBackground(QPainter * painter) painter->drawEllipse(bounds); } -double BlockClockDial::degreesPerPixel() +double BlockStatusDial::degreesPerPixel() { double circumference = width() * 3.1415926; return 360 / circumference; } -void BlockClockDial::paintTimeTicks(QPainter * painter) +void BlockStatusDial::paintTimeTicks(QPainter * painter) { QPen pen(m_time_tick_color); pen.setWidthF(m_pen_width); @@ -309,7 +309,7 @@ void BlockClockDial::paintTimeTicks(QPainter * painter) } } -void BlockClockDial::paint(QPainter * painter) +void BlockStatusDial::paint(QPainter * painter) { if (width() <= 0 || height() <= 0) { return; diff --git a/src/qml/components/blockclockdial.h b/src/qml/components/blockstatusdial.h similarity index 96% rename from src/qml/components/blockclockdial.h rename to src/qml/components/blockstatusdial.h index e7a103f0c0..63ec98f26f 100644 --- a/src/qml/components/blockclockdial.h +++ b/src/qml/components/blockstatusdial.h @@ -11,7 +11,7 @@ #include #include -class BlockClockDial : public QQuickPaintedItem +class BlockStatusDial : public QQuickPaintedItem { Q_OBJECT Q_PROPERTY(QVariantList timeRatioList READ timeRatioList WRITE setTimeRatioList) @@ -26,7 +26,7 @@ class BlockClockDial : public QQuickPaintedItem Q_PROPERTY(QColor timeTickColor READ timeTickColor WRITE setTimeTickColor) public: - explicit BlockClockDial(QQuickItem * parent = nullptr); + explicit BlockStatusDial(QQuickItem * parent = nullptr); void paint(QPainter * painter) override; QVariantList timeRatioList() const { return m_time_ratio_list; }; diff --git a/src/qml/controls/Theme.qml b/src/qml/controls/Theme.qml index f57e152cbd..eab30fe5d7 100644 --- a/src/qml/controls/Theme.qml +++ b/src/qml/controls/Theme.qml @@ -6,14 +6,14 @@ import Qt.labs.settings 1.0 Control { id: root property bool dark: true - property real blockclocksize: (5/12) + property real blockstatussize: (5/12) readonly property ColorSet color: dark ? darkColorSet : lightColorSet readonly property ImageSet image: dark ? darkImageSet : lightImageSet Settings { id: settings property alias dark: root.dark - property alias blockclocksize: root.blockclocksize + property alias blockstatussize: root.blockstatussize } component ColorSet: QtObject { diff --git a/src/qml/imageprovider.cpp b/src/qml/imageprovider.cpp index daf2feeae2..cb7c452a80 100644 --- a/src/qml/imageprovider.cpp +++ b/src/qml/imageprovider.cpp @@ -37,14 +37,14 @@ QPixmap ImageProvider::requestPixmap(const QString& id, QSize* size, const QSize return QIcon(":/icons/bitcoin-circle").pixmap(requested_size); } - if (id == "blockclock-size-compact") { + if (id == "blockstatus-size-compact") { *size = requested_size; - return QIcon(":/icons/blockclock-size-compact").pixmap(requested_size); + return QIcon(":/icons/blockstatus-size-compact").pixmap(requested_size); } - if (id == "blockclock-size-showcase") { + if (id == "blockstatus-size-showcase") { *size = requested_size; - return QIcon(":/icons/blockclock-size-showcase").pixmap(requested_size); + return QIcon(":/icons/blockstatus-size-showcase").pixmap(requested_size); } if (id == "blocktime-dark") { diff --git a/src/qml/pages/node/NodeRunner.qml b/src/qml/pages/node/NodeRunner.qml index 2372983e21..13b51ea105 100644 --- a/src/qml/pages/node/NodeRunner.qml +++ b/src/qml/pages/node/NodeRunner.qml @@ -24,7 +24,7 @@ Page { Component.onCompleted: nodeModel.startNodeInitializionThread(); - BlockClock { + BlockStatus { parentWidth: parent.width - 40 parentHeight: parent.height anchors.centerIn: parent diff --git a/src/qml/pages/onboarding/OnboardingBlockclock.qml b/src/qml/pages/onboarding/OnboardingBlockStatus.qml similarity index 92% rename from src/qml/pages/onboarding/OnboardingBlockclock.qml rename to src/qml/pages/onboarding/OnboardingBlockStatus.qml index dbddfd192f..f1fb0cab7b 100644 --- a/src/qml/pages/onboarding/OnboardingBlockclock.qml +++ b/src/qml/pages/onboarding/OnboardingBlockStatus.qml @@ -20,9 +20,9 @@ InformationPage { sourceSize.height: 200 } bold: true - headerText: qsTr("The block clock") + headerText: qsTr("The block status") description: qsTr("The Bitcoin network targets a new block every 10 minutes. " + - "Sometimes it's faster and sometimes slower.\n\nThe block clock indicates each " + + "Sometimes it's faster and sometimes slower.\n\nThe block status indicates each " + "block on a dial that represents the current day.") buttonText: qsTr("Next") } diff --git a/src/qml/pages/onboarding/OnboardingWizard.qml b/src/qml/pages/onboarding/OnboardingWizard.qml index 43b3c5b587..177188006f 100644 --- a/src/qml/pages/onboarding/OnboardingWizard.qml +++ b/src/qml/pages/onboarding/OnboardingWizard.qml @@ -23,12 +23,12 @@ PageStack { id: strengthen OnboardingStrengthen { onBack: root.pop() - onNext: root.push(blockclock) + onNext: root.push(blockstatus) } } Component { - id: blockclock - OnboardingBlockclock { + id: blockstatus + OnboardingBlockStatus { onBack: root.pop() onNext: root.push(storageLocation) } diff --git a/src/qml/pages/settings/SettingsBlockClockDisplayMode.qml b/src/qml/pages/settings/SettingsBlockStatusDisplayMode.qml similarity index 91% rename from src/qml/pages/settings/SettingsBlockClockDisplayMode.qml rename to src/qml/pages/settings/SettingsBlockStatusDisplayMode.qml index 8cbf96231d..8450965c78 100644 --- a/src/qml/pages/settings/SettingsBlockClockDisplayMode.qml +++ b/src/qml/pages/settings/SettingsBlockStatusDisplayMode.qml @@ -27,10 +27,10 @@ Page { centerItem: Header { headerBold: true headerSize: 18 - header: qsTr("Block clock display mode") + header: qsTr("Block status display mode") } } - BlockClockDisplayMode { + BlockStatusDisplayMode { width: Math.min(parent.width, 450) anchors.horizontalCenter: parent.horizontalCenter } diff --git a/src/qml/pages/settings/SettingsDisplay.qml b/src/qml/pages/settings/SettingsDisplay.qml index db093efd5c..e3dab40e21 100644 --- a/src/qml/pages/settings/SettingsDisplay.qml +++ b/src/qml/pages/settings/SettingsDisplay.qml @@ -54,14 +54,14 @@ Item { } Separator { Layout.fillWidth: true } Setting { - id: gotoBlockClockSize + id: gotoBlockStatusSize Layout.fillWidth: true - header: qsTr("Block clock display mode") + header: qsTr("Block status display mode") actionItem: CaretRightIcon { - color: gotoBlockClockSize.stateColor + color: gotoBlockStatusSize.stateColor } onClicked: { - nodeSettingsView.push(blockclocksize_page) + nodeSettingsView.push(blockstatus_size_page) } } } @@ -76,8 +76,8 @@ Item { } } Component { - id: blockclocksize_page - SettingsBlockClockDisplayMode { + id: blockstatus_size_page + SettingsBlockStatusDisplayMode { onBack: { nodeSettingsView.pop() } diff --git a/src/qml/pages/wallet/DesktopWallets.qml b/src/qml/pages/wallet/DesktopWallets.qml index 1e45d8d248..cc1fad2d6f 100644 --- a/src/qml/pages/wallet/DesktopWallets.qml +++ b/src/qml/pages/wallet/DesktopWallets.qml @@ -70,24 +70,24 @@ Page { shorten: true } NavigationTab { - id: blockClockTabButton + id: blockStatusTabButton Layout.preferredWidth: 30 Layout.rightMargin: 10 property int index: 3 ButtonGroup.group: navigationTabs Tooltip { - id: blockClockTooltip + id: blockStatusTooltip property var syncState: Utils.formatRemainingSyncTime(nodeModel.remainingSyncTime) property bool synced: nodeModel.verificationProgress > 0.9999 property bool paused: nodeModel.pause property bool connected: nodeModel.numOutboundPeers > 0 - anchors.top: blockClockTabButton.bottom + anchors.top: blockStatusTabButton.bottom anchors.topMargin: -5 - anchors.horizontalCenter: blockClockTabButton.horizontalCenter + anchors.horizontalCenter: blockStatusTabButton.horizontalCenter - visible: blockClockTabButton.hovered + visible: blockStatusTabButton.hovered text: { if (paused) { qsTr("Paused") @@ -135,9 +135,9 @@ Page { CoreText { text: "Receive" } } Item { - id: blockClockTab + id: blockStatusTab anchors.fill: parent - BlockClock { + BlockStatus { parentWidth: parent.width - 40 parentHeight: parent.height anchors.centerIn: parent diff --git a/src/qml/res/icons/blockclock-size-compact.png b/src/qml/res/icons/blockstatus-size-compact.png similarity index 100% rename from src/qml/res/icons/blockclock-size-compact.png rename to src/qml/res/icons/blockstatus-size-compact.png diff --git a/src/qml/res/icons/blockclock-size-showcase.png b/src/qml/res/icons/blockstatus-size-showcase.png similarity index 100% rename from src/qml/res/icons/blockclock-size-showcase.png rename to src/qml/res/icons/blockstatus-size-showcase.png diff --git a/src/qml/res/src/blockclock-size-compact.svg b/src/qml/res/src/blockstatus-size-compact.svg similarity index 100% rename from src/qml/res/src/blockclock-size-compact.svg rename to src/qml/res/src/blockstatus-size-compact.svg diff --git a/src/qml/res/src/blockclock-size-showcase.svg b/src/qml/res/src/blockstatus-size-showcase.svg similarity index 100% rename from src/qml/res/src/blockclock-size-showcase.svg rename to src/qml/res/src/blockstatus-size-showcase.svg