Rebase gui-qml on bitcoin/bitcoin, include qt6 and cmake #472
Conversation
This encapsulates a commonly used button into a reusable component.
Represents the yellow-orange color used for the NetworkIndicator when the app is running on the Signet network.
Signals to the user what network they are running under when not on the main network.
Currently we included the export filled icon from the icon set, but the design file now specifies that we use the export-outline icon as the export icon.
Represents the 1px gray line that separates settings from one another
Extracts out the Separator from the Setting control. Adjusts relevant pages ColumnLayout spacing values. Additionally, adds proper margin values to header since we no longer have spacing provided by a ColumnLayout inside of the Setting control.
There is no use case for a ValueInput that will be fed into a setting to be multi-line in nature
This gives the focus back to the parent setting, relinquishing focus on the ValueInput and moving it out of the edit state.
This reverts commit 9645d37.
This property will be used to set the target number of blocks for the standard fees listed in the UI drop down menu.
The FeeSelection component provides the standard fee options via a drop down menu.
These are purely cosmetic adjustments: - Make the font size of the selector the same as other send form fields - Lighter color for the option durations - Various spacing tweaks for a more harmonious appearance There are still some very minor details like item height, hover state, etc that we may tweak further as make our design system consistent. But these tweaks here get us very close.
The Context is used to change the nav bar text
|
Fix for the black screen issue: davidgumberg@c26f30a |
You are a prince!! Picked. 😘 |
Should this also be applied to the |
|
This PR uses a straightforward approach to rebasing. While it doesn’t follow the modern method for creating QML modules, it has a key advantage for review purposes: the directory layout remains unchanged. This makes it easy to verify: I would expect this to produce no differences, but it is not. Some of these changes could be PR'ed to the |
There was a problem hiding this comment.
Testing f5be211 on Ubuntu 25.04 + Qt 6.8.3:
qrc:/qml/controls/Theme.qml:13:5: QML Settings: The Settings type from Qt.labs.settings is deprecated and will be removed in a future release. Please use the one from QtCore instead.
qrc:/qml/components/BlockClock.qml:38:5: QML Settings: The Settings type from Qt.labs.settings is deprecated and will be removed in a future release. Please use the one from QtCore instead.
qrc:/qml/pages/wallet/Send.qml:33:9: QML Settings: The Settings type from Qt.labs.settings is deprecated and will be removed in a future release. Please use the one from QtCore instead.
expression for onCompleted@qrc:/qml/components/BlockClock.qml:120
Too many arguments, ignoring 1
Running initialization in thread
qrc:/qml/pages/main.qml:24:5: QML Settings: The Settings type from Qt.labs.settings is deprecated and will be removed in a future release. Please use the one from QtCore instead.
I believe we can ignore those messages for now. |
QML diff explanations:Commenting on: diff --git a/src/qml/components/BlockClock.qml b/src/qml/components/BlockClock.qml
index 51b02afe51..fa309766c6 100644
--- a/src/qml/components/BlockClock.qml
+++ b/src/qml/components/BlockClock.qml
@@ -22,7 +22,6 @@ Item {
height: dial.height + networkIndicator.height + networkIndicator.anchors.topMargin
property alias header: mainText.text
- property alias headerSize: mainText.font.pixelSize
property alias subText: subText.text
property int headerSize: 32
property bool connected: nodeModel.numOutboundPeers > https://doc.qt.io/qt-6/qmllint-warnings-and-errors-duplicated-name.html diff --git a/src/qml/components/StorageLocations.qml b/src/qml/components/StorageLocations.qml
index acaa69b40a..52cd39850b 100644
--- a/src/qml/components/StorageLocations.qml
+++ b/src/qml/components/StorageLocations.qml
@@ -5,7 +5,7 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
-import QtQuick.Dialogs 1.3
+import QtQuick.Dialogs
import org.bitcoincore.qt 1.0
@@ -41,8 +41,7 @@ ColumnLayout {
}
FileDialog {
id: fileDialog
- selectFolder: true
- folder: shortcuts.home
+ currentFolder: shortcuts.home
onAccepted: {
optionsModel.setCustomDataDirString(fileDialog.fileUrls[0].toString())
var customDataDir = fileDialog.fileUrl.toString();
The old version number for this module in particular resulted in not-installed error Qt 6 FileDialog has slightly different properties than earlier version. diff --git a/src/qml/components/blockclockdial.cpp b/src/qml/components/blockclockdial.cpp
index a6842702ea..f39658b5f5 100644
--- a/src/qml/components/blockclockdial.cpp
+++ b/src/qml/components/blockclockdial.cpp
@@ -20,9 +20,9 @@ BlockClockDial::BlockClockDial(QQuickItem *parent)
m_delay_timer.setSingleShot(true);
m_delay_timer.setInterval(5000);
connect(&m_delay_timer, &QTimer::timeout,
- this, [=]() { this->m_animation_timer.start(); });
+ this, [this]() { this->m_animation_timer.start(); });
connect(&m_animation_timer, &QTimer::timeout,
- this, [=]() {
+ this, [=, this]() {
if (m_is_connected
&& getTargetAnimationAngle() - m_animating_max_angle < 1) {
m_animation_timer.stop();As far as I can tell in C++11 diff --git a/src/qml/controls/linegraph.cpp b/src/qml/controls/linegraph.cpp
index 1ba1a0f5a5..6c59d0d919 100644
--- a/src/qml/controls/linegraph.cpp
+++ b/src/qml/controls/linegraph.cpp
@@ -94,7 +94,7 @@ void LineGraph::paintMarkerLines(QPainter * painter)
void LineGraph::paintPath(QPainterPath * painter_path)
{
- int item_count = std::min(m_max_samples, m_value_list.size());
+ int item_count = std::min(m_max_samples, static_cast<int>(m_value_list.size()));
qreal h = height();
qreal w = width();
diff --git a/src/qml/pages/wallet/CreateName.qml b/src/qml/pages/wallet/CreateName.qml
index a780f23f76..e216801162 100644
--- a/src/qml/pages/wallet/CreateName.qml
+++ b/src/qml/pages/wallet/CreateName.qml
@@ -49,7 +49,7 @@ Page {
Layout.leftMargin: 20
Layout.rightMargin: 20
placeholderText: qsTr("Eg. My bitcoin wallet...")
- validator: RegExpValidator { regExp: /^[a-zA-Z0-9_]{1,20}$/ }
+ validator: RegularExpressionValidator { regularExpression: /^[a-zA-Z0-9_]{1,20}$/ }
onTextChanged: {
continueButton.enabled = walletNameInput.text.length > 0
}This is setting a property in an diff --git a/src/qml/pages/wallet/SendResult.qml b/src/qml/pages/wallet/SendResult.qml
index 10f5c0449b..3b119aa7c4 100644
--- a/src/qml/pages/wallet/SendResult.qml
+++ b/src/qml/pages/wallet/SendResult.qml
@@ -5,7 +5,7 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
import org.bitcoincore.qt 1.0
import "../../controls"See above, Qt 6 doesn't require specific version numbers and is backwarsd compatible for some modules but not the re-implemented |
UPD. Oh , I see. It is a completely different module now. |
|
I have qt 6.9 installed and changed this line to I could add a commit that removes all version numbers from qt import statements? |
This can be done after rebasing. |
|
also: https://doc.qt.io/qt-6/qtquickcontrols-index.html#versions
|
No description provided.