Skip to content

Commit 8f86d4a

Browse files
committed
qml: Add UI Snapshot files to Make system
1 parent 84c4372 commit 8f86d4a

File tree

3 files changed

+35
-0
lines changed

3 files changed

+35
-0
lines changed

src/Makefile.qt.include

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,11 +334,14 @@ QML_RES_ICONS = \
334334
qml/res/icons/caret-left.png \
335335
qml/res/icons/caret-right.png \
336336
qml/res/icons/check.png \
337+
qml/res/icons/circle-file.png \
338+
qml/res/icons/circle-green-check.png \
337339
qml/res/icons/cross.png \
338340
qml/res/icons/error.png \
339341
qml/res/icons/export.png \
340342
qml/res/icons/gear.png \
341343
qml/res/icons/gear-outline.png \
344+
qml/res/icons/green-check.png \
342345
qml/res/icons/hidden.png \
343346
qml/res/icons/info.png \
344347
qml/res/icons/network-dark.png \
@@ -364,14 +367,17 @@ QML_RES_QML = \
364367
qml/components/ConnectionSettings.qml \
365368
qml/components/DeveloperOptions.qml \
366369
qml/components/ExternalPopup.qml \
370+
qml/components/LoadedSnapshotSettings.qml \
367371
qml/components/PeersIndicator.qml \
368372
qml/components/NetworkTrafficGraph.qml \
369373
qml/components/NetworkIndicator.qml \
374+
qml/components/ProgressBarSettings.qml \
370375
qml/components/ProxySettings.qml \
371376
qml/components/Separator.qml \
372377
qml/components/StorageLocations.qml \
373378
qml/components/StorageOptions.qml \
374379
qml/components/StorageSettings.qml \
380+
qml/components/SnapshotSettings.qml \
375381
qml/components/ThemeSettings.qml \
376382
qml/components/TotalBytesIndicator.qml \
377383
qml/components/Tooltip.qml \
@@ -381,6 +387,7 @@ QML_RES_QML = \
381387
qml/controls/CoreTextField.qml \
382388
qml/controls/ExternalLink.qml \
383389
qml/controls/FocusBorder.qml \
390+
qml/controls/GreenCheckIcon.qml \
384391
qml/controls/Header.qml \
385392
qml/controls/Icon.qml \
386393
qml/controls/InformationPage.qml \
@@ -419,7 +426,10 @@ QML_RES_QML = \
419426
qml/pages/settings/SettingsConnection.qml \
420427
qml/pages/settings/SettingsDeveloper.qml \
421428
qml/pages/settings/SettingsDisplay.qml \
429+
qml/pages/settings/SettingsLoadedSnapshot.qml \
430+
qml/pages/settings/SettingsProgressBar.qml \
422431
qml/pages/settings/SettingsProxy.qml \
432+
qml/pages/settings/SettingsSnapshot.qml \
423433
qml/pages/settings/SettingsStorage.qml \
424434
qml/pages/settings/SettingsTheme.qml \
425435
qml/pages/wallet/AddWallet.qml \

src/qml/bitcoin_qml.qrc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@
1010
<file>components/PeersIndicator.qml</file>
1111
<file>components/DeveloperOptions.qml</file>
1212
<file>components/ExternalPopup.qml</file>
13+
<file>components/LoadedSnapshotSettings.qml</file>
1314
<file>components/NetworkTrafficGraph.qml</file>
1415
<file>components/NetworkIndicator.qml</file>
16+
<file>components/ProgressBarSettings.qml</file>
1517
<file>components/ProxySettings.qml</file>
1618
<file>components/StorageLocations.qml</file>
1719
<file>components/Separator.qml</file>
20+
<file>components/SnapshotSettings.qml</file>
1821
<file>components/StorageOptions.qml</file>
1922
<file>components/StorageSettings.qml</file>
2023
<file>components/ThemeSettings.qml</file>
@@ -25,6 +28,7 @@
2528
<file>controls/CoreTextField.qml</file>
2629
<file>controls/ExternalLink.qml</file>
2730
<file>controls/FocusBorder.qml</file>
31+
<file>controls/GreenCheckIcon.qml</file>
2832
<file>controls/Header.qml</file>
2933
<file>controls/Icon.qml</file>
3034
<file>controls/InformationPage.qml</file>
@@ -63,7 +67,10 @@
6367
<file>pages/settings/SettingsConnection.qml</file>
6468
<file>pages/settings/SettingsDeveloper.qml</file>
6569
<file>pages/settings/SettingsDisplay.qml</file>
70+
<file>pages/settings/SettingsLoadedSnapshot.qml</file>
71+
<file>pages/settings/SettingsProgressBar.qml</file>
6672
<file>pages/settings/SettingsProxy.qml</file>
73+
<file>pages/settings/SettingsSnapshot.qml</file>
6774
<file>pages/settings/SettingsStorage.qml</file>
6875
<file>pages/settings/SettingsTheme.qml</file>
6976
<file>pages/wallet/AddWallet.qml</file>
@@ -89,11 +96,14 @@
8996
<file alias="caret-left">res/icons/caret-left.png</file>
9097
<file alias="caret-right">res/icons/caret-right.png</file>
9198
<file alias="check">res/icons/check.png</file>
99+
<file alias="circle-file">res/icons/circle-file.png</file>
100+
<file alias="circle-green-check">res/icons/circle-green-check.png</file>
92101
<file alias="cross">res/icons/cross.png</file>
93102
<file alias="error">res/icons/error.png</file>
94103
<file alias="export">res/icons/export.png</file>
95104
<file alias="gear">res/icons/gear.png</file>
96105
<file alias="gear-outline">res/icons/gear-outline.png</file>
106+
<file alias="green-check">res/icons/green-check.png</file>
97107
<file alias="hidden">res/icons/hidden.png</file>
98108
<file alias="info">res/icons/info.png</file>
99109
<file alias="network-dark">res/icons/network-dark.png</file>

src/qml/imageprovider.cpp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,16 @@ QPixmap ImageProvider::requestPixmap(const QString& id, QSize* size, const QSize
7777
return QIcon(":/icons/check").pixmap(requested_size);
7878
}
7979

80+
if (id == "circle-file") {
81+
*size = requested_size;
82+
return QIcon(":/icons/circle-file").pixmap(requested_size);
83+
}
84+
85+
if (id == "circle-green-check") {
86+
*size = requested_size;
87+
return QIcon(":/icons/circle-green-check").pixmap(requested_size);
88+
}
89+
8090
if (id == "cross") {
8191
*size = requested_size;
8292
return QIcon(":/icons/cross").pixmap(requested_size);
@@ -102,6 +112,11 @@ QPixmap ImageProvider::requestPixmap(const QString& id, QSize* size, const QSize
102112
return QIcon(":/icons/gear-outline").pixmap(requested_size);
103113
}
104114

115+
if (id == "green-check") {
116+
*size = requested_size;
117+
return QIcon(":/icons/green-check").pixmap(requested_size);
118+
}
119+
105120
if (id == "info") {
106121
*size = requested_size;
107122
return QIcon(":/icons/info").pixmap(requested_size);

0 commit comments

Comments
 (0)