qml: Rename to Block Status

Author: johnny9

src/qml/bitcoin.cpp

@@ -18,7 +18,7 @@
 #ifdef __ANDROID__
 #include <qml/androidnotifier.h>
 #endif
-#include <qml/components/blockclockdial.h>
+#include <qml/components/blockstatusdial.h>
 #include <qml/controls/linegraph.h>
 #include <qml/guiconstants.h>
 #include <qml/models/chainmodel.h>
@@ -327,7 +327,7 @@ int QmlGuiMain(int argc, char* argv[])
     AppMode app_mode = SetupAppMode();
 
     qmlRegisterSingletonInstance<AppMode>("org.bitcoincore.qt", 1, 0, "AppMode", &app_mode);
-    qmlRegisterType<BlockClockDial>("org.bitcoincore.qt", 1, 0, "BlockClockDial");
+    qmlRegisterType<BlockStatusDial>("org.bitcoincore.qt", 1, 0, "BlockStatusDial");
     qmlRegisterType<LineGraph>("org.bitcoincore.qt", 1, 0, "LineGraph");
     qmlRegisterUncreatableType<PeerDetailsModel>("org.bitcoincore.qt", 1, 0, "PeerDetailsModel", "");
 

src/qml/bitcoin_qml.qrc

@@ -1,8 +1,8 @@
 <!DOCTYPE RCC><RCC version="1.0">
     <qresource prefix="/qml">
         <file>components/AboutOptions.qml</file>
-        <file>components/BlockClock.qml</file>
-        <file>components/BlockClockDisplayMode.qml</file>
+        <file>components/BlockStatus.qml</file>
+        <file>components/BlockStatusDisplayMode.qml</file>
         <file>components/BlockCounter.qml</file>
         <file>controls/CaretRightIcon.qml</file>
         <file>components/ConnectionOptions.qml</file>
@@ -55,15 +55,15 @@
         <file>pages/node/Peers.qml</file>
         <file>pages/node/PeerDetails.qml</file>
         <file>pages/node/Shutdown.qml</file>
-        <file>pages/onboarding/OnboardingBlockclock.qml</file>
+        <file>pages/onboarding/OnboardingBlockStatus.qml</file>
         <file>pages/onboarding/OnboardingConnection.qml</file>
         <file>pages/onboarding/OnboardingCover.qml</file>
         <file>pages/onboarding/OnboardingStorageAmount.qml</file>
         <file>pages/onboarding/OnboardingStorageLocation.qml</file>
         <file>pages/onboarding/OnboardingStrengthen.qml</file>
         <file>pages/onboarding/OnboardingWizard.qml</file>
         <file>pages/settings/SettingsAbout.qml</file>
-        <file>pages/settings/SettingsBlockClockDisplayMode.qml</file>
+        <file>pages/settings/SettingsBlockStatusDisplayMode.qml</file>
         <file>pages/settings/SettingsConnection.qml</file>
         <file>pages/settings/SettingsDeveloper.qml</file>
         <file>pages/settings/SettingsDisplay.qml</file>
@@ -85,8 +85,8 @@
         <file alias="arrow-down">res/icons/arrow-down.png</file>
         <file alias="arrow-up">res/icons/arrow-up.png</file>
         <file alias="bitcoin-circle">res/icons/bitcoin-circle.png</file>
-        <file alias="blockclock-size-compact">res/icons/blockclock-size-compact.png</file>
-        <file alias="blockclock-size-showcase">res/icons/blockclock-size-showcase.png</file>
+        <file alias="blockstatus-size-compact">res/icons/blockstatus-size-compact.png</file>
+        <file alias="blockstatus-size-showcase">res/icons/blockstatus-size-showcase.png</file>
         <file alias="blocktime-dark">res/icons/blocktime-dark.png</file>
         <file alias="blocktime-light">res/icons/blocktime-light.png</file>
         <file alias="bitcoin">../qt/res/icons/bitcoin.png</file>

src/qml/components/BlockClock.qml 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

src/qml/components/BlockClockDisplayMode.qml src/qml/components/BlockStatusDisplayMode.qml

@@ -21,22 +21,22 @@ 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)
         }
     }
 
     OptionButton {
         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)
         }
     }
 }

src/qml/components/blockclockdial.cpp 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 <qml/components/blockclockdial.h>
+#include <qml/components/blockstatusdial.h>
 
 #include <QBrush>
 #include <QColor>
@@ -12,7 +12,7 @@
 #include <QtMath>
 #include <QtGlobal>
 
-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,39 +128,39 @@ 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();
 
     Q_EMIT scaleChanged();
 }
 
-void BlockClockDial::setBackgroundColor(QColor color)
+void BlockStatusDial::setBackgroundColor(QColor color)
 {
     m_background_color = color;
     update();
 }
 
-void BlockClockDial::setConfirmationColors(QList<QColor> colorList)
+void BlockStatusDial::setConfirmationColors(QList<QColor> 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;

src/qml/components/blockclockdial.h src/qml/components/blockstatusdial.h

@@ -11,7 +11,7 @@
 #include <QTimer>
 #include <QtGlobal>
 
-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; };

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 {

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") {

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

src/qml/pages/onboarding/OnboardingBlockclock.qml 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")
 }

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)
         }