diff options
| author | Monzero Build System <builds@monzero.org> | 2026-08-15 21:26:40 +0100 |
|---|---|---|
| committer | Monzero Build System <builds@monzero.org> | 2026-08-15 21:26:40 +0100 |
| commit | dceeb88444ce966caa1a133d2926d5f7213c87ff (patch) | |
| tree | d74c9c7d7e43c2a0d39d656c690c63050cff7f53 | |
| parent | 81f33c7e00bf183823909a02e6d96ce11e41adce (diff) | |
| download | monzero-gui-phase0-20260815.tar.gz monzero-gui-phase0-20260815.tar.xz monzero-gui-phase0-20260815.zip | |
Establish Monzero GUI Phase 0 baselinemonzero-gui-phase0-20260815
120 files changed, 1785 insertions, 1784 deletions
@@ -34,3 +34,6 @@ Session.vim tags # Persistent undo [._]*.un~ +# Monzero local and cross-compiled build trees +/build-monzero/ +/build-*/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c8efa13..c02b4522 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.12) -project(monero-gui) +project(monzero-gui) message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}") @@ -13,7 +13,7 @@ option(STATIC "Link libraries statically, requires static Qt") option(USE_DEVICE_TREZOR "Trezor support compilation" ON) option(WITH_SCANNER "Enable webcam QR scanner" OFF) option(WITH_DESKTOP_ENTRY "Ask to install desktop entry on first startup" ON) -option(WITH_UPDATER "Regularly check for new updates" ON) +option(WITH_UPDATER "Regularly check for new updates" OFF) option(DEV_MODE "Checkout latest monero master on build" OFF) if(DEV_MODE) diff --git a/LeftPanel.qml b/LeftPanel.qml index 4365f996..366a1f40 100644 --- a/LeftPanel.qml +++ b/LeftPanel.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -34,8 +34,8 @@ import moneroComponents.NetworkType 1.0 import moneroComponents.Clipboard 1.0 import FontAwesome 1.0 -import "components" as MoneroComponents -import "components/effects/" as MoneroEffects +import "components" as MonzeroComponents +import "components/effects/" as MonzeroEffects Rectangle { id: panel @@ -80,15 +80,15 @@ Rectangle { anchors.bottom: parent.bottom anchors.top: parent.top - MoneroEffects.GradientBackground { + MonzeroEffects.GradientBackground { anchors.fill: parent - fallBackColor: MoneroComponents.Style.middlePanelBackgroundColor - initialStartColor: MoneroComponents.Style.leftPanelBackgroundGradientStart - initialStopColor: MoneroComponents.Style.leftPanelBackgroundGradientStop - blackColorStart: MoneroComponents.Style._b_leftPanelBackgroundGradientStart - blackColorStop: MoneroComponents.Style._b_leftPanelBackgroundGradientStop - whiteColorStart: MoneroComponents.Style._w_leftPanelBackgroundGradientStart - whiteColorStop: MoneroComponents.Style._w_leftPanelBackgroundGradientStop + fallBackColor: MonzeroComponents.Style.middlePanelBackgroundColor + initialStartColor: MonzeroComponents.Style.leftPanelBackgroundGradientStart + initialStopColor: MonzeroComponents.Style.leftPanelBackgroundGradientStop + blackColorStart: MonzeroComponents.Style._b_leftPanelBackgroundGradientStart + blackColorStop: MonzeroComponents.Style._b_leftPanelBackgroundGradientStop + whiteColorStart: MonzeroComponents.Style._w_leftPanelBackgroundGradientStart + whiteColorStop: MonzeroComponents.Style._w_leftPanelBackgroundGradientStop posStart: 0.6 start: Qt.point(0, 0) end: Qt.point(height, width) @@ -116,15 +116,15 @@ Rectangle { Image { id: card - visible: !isOpenGL || MoneroComponents.Style.blackTheme + visible: !isOpenGL || MonzeroComponents.Style.blackTheme width: 260 height: 135 fillMode: Image.PreserveAspectFit - source: MoneroComponents.Style.blackTheme ? "qrc:///images/card-background-black" + (currentAccountIndex % MoneroComponents.Style.accountColors.length) + ".png" : "qrc:///images/card-background-white.png" + source: MonzeroComponents.Style.blackTheme ? "qrc:///images/card-background-black" + (currentAccountIndex % MonzeroComponents.Style.accountColors.length) + ".png" : "qrc:///images/card-background-white.png" } DropShadow { - visible: isOpenGL && !MoneroComponents.Style.blackTheme + visible: isOpenGL && !MonzeroComponents.Style.blackTheme anchors.fill: card horizontalOffset: 3 verticalOffset: 3 @@ -135,7 +135,7 @@ Rectangle { cached: true } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: testnetLabel visible: persistentSettings.nettype != NetworkType.MAINNET text: (persistentSettings.nettype == NetworkType.TESTNET ? qsTr("Testnet") : qsTr("Stagenet")) + translationManager.emptyString @@ -149,7 +149,7 @@ Rectangle { themeTransition: false } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: viewOnlyLabel visible: viewOnly text: qsTr("View Only") + translationManager.emptyString @@ -172,11 +172,11 @@ Rectangle { height: 490 width: 50 - MoneroComponents.Label { + MonzeroComponents.Label { fontSize: 12 id: accountIndex text: qsTr("Account") + translationManager.emptyString + " #" + currentAccountIndex - color: MoneroComponents.Style.blackTheme ? "white" : "black" + color: MonzeroComponents.Style.blackTheme ? "white" : "black" anchors.left: parent.left anchors.leftMargin: 60 anchors.top: parent.top @@ -191,11 +191,11 @@ Rectangle { } } - MoneroComponents.Label { + MonzeroComponents.Label { fontSize: 16 id: accountLabel textWidth: 170 - color: MoneroComponents.Style.blackTheme ? "white" : "black" + color: MonzeroComponents.Style.blackTheme ? "white" : "black" anchors.left: parent.left anchors.leftMargin: 60 anchors.top: parent.top @@ -211,11 +211,11 @@ Rectangle { } } - MoneroComponents.Label { + MonzeroComponents.Label { fontSize: 16 visible: isSyncing text: qsTr("Syncing...") + translationManager.emptyString - color: MoneroComponents.Style.blackTheme ? "white" : "black" + color: MonzeroComponents.Style.blackTheme ? "white" : "black" anchors.left: parent.left anchors.leftMargin: 20 anchors.bottom: currencyLabel.top @@ -223,17 +223,17 @@ Rectangle { themeTransition: false } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: currencyLabel font.pixelSize: 16 text: { if (persistentSettings.fiatPriceEnabled && persistentSettings.fiatPriceToggle) { return appWindow.fiatApiCurrencySymbol(); } else { - return "XMR" + return "XMZ" } } - color: MoneroComponents.Style.blackTheme ? "white" : "black" + color: MonzeroComponents.Style.blackTheme ? "white" : "black" anchors.left: parent.left anchors.leftMargin: 20 anchors.top: parent.top @@ -249,16 +249,16 @@ Rectangle { } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: balancePart1 themeTransition: false anchors.left: parent.left anchors.leftMargin: 58 anchors.baseline: currencyLabel.baseline - color: MoneroComponents.Style.blackTheme ? "white" : "black" + color: MonzeroComponents.Style.blackTheme ? "white" : "black" Binding on color { when: balancePart1MouseArea.containsMouse || balancePart2MouseArea.containsMouse - value: MoneroComponents.Style.orange + value: MonzeroComponents.Style.orange } text: { if (persistentSettings.fiatPriceEnabled && persistentSettings.fiatPriceToggle) { @@ -288,7 +288,7 @@ Rectangle { } } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: balancePart2 themeTransition: false anchors.left: balancePart1.right @@ -348,14 +348,14 @@ Rectangle { property var previousButton: transferButton // top border - MoneroComponents.MenuButtonDivider { + MonzeroComponents.MenuButtonDivider { anchors.left: parent.left anchors.right: parent.right anchors.leftMargin: 20 } // ------------- Account tab --------------- - MoneroComponents.MenuButton { + MonzeroComponents.MenuButton { id: accountButton anchors.left: parent.left anchors.right: parent.right @@ -369,7 +369,7 @@ Rectangle { } } - MoneroComponents.MenuButtonDivider { + MonzeroComponents.MenuButtonDivider { visible: accountButton.present anchors.left: parent.left anchors.right: parent.right @@ -377,7 +377,7 @@ Rectangle { } // ------------- Transfer tab --------------- - MoneroComponents.MenuButton { + MonzeroComponents.MenuButton { id: transferButton anchors.left: parent.left anchors.right: parent.right @@ -390,7 +390,7 @@ Rectangle { } } - MoneroComponents.MenuButtonDivider { + MonzeroComponents.MenuButtonDivider { visible: transferButton.present anchors.left: parent.left anchors.right: parent.right @@ -399,7 +399,7 @@ Rectangle { // ------------- AddressBook tab --------------- - MoneroComponents.MenuButton { + MonzeroComponents.MenuButton { id: addressBookButton anchors.left: parent.left anchors.right: parent.right @@ -413,7 +413,7 @@ Rectangle { } } - MoneroComponents.MenuButtonDivider { + MonzeroComponents.MenuButtonDivider { visible: addressBookButton.present anchors.left: parent.left anchors.right: parent.right @@ -421,7 +421,7 @@ Rectangle { } // ------------- Receive tab --------------- - MoneroComponents.MenuButton { + MonzeroComponents.MenuButton { id: receiveButton anchors.left: parent.left anchors.right: parent.right @@ -434,7 +434,7 @@ Rectangle { } } - MoneroComponents.MenuButtonDivider { + MonzeroComponents.MenuButtonDivider { visible: receiveButton.present anchors.left: parent.left anchors.right: parent.right @@ -443,7 +443,7 @@ Rectangle { // ------------- History tab --------------- - MoneroComponents.MenuButton { + MonzeroComponents.MenuButton { id: historyButton anchors.left: parent.left anchors.right: parent.right @@ -456,7 +456,7 @@ Rectangle { } } - MoneroComponents.MenuButtonDivider { + MonzeroComponents.MenuButtonDivider { visible: historyButton.present anchors.left: parent.left anchors.right: parent.right @@ -464,7 +464,7 @@ Rectangle { } // ------------- Advanced tab --------------- - MoneroComponents.MenuButton { + MonzeroComponents.MenuButton { id: advancedButton visible: appWindow.walletMode >= 2 anchors.left: parent.left @@ -478,7 +478,7 @@ Rectangle { } } - MoneroComponents.MenuButtonDivider { + MonzeroComponents.MenuButtonDivider { visible: advancedButton.present && appWindow.walletMode >= 2 anchors.left: parent.left anchors.right: parent.right @@ -486,7 +486,7 @@ Rectangle { } // ------------- Settings tab --------------- - MoneroComponents.MenuButton { + MonzeroComponents.MenuButton { id: settingsButton anchors.left: parent.left anchors.right: parent.right @@ -499,7 +499,7 @@ Rectangle { } } - MoneroComponents.MenuButtonDivider { + MonzeroComponents.MenuButtonDivider { visible: settingsButton.present anchors.left: parent.left anchors.right: parent.right @@ -521,7 +521,7 @@ Rectangle { color: "transparent" } - MoneroComponents.ProgressBar { + MonzeroComponents.ProgressBar { id: progressBar anchors.left: parent.left anchors.right: parent.right @@ -531,7 +531,7 @@ Rectangle { visible: !appWindow.disconnected } - MoneroComponents.ProgressBar { + MonzeroComponents.ProgressBar { id: daemonProgressBar anchors.left: parent.left anchors.right: parent.right @@ -541,7 +541,7 @@ Rectangle { height: 62 } - MoneroComponents.NetworkStatusItem { + MonzeroComponents.NetworkStatusItem { id: networkStatus anchors.left: parent.left anchors.right: parent.right diff --git a/MiddlePanel.qml b/MiddlePanel.qml index cd703a16..10aa850e 100644 --- a/MiddlePanel.qml +++ b/MiddlePanel.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -38,8 +38,8 @@ import moneroComponents.Wallet 1.0 import "./pages" import "./pages/settings" import "./pages/merchant" -import "./components" as MoneroComponents -import "./components/effects/" as MoneroEffects +import "./components" as MonzeroComponents +import "./components/effects/" as MonzeroEffects Rectangle { id: root @@ -72,20 +72,20 @@ Rectangle { Rectangle { // grey background on merchantView visible: currentView === merchantView - color: MoneroComponents.Style.moneroGrey + color: MonzeroComponents.Style.moneroGrey anchors.fill: parent } - MoneroEffects.GradientBackground { + MonzeroEffects.GradientBackground { visible: currentView !== merchantView anchors.fill: parent - fallBackColor: MoneroComponents.Style.middlePanelBackgroundColor - initialStartColor: MoneroComponents.Style.middlePanelBackgroundGradientStart - initialStopColor: MoneroComponents.Style.middlePanelBackgroundGradientStop - blackColorStart: MoneroComponents.Style._b_middlePanelBackgroundGradientStart - blackColorStop: MoneroComponents.Style._b_middlePanelBackgroundGradientStop - whiteColorStart: MoneroComponents.Style._w_middlePanelBackgroundGradientStart - whiteColorStop: MoneroComponents.Style._w_middlePanelBackgroundGradientStop + fallBackColor: MonzeroComponents.Style.middlePanelBackgroundColor + initialStartColor: MonzeroComponents.Style.middlePanelBackgroundGradientStart + initialStopColor: MonzeroComponents.Style.middlePanelBackgroundGradientStop + blackColorStart: MonzeroComponents.Style._b_middlePanelBackgroundGradientStart + blackColorStop: MonzeroComponents.Style._b_middlePanelBackgroundGradientStop + whiteColorStart: MonzeroComponents.Style._w_middlePanelBackgroundGradientStart + whiteColorStop: MonzeroComponents.Style._w_middlePanelBackgroundGradientStop start: Qt.point(0, 0) end: Qt.point(height, width) } @@ -237,12 +237,12 @@ Rectangle { anchors.bottom: parent.bottom anchors.left: parent.left width: 1 - color: MoneroComponents.Style.appWindowBorderColor + color: MonzeroComponents.Style.appWindowBorderColor - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: parent - blackColor: MoneroComponents.Style._b_appWindowBorderColor - whiteColor: MoneroComponents.Style._w_appWindowBorderColor + blackColor: MonzeroComponents.Style._b_appWindowBorderColor + whiteColor: MonzeroComponents.Style._w_appWindowBorderColor } } @@ -1,4 +1,4 @@ -# Monero GUI +# Monzero GUI Copyright (c) 2014-2024, The Monero Project diff --git a/components/AdvancedOptionsItem.qml b/components/AdvancedOptionsItem.qml index d43944e8..4fc8ea26 100644 --- a/components/AdvancedOptionsItem.qml +++ b/components/AdvancedOptionsItem.qml @@ -1,7 +1,7 @@ import QtQuick 2.9 import QtQuick.Layouts 1.1 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents RowLayout { id: advancedOptionsItem @@ -19,7 +19,7 @@ RowLayout { Layout.maximumWidth: 195 Layout.leftMargin: 10 - MoneroComponents.Label { + MonzeroComponents.Label { id: title fontSize: 14 tooltipIconVisible: true diff --git a/components/CheckBox.qml b/components/CheckBox.qml index d0615e0f..444b7f3d 100644 --- a/components/CheckBox.qml +++ b/components/CheckBox.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -30,8 +30,8 @@ import QtQuick 2.9 import QtQuick.Layouts 1.1 import FontAwesome 1.0 -import "." as MoneroComponents -import "effects/" as MoneroEffects +import "." as MonzeroComponents +import "effects/" as MonzeroEffects Item { id: checkBox @@ -82,22 +82,22 @@ Item { visible: checkBox.border anchors.fill: parent radius: 3 - color: checkBox.enabled ? "transparent" : MoneroComponents.Style.inputBoxBackgroundDisabled + color: checkBox.enabled ? "transparent" : MonzeroComponents.Style.inputBoxBackgroundDisabled border.color: if (checkBox.activeFocus) { - return MoneroComponents.Style.inputBorderColorActive; + return MonzeroComponents.Style.inputBorderColorActive; } else { - return MoneroComponents.Style.inputBorderColorInActive; + return MonzeroComponents.Style.inputBorderColorInActive; } } - MoneroEffects.ImageMask { + MonzeroEffects.ImageMask { id: img visible: checkBox.checked || checkBox.uncheckedIcon != "" anchors.centerIn: parent width: checkBox.imgWidth height: checkBox.imgHeight - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor fontAwesomeFallbackIcon: checkBox.fontAwesomeIcons ? getIcon() : FontAwesome.plus fontAwesomeFallbackSize: 14 image: checkBox.fontAwesomeIcons ? "" : getIcon() @@ -110,11 +110,11 @@ Item { } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: label - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: checkBox.fontSize - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor textFormat: Text.RichText wrapMode: Text.NoWrap visible: text != "" diff --git a/components/CheckBox2.qml b/components/CheckBox2.qml index 3764b99f..b9ffac96 100644 --- a/components/CheckBox2.qml +++ b/components/CheckBox2.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -32,8 +32,8 @@ import QtGraphicalEffects 1.0 import FontAwesome 1.0 import "." 1.0 -import "." as MoneroComponents -import "effects/" as MoneroEffects +import "." as MonzeroComponents +import "effects/" as MonzeroEffects RowLayout { id: checkBox @@ -58,7 +58,7 @@ RowLayout { width: (label.width + indicatorRect.width + checkBox.textMargin) color: "transparent" - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: label font.family: Style.fontLight.name font.pixelSize: checkBox.fontSize @@ -77,18 +77,18 @@ RowLayout { color: "transparent" rotation: checkBox.checked ? 180 : 0 - MoneroEffects.ImageMask { + MonzeroEffects.ImageMask { id: indicatorImage anchors.centerIn: parent width: 12 height: 8 image: "qrc:///images/whiteDropIndicator.png" - color: MoneroComponents.Style.defaultFontColor - opacity: MoneroComponents.Style.blackTheme ? 1 : 0.75 + color: MonzeroComponents.Style.defaultFontColor + opacity: MonzeroComponents.Style.blackTheme ? 1 : 0.75 fontAwesomeFallbackIcon: FontAwesome.arrowDown fontAwesomeFallbackSize: 14 - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: indicatorImage blackColor: "white" whiteColor: "black" diff --git a/components/ContextMenu.qml b/components/ContextMenu.qml index efbd38ab..0b3a37d0 100644 --- a/components/ContextMenu.qml +++ b/components/ContextMenu.qml @@ -2,7 +2,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 import FontAwesome 1.0 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents MouseArea { signal cut() @@ -26,10 +26,10 @@ MouseArea { id: contextMenu background: Rectangle { - border.color: MoneroComponents.Style.buttonBackgroundColorDisabledHover + border.color: MonzeroComponents.Style.buttonBackgroundColorDisabledHover border.width: 1 radius: 2 - color: MoneroComponents.Style.blackTheme ? MoneroComponents.Style.buttonBackgroundColorDisabled : "#E5E5E5" + color: MonzeroComponents.Style.blackTheme ? MonzeroComponents.Style.buttonBackgroundColorDisabled : "#E5E5E5" } padding: 1 @@ -45,31 +45,31 @@ MouseArea { root.parent.forceActiveFocus() } - MoneroComponents.ContextMenuItem { + MonzeroComponents.ContextMenuItem { enabled: root.parent.selectedText != "" && !root.parent.readOnly onTriggered: root.cut() text: qsTr("Cut") + translationManager.emptyString } - MoneroComponents.ContextMenuItem { + MonzeroComponents.ContextMenuItem { enabled: root.parent.selectedText != "" onTriggered: root.copy() text: qsTr("Copy") + translationManager.emptyString } - MoneroComponents.ContextMenuItem { + MonzeroComponents.ContextMenuItem { enabled: root.parent.canPaste === true onTriggered: root.paste() text: qsTr("Paste") + translationManager.emptyString } - MoneroComponents.ContextMenuItem { + MonzeroComponents.ContextMenuItem { enabled: root.parent.selectedText != "" && !root.parent.readOnly onTriggered: root.remove() text: qsTr("Delete") + translationManager.emptyString } - MoneroComponents.ContextMenuItem { + MonzeroComponents.ContextMenuItem { enabled: root.parent.text != "" onTriggered: root.selectAll() text: qsTr("Select All") + translationManager.emptyString diff --git a/components/ContextMenuItem.qml b/components/ContextMenuItem.qml index c4e0f395..64279b92 100644 --- a/components/ContextMenuItem.qml +++ b/components/ContextMenuItem.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.2 import QtQuick.Layouts 1.1 import FontAwesome 1.0 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents MenuItem { id: menuItem @@ -12,7 +12,7 @@ MenuItem { property alias glyphIcon: glyphIcon.text background: Rectangle { - color: MoneroComponents.Style.buttonBackgroundColorDisabledHover + color: MonzeroComponents.Style.buttonBackgroundColorDisabledHover opacity: 0 MouseArea { @@ -45,15 +45,15 @@ MenuItem { Text { id: glyphIcon - color: MoneroComponents.Style.buttonTextColor + color: MonzeroComponents.Style.buttonTextColor font.family: glyphIconSolid ? FontAwesome.fontFamilySolid : FontAwesome.fontFamily font.pixelSize: 14 font.styleName: glyphIconSolid ? "Solid" : "Regular" } Text { - color: MoneroComponents.Style.blackTheme ? MoneroComponents.Style.buttonTextColor : MoneroComponents.Style.defaultFontColor - font.family: MoneroComponents.Style.fontRegular.name + color: MonzeroComponents.Style.blackTheme ? MonzeroComponents.Style.buttonTextColor : MonzeroComponents.Style.defaultFontColor + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 Layout.fillWidth: true text: menuItem.text diff --git a/components/DaemonManagerDialog.qml b/components/DaemonManagerDialog.qml index 683318df..90400e85 100644 --- a/components/DaemonManagerDialog.qml +++ b/components/DaemonManagerDialog.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -34,7 +34,7 @@ import QtQuick.Controls.Styles 1.4 import QtQuick.Window 2.0 import moneroComponents.Wallet 1.0 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Window { id: root @@ -53,7 +53,7 @@ Window { // TODO: implement without hardcoding sizes width: 480 height: 200 - color: MoneroComponents.Style.middlePanelBackgroundColor + color: MonzeroComponents.Style.middlePanelBackgroundColor // Make window draggable MouseArea { @@ -95,14 +95,14 @@ Window { } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { text: qsTr("Starting local node in %1 seconds").arg(countDown) + translationManager.emptyString; font.pixelSize: 18 Layout.alignment: Qt.AlignHCenter Layout.fillWidth: true horizontalAlignment: Text.AlignHCenter themeTransition: false - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor } } @@ -112,7 +112,7 @@ Window { spacing: 60 Layout.alignment: Qt.AlignHCenter - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: okButton visible:false fontSize: 14 @@ -126,7 +126,7 @@ Window { } } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: cancelButton fontSize: 14 text: qsTr("Use custom settings") + translationManager.emptyString diff --git a/components/DatePicker.qml b/components/DatePicker.qml index a9eba5f4..451af42d 100644 --- a/components/DatePicker.qml +++ b/components/DatePicker.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -34,15 +34,15 @@ import QtGraphicalEffects 1.0 import QtQuick.Controls.Styles 1.2 import FontAwesome 1.0 -import "." as MoneroComponents -import "effects/" as MoneroEffects +import "." as MonzeroComponents +import "effects/" as MonzeroEffects Item { id: datePicker readonly property alias expanded: popup.visible property date currentDate property bool showCurrentDate: true - property color backgroundColor : MoneroComponents.Style.appWindowBorderColor + property color backgroundColor : MonzeroComponents.Style.appWindowBorderColor property color errorColor : "red" property bool error: false property alias inputLabel: inputLabel @@ -59,16 +59,16 @@ Item { height: 22 width: parent.width - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: inputLabel anchors.top: parent.top anchors.topMargin: 2 anchors.left: parent.left - font.family: MoneroComponents.Style.fontLight.name + font.family: MonzeroComponents.Style.fontLight.name font.pixelSize: 14 font.bold: false textFormat: Text.RichText - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor themeTransition: false MouseArea { @@ -105,7 +105,7 @@ Item { anchors.left: parent.left anchors.leftMargin: 2 anchors.right: parent.right - property string headerFontColor: MoneroComponents.Style.blackTheme ? "#e6e6e6" : "#333333" + property string headerFontColor: MonzeroComponents.Style.blackTheme ? "#e6e6e6" : "#333333" spacing: 0 function setDate(date) { @@ -127,10 +127,10 @@ Item { id: dayInput readOnly: true Layout.preferredWidth: childrenRect.width + 40 - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 color: datePicker.error ? errorColor : parent.headerFontColor - selectionColor: MoneroComponents.Style.dimmedFontColor + selectionColor: MonzeroComponents.Style.dimmedFontColor selectByMouse: true horizontalAlignment: TextInput.AlignHCenter maximumLength: 2 @@ -151,10 +151,10 @@ Item { } } - MoneroComponents.TextPlain { - font.family: MoneroComponents.Style.fontRegular.name + MonzeroComponents.TextPlain { + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 - color: datePicker.error ? errorColor : MoneroComponents.Style.defaultFontColor + color: datePicker.error ? errorColor : MonzeroComponents.Style.defaultFontColor text: "-" themeTransition: false } @@ -163,10 +163,10 @@ Item { id: monthInput readOnly: true Layout.preferredWidth: childrenRect.width + 40 - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 color: datePicker.error ? errorColor : parent.headerFontColor - selectionColor: MoneroComponents.Style.dimmedFontColor + selectionColor: MonzeroComponents.Style.dimmedFontColor selectByMouse: true horizontalAlignment: TextInput.AlignHCenter maximumLength: 2 @@ -186,10 +186,10 @@ Item { } } - MoneroComponents.TextPlain { - font.family: MoneroComponents.Style.fontRegular.name + MonzeroComponents.TextPlain { + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 - color: datePicker.error ? errorColor : MoneroComponents.Style.defaultFontColor + color: datePicker.error ? errorColor : MonzeroComponents.Style.defaultFontColor text: "-" themeTransition: false } @@ -197,10 +197,10 @@ Item { TextInput { id: yearInput Layout.preferredWidth: childrenRect.width + 60 - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 color: datePicker.error ? errorColor : parent.headerFontColor - selectionColor: MoneroComponents.Style.dimmedFontColor + selectionColor: MonzeroComponents.Style.dimmedFontColor selectByMouse: true horizontalAlignment: TextInput.AlignHCenter maximumLength: 4 @@ -222,7 +222,7 @@ Item { Layout.fillWidth: true color: "transparent" - MoneroEffects.ImageMask { + MonzeroEffects.ImageMask { id: button anchors.right: parent.right anchors.rightMargin: 10 @@ -232,7 +232,7 @@ Item { width: 12 fontAwesomeFallbackIcon: FontAwesome.arrowDown fontAwesomeFallbackSize: 14 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor rotation: datePicker.expanded ? 180 : 0 } @@ -261,9 +261,9 @@ Item { x: head.x y: head.y + head.height - 2 - color: MoneroComponents.Style.middlePanelBackgroundColor + color: MonzeroComponents.Style.middlePanelBackgroundColor border.width: 1 - border.color: MoneroComponents.Style.appWindowBorderColor + border.color: MonzeroComponents.Style.appWindowBorderColor height: datePicker.expanded ? calendar.height + 2 : 0 clip: true @@ -286,7 +286,7 @@ Item { anchors.leftMargin: 1 anchors.rightMargin: 1 anchors.top: parent.top - color: MoneroComponents.Style.appWindowBorderColor + color: MonzeroComponents.Style.appWindowBorderColor height: 1 } @@ -302,7 +302,7 @@ Item { style: CalendarStyle { gridVisible: false - background: Rectangle { color: MoneroComponents.Style.middlePanelBackgroundColor } + background: Rectangle { color: MonzeroComponents.Style.middlePanelBackgroundColor } dayDelegate: Item { z: parent.z + 1 implicitHeight: implicitWidth @@ -314,10 +314,10 @@ Item { radius: parent.implicitHeight / 2 } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: dayText anchors.centerIn: parent - font.family: MoneroComponents.Style.fontMonoRegular.name + font.family: MonzeroComponents.Style.fontMonoRegular.name font.pixelSize: { if(!styleData.visibleMonth) return 12 return 14 @@ -331,22 +331,22 @@ Item { color: { if (currentDate.toDateString() === styleData.date.toDateString()) { if (dayArea.containsMouse) { - dayRect.color = MoneroComponents.Style.buttonBackgroundColorHover; + dayRect.color = MonzeroComponents.Style.buttonBackgroundColorHover; } else { - dayRect.color = MoneroComponents.Style.buttonBackgroundColor; + dayRect.color = MonzeroComponents.Style.buttonBackgroundColor; } } else { if (dayArea.containsMouse) { - dayRect.color = MoneroComponents.Style.blackTheme ? "#20FFFFFF" : "#10000000" + dayRect.color = MonzeroComponents.Style.blackTheme ? "#20FFFFFF" : "#10000000" } else { dayRect.color = "transparent"; } } if(!styleData.valid) return "transparent" if(styleData.date.toDateString() === (new Date()).toDateString()) return "#FFFF00" - if(!styleData.visibleMonth) return MoneroComponents.Style.lightGreyFontColor - if(dayArea.pressed) return MoneroComponents.Style.defaultFontColor - return MoneroComponents.Style.defaultFontColor + if(!styleData.visibleMonth) return MonzeroComponents.Style.lightGreyFontColor + if(dayArea.pressed) return MonzeroComponents.Style.defaultFontColor + return MonzeroComponents.Style.defaultFontColor } } @@ -376,12 +376,12 @@ Item { implicitHeight: 20 implicitWidth: calendar.width / 7 - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { anchors.centerIn: parent elide: Text.ElideRight - font.family: MoneroComponents.Style.fontMonoRegular.name + font.family: MonzeroComponents.Style.fontMonoRegular.name font.pixelSize: 12 - color: MoneroComponents.Style.lightGreyFontColor + color: MonzeroComponents.Style.lightGreyFontColor themeTransition: false text: { var locale = Qt.locale() @@ -391,15 +391,15 @@ Item { } navigationBar: Rectangle { - color: MoneroComponents.Style.middlePanelBackgroundColor + color: MonzeroComponents.Style.middlePanelBackgroundColor implicitWidth: calendar.width implicitHeight: 30 - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { anchors.centerIn: parent - font.family: MoneroComponents.Style.fontMonoRegular.name + font.family: MonzeroComponents.Style.fontMonoRegular.name font.pixelSize: 14 - color: MoneroComponents.Style.dimmedFontColor + color: MonzeroComponents.Style.dimmedFontColor themeTransition: false text: styleData.title } @@ -412,7 +412,7 @@ Item { anchors.bottom: parent.bottom width: height - MoneroEffects.ImageMask { + MonzeroEffects.ImageMask { id: prevMonthIcon anchors.centerIn: parent image: "qrc:///images/prevMonth.png" @@ -420,7 +420,7 @@ Item { width: 12 fontAwesomeFallbackIcon: FontAwesome.arrowLeft fontAwesomeFallbackSize: 14 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor } MouseArea { @@ -438,7 +438,7 @@ Item { anchors.bottom: parent.bottom width: height - MoneroEffects.ImageMask { + MonzeroEffects.ImageMask { id: nextMonthIcon anchors.centerIn: parent image: "qrc:///images/prevMonth.png" @@ -447,7 +447,7 @@ Item { rotation: 180 fontAwesomeFallbackIcon: FontAwesome.arrowLeft fontAwesomeFallbackSize: 14 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor } MouseArea { diff --git a/components/DevicePassphraseDialog.qml b/components/DevicePassphraseDialog.qml index 75db3988..d6e3f2e3 100644 --- a/components/DevicePassphraseDialog.qml +++ b/components/DevicePassphraseDialog.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -27,7 +27,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import QtQuick 2.9 -import "." as MoneroComponents +import "." as MonzeroComponents Item { id: root diff --git a/components/Dialog.qml b/components/Dialog.qml index 0cd712fa..7fd99f94 100644 --- a/components/Dialog.qml +++ b/components/Dialog.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2021-2024, The Monero Project +// Copyright (c) 2021-2024, The Monzero Project // // All rights reserved. // @@ -30,7 +30,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 import QtQuick.Layouts 1.1 -import "." as MoneroComponents +import "." as MonzeroComponents Popup { id: dialog @@ -39,9 +39,9 @@ Popup { property alias title: header.text background: Rectangle { - border.color: MoneroComponents.Style.blackTheme ? Qt.rgba(255, 255, 255, 0.25) : Qt.rgba(0, 0, 0, 0.25) + border.color: MonzeroComponents.Style.blackTheme ? Qt.rgba(255, 255, 255, 0.25) : Qt.rgba(0, 0, 0, 0.25) border.width: 1 - color: MoneroComponents.Style.blackTheme ? "black" : "white" + color: MonzeroComponents.Style.blackTheme ? "black" : "white" radius: 10 } closePolicy: Popup.CloseOnEscape @@ -56,9 +56,9 @@ Popup { Text { id: header - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor font.bold: true - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 18 visible: text != "" } diff --git a/components/IconButton.qml b/components/IconButton.qml index 334f0da5..2d4c3074 100644 --- a/components/IconButton.qml +++ b/components/IconButton.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -27,19 +27,19 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import QtQuick 2.9 -import "../components" as MoneroComponents -import "../components/effects" as MoneroEffects +import "../components" as MonzeroComponents +import "../components/effects" as MonzeroEffects -MoneroEffects.ImageMask { +MonzeroEffects.ImageMask { id: button z: 666 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor image: "" property alias tooltip: tooltip.text signal clicked(var mouse) - MoneroComponents.Tooltip { + MonzeroComponents.Tooltip { id: tooltip anchors.fill: parent tooltipLeft: true diff --git a/components/InlineButton.qml b/components/InlineButton.qml index 3fd75538..4827ce22 100644 --- a/components/InlineButton.qml +++ b/components/InlineButton.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -32,14 +32,14 @@ import QtGraphicalEffects 1.0 import FontAwesome 1.0 -import "." as MoneroComponents -import "./effects/" as MoneroEffects +import "." as MonzeroComponents +import "./effects/" as MonzeroEffects Item { id: inlineButton property bool small: false - property string textColor: MoneroComponents.Style.inlineButtonTextColor + property string textColor: MonzeroComponents.Style.inlineButtonTextColor property alias text: inlineText.text property alias fontPixelSize: inlineText.font.pixelSize property alias fontFamily: inlineText.font.family @@ -64,13 +64,13 @@ Item { Rectangle{ id: rect anchors.fill: parent - color: buttonArea.containsMouse ? MoneroComponents.Style.buttonInlineBackgroundColorHover : MoneroComponents.Style.buttonInlineBackgroundColor + color: buttonArea.containsMouse ? MonzeroComponents.Style.buttonInlineBackgroundColorHover : MonzeroComponents.Style.buttonInlineBackgroundColor radius: 4 border.width: parent.focus && parent.enabled ? 1 : 0 - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: inlineText - font.family: MoneroComponents.Style.fontBold.name + font.family: MonzeroComponents.Style.fontBold.name font.bold: true font.pixelSize: inlineButton.isFontAwesomeIcon ? 22 : inlineButton.small ? 14 : 16 color: inlineButton.textColor @@ -78,14 +78,14 @@ Item { anchors.horizontalCenter: parent.horizontalCenter themeTransition: false - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: inlineText - blackColor: MoneroComponents.Style._b_inlineButtonTextColor - whiteColor: MoneroComponents.Style._w_inlineButtonTextColor + blackColor: MonzeroComponents.Style._b_inlineButtonTextColor + whiteColor: MonzeroComponents.Style._w_inlineButtonTextColor } } - MoneroComponents.Tooltip { + MonzeroComponents.Tooltip { id: tooltip anchors.fill: parent } @@ -109,7 +109,7 @@ Item { } DropShadow { - visible: !MoneroComponents.Style.blackTheme + visible: !MonzeroComponents.Style.blackTheme anchors.fill: rect horizontalOffset: 2 verticalOffset: 2 diff --git a/components/Input.qml b/components/Input.qml index 3fb83af1..6299e001 100644 --- a/components/Input.qml +++ b/components/Input.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -29,24 +29,24 @@ import QtQuick.Controls 2.0 import QtQuick 2.9 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents TextField { id: textField - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 18 font.bold: true horizontalAlignment: TextInput.AlignLeft selectByMouse: true - color: MoneroComponents.Style.defaultFontColor - selectionColor: MoneroComponents.Style.textSelectionColor - selectedTextColor: MoneroComponents.Style.textSelectedColor + color: MonzeroComponents.Style.defaultFontColor + selectionColor: MonzeroComponents.Style.textSelectionColor + selectedTextColor: MonzeroComponents.Style.textSelectedColor background: Rectangle { color: "transparent" } - MoneroComponents.ContextMenu { + MonzeroComponents.ContextMenu { cursorShape: Qt.IBeamCursor onCut: textField.cut(); onCopy: textField.copy(); diff --git a/components/InputDialog.qml b/components/InputDialog.qml index 40e3e445..eb21963c 100644 --- a/components/InputDialog.qml +++ b/components/InputDialog.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -33,7 +33,7 @@ import QtQuick.Layouts 1.1 import QtQuick.Controls.Styles 1.4 import QtQuick.Window 2.0 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Item { id: root @@ -79,33 +79,33 @@ Item { Layout.fillWidth: true font.pixelSize: 16 - font.family: MoneroComponents.Style.fontLight.name + font.family: MonzeroComponents.Style.fontLight.name - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor } - MoneroComponents.Input { + MonzeroComponents.Input { id : input focus: true Layout.topMargin: 6 Layout.fillWidth: true horizontalAlignment: TextInput.AlignLeft verticalAlignment: TextInput.AlignVCenter - font.family: MoneroComponents.Style.fontLight.name + font.family: MonzeroComponents.Style.fontLight.name font.pixelSize: 24 KeyNavigation.tab: okButton bottomPadding: 10 leftPadding: 10 topPadding: 10 - color: MoneroComponents.Style.defaultFontColor - selectionColor: MoneroComponents.Style.textSelectionColor - selectedTextColor: MoneroComponents.Style.textSelectedColor + color: MonzeroComponents.Style.defaultFontColor + selectionColor: MonzeroComponents.Style.textSelectionColor + selectedTextColor: MonzeroComponents.Style.textSelectedColor background: Rectangle { radius: 2 - border.color: MoneroComponents.Style.inputBorderColorActive + border.color: MonzeroComponents.Style.inputBorderColorActive border.width: 1 - color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF" + color: MonzeroComponents.Style.blackTheme ? "black" : "#A9FFFFFF" } Keys.enabled: root.visible @@ -127,7 +127,7 @@ Item { Layout.topMargin: 16 Layout.alignment: Qt.AlignRight - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: cancelButton primary: false small: true @@ -140,7 +140,7 @@ Item { root.rejected() } } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: okButton small: true width: 120 diff --git a/components/InputMulti.qml b/components/InputMulti.qml index 6f07dd3a..94ec441d 100644 --- a/components/InputMulti.qml +++ b/components/InputMulti.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -30,26 +30,26 @@ import QtQuick.Controls 2.0 import QtQuick 2.9 import "../js/TxUtils.js" as TxUtils -import "../components" as MoneroComponents +import "../components" as MonzeroComponents TextArea { property int fontSize: 18 property bool fontBold: false - property string fontColor: MoneroComponents.Style.defaultFontColor + property string fontColor: MonzeroComponents.Style.defaultFontColor property bool mouseSelection: true property bool error: false property bool addressValidation: false id: textArea - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name color: fontColor font.pixelSize: fontSize font.bold: fontBold horizontalAlignment: TextInput.AlignLeft selectByMouse: mouseSelection - selectionColor: MoneroComponents.Style.textSelectionColor - selectedTextColor: MoneroComponents.Style.textSelectedColor + selectionColor: MonzeroComponents.Style.textSelectionColor + selectedTextColor: MonzeroComponents.Style.textSelectedColor property int minimumHeight: 100 height: contentHeight > minimumHeight ? contentHeight : minimumHeight @@ -57,7 +57,7 @@ TextArea { onTextChanged: { if(addressValidation){ // js replacement for `RegExpValidator { regExp: /[0-9A-Fa-f]{95}/g }` - if (textArea.text.startsWith("monero:")) { + if (textArea.text.startsWith("monzero:")) { error = false; return; } @@ -69,7 +69,7 @@ TextArea { } } - MoneroComponents.ContextMenu { + MonzeroComponents.ContextMenu { cursorShape: Qt.IBeamCursor onCut: textArea.cut(); onCopy: textArea.copy(); diff --git a/components/Label.qml b/components/Label.qml index 22778113..28a8bd8b 100644 --- a/components/Label.qml +++ b/components/Label.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -29,7 +29,7 @@ import QtQuick 2.9 import QtQuick.Layouts 1.1 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Item { id: item @@ -42,7 +42,7 @@ Item { property string tipText: "" property int fontSize: 16 property bool fontBold: false - property string fontColor: MoneroComponents.Style.defaultFontColor + property string fontColor: MonzeroComponents.Style.defaultFontColor property string fontFamily: "" property alias wrapMode: label.wrapMode property alias horizontalAlignment: label.horizontalAlignment @@ -55,7 +55,7 @@ Item { width: label.width Layout.topMargin: 10 - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: label anchors.bottom: parent.bottom anchors.bottomMargin: 2 @@ -64,7 +64,7 @@ Item { if(fontFamily){ return fontFamily; } else { - return MoneroComponents.Style.fontRegular.name; + return MonzeroComponents.Style.fontRegular.name; } } font.pixelSize: fontSize diff --git a/components/LabelButton.qml b/components/LabelButton.qml index b7a40651..4f181f37 100644 --- a/components/LabelButton.qml +++ b/components/LabelButton.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -29,7 +29,7 @@ import QtQuick 2.9 import QtQuick.Layouts 1.1 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Rectangle { @@ -37,22 +37,22 @@ Rectangle { property alias text: labelButtonText.text id: labelButton - color: MoneroComponents.Style.buttonBackgroundColorDisabled + color: MonzeroComponents.Style.buttonBackgroundColorDisabled radius: 3 height: 20 width: labelButtonText.width + 14 anchors.right: copyButton.left anchors.rightMargin: 6 - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: labelButtonText anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 12 font.bold: true text: "" - color: MoneroComponents.Style.inlineButtonTextColor + color: MonzeroComponents.Style.inlineButtonTextColor } MouseArea { @@ -61,11 +61,11 @@ Rectangle { hoverEnabled: true onClicked: labelButton.clicked() onEntered: { - labelButton.color = MoneroComponents.Style.buttonBackgroundColorDisabledHover; + labelButton.color = MonzeroComponents.Style.buttonBackgroundColorDisabledHover; labelButtonText.opacity = 0.8; } onExited: { - labelButton.color = MoneroComponents.Style.buttonBackgroundColorDisabled; + labelButton.color = MonzeroComponents.Style.buttonBackgroundColorDisabled; labelButtonText.opacity = 1.0; } } diff --git a/components/LabelSubheader.qml b/components/LabelSubheader.qml index a7432c5a..020c66ca 100644 --- a/components/LabelSubheader.qml +++ b/components/LabelSubheader.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -28,8 +28,8 @@ import QtQuick 2.9 -import "../components" as MoneroComponents -import "../components/effects/" as MoneroEffects +import "../components" as MonzeroComponents +import "../components/effects/" as MonzeroEffects Label { id: item @@ -42,12 +42,12 @@ Label { anchors.left: parent.left anchors.right: parent.right height: 2 - color: MoneroComponents.Style.appWindowBorderColor + color: MonzeroComponents.Style.appWindowBorderColor - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: parent - blackColor: MoneroComponents.Style._b_appWindowBorderColor - whiteColor: MoneroComponents.Style._w_appWindowBorderColor + blackColor: MonzeroComponents.Style._b_appWindowBorderColor + whiteColor: MonzeroComponents.Style._w_appWindowBorderColor } } } diff --git a/components/LanguageButton.qml b/components/LanguageButton.qml index aa33ea85..100f5570 100644 --- a/components/LanguageButton.qml +++ b/components/LanguageButton.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2020-2024, The Monero Project +// Copyright (c) 2020-2024, The Monzero Project // // All rights reserved. // @@ -31,7 +31,7 @@ import QtQuick.Layouts 1.3 import FontAwesome 1.0 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Item { implicitHeight: layout.height @@ -42,16 +42,16 @@ Item { opacity: mouseArea.containsMouse ? 1 : 0.85 spacing: 10 - MoneroComponents.Label { + MonzeroComponents.Label { Layout.bottomMargin: 5 - fontColor: MoneroComponents.Style.defaultFontColor + fontColor: MonzeroComponents.Style.defaultFontColor fontFamily: FontAwesome.fontFamilySolid fontSize: 26 styleName: "Solid" text: FontAwesome.language } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { font.pixelSize: 14 text: persistentSettings.language } diff --git a/components/LanguageSidebar.qml b/components/LanguageSidebar.qml index 630d1fb4..8b62973c 100644 --- a/components/LanguageSidebar.qml +++ b/components/LanguageSidebar.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -26,7 +26,7 @@ // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import "../components" as MoneroComponents +import "../components" as MonzeroComponents import QtQuick 2.9 import QtQuick.XmlListModel 2.0 @@ -42,7 +42,7 @@ Drawer { y: titleBar.height background: Rectangle { - color: MoneroComponents.Style.blackTheme ? "#0d0d0d" : "white" + color: MonzeroComponents.Style.blackTheme ? "#0d0d0d" : "white" width: parent.width } @@ -71,7 +71,7 @@ Drawer { delegate: Rectangle { id: item - color: index == languagesListView.currentIndex ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent" + color: index == languagesListView.currentIndex ? MonzeroComponents.Style.titleBarButtonHoverColor : "transparent" width: sideBar.width height: 32 @@ -103,7 +103,7 @@ Drawer { anchors.leftMargin: 0 height: parent.height width: 2 - color: index == languagesListView.currentIndex ? MoneroComponents.Style.buttonBackgroundColor : "transparent" + color: index == languagesListView.currentIndex ? MonzeroComponents.Style.buttonBackgroundColor : "transparent" } Rectangle { @@ -121,12 +121,12 @@ Drawer { } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { anchors.left: parent.left anchors.leftMargin: 32 font.bold: languagesListView.currentIndex == index ? true : false font.pixelSize: 14 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor text: display_name anchors.verticalCenter: parent.verticalCenter } @@ -135,8 +135,8 @@ Drawer { anchors.bottom: parent.bottom anchors.left: parent.left anchors.right: parent.right - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity height: 1 } diff --git a/components/LineEdit.qml b/components/LineEdit.qml index 0274103d..e70fd50b 100644 --- a/components/LineEdit.qml +++ b/components/LineEdit.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -31,7 +31,7 @@ import QtQuick 2.9 import QtGraphicalEffects 1.0 import QtQuick.Layouts 1.1 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents ColumnLayout { id: item @@ -56,10 +56,10 @@ ColumnLayout { property alias placeholderText: placeholderLabel.text property bool placeholderCenter: false - property string placeholderFontFamily: MoneroComponents.Style.fontRegular.name + property string placeholderFontFamily: MonzeroComponents.Style.fontRegular.name property bool placeholderFontBold: false property int placeholderFontSize: 18 - property string placeholderColor: MoneroComponents.Style.defaultFontColor + property string placeholderColor: MonzeroComponents.Style.defaultFontColor property real placeholderOpacity: 0.35 property real placeholderLeftMargin: { if (placeholderCenter) { @@ -81,15 +81,15 @@ ColumnLayout { property bool borderDisabled: false property string borderColor: { if ((error && input.text !== "") || (errorWhenEmpty && input.text == "")) { - return MoneroComponents.Style.inputBorderColorInvalid; + return MonzeroComponents.Style.inputBorderColorInvalid; } else if (input.activeFocus) { - return MoneroComponents.Style.inputBorderColorActive; + return MonzeroComponents.Style.inputBorderColorActive; } else { - return MoneroComponents.Style.inputBorderColorInActive; + return MonzeroComponents.Style.inputBorderColorInActive; } } - property string fontFamily: MoneroComponents.Style.fontRegular.name + property string fontFamily: MonzeroComponents.Style.fontRegular.name property int fontSize: 18 property bool fontBold: false property alias fontColor: input.color @@ -167,15 +167,15 @@ ColumnLayout { height: (inputLabel.height + 10) visible: showingHeader ? true : false - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: inputLabel anchors.top: parent.top anchors.left: parent.left - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: labelFontSize font.bold: labelFontBold textFormat: Text.RichText - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor onLinkActivated: item.labelLinkActivated() MouseArea { @@ -189,7 +189,7 @@ ColumnLayout { anchors.right: parent.right spacing: 16 - MoneroComponents.LabelButton { + MonzeroComponents.LabelButton { id: copyButtonId text: qsTr("Copy") + translationManager.emptyString onClicked: { @@ -202,7 +202,7 @@ ColumnLayout { visible: copyButton && input.text !== "" } - MoneroComponents.LabelButton { + MonzeroComponents.LabelButton { id: pasteButtonId onClicked: { input.clear(); @@ -214,7 +214,7 @@ ColumnLayout { } } - MoneroComponents.Input { + MonzeroComponents.Input { id: input Keys.onBacktabPressed: { item.backtabPressed(); @@ -244,7 +244,7 @@ ColumnLayout { onTextChanged: item.textUpdated() echoMode: isPasswordHidden() ? TextInput.Password : TextInput.Normal - MoneroComponents.Label { + MonzeroComponents.Label { visible: password || passwordLinked fontSize: 20 text: isPasswordHidden() ? FontAwesome.eye : FontAwesome.eyeSlash @@ -264,7 +264,7 @@ ColumnLayout { } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: placeholderLabel visible: input.text ? false : true anchors.verticalCenter: parent.verticalCenter @@ -284,7 +284,7 @@ ColumnLayout { Rectangle { anchors.fill: parent anchors.topMargin: 1 - color: item.enabled ? "transparent" : MoneroComponents.Style.inputBoxBackgroundDisabled + color: item.enabled ? "transparent" : MonzeroComponents.Style.inputBoxBackgroundDisabled } Rectangle { diff --git a/components/LineEditMulti.qml b/components/LineEditMulti.qml index d937b6dd..efc6f740 100644 --- a/components/LineEditMulti.qml +++ b/components/LineEditMulti.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -29,7 +29,7 @@ import QtQuick 2.9 import QtQuick.Layouts 1.1 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents ColumnLayout { id: item @@ -50,33 +50,33 @@ ColumnLayout { property int inputRadius: 4 property bool placeholderCenter: false - property string placeholderFontFamily: MoneroComponents.Style.fontRegular.name + property string placeholderFontFamily: MonzeroComponents.Style.fontRegular.name property bool placeholderFontBold: false property int placeholderFontSize: 18 - property string placeholderColor: MoneroComponents.Style.defaultFontColor + property string placeholderColor: MonzeroComponents.Style.defaultFontColor property real placeholderOpacity: 0.35 property bool borderDisabled: false property string borderColor: { if(input.error && input.text !== ""){ - return MoneroComponents.Style.inputBorderColorInvalid; + return MonzeroComponents.Style.inputBorderColorInvalid; } else if(input.activeFocus){ - return MoneroComponents.Style.inputBorderColorActive; + return MonzeroComponents.Style.inputBorderColorActive; } else { - return MoneroComponents.Style.inputBorderColorInActive; + return MonzeroComponents.Style.inputBorderColorInActive; } } property alias error: input.error property alias cursorPosition: input.cursorPosition - property string labelFontColor: MoneroComponents.Style.defaultFontColor + property string labelFontColor: MonzeroComponents.Style.defaultFontColor property bool labelFontBold: false property int labelFontSize: 16 property bool labelButtonVisible: false - property string fontColor: MoneroComponents.Style.defaultFontColor - property string fontFamily: MoneroComponents.Style.fontRegular.name + property string fontColor: MonzeroComponents.Style.defaultFontColor + property string fontFamily: MonzeroComponents.Style.fontRegular.name property bool fontBold: false property int fontSize: 16 @@ -105,11 +105,11 @@ ColumnLayout { height: (inputLabel.height + 10) visible: showingHeader ? true : false - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: inputLabel anchors.top: parent.top anchors.left: parent.left - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: item.labelFontSize font.bold: labelFontBold textFormat: Text.RichText @@ -127,13 +127,13 @@ ColumnLayout { anchors.right: parent.right spacing: 16 - MoneroComponents.LabelButton { + MonzeroComponents.LabelButton { id: labelButton onClicked: labelButtonClicked() visible: labelButtonVisible } - MoneroComponents.LabelButton { + MonzeroComponents.LabelButton { id: copyButtonId visible: copyButton && input.text !== "" text: qsTr("Copy") + translationManager.emptyString @@ -146,7 +146,7 @@ ColumnLayout { } } - MoneroComponents.LabelButton { + MonzeroComponents.LabelButton { id: pasteButtonId onClicked: { input.clear(); @@ -158,7 +158,7 @@ ColumnLayout { } } - MoneroComponents.InputMulti { + MonzeroComponents.InputMulti { id: input readOnly: false addressValidation: false @@ -182,7 +182,7 @@ ColumnLayout { Keys.onReturnPressed: item.returnPressed() Keys.onEnterPressed: item.enterPressed() - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: placeholderLabel visible: input.text ? false : true anchors.verticalCenter: parent.verticalCenter diff --git a/components/MenuBar.qml b/components/MenuBar.qml index e605f01e..6a60bb35 100644 --- a/components/MenuBar.qml +++ b/components/MenuBar.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -27,7 +27,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import Qt.labs.platform 1.0 as PlatformLabs -import "." as MoneroComponents +import "." as MonzeroComponents PlatformLabs.MenuBar { PlatformLabs.Menu { @@ -41,9 +41,9 @@ PlatformLabs.MenuBar { PlatformLabs.Menu { title: qsTr("View") PlatformLabs.MenuItem { - text: MoneroComponents.Style.blackTheme ? qsTr("Light Theme") : qsTr("Dark Theme") + text: MonzeroComponents.Style.blackTheme ? qsTr("Light Theme") : qsTr("Dark Theme") onTriggered: { - MoneroComponents.Style.blackTheme = !MoneroComponents.Style.blackTheme; + MonzeroComponents.Style.blackTheme = !MonzeroComponents.Style.blackTheme; } } PlatformLabs.MenuItem { diff --git a/components/MenuButton.qml b/components/MenuButton.qml index 5f6381f3..70707a3b 100644 --- a/components/MenuButton.qml +++ b/components/MenuButton.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -29,8 +29,8 @@ import QtQuick 2.9 import QtGraphicalEffects 1.0 -import "../components" as MoneroComponents -import "effects/" as MoneroEffects +import "../components" as MonzeroComponents +import "effects/" as MonzeroEffects Rectangle { id: button @@ -72,8 +72,8 @@ Rectangle { start: Qt.point(width, 0) end: Qt.point(0, 0) gradient: Gradient { - GradientStop { position: 0.0; color: MoneroComponents.Style.menuButtonGradientStart } - GradientStop { position: 1.0; color: MoneroComponents.Style.menuButtonGradientStop } + GradientStop { position: 0.0; color: MonzeroComponents.Style.menuButtonGradientStart } + GradientStop { position: 1.0; color: MonzeroComponents.Style.menuButtonGradientStop } } opacity: button.checked ? 1 : 0.3 } @@ -82,7 +82,7 @@ Rectangle { Rectangle { visible: !isOpenGL && (button.checked || buttonArea.containsMouse) anchors.fill: parent - color: MoneroComponents.Style.menuButtonFallbackBackgroundColor + color: MonzeroComponents.Style.menuButtonFallbackBackgroundColor opacity: button.checked ? 1 : 0.3 } @@ -92,14 +92,14 @@ Rectangle { anchors.leftMargin: 20 height: parent.height width: 2 - color: button.checked ? MoneroComponents.Style.accountColors[currentAccountIndex % MoneroComponents.Style.accountColors.length] : "transparent" + color: button.checked ? MonzeroComponents.Style.accountColors[currentAccountIndex % MonzeroComponents.Style.accountColors.length] : "transparent" // button text - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: label - color: MoneroComponents.Style.menuButtonTextColor - themeTransitionBlackColor: MoneroComponents.Style._b_menuButtonTextColor - themeTransitionWhiteColor: MoneroComponents.Style._w_menuButtonTextColor + color: MonzeroComponents.Style.menuButtonTextColor + themeTransitionBlackColor: MonzeroComponents.Style._b_menuButtonTextColor + themeTransitionWhiteColor: MonzeroComponents.Style._w_menuButtonTextColor anchors.verticalCenter: parent.verticalCenter anchors.left: parent.right anchors.leftMargin: button.getOffset() + 8 @@ -109,26 +109,26 @@ Rectangle { } // menu button right arrow - MoneroEffects.ImageMask { + MonzeroEffects.ImageMask { anchors.verticalCenter: parent.verticalCenter anchors.leftMargin: parent.getOffset() anchors.right: parent.right anchors.rightMargin: 20 height: 14 width: 8 - image: MoneroComponents.Style.menuButtonImageRightSource - color: button.checked ? MoneroComponents.Style.menuButtonImageRightColorActive : MoneroComponents.Style.menuButtonImageRightColor + image: MonzeroComponents.Style.menuButtonImageRightSource + color: button.checked ? MonzeroComponents.Style.menuButtonImageRightColorActive : MonzeroComponents.Style.menuButtonImageRightColor opacity: button.checked ? 0.8 : 0.25 } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: symbolText anchors.right: parent.right anchors.rightMargin: 44 anchors.verticalCenter: parent.verticalCenter font.pixelSize: 12 font.bold: true - color: MoneroComponents.Style.menuButtonTextColor + color: MonzeroComponents.Style.menuButtonTextColor visible: appWindow.ctrlPressed themeTransition: false } diff --git a/components/MenuButtonDivider.qml b/components/MenuButtonDivider.qml index 50d7c0f4..2cbf3627 100644 --- a/components/MenuButtonDivider.qml +++ b/components/MenuButtonDivider.qml @@ -1,15 +1,15 @@ import QtQuick 2.9 -import "." as MoneroComponents -import "effects/" as MoneroEffects +import "." as MonzeroComponents +import "effects/" as MonzeroEffects Rectangle { - color: MoneroComponents.Style.appWindowBorderColor + color: MonzeroComponents.Style.appWindowBorderColor height: 1 - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: parent - blackColor: MoneroComponents.Style._b_appWindowBorderColor - whiteColor: MoneroComponents.Style._w_appWindowBorderColor + blackColor: MonzeroComponents.Style._b_appWindowBorderColor + whiteColor: MonzeroComponents.Style._w_appWindowBorderColor } } diff --git a/components/Navbar.qml b/components/Navbar.qml index 3383d560..a1706e06 100644 --- a/components/Navbar.qml +++ b/components/Navbar.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -28,10 +28,10 @@ import QtQuick 2.9 import QtQuick.Layouts 1.1 -import "." as MoneroComponents +import "." as MonzeroComponents Rectangle { - default property list<MoneroComponents.NavbarItem> items + default property list<MonzeroComponents.NavbarItem> items property alias currentIndex: repeater.currentIndex property alias previousIndex: repeater.previousIndex @@ -44,12 +44,12 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter columnSpacing: 0 - property string fontColorActive: MoneroComponents.Style.blackTheme ? "white" : "white" - property string fontColorInActive: MoneroComponents.Style.blackTheme ? "white" : MoneroComponents.Style.dimmedFontColor + property string fontColorActive: MonzeroComponents.Style.blackTheme ? "white" : "white" + property string fontColorInActive: MonzeroComponents.Style.blackTheme ? "white" : MonzeroComponents.Style.dimmedFontColor property int fontSize: 15 property bool fontBold: true - property var fontFamily: MoneroComponents.Style.fontRegular.name - property string borderColor: MoneroComponents.Style.blackTheme ? "#808080" : "#B9B9B9" + property var fontFamily: MonzeroComponents.Style.fontRegular.name + property string borderColor: MonzeroComponents.Style.blackTheme ? "#808080" : "#B9B9B9" property int textMargin: { // left-right margins for a given cell if(appWindow.width < 890){ @@ -137,7 +137,7 @@ Rectangle { implicitHeight: children[0].implicitHeight implicitWidth: children[0].implicitWidth - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { anchors.centerIn: parent font.family: grid.fontFamily font.pixelSize: grid.fontSize diff --git a/components/NavbarItem.qml b/components/NavbarItem.qml index b1a56239..5586912c 100644 --- a/components/NavbarItem.qml +++ b/components/NavbarItem.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2021-2024, The Monero Project +// Copyright (c) 2021-2024, The Monzero Project // // All rights reserved. // diff --git a/components/NetworkStatusItem.qml b/components/NetworkStatusItem.qml index c22a4b2d..b2806838 100644 --- a/components/NetworkStatusItem.qml +++ b/components/NetworkStatusItem.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -31,7 +31,7 @@ import QtQuick.Layouts 1.1 import FontAwesome 1.0 import moneroComponents.Wallet 1.0 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Rectangle { id: item @@ -82,7 +82,7 @@ Rectangle { if(item.connected == Wallet.ConnectionStatus_Connected){ return 1 } else { - MoneroComponents.Style.blackTheme ? 0.5 : 0.3 + MonzeroComponents.Style.blackTheme ? 0.5 : 0.3 } } @@ -94,7 +94,7 @@ Rectangle { source: { if(appWindow.isMining) { return "qrc:///images/miningxmr.png" - } else if(item.connected == Wallet.ConnectionStatus_Connected || !MoneroComponents.Style.blackTheme) { + } else if(item.connected == Wallet.ConnectionStatus_Connected || !MonzeroComponents.Style.blackTheme) { return "qrc:///images/lightning.png" } else { return "qrc:///images/lightning-white.png" @@ -120,30 +120,30 @@ Rectangle { height: 40 width: 260 - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: statusText anchors.left: parent.left anchors.top: parent.top anchors.topMargin: 0 - font.family: MoneroComponents.Style.fontMedium.name + font.family: MonzeroComponents.Style.fontMedium.name font.bold: true font.pixelSize: 13 - color: MoneroComponents.Style.blackTheme ? MoneroComponents.Style.dimmedFontColor : MoneroComponents.Style.defaultFontColor - opacity: MoneroComponents.Style.blackTheme ? 0.65 : 0.75 + color: MonzeroComponents.Style.blackTheme ? MonzeroComponents.Style.dimmedFontColor : MonzeroComponents.Style.defaultFontColor + opacity: MonzeroComponents.Style.blackTheme ? 0.65 : 0.75 text: qsTr("Network status") + translationManager.emptyString themeTransition: false } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: statusTextVal anchors.left: parent.left anchors.top: parent.top anchors.topMargin: 14 - font.family: MoneroComponents.Style.fontMedium.name + font.family: MonzeroComponents.Style.fontMedium.name font.pixelSize: 20 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor text: getConnectionStatusString(item.connected) + translationManager.emptyString - opacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.7 + opacity: MonzeroComponents.Style.blackTheme ? 1.0 : 0.7 themeTransition: false MouseArea { @@ -161,11 +161,11 @@ Rectangle { } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { anchors.left: statusTextVal.right anchors.leftMargin: 16 anchors.verticalCenter: parent.verticalCenter - color: refreshMouseArea.containsMouse ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor + color: refreshMouseArea.containsMouse ? MonzeroComponents.Style.defaultFontColor : MonzeroComponents.Style.dimmedFontColor font.family: FontAwesome.fontFamilySolid font.pixelSize: 24 font.styleName: "Solid" diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml index f369593b..706b79d2 100644 --- a/components/PasswordDialog.qml +++ b/components/PasswordDialog.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -34,8 +34,8 @@ import QtQuick.Controls.Styles 1.4 import QtQuick.Window 2.0 import FontAwesome 1.0 -import "." as MoneroComponents -import "effects/" as MoneroEffects +import "." as MonzeroComponents +import "effects/" as MonzeroEffects import "../js/Utils.js" as Utils FocusScope { @@ -172,9 +172,9 @@ FocusScope { Layout.fillWidth: true font.pixelSize: 16 - font.family: MoneroComponents.Style.fontLight.name + font.family: MonzeroComponents.Style.fontLight.name - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor } Label { @@ -184,17 +184,17 @@ FocusScope { wrapMode: Text.Wrap font.pixelSize: 14 - font.family: MoneroComponents.Style.fontLight.name + font.family: MonzeroComponents.Style.fontLight.name - color: MoneroComponents.Style.warningColor + color: MonzeroComponents.Style.warningColor } Label { id: errorTextLabel visible: root.errorText || text !== "" - color: MoneroComponents.Style.errorColor + color: MonzeroComponents.Style.errorColor font.pixelSize: 16 - font.family: MoneroComponents.Style.fontLight.name + font.family: MonzeroComponents.Style.fontLight.name Layout.fillWidth: true wrapMode: Text.Wrap } @@ -202,15 +202,15 @@ FocusScope { Label { id: capsLockTextLabel visible: false - color: MoneroComponents.Style.errorColor + color: MonzeroComponents.Style.errorColor font.pixelSize: 16 - font.family: MoneroComponents.Style.fontLight.name + font.family: MonzeroComponents.Style.fontLight.name Layout.fillWidth: true wrapMode: Text.Wrap text: qsTr("CAPS LOCK IS ON.") + translationManager.emptyString; } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: passwordInput1 password: true input.focus: root.visible && (appWindow.active || Qt.application.state === Qt.ApplicationActive) @@ -247,12 +247,12 @@ FocusScope { Layout.fillWidth: true font.pixelSize: 16 - font.family: MoneroComponents.Style.fontLight.name + font.family: MonzeroComponents.Style.fontLight.name - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: passwordInput2 passwordLinked: passwordInput1 visible: !passwordDialogMode @@ -284,7 +284,7 @@ FocusScope { Layout.topMargin: 16 Layout.alignment: Qt.AlignRight - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: cancelButton primary: false small: true @@ -293,7 +293,7 @@ FocusScope { onClicked: onCancel() } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: okButton fontAwesomeIcon: true rightIcon: okButtonIcon @@ -311,10 +311,10 @@ FocusScope { Layout.fillWidth: true font.pixelSize: 14 - font.family: MoneroComponents.Style.fontLight.name + font.family: MonzeroComponents.Style.fontLight.name font.italic: true - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor } } } diff --git a/components/ProcessingSplash.qml b/components/ProcessingSplash.qml index 469cc1fa..1c41f589 100644 --- a/components/ProcessingSplash.qml +++ b/components/ProcessingSplash.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -32,14 +32,14 @@ import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Layouts 1.1 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Rectangle { id: root - color: MoneroComponents.Style.blackTheme ? "black" : "white" + color: MonzeroComponents.Style.blackTheme ? "black" : "white" visible: false radius: 10 - border.color: MoneroComponents.Style.blackTheme ? Qt.rgba(255, 255, 255, 0.25) : Qt.rgba(0, 0, 0, 0.25) + border.color: MonzeroComponents.Style.blackTheme ? Qt.rgba(255, 255, 255, 0.25) : Qt.rgba(0, 0, 0, 0.25) border.width: 1 z: 11 property alias messageText: messageTitle.text @@ -74,7 +74,7 @@ Rectangle { width: 60 height: 60 anchors.centerIn: parent - source: "qrc:///images/monero-vector.svg" + source: "qrc:///images/monzero-xmz-coin.png" mipmap: true } @@ -98,7 +98,7 @@ Rectangle { } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: messageTitle text: qsTr("Please wait...") + translationManager.emptyString font.pixelSize: 24 @@ -106,7 +106,7 @@ Rectangle { Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter Layout.fillWidth: true themeTransition: false - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor } } } diff --git a/components/ProgressBar.qml b/components/ProgressBar.qml index 7600d683..5c7b70e5 100644 --- a/components/ProgressBar.qml +++ b/components/ProgressBar.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -29,7 +29,7 @@ import QtQuick 2.9 import moneroComponents.Wallet 1.0 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Rectangle { id: item @@ -61,27 +61,27 @@ Rectangle { anchors.rightMargin: 15 anchors.fill: parent - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: progressText anchors.top: parent.top anchors.topMargin: 6 - font.family: MoneroComponents.Style.fontMedium.name + font.family: MonzeroComponents.Style.fontMedium.name font.pixelSize: 13 - font.bold: MoneroComponents.Style.progressBarProgressTextBold - color: MoneroComponents.Style.defaultFontColor + font.bold: MonzeroComponents.Style.progressBarProgressTextBold + color: MonzeroComponents.Style.defaultFontColor text: qsTr("Synchronizing %1").arg(syncType) + translationManager.emptyString height: 18 } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: progressTextValue anchors.top: parent.top anchors.topMargin: 6 anchors.right: parent.right - font.family: MoneroComponents.Style.fontMedium.name + font.family: MonzeroComponents.Style.fontMedium.name font.pixelSize: 13 - font.bold: MoneroComponents.Style.progressBarProgressTextBold - color: MoneroComponents.Style.defaultFontColor + font.bold: MonzeroComponents.Style.progressBarProgressTextBold + color: MonzeroComponents.Style.defaultFontColor height:18 } @@ -93,17 +93,17 @@ Rectangle { anchors.topMargin: 4 height: 8 radius: 8 - color: MoneroComponents.Style.progressBarBackgroundColor + color: MonzeroComponents.Style.progressBarBackgroundColor states: [ State { name: "black"; - when: MoneroComponents.Style.blackTheme - PropertyChanges { target: bar; color: MoneroComponents.Style._b_progressBarBackgroundColor} + when: MonzeroComponents.Style.blackTheme + PropertyChanges { target: bar; color: MonzeroComponents.Style._b_progressBarBackgroundColor} }, State { name: "white"; - when: !MoneroComponents.Style.blackTheme - PropertyChanges { target: bar; color: MoneroComponents.Style._w_progressBarBackgroundColor} + when: !MonzeroComponents.Style.blackTheme + PropertyChanges { target: bar; color: MonzeroComponents.Style._w_progressBarBackgroundColor} } ] diff --git a/components/QRCodeScanner.qml b/components/QRCodeScanner.qml index 7479c75f..7497ccd7 100644 --- a/components/QRCodeScanner.qml +++ b/components/QRCodeScanner.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // diff --git a/components/RadioButton.qml b/components/RadioButton.qml index 465477bc..f097e951 100644 --- a/components/RadioButton.qml +++ b/components/RadioButton.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -29,7 +29,7 @@ import QtQuick 2.9 import QtQuick.Layouts 1.1 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Item { id: radioButton @@ -41,8 +41,8 @@ Item { height: 26 width: layout.width // legacy properties - property var checkedColor: MoneroComponents.Style.blackTheme ? "white" : "#666666" - property var borderColor: checked ? MoneroComponents.Style.inputBorderColorActive : MoneroComponents.Style.inputBorderColorInActive + property var checkedColor: MonzeroComponents.Style.blackTheme ? "white" : "#666666" + property var borderColor: checked ? MonzeroComponents.Style.inputBorderColorActive : MonzeroComponents.Style.inputBorderColorInActive function toggle(){ radioButton.checked = !radioButton.checked @@ -72,11 +72,11 @@ Item { } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: label Layout.leftMargin: 10 - color: MoneroComponents.Style.defaultFontColor - font.family: MoneroComponents.Style.fontRegular.name + color: MonzeroComponents.Style.defaultFontColor + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: radioButton.fontSize wrapMode: Text.Wrap } diff --git a/components/RemoteNodeDialog.qml b/components/RemoteNodeDialog.qml index 015f122d..36376386 100644 --- a/components/RemoteNodeDialog.qml +++ b/components/RemoteNodeDialog.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2021-2024, The Monero Project +// Copyright (c) 2021-2024, The Monzero Project // // All rights reserved. // @@ -30,9 +30,9 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 import QtQuick.Layouts 1.1 -import "." as MoneroComponents +import "." as MonzeroComponents -MoneroComponents.Dialog { +MonzeroComponents.Dialog { id: root title: (editMode ? qsTr("Edit remote node") : qsTr("Add remote node")) + translationManager.emptyString @@ -89,7 +89,7 @@ MoneroComponents.Dialog { root.success = false; } - MoneroComponents.RemoteNodeEdit { + MonzeroComponents.RemoteNodeEdit { id: remoteNodeAddress Layout.fillWidth: true placeholderFontSize: 15 @@ -107,7 +107,7 @@ MoneroComponents.Dialog { Layout.fillWidth: true spacing: 32 - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: daemonUsername Layout.fillWidth: true Layout.minimumWidth: 220 @@ -118,7 +118,7 @@ MoneroComponents.Dialog { fontSize: 15 } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: daemonPassword Layout.fillWidth: true Layout.minimumWidth: 220 @@ -136,7 +136,7 @@ MoneroComponents.Dialog { } } - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { id: setTrustedDaemonCheckBox activeFocusOnTab: true text: qsTr("Mark as Trusted Daemon") + translationManager.emptyString @@ -146,7 +146,7 @@ MoneroComponents.Dialog { Layout.alignment: Qt.AlignRight spacing: parent.spacing - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { activeFocusOnTab: true fontBold: false primary: false @@ -155,7 +155,7 @@ MoneroComponents.Dialog { onClicked: root.close() } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { activeFocusOnTab: true fontBold: false enabled: remoteNodeAddress.getAddress() != "" diff --git a/components/RemoteNodeEdit.qml b/components/RemoteNodeEdit.qml index e6ce47f2..439c54cc 100644 --- a/components/RemoteNodeEdit.qml +++ b/components/RemoteNodeEdit.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -32,7 +32,7 @@ import QtQuick 2.9 import QtQuick.Layouts 1.1 import "../js/Utils.js" as Utils -import "../components" as MoneroComponents +import "../components" as MonzeroComponents GridLayout { columns: 2 @@ -48,15 +48,15 @@ GridLayout { // TODO: LEGACY; remove these placeHolder variables when // the wizards get redesigned to the black-theme - property string placeholderFontFamily: MoneroComponents.Style.fontRegular.name + property string placeholderFontFamily: MonzeroComponents.Style.fontRegular.name property bool placeholderFontBold: false property int placeholderFontSize: 15 - property string placeholderColor: MoneroComponents.Style.defaultFontColor + property string placeholderColor: MonzeroComponents.Style.defaultFontColor property real placeholderOpacity: 0.35 property int labelFontSize: 14 property string lineEditBackgroundColor: "transparent" - property string lineEditFontColor: MoneroComponents.Style.defaultFontColor + property string lineEditFontColor: MonzeroComponents.Style.defaultFontColor property bool lineEditFontBold: false property int lineEditFontSize: 15 @@ -82,7 +82,7 @@ GridLayout { return addr + ":" + port; } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: daemonAddr Layout.fillWidth: true Layout.minimumWidth: 220 @@ -105,7 +105,7 @@ GridLayout { text: initialHostPort[1] } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: daemonPort Layout.fillWidth: true Layout.minimumWidth: 120 diff --git a/components/RemoteNodeList.qml b/components/RemoteNodeList.qml index f1779e0c..61144c45 100644 --- a/components/RemoteNodeList.qml +++ b/components/RemoteNodeList.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2021-2024, The Monero Project +// Copyright (c) 2021-2024, The Monzero Project // // All rights reserved. // @@ -31,14 +31,14 @@ import QtQuick.Layouts 1.1 import FontAwesome 1.0 -import "." as MoneroComponents -import "effects/" as MoneroEffects +import "." as MonzeroComponents +import "effects/" as MonzeroEffects ColumnLayout { id: remoteNodeList spacing: 20 - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { border: false checkedIcon: FontAwesome.minusCircle uncheckedIcon: FontAwesome.plusCircle @@ -59,7 +59,7 @@ ColumnLayout { Rectangle { height: 30 Layout.fillWidth: true - color: itemMouseArea.containsMouse || trustedDaemonCheckMark.labelMouseArea.containsMouse || index === remoteNodesModel.selected ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent" + color: itemMouseArea.containsMouse || trustedDaemonCheckMark.labelMouseArea.containsMouse || index === remoteNodesModel.selected ? MonzeroComponents.Style.titleBarButtonHoverColor : "transparent" Rectangle { visible: index === remoteNodesModel.selected @@ -71,17 +71,17 @@ ColumnLayout { } Rectangle { - color: MoneroComponents.Style.appWindowBorderColor + color: MonzeroComponents.Style.appWindowBorderColor anchors.right: parent.right anchors.left: parent.left anchors.top: parent.top height: 1 visible: index > 0 - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: parent - blackColor: MoneroComponents.Style._b_appWindowBorderColor - whiteColor: MoneroComponents.Style._w_appWindowBorderColor + blackColor: MonzeroComponents.Style._b_appWindowBorderColor + whiteColor: MonzeroComponents.Style._w_appWindowBorderColor } } @@ -91,10 +91,10 @@ ColumnLayout { color: "transparent" property var trusted: remoteNodesModel.get(index) ? remoteNodesModel.get(index).trusted : false - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: addressText width: parent.width - trustedDaemonCheckMark.width - color: index === remoteNodesModel.selected ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor + color: index === remoteNodesModel.selected ? MonzeroComponents.Style.defaultFontColor : MonzeroComponents.Style.dimmedFontColor anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.leftMargin: 6 @@ -104,7 +104,7 @@ ColumnLayout { elide: Text.ElideMiddle } - MoneroComponents.Label { + MonzeroComponents.Label { id: trustedDaemonCheckMark anchors.left: addressText.right anchors.leftMargin: 3 @@ -113,7 +113,7 @@ ColumnLayout { z: itemMouseArea.z + 1 fontSize: 16 fontFamily: FontAwesome.fontFamilySolid - fontColor: index === remoteNodesModel.selected ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor + fontColor: index === remoteNodesModel.selected ? MonzeroComponents.Style.defaultFontColor : MonzeroComponents.Style.dimmedFontColor styleName: "Solid" visible: trusted text: FontAwesome.shieldAlt @@ -136,7 +136,7 @@ ColumnLayout { height: 30 spacing: 2 - MoneroComponents.InlineButton { + MonzeroComponents.InlineButton { buttonColor: "transparent" fontFamily: FontAwesome.fontFamily fontPixelSize: 18 @@ -151,7 +151,7 @@ ColumnLayout { }) } - MoneroComponents.InlineButton { + MonzeroComponents.InlineButton { buttonColor: "transparent" fontFamily: FontAwesome.fontFamily text: FontAwesome.times diff --git a/components/SettingsListItem.qml b/components/SettingsListItem.qml index 7c778704..1055abdc 100644 --- a/components/SettingsListItem.qml +++ b/components/SettingsListItem.qml @@ -2,7 +2,7 @@ import QtQuick 2.9 import QtQuick.Layouts 1.1 import FontAwesome 1.0 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents ColumnLayout { id: settingsListItem @@ -30,8 +30,8 @@ ColumnLayout { anchors.left: parent.left anchors.right: parent.right height: 1 - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } Rectangle { @@ -54,25 +54,25 @@ ColumnLayout { anchors.leftMargin: 16 anchors.verticalCenter: parent.verticalCenter - MoneroComponents.Label { + MonzeroComponents.Label { id: iconLabel fontSize: 32 fontFamily: FontAwesome.fontFamilySolid anchors.centerIn: parent - fontColor: MoneroComponents.Style.defaultFontColor + fontColor: MonzeroComponents.Style.defaultFontColor styleName: "Solid" } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: header anchors.left: icon.right anchors.leftMargin: 16 anchors.top: parent.top - color: MoneroComponents.Style.defaultFontColor - opacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.8 + color: MonzeroComponents.Style.defaultFontColor + opacity: MonzeroComponents.Style.blackTheme ? 1.0 : 0.8 font.bold: true - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 16 } @@ -82,8 +82,8 @@ ColumnLayout { anchors.topMargin: 4 anchors.left: icon.right anchors.leftMargin: 16 - color: MoneroComponents.Style.dimmedFontColor - font.family: MoneroComponents.Style.fontRegular.name + color: MonzeroComponents.Style.dimmedFontColor + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 horizontalAlignment: TextInput.AlignLeft wrapMode: Text.WordWrap; @@ -99,8 +99,8 @@ ColumnLayout { anchors.left: parent.left anchors.right: parent.right height: 1 - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity visible: settingsListItem.isLast } @@ -109,21 +109,21 @@ ColumnLayout { cursorShape: Qt.PointingHandCursor anchors.fill: parent hoverEnabled: true - onEntered: root.color = MoneroComponents.Style.titleBarButtonHoverColor + onEntered: root.color = MonzeroComponents.Style.titleBarButtonHoverColor onExited: root.color = "transparent" onClicked: { settingsListItem.clicked() } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: symbolText anchors.right: parent.right anchors.rightMargin: 44 anchors.verticalCenter: parent.verticalCenter font.pixelSize: 12 font.bold: true - color: MoneroComponents.Style.menuButtonTextColor + color: MonzeroComponents.Style.menuButtonTextColor visible: appWindow.ctrlPressed themeTransition: false } diff --git a/components/Slider.qml b/components/Slider.qml index df3b3cb3..f44d124f 100644 --- a/components/Slider.qml +++ b/components/Slider.qml @@ -2,7 +2,7 @@ import QtQuick 2.9 import QtQuick.Controls 2.0 as QtQuickControls import QtQuick.Layouts 1.1 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents ColumnLayout { property alias from: slider.from @@ -16,11 +16,11 @@ ColumnLayout { spacing: 0 - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: label - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor font.pixelSize: 14 - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name } QtQuickControls.Slider { @@ -36,12 +36,12 @@ ColumnLayout { width: parent.availableWidth height: implicitHeight radius: 2 - color: MoneroComponents.Style.progressBarBackgroundColor + color: MonzeroComponents.Style.progressBarBackgroundColor Rectangle { width: parent.visualPosition * parent.width height: parent.height - color: MoneroComponents.Style.green + color: MonzeroComponents.Style.green radius: 2 } } @@ -53,7 +53,7 @@ ColumnLayout { implicitHeight: 18 radius: 8 color: parent.pressed ? "#f0f0f0" : "#f6f6f6" - border.color: MoneroComponents.Style.grey + border.color: MonzeroComponents.Style.grey } onMoved: parent.moved() diff --git a/components/StandardButton.qml b/components/StandardButton.qml index 0df44194..b8cedd6a 100644 --- a/components/StandardButton.qml +++ b/components/StandardButton.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -31,7 +31,7 @@ import QtQuick.Layouts 1.1 import FontAwesome 1.0 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Item { id: button @@ -39,7 +39,7 @@ Item { property bool primary: true property string rightIcon: "" property string rightIconInactive: "" - property color textColor: primary ? MoneroComponents.Style.buttonTextColor : MoneroComponents.Style.buttonSecondaryTextColor; + property color textColor: primary ? MonzeroComponents.Style.buttonTextColor : MonzeroComponents.Style.buttonSecondaryTextColor; property bool small: false property alias text: label.text property alias fontBold: label.font.bold @@ -80,8 +80,8 @@ Item { PropertyChanges { target: buttonRect color: primary - ? MoneroComponents.Style.buttonBackgroundColorHover - : MoneroComponents.Style.buttonSecondaryBackgroundColorHover + ? MonzeroComponents.Style.buttonBackgroundColorHover + : MonzeroComponents.Style.buttonSecondaryBackgroundColorHover } }, State { @@ -90,8 +90,8 @@ Item { PropertyChanges { target: buttonRect color: primary - ? MoneroComponents.Style.buttonBackgroundColor - : MoneroComponents.Style.buttonSecondaryBackgroundColor + ? MonzeroComponents.Style.buttonBackgroundColor + : MonzeroComponents.Style.buttonSecondaryBackgroundColor } }, State { @@ -101,8 +101,8 @@ Item { target: buttonRect opacity: 0.5 color: primary - ? MoneroComponents.Style.buttonBackgroundColor - : MoneroComponents.Style.buttonSecondaryBackgroundColor + ? MonzeroComponents.Style.buttonBackgroundColor + : MonzeroComponents.Style.buttonSecondaryBackgroundColor } PropertyChanges { target: label @@ -123,16 +123,16 @@ Item { spacing: 11 anchors.centerIn: parent - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: label - font.family: MoneroComponents.Style.fontBold.name + font.family: MonzeroComponents.Style.fontBold.name font.bold: button.primary ? true : false font.pixelSize: button.fontSize color: !buttonArea.pressed ? button.textColor : "transparent" visible: text !== "" themeTransition: false - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { anchors.centerIn: parent color: button.textColor font.bold: label.font.bold @@ -161,7 +161,7 @@ Item { Text { Layout.alignment: Qt.AlignVCenter | Qt.AlignRight - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor font.family: FontAwesome.fontFamilySolid font.pixelSize: button.small ? 16 : 20 font.styleName: "Solid" @@ -170,7 +170,7 @@ Item { } } - MoneroComponents.Tooltip { + MonzeroComponents.Tooltip { id: tooltip anchors.fill: parent } diff --git a/components/StandardDialog.qml b/components/StandardDialog.qml index 6f515f51..f5cce8f4 100644 --- a/components/StandardDialog.qml +++ b/components/StandardDialog.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -33,8 +33,8 @@ import QtQuick.Layouts 1.1 import QtQuick.Controls.Styles 1.4 import QtQuick.Window 2.0 -import "../components" as MoneroComponents -import "effects/" as MoneroEffects +import "../components" as MonzeroComponents +import "effects/" as MonzeroEffects Rectangle { id: root @@ -58,15 +58,15 @@ Rectangle { signal closeCallback(); // background - MoneroEffects.GradientBackground { + MonzeroEffects.GradientBackground { anchors.fill: parent - fallBackColor: MoneroComponents.Style.middlePanelBackgroundColor - initialStartColor: MoneroComponents.Style.middlePanelBackgroundGradientStart - initialStopColor: MoneroComponents.Style.middlePanelBackgroundGradientStop - blackColorStart: MoneroComponents.Style._b_middlePanelBackgroundGradientStart - blackColorStop: MoneroComponents.Style._b_middlePanelBackgroundGradientStop - whiteColorStart: MoneroComponents.Style._w_middlePanelBackgroundGradientStart - whiteColorStop: MoneroComponents.Style._w_middlePanelBackgroundGradientStop + fallBackColor: MonzeroComponents.Style.middlePanelBackgroundColor + initialStartColor: MonzeroComponents.Style.middlePanelBackgroundGradientStart + initialStopColor: MonzeroComponents.Style.middlePanelBackgroundGradientStop + blackColorStart: MonzeroComponents.Style._b_middlePanelBackgroundGradientStart + blackColorStop: MonzeroComponents.Style._b_middlePanelBackgroundGradientStop + whiteColorStart: MonzeroComponents.Style._w_middlePanelBackgroundGradientStart + whiteColorStop: MonzeroComponents.Style._w_middlePanelBackgroundGradientStop start: Qt.point(0, 0) end: Qt.point(height, width) } @@ -112,11 +112,11 @@ Rectangle { Layout.topMargin: 14 Layout.fillWidth: true - MoneroComponents.Label { + MonzeroComponents.Label { id: dialogTitle fontSize: 18 fontFamily: "Arial" - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor } } @@ -138,13 +138,13 @@ Rectangle { Layout.fillWidth: true Layout.fillHeight: true renderType: Text.QtRendering - font.family: MoneroComponents.Style.fontLight.name + font.family: MonzeroComponents.Style.fontLight.name textFormat: TextEdit.AutoText readOnly: true font.pixelSize: 14 selectByMouse: false wrapMode: TextEdit.Wrap - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor MouseArea { anchors.fill: parent @@ -169,7 +169,7 @@ Rectangle { spacing: 60 Layout.alignment: Qt.AlignHCenter - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: cancelButton primary: false text: qsTr("Cancel") + translationManager.emptyString @@ -179,7 +179,7 @@ Rectangle { } } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: okButton text: qsTr("OK") + translationManager.emptyString KeyNavigation.tab: cancelButton @@ -200,12 +200,12 @@ Rectangle { height: 48 color: "transparent" - MoneroEffects.ImageMask { + MonzeroEffects.ImageMask { anchors.centerIn: parent width: 16 height: 16 - image: MoneroComponents.Style.titleBarCloseSource - color: MoneroComponents.Style.defaultFontColor + image: MonzeroComponents.Style.titleBarCloseSource + color: MonzeroComponents.Style.defaultFontColor opacity: 0.75 } @@ -224,7 +224,7 @@ Rectangle { // window borders Rectangle{ width: 1 - color: MoneroComponents.Style.grey + color: MonzeroComponents.Style.grey anchors.left: parent.left anchors.top: parent.top anchors.bottom: parent.bottom @@ -232,7 +232,7 @@ Rectangle { Rectangle{ width: 1 - color: MoneroComponents.Style.grey + color: MonzeroComponents.Style.grey anchors.right: parent.right anchors.top: parent.top anchors.bottom: parent.bottom @@ -240,7 +240,7 @@ Rectangle { Rectangle{ height: 1 - color: MoneroComponents.Style.grey + color: MonzeroComponents.Style.grey anchors.left: parent.left anchors.top: parent.top anchors.right: parent.right @@ -248,7 +248,7 @@ Rectangle { Rectangle{ height: 1 - color: MoneroComponents.Style.grey + color: MonzeroComponents.Style.grey anchors.left: parent.left anchors.bottom: parent.bottom anchors.right: parent.right diff --git a/components/StandardDropdown.qml b/components/StandardDropdown.qml index f7bf831b..fb44caa2 100644 --- a/components/StandardDropdown.qml +++ b/components/StandardDropdown.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -32,8 +32,8 @@ import QtGraphicalEffects 1.0 import FontAwesome 1.0 import QtQuick.Layouts 1.1 -import "../components" as MoneroComponents -import "../components/effects/" as MoneroEffects +import "../components" as MonzeroComponents +import "../components/effects/" as MonzeroEffects ColumnLayout { id: dropdown @@ -43,9 +43,9 @@ ColumnLayout { property alias dataModel: repeater.model property string shadowPressedColor property string shadowReleasedColor - property string pressedColor: MoneroComponents.Style.appWindowBorderColor - property string releasedColor: MoneroComponents.Style.titleBarButtonHoverColor - property string textColor: MoneroComponents.Style.defaultFontColor + property string pressedColor: MonzeroComponents.Style.appWindowBorderColor + property string releasedColor: MonzeroComponents.Style.titleBarButtonHoverColor + property string textColor: MonzeroComponents.Style.defaultFontColor property alias currentIndex: columnid.currentIndex readonly property alias expanded: popup.visible property alias labelText: dropdownLabel.text @@ -59,7 +59,7 @@ ColumnLayout { property int dropdownHeight: 39 property int fontSize: 14 property int fontItemSize: 14 - property string colorBorder: MoneroComponents.Style.inputBorderColorInActive + property string colorBorder: MonzeroComponents.Style.inputBorderColorInActive property string colorHeaderBackground: "transparent" property bool headerBorder: true property bool headerFontBold: false @@ -76,28 +76,28 @@ ColumnLayout { height: (dropdownLabel.height + 10) visible: showingHeader ? true : false - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: dropdownLabel anchors.top: parent.top anchors.left: parent.left - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: labelFontSize font.bold: labelFontBold textFormat: Text.RichText - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor } } Rectangle { id: head - color: dropArea.containsMouse ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent" + color: dropArea.containsMouse ? MonzeroComponents.Style.titleBarButtonHoverColor : "transparent" border.width: dropdown.headerBorder ? 1 : 0 border.color: dropdown.colorBorder radius: 4 Layout.fillWidth: true Layout.preferredHeight: dropdownHeight - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.leftMargin: 10 @@ -105,7 +105,7 @@ ColumnLayout { anchors.rightMargin: 12 width: droplist.width elide: Text.ElideRight - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.bold: dropdown.headerFontBold font.pixelSize: dropdown.fontSize color: dropdown.textColor @@ -120,7 +120,7 @@ ColumnLayout { anchors.rightMargin: 12 width: dropdownIcon.width - MoneroEffects.ImageMask { + MonzeroEffects.ImageMask { id: dropdownIcon anchors.centerIn: parent image: "qrc:///images/whiteDropIndicator.png" @@ -128,7 +128,7 @@ ColumnLayout { width: 12 fontAwesomeFallbackIcon: FontAwesome.arrowDown fontAwesomeFallbackSize: 14 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor } } @@ -183,26 +183,26 @@ ColumnLayout { //radius: index === repeater.count - 1 ? 4 : 0 color: itemArea.containsMouse || index === columnid.currentIndex || itemArea.containsMouse ? dropdown.releasedColor : dropdown.pressedColor - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: col1Text anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.right: col2Text.left anchors.leftMargin: 12 anchors.rightMargin: 0 - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.bold: false font.pixelSize: fontItemSize color: itemArea.containsMouse || index === columnid.currentIndex || itemArea.containsMouse ? "#FA6800" : "#FFFFFF" text: qsTr(column1) + translationManager.emptyString } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: col2Text anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right anchors.rightMargin: 45 - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 color: "#FFFFFF" text: "" diff --git a/components/SuccessfulTxDialog.qml b/components/SuccessfulTxDialog.qml index bd59b7ef..61191499 100644 --- a/components/SuccessfulTxDialog.qml +++ b/components/SuccessfulTxDialog.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -31,7 +31,7 @@ import QtQuick.Controls 2.0 import QtQuick.Layouts 1.1 import moneroComponents.Clipboard 1.0 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Rectangle { id: root @@ -40,10 +40,10 @@ Rectangle { // TODO: implement without hardcoding sizes width: 580 height: 400 - color: MoneroComponents.Style.blackTheme ? "black" : "white" + color: MonzeroComponents.Style.blackTheme ? "black" : "white" visible: false radius: 10 - border.color: MoneroComponents.Style.blackTheme ? Qt.rgba(255, 255, 255, 0.25) : Qt.rgba(0, 0, 0, 0.25) + border.color: MonzeroComponents.Style.blackTheme ? Qt.rgba(255, 255, 255, 0.25) : Qt.rgba(0, 0, 0, 0.25) border.width: 1 Keys.enabled: true Keys.onEscapePressed: { @@ -80,7 +80,7 @@ Rectangle { Layout.fillWidth: true Layout.alignment: Qt.AlignCenter - MoneroComponents.Label { + MonzeroComponents.Label { fontSize: 18 fontFamily: "Arial" horizontalAlignment: Text.AlignHCenter @@ -108,7 +108,7 @@ Rectangle { } } - MoneroComponents.LineEditMulti { + MonzeroComponents.LineEditMulti { visible: !appWindow.viewOnly Layout.leftMargin: 25 Layout.rightMargin: 25 @@ -121,7 +121,7 @@ Rectangle { fontSize: 16 } - MoneroComponents.LineEditMulti { + MonzeroComponents.LineEditMulti { visible: appWindow.viewOnly Layout.leftMargin: 25 borderDisabled: true @@ -140,7 +140,7 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 50 - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: viewProgressButton visible: !appWindow.viewOnly text: qsTr("View progress") + translationManager.emptyString; @@ -154,7 +154,7 @@ Rectangle { } } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: openFolderButton visible: appWindow.viewOnly text: qsTr("Open folder") + translationManager.emptyString; @@ -165,7 +165,7 @@ Rectangle { } } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: doneButton text: qsTr("Done") + translationManager.emptyString; width: 200 diff --git a/components/TextBlock.qml b/components/TextBlock.qml index 9d1d0cf4..3227d545 100644 --- a/components/TextBlock.qml +++ b/components/TextBlock.qml @@ -1,11 +1,11 @@ import QtQuick 2.9 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents TextEdit { - color: MoneroComponents.Style.defaultFontColor - font.family: MoneroComponents.Style.fontRegular.name - selectionColor: MoneroComponents.Style.textSelectionColor + color: MonzeroComponents.Style.defaultFontColor + font.family: MonzeroComponents.Style.fontRegular.name + selectionColor: MonzeroComponents.Style.textSelectionColor wrapMode: Text.Wrap readOnly: true selectByMouse: true diff --git a/components/TextPlain.qml b/components/TextPlain.qml index ed6b7977..fa41fb4c 100644 --- a/components/TextPlain.qml +++ b/components/TextPlain.qml @@ -1,7 +1,7 @@ import QtQuick 2.9 -import "." as MoneroComponents -import "effects/" as MoneroEffects +import "." as MonzeroComponents +import "effects/" as MonzeroEffects Text { // When using this component, please note that if you use a color different @@ -16,7 +16,7 @@ Text { property alias tooltipLeft: tooltip.tooltipLeft property alias tooltipIconVisible: tooltip.tooltipIconVisible property alias tooltipPopup: tooltip.tooltipPopup - font.family: MoneroComponents.Style.fontMedium.name + font.family: MonzeroComponents.Style.fontMedium.name font.bold: false font.pixelSize: 14 textFormat: Text.PlainText @@ -26,19 +26,19 @@ Text { height: root.height anchors.left: parent.left anchors.top: parent.top - color: root.focus ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent" + color: root.focus ? MonzeroComponents.Style.titleBarButtonHoverColor : "transparent" } - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { enabled: root.themeTransition themeTransition: root.themeTransition targetObj: root duration: 750 - blackColor: root.themeTransitionBlackColor !== "" ? root.themeTransitionBlackColor : MoneroComponents.Style._b_defaultFontColor - whiteColor: root.themeTransitionWhiteColor !== "" ? root.themeTransitionWhiteColor : MoneroComponents.Style._w_defaultFontColor + blackColor: root.themeTransitionBlackColor !== "" ? root.themeTransitionBlackColor : MonzeroComponents.Style._b_defaultFontColor + whiteColor: root.themeTransitionWhiteColor !== "" ? root.themeTransitionWhiteColor : MonzeroComponents.Style._w_defaultFontColor } - MoneroComponents.Tooltip { + MonzeroComponents.Tooltip { id: tooltip anchors.top: parent.top anchors.left: tooltipIconVisible ? parent.right : parent.left diff --git a/components/TextPlainArea.qml b/components/TextPlainArea.qml index 648662b2..f1ccde8e 100644 --- a/components/TextPlainArea.qml +++ b/components/TextPlainArea.qml @@ -1,15 +1,15 @@ import QtQuick 2.9 import QtQuick.Controls 2.0 -import "." as MoneroComponents +import "." as MonzeroComponents TextArea { id: textArea property bool themeTransition: true property string colorWhiteTheme: "" property string colorBlackTheme: "" - color: MoneroComponents.Style.defaultFontColor - font.family: MoneroComponents.Style.fontRegular.name + color: MonzeroComponents.Style.defaultFontColor + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 selectByMouse: false wrapMode: Text.WordWrap; @@ -22,20 +22,20 @@ TextArea { states: [ State { name: "black"; - when: textArea.themeTransition && MoneroComponents.Style.blackTheme + when: textArea.themeTransition && MonzeroComponents.Style.blackTheme PropertyChanges { target: textArea color: { - return textArea.colorBlackTheme ? textArea.colorBlackTheme : MoneroComponents.Style._b_defaultFontColor + return textArea.colorBlackTheme ? textArea.colorBlackTheme : MonzeroComponents.Style._b_defaultFontColor } } }, State { name: "white"; - when: textArea.themeTransition && !MoneroComponents.Style.blackTheme + when: textArea.themeTransition && !MonzeroComponents.Style.blackTheme PropertyChanges { target: textArea color: { - return textArea.colorWhiteTheme ? textArea.colorWhiteTheme : MoneroComponents.Style._w_defaultFontColor + return textArea.colorWhiteTheme ? textArea.colorWhiteTheme : MonzeroComponents.Style._w_defaultFontColor } } } diff --git a/components/TipItem.qml b/components/TipItem.qml index a6223b48..4b758e9f 100644 --- a/components/TipItem.qml +++ b/components/TipItem.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -29,7 +29,7 @@ import QtQuick 2.9 import QtQuick.Window 2.1 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Window { property alias text: content.text @@ -60,7 +60,7 @@ Window { source: "qrc:///images/tip.png" } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: content anchors.horizontalCenter: parent.horizontalCenter y: 6 diff --git a/components/TitleBar.qml b/components/TitleBar.qml index 640641ef..75cd980e 100644 --- a/components/TitleBar.qml +++ b/components/TitleBar.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -32,8 +32,8 @@ import QtGraphicalEffects 1.0 import QtQuick.Layouts 1.2 import FontAwesome 1.0 -import "." as MoneroComponents -import "effects/" as MoneroEffects +import "." as MonzeroComponents +import "effects/" as MonzeroEffects Rectangle { id: root @@ -75,16 +75,16 @@ Rectangle { } ] - MoneroEffects.GradientBackground { + MonzeroEffects.GradientBackground { anchors.fill: parent duration: 300 - fallBackColor: MoneroComponents.Style.middlePanelBackgroundColor - initialStartColor: MoneroComponents.Style.titleBarBackgroundGradientStart - initialStopColor: MoneroComponents.Style.titleBarBackgroundGradientStop - blackColorStart: MoneroComponents.Style._b_titleBarBackgroundGradientStart - blackColorStop: MoneroComponents.Style._b_titleBarBackgroundGradientStop - whiteColorStart: MoneroComponents.Style._w_titleBarBackgroundGradientStart - whiteColorStop: MoneroComponents.Style._w_titleBarBackgroundGradientStop + fallBackColor: MonzeroComponents.Style.middlePanelBackgroundColor + initialStartColor: MonzeroComponents.Style.titleBarBackgroundGradientStart + initialStopColor: MonzeroComponents.Style.titleBarBackgroundGradientStop + blackColorStart: MonzeroComponents.Style._b_titleBarBackgroundGradientStart + blackColorStop: MonzeroComponents.Style._b_titleBarBackgroundGradientStop + whiteColorStart: MonzeroComponents.Style._w_titleBarBackgroundGradientStart + whiteColorStop: MonzeroComponents.Style._w_titleBarBackgroundGradientStop start: Qt.point(width, 0) end: Qt.point(0, 0) } @@ -105,14 +105,14 @@ Rectangle { text: FontAwesome.lock font.family: FontAwesome.fontFamilySolid font.pixelSize: 16 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor font.styleName: "Solid" anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter opacity: 0.75 } - MoneroComponents.Tooltip { + MonzeroComponents.Tooltip { id: btnLockWalletTooltip anchors.fill: parent text: qsTr("Lock this wallet") + translationManager.emptyString @@ -123,7 +123,7 @@ Rectangle { hoverEnabled: true cursorShape: Qt.PointingHandCursor onEntered: { - parent.color = MoneroComponents.Style.titleBarButtonHoverColor + parent.color = MonzeroComponents.Style.titleBarButtonHoverColor btnLockWalletTooltip.tooltipPopup.open() } onExited: { @@ -146,14 +146,14 @@ Rectangle { text: FontAwesome.signOutAlt font.family: FontAwesome.fontFamilySolid font.pixelSize: 16 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor font.styleName: "Solid" anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter opacity: 0.75 } - MoneroComponents.Tooltip { + MonzeroComponents.Tooltip { id: btnCloseWalletTooltip anchors.fill: parent text: qsTr("Close this wallet and return to main menu") + translationManager.emptyString @@ -164,7 +164,7 @@ Rectangle { hoverEnabled: true cursorShape: Qt.PointingHandCursor onEntered: { - parent.color = MoneroComponents.Style.titleBarButtonHoverColor + parent.color = MonzeroComponents.Style.titleBarButtonHoverColor btnCloseWalletTooltip.tooltipPopup.open() } onExited: { @@ -186,14 +186,14 @@ Rectangle { text: FontAwesome.globe font.family: FontAwesome.fontFamilySolid font.pixelSize: 16 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor font.styleName: "Solid" anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter opacity: 0.75 } - MoneroComponents.Tooltip { + MonzeroComponents.Tooltip { id: btnLanguageToggleTooltip anchors.fill: parent text: qsTr("Change language") + translationManager.emptyString @@ -204,7 +204,7 @@ Rectangle { hoverEnabled: true cursorShape: Qt.PointingHandCursor onEntered: { - parent.color = MoneroComponents.Style.titleBarButtonHoverColor + parent.color = MonzeroComponents.Style.titleBarButtonHoverColor btnLanguageToggleTooltip.tooltipPopup.open() } onExited: { @@ -223,19 +223,19 @@ Rectangle { Text { text: FontAwesome.moonO - font.family: MoneroComponents.Style.blackTheme ? FontAwesome.fontFamilySolid : FontAwesome.fontFamily - font.styleName: MoneroComponents.Style.blackTheme ? "Solid" : "Regular" + font.family: MonzeroComponents.Style.blackTheme ? FontAwesome.fontFamilySolid : FontAwesome.fontFamily + font.styleName: MonzeroComponents.Style.blackTheme ? "Solid" : "Regular" font.pixelSize: 15 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter opacity: 0.75 } - MoneroComponents.Tooltip { + MonzeroComponents.Tooltip { id: btnSwitchThemeTooltip anchors.fill: parent - text: MoneroComponents.Style.blackTheme ? qsTr("Switch to light theme") : qsTr("Switch to dark theme") + translationManager.emptyString + text: MonzeroComponents.Style.blackTheme ? qsTr("Switch to light theme") : qsTr("Switch to dark theme") + translationManager.emptyString } MouseArea { @@ -243,7 +243,7 @@ Rectangle { hoverEnabled: true cursorShape: Qt.PointingHandCursor onEntered: { - parent.color = MoneroComponents.Style.titleBarButtonHoverColor + parent.color = MonzeroComponents.Style.titleBarButtonHoverColor btnSwitchThemeTooltip.tooltipPopup.open() } onExited: { @@ -251,7 +251,7 @@ Rectangle { btnSwitchThemeTooltip.tooltipPopup.close() } onClicked: { - MoneroComponents.Style.blackTheme = !MoneroComponents.Style.blackTheme; + MonzeroComponents.Style.blackTheme = !MonzeroComponents.Style.blackTheme; } } } @@ -279,16 +279,17 @@ Rectangle { anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter - source: MoneroComponents.Style.titleBarLogoSource + source: "qrc:///images/monzero-xmz-coin.png" + fillMode: Image.PreserveAspectFit visible: { if(!isOpenGL) return true; - if(!MoneroComponents.Style.blackTheme) return true; + if(!MonzeroComponents.Style.blackTheme) return true; return false; } } Colorize { - visible: isOpenGL && MoneroComponents.Style.blackTheme + visible: isOpenGL && MonzeroComponents.Style.blackTheme anchors.fill: imgLogo source: imgLogo saturation: 0.0 @@ -300,7 +301,7 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: parent.height - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { font.pixelSize: 20 horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter @@ -318,17 +319,17 @@ Rectangle { Layout.preferredWidth: parent.height Layout.preferredHeight: parent.height - MoneroEffects.ImageMask { + MonzeroEffects.ImageMask { anchors.bottom: parent.bottom anchors.bottomMargin: 18 anchors.horizontalCenter: parent.horizontalCenter height: 3 width: 15 - image: MoneroComponents.Style.titleBarMinimizeSource - color: MoneroComponents.Style.defaultFontColor + image: MonzeroComponents.Style.titleBarMinimizeSource + color: MonzeroComponents.Style.defaultFontColor fontAwesomeFallbackIcon: FontAwesome.minus fontAwesomeFallbackSize: 18 - fontAwesomeFallbackOpacity: MoneroComponents.Style.blackTheme ? 0.8 : 0.6 + fontAwesomeFallbackOpacity: MonzeroComponents.Style.blackTheme ? 0.8 : 0.6 opacity: 0.75 } @@ -336,7 +337,7 @@ Rectangle { anchors.fill: parent hoverEnabled: true cursorShape: Qt.PointingHandCursor - onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor + onEntered: parent.color = MonzeroComponents.Style.titleBarButtonHoverColor onExited: parent.color = "transparent" onClicked: root.minimizeClicked(); } @@ -353,7 +354,7 @@ Rectangle { Image { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter - source: MoneroComponents.Style.titleBarFullscreenSource + source: MonzeroComponents.Style.titleBarFullscreenSource sourceSize.width: 16 sourceSize.height: 16 smooth: true @@ -367,7 +368,7 @@ Rectangle { anchors.fill: parent hoverEnabled: true cursorShape: Qt.PointingHandCursor - onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor + onEntered: parent.color = MonzeroComponents.Style.titleBarButtonHoverColor onExited: parent.color = "transparent" onClicked: root.maximizeClicked(); } @@ -380,16 +381,16 @@ Rectangle { Layout.preferredWidth: parent.height Layout.preferredHeight: parent.height - MoneroEffects.ImageMask { + MonzeroEffects.ImageMask { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter height: 16 width: 16 - image: MoneroComponents.Style.titleBarCloseSource - color: MoneroComponents.Style.defaultFontColor + image: MonzeroComponents.Style.titleBarCloseSource + color: MonzeroComponents.Style.defaultFontColor fontAwesomeFallbackIcon: FontAwesome.times fontAwesomeFallbackSize: 21 - fontAwesomeFallbackOpacity: MoneroComponents.Style.blackTheme ? 0.8 : 0.6 + fontAwesomeFallbackOpacity: MonzeroComponents.Style.blackTheme ? 0.8 : 0.6 opacity: 0.75 } @@ -397,7 +398,7 @@ Rectangle { anchors.fill: parent hoverEnabled: true cursorShape: Qt.PointingHandCursor - onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor + onEntered: parent.color = MonzeroComponents.Style.titleBarButtonHoverColor onExited: parent.color = "transparent" onClicked: root.closeClicked(); } @@ -409,13 +410,13 @@ Rectangle { anchors.bottom: parent.bottom anchors.left: parent.left anchors.right: parent.right - height: MoneroComponents.Style.blackTheme ? 1 : 1 - color: MoneroComponents.Style.titleBarBackgroundBorderColor + height: MonzeroComponents.Style.blackTheme ? 1 : 1 + color: MonzeroComponents.Style.titleBarBackgroundBorderColor - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: parent - blackColor: MoneroComponents.Style._b_titleBarBackgroundBorderColor - whiteColor: MoneroComponents.Style._w_titleBarBackgroundBorderColor + blackColor: MonzeroComponents.Style._b_titleBarBackgroundBorderColor + whiteColor: MonzeroComponents.Style._w_titleBarBackgroundBorderColor } } diff --git a/components/Tooltip.qml b/components/Tooltip.qml index 8903cb53..61575067 100644 --- a/components/Tooltip.qml +++ b/components/Tooltip.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2021-2024, The Monero Project +// Copyright (c) 2021-2024, The Monzero Project // // All rights reserved. // @@ -31,7 +31,7 @@ import QtQuick.Controls 2.2 import QtQuick.Layouts 1.1 import FontAwesome 1.0 -import "." as MoneroComponents +import "." as MonzeroComponents Rectangle { property alias text: tooltip.text @@ -48,7 +48,7 @@ Rectangle { Text { id: icon visible: tooltipIconVisible - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor font.family: FontAwesome.fontFamily font.pixelSize: 10 font.styleName: "Regular" @@ -72,9 +72,9 @@ Rectangle { height: tooltip.height + 20 background: Rectangle { - border.color: MoneroComponents.Style.buttonInlineBackgroundColor + border.color: MonzeroComponents.Style.buttonInlineBackgroundColor border.width: 1 - color: MoneroComponents.Style.titleBarBackgroundGradientStart + color: MonzeroComponents.Style.titleBarBackgroundGradientStart radius: 4 } closePolicy: Popup.NoAutoClose @@ -101,8 +101,8 @@ Rectangle { id: tooltip width: contentWidth Layout.maximumWidth: 370 - color: MoneroComponents.Style.defaultFontColor - font.family: MoneroComponents.Style.fontRegular.name + color: MonzeroComponents.Style.defaultFontColor + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 12 textFormat: Text.RichText wrapMode: Text.WordWrap diff --git a/components/TxConfirmationDialog.qml b/components/TxConfirmationDialog.qml index 51da022f..86e1558b 100644 --- a/components/TxConfirmationDialog.qml +++ b/components/TxConfirmationDialog.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -31,7 +31,7 @@ import QtQuick.Controls 1.4 as QtQuickControls1 import QtQuick.Controls 2.2 import QtQuick.Layouts 1.1 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents import "../js/Utils.js" as Utils import FontAwesome 1.0 @@ -45,10 +45,10 @@ Rectangle { // TODO: implement without hardcoding sizes width: 590 height: layout.height + layout.anchors.margins * 2 - color: MoneroComponents.Style.blackTheme ? "black" : "white" + color: MonzeroComponents.Style.blackTheme ? "black" : "white" visible: false radius: 10 - border.color: MoneroComponents.Style.blackTheme ? Qt.rgba(255, 255, 255, 0.25) : Qt.rgba(0, 0, 0, 0.25) + border.color: MonzeroComponents.Style.blackTheme ? Qt.rgba(255, 255, 255, 0.25) : Qt.rgba(0, 0, 0, 0.25) border.width: 1 Keys.enabled: true Keys.onEscapePressed: { @@ -140,8 +140,8 @@ Rectangle { root.sweepUnmixable = false; } - function showFiatConversion(valueXMR) { - const fiatFee = fiatApiConvertToFiat(valueXMR); + function showFiatConversion(valueXMZ) { + const fiatFee = fiatApiConvertToFiat(valueXMZ); return "%1 %2".arg(fiatFee < 0.01 ? "<0.01" : "~" + fiatFee).arg(fiatApiCurrencySymbol()); } @@ -157,7 +157,7 @@ Rectangle { Layout.topMargin: 10 Layout.fillWidth: true - MoneroComponents.Label { + MonzeroComponents.Label { id: dialogTitle Layout.fillWidth: true fontSize: 18 @@ -179,7 +179,7 @@ Rectangle { id: errorText Layout.fillWidth: true Layout.fillHeight: true - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor wrapMode: Text.Wrap font.pixelSize: 15 } @@ -201,12 +201,12 @@ Rectangle { Layout.fillWidth: true horizontalAlignment: Text.AlignHCenter font.pixelSize: root.transactionAmount == "(all)" && currentWallet.isHwBacked() === true ? 32 : 42 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor text: { if (root.transactionAmount == "(all)" && currentWallet.isHwBacked() === true) { return qsTr("All unlocked balance") + translationManager.emptyString; } else { - return root.transactionAmount + " XMR " + translationManager.emptyString; + return root.transactionAmount + " XMZ " + translationManager.emptyString; } } } @@ -216,7 +216,7 @@ Rectangle { Layout.fillWidth: true horizontalAlignment: Text.AlignHCenter font.pixelSize: 20 - color: MoneroComponents.Style.buttonSecondaryTextColor + color: MonzeroComponents.Style.buttonSecondaryTextColor text: showFiatConversion(transactionAmount) + translationManager.emptyString } } @@ -229,7 +229,7 @@ Rectangle { rowSpacing: 16 Text { - color: MoneroComponents.Style.dimmedFontColor + color: MonzeroComponents.Style.dimmedFontColor text: qsTr("From") + ":" + translationManager.emptyString font.pixelSize: 15 } @@ -241,7 +241,7 @@ Rectangle { Text { Layout.fillWidth: true font.pixelSize: 15 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor textFormat: Text.RichText text: { if (currentWallet) { @@ -271,7 +271,7 @@ Rectangle { Text { font.pixelSize: 15 - color: MoneroComponents.Style.dimmedFontColor + color: MonzeroComponents.Style.dimmedFontColor text: qsTr("To") + ":" + translationManager.emptyString } @@ -287,8 +287,8 @@ Rectangle { TextArea.flickable: TextArea { id : recipientsArea - color: MoneroComponents.Style.defaultFontColor - font.family: MoneroComponents.Style.fontMonoRegular.name + color: MonzeroComponents.Style.defaultFontColor + font.family: MonzeroComponents.Style.fontMonoRegular.name font.pixelSize: 14 topPadding: 0 bottomPadding: 0 @@ -297,7 +297,7 @@ Rectangle { readOnly: true selectByKeyboard: true selectByMouse: true - selectionColor: MoneroComponents.Style.textSelectionColor + selectionColor: MonzeroComponents.Style.textSelectionColor textFormat: TextEdit.RichText wrapMode: TextEdit.Wrap text: { @@ -310,10 +310,10 @@ Rectangle { if (addressBookName) { title = FontAwesome.addressBook + " " + Utils.htmlEscape(addressBookName); } else { - title = qsTr("Monero address") + translationManager.emptyString; + title = qsTr("Monzero address") + translationManager.emptyString; } if (recipients.length > 1) { - title = "%1. %2 - %3 XMR".arg(index + 1).arg(title).arg(recipient.amount); + title = "%1. %2 - %3 XMZ".arg(index + 1).arg(title).arg(recipient.amount); if (persistentSettings.fiatPriceEnabled) { title += " (%1)".arg(showFiatConversion(recipient.amount)); } @@ -330,7 +330,7 @@ Rectangle { } Text { - color: MoneroComponents.Style.dimmedFontColor + color: MonzeroComponents.Style.dimmedFontColor text: qsTr("Fee") + ":" + translationManager.emptyString font.pixelSize: 15 } @@ -341,7 +341,7 @@ Rectangle { Text { property bool maliciousTxFee: parseFloat(root.transactionFee) > 0.01 - color: maliciousTxFee ? "red" : MoneroComponents.Style.defaultFontColor + color: maliciousTxFee ? "red" : MonzeroComponents.Style.defaultFontColor font.pixelSize: maliciousTxFee ? 20 : 15 text: { if (currentWallet) { @@ -352,7 +352,7 @@ Rectangle { return qsTr("Calculating fee") + "..." + translationManager.emptyString; } } else { - return root.transactionFee + " XMR" + (maliciousTxFee ? " (HIGH FEE)" : "") + return root.transactionFee + " XMZ" + (maliciousTxFee ? " (HIGH FEE)" : "") } } else { return ""; @@ -363,7 +363,7 @@ Rectangle { Text { Layout.fillWidth: true Layout.leftMargin: 8 - color: MoneroComponents.Style.buttonSecondaryTextColor + color: MonzeroComponents.Style.buttonSecondaryTextColor visible: persistentSettings.fiatPriceEnabled && root.transactionFee font.pixelSize: 15 text: showFiatConversion(root.transactionFee) @@ -389,7 +389,7 @@ Rectangle { Text { id: bottomText - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor text: "" horizontalAlignment: Text.AlignHCenter wrapMode: Text.Wrap @@ -413,7 +413,7 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 50 - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: backButton text: qsTr("Back") + translationManager.emptyString; width: 200 @@ -426,7 +426,7 @@ Rectangle { } } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: confirmButton text: qsTr("Confirm") + translationManager.emptyString; rightIcon: "qrc:///images/rightArrow.png" diff --git a/components/UpdateDialog.qml b/components/UpdateDialog.qml index c3710cf7..fee6c685 100644 --- a/components/UpdateDialog.qml +++ b/components/UpdateDialog.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2020-2024, The Monero Project +// Copyright (c) 2020-2024, The Monzero Project // // All rights reserved. // @@ -32,7 +32,7 @@ import QtQuick.Layouts 1.1 import moneroComponents.Downloader 1.0 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Popup { id: updateDialog @@ -48,9 +48,9 @@ Popup { property string version: "" background: Rectangle { - border.color: MoneroComponents.Style.appWindowBorderColor + border.color: MonzeroComponents.Style.appWindowBorderColor border.width: 1 - color: MoneroComponents.Style.middlePanelBackgroundColor + color: MonzeroComponents.Style.middlePanelBackgroundColor } closePolicy: Popup.NoAutoClose padding: 20 @@ -70,17 +70,17 @@ Popup { spacing: updateDialog.padding Text { - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor font.bold: true - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 18 - text: qsTr("New Monero version v%1 is available.").arg(updateDialog.version) + text: qsTr("New Monzero version v%1 is available.").arg(updateDialog.version) } Text { id: errorText color: "red" - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 18 text: updateDialog.error visible: text @@ -88,14 +88,14 @@ Popup { Text { id: statusText - color: updateDialog.valid ? MoneroComponents.Style.green : MoneroComponents.Style.defaultFontColor - font.family: MoneroComponents.Style.fontRegular.name + color: updateDialog.valid ? MonzeroComponents.Style.green : MonzeroComponents.Style.defaultFontColor + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 18 visible: !errorText.visible text: { if (!updateDialog.url) { - return qsTr("Please visit getmonero.org for details") + translationManager.emptyString; + return qsTr("Please visit monzero.org for details") + translationManager.emptyString; } if (downloader.active) { return "%1 (%2%)" @@ -112,13 +112,13 @@ Popup { Rectangle { id: progressBar - color: MoneroComponents.Style.lightGreyFontColor + color: MonzeroComponents.Style.lightGreyFontColor height: 3 Layout.fillWidth: true visible: updateDialog.valid || downloader.active Rectangle { - color: MoneroComponents.Style.buttonBackgroundColor + color: MonzeroComponents.Style.buttonBackgroundColor height: parent.height width: parent.width * updateDialog.progress / 100 } @@ -128,7 +128,7 @@ Popup { Layout.alignment: Qt.AlignRight spacing: parent.spacing - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: cancelButton fontBold: false primary: !updateDialog.url @@ -148,7 +148,7 @@ Popup { } } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: downloadButton KeyNavigation.tab: cancelButton fontBold: false @@ -172,7 +172,7 @@ Popup { } } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: saveButton KeyNavigation.tab: cancelButton fontBold: false diff --git a/components/WarningBox.qml b/components/WarningBox.qml index 62f6912a..a41a6b4a 100644 --- a/components/WarningBox.qml +++ b/components/WarningBox.qml @@ -2,7 +2,7 @@ import QtQuick 2.9 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.0 -import "." as MoneroComponents +import "." as MonzeroComponents Rectangle { id: root @@ -13,9 +13,9 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: warningLayout.height - color: MoneroComponents.Style.titleBarButtonHoverColor + color: MonzeroComponents.Style.titleBarButtonHoverColor radius: 4 - border.color: MoneroComponents.Style.inputBorderColorInActive + border.color: MonzeroComponents.Style.inputBorderColorInActive border.width: 1 signal linkActivated; @@ -40,8 +40,8 @@ Rectangle { Text { id: content Layout.fillWidth: true - color: MoneroComponents.Style.defaultFontColor - font.family: MoneroComponents.Style.fontRegular.name + color: MonzeroComponents.Style.defaultFontColor + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: root.fontSize horizontalAlignment: TextInput.AlignLeft textFormat: Text.RichText diff --git a/components/effects/ColorTransition.qml b/components/effects/ColorTransition.qml index ebafeb33..76c88ac3 100644 --- a/components/effects/ColorTransition.qml +++ b/components/effects/ColorTransition.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -29,7 +29,7 @@ import QtQuick 2.9 import QtGraphicalEffects 1.0 -import "../" as MoneroComponents +import "../" as MonzeroComponents Item { id: root @@ -42,11 +42,11 @@ Item { states: [ State { name: "black"; - when: MoneroComponents.Style.blackTheme && root.themeTransition + when: MonzeroComponents.Style.blackTheme && root.themeTransition PropertyChanges { target: root.targetObj; color: root.blackColor} }, State { name: "white"; - when: !MoneroComponents.Style.blackTheme && root.themeTransition + when: !MonzeroComponents.Style.blackTheme && root.themeTransition PropertyChanges { target: root.targetObj; color: root.whiteColor} } ] diff --git a/components/effects/GradientBackground.qml b/components/effects/GradientBackground.qml index 608ce815..21bafdc5 100644 --- a/components/effects/GradientBackground.qml +++ b/components/effects/GradientBackground.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -29,7 +29,7 @@ import QtQuick 2.9 import QtGraphicalEffects 1.0 -import "../" as MoneroComponents +import "../" as MonzeroComponents Item { id: root @@ -76,7 +76,7 @@ Item { states: [ State { name: "black"; - when: isOpenGL && MoneroComponents.Style.blackTheme + when: isOpenGL && MonzeroComponents.Style.blackTheme PropertyChanges { target: gradientStart color: root.blackColorStart @@ -87,7 +87,7 @@ Item { } }, State { name: "white"; - when: isOpenGL && !MoneroComponents.Style.blackTheme + when: isOpenGL && !MonzeroComponents.Style.blackTheme PropertyChanges { target: gradientStart color: root.whiteColorStart diff --git a/components/effects/ImageMask.qml b/components/effects/ImageMask.qml index 0ed8eff2..f9e6f65d 100644 --- a/components/effects/ImageMask.qml +++ b/components/effects/ImageMask.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -29,7 +29,7 @@ import QtQuick 2.9 import QtGraphicalEffects 1.0 -import "../" as MoneroComponents +import "../" as MonzeroComponents import FontAwesome 1.0 Item { @@ -44,7 +44,7 @@ Item { property string fontAwesomeFallbackStyle: "Solid" property int fontAwesomeFallbackSize: 16 property double fontAwesomeFallbackOpacity: 0.8 - property string fontAwesomeFallbackColor: MoneroComponents.Style.defaultFontColor + property string fontAwesomeFallbackColor: MonzeroComponents.Style.defaultFontColor property alias fontAwesomeFallback: fontAwesomeFallback property alias svgMask: svgMask diff --git a/fonts/FontAwesome/FontAwesome.qml b/fonts/FontAwesome/FontAwesome.qml index f2cfbab1..7b1e15a5 100644 --- a/fonts/FontAwesome/FontAwesome.qml +++ b/fonts/FontAwesome/FontAwesome.qml @@ -23,7 +23,7 @@ Object { property string fontFamilyBrands: brands.name property string fontFamilySolid: solid.name - // Icons used in Monero GUI (Font Awesome version 5.15.3) + // Icons used in Monzero GUI (Font Awesome version 5.15.3) // To add new icons, check unicodes in Font Awesome Free's Cheatsheet: // https://fontawesome.com/v5/cheatsheet/free/solid // https://fontawesome.com/v5/cheatsheet/free/regular diff --git a/images/branding/monzero-xmz-coin.png b/images/branding/monzero-xmz-coin.png Binary files differnew file mode 100644 index 00000000..0e00071e --- /dev/null +++ b/images/branding/monzero-xmz-coin.png diff --git a/images/monzero-xmz-coin.png b/images/monzero-xmz-coin.png Binary files differnew file mode 100644 index 00000000..0e00071e --- /dev/null +++ b/images/monzero-xmz-coin.png @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -45,9 +45,9 @@ import moneroComponents.Settings 1.0 import moneroComponents.P2PoolManager 1.0 import "components" -import "components" as MoneroComponents -import "components/effects" as MoneroEffects -import "pages/merchant" as MoneroMerchant +import "components" as MonzeroComponents +import "components/effects" as MonzeroEffects +import "pages/merchant" as MonzeroMerchant import "wizard" import "js/Utils.js" as Utils import "js/Windows.js" as Windows @@ -55,7 +55,7 @@ import "version.js" as Version ApplicationWindow { id: appWindow - title: "Monero" + + title: "Monzero" + (persistentSettings.displayWalletNameInTitleBar && walletName ? " - " + walletName : "") @@ -107,16 +107,16 @@ ApplicationWindow { property var fiatPriceAPIs: { return { "kraken": { - "xmrusd": "https://api.kraken.com/0/public/Ticker?pair=XMRUSD", - "xmreur": "https://api.kraken.com/0/public/Ticker?pair=XMREUR" + "xmrusd": "https://api.kraken.com/0/public/Ticker?pair=XMZUSD", + "xmreur": "https://api.kraken.com/0/public/Ticker?pair=XMZEUR" }, "coingecko": { "xmrusd": "https://api.coingecko.com/api/v3/simple/price?ids=monero&vs_currencies=usd", "xmreur": "https://api.coingecko.com/api/v3/simple/price?ids=monero&vs_currencies=eur" }, "cryptocompare": { - "xmrusd": "https://min-api.cryptocompare.com/data/price?fsym=XMR&tsyms=USD", - "xmreur": "https://min-api.cryptocompare.com/data/price?fsym=XMR&tsyms=EUR", + "xmrusd": "https://min-api.cryptocompare.com/data/price?fsym=XMZ&tsyms=USD", + "xmreur": "https://min-api.cryptocompare.com/data/price?fsym=XMZ&tsyms=EUR", } } } @@ -439,8 +439,8 @@ ApplicationWindow { leftPanel.balanceString = balance leftPanel.balanceUnlockedString = balanceU if (middlePanel.state === "Account") { - middlePanel.accountView.balanceAllText = walletManager.displayAmount(appWindow.currentWallet.balanceAll()) + " XMR"; - middlePanel.accountView.unlockedBalanceAllText = walletManager.displayAmount(appWindow.currentWallet.unlockedBalanceAll()) + " XMR"; + middlePanel.accountView.balanceAllText = walletManager.displayAmount(appWindow.currentWallet.balanceAll()) + " XMZ"; + middlePanel.accountView.unlockedBalanceAllText = walletManager.displayAmount(appWindow.currentWallet.unlockedBalanceAll()) + " XMZ"; } } @@ -450,7 +450,7 @@ ApplicationWindow { const parsed = walletManager.parse_uri_to_object(normalizedUri); if (parsed.error) { - console.log("Invalid Monero URI: " + parsed.error); + console.log("Invalid Monzero URI: " + parsed.error); } else { middlePanel.transferView.sendTo( parsed.address || "", @@ -828,7 +828,7 @@ ApplicationWindow { // resume refresh currentWallet.startRefresh(); informationPopup.title = qsTr("Daemon failed to start") + translationManager.emptyString; - informationPopup.text = error + ".\n\n" + qsTr("Please check your wallet and daemon log for errors. You can also try to start %1 manually.").arg((isWindows)? "monerod.exe" : "monerod") + informationPopup.text = error + ".\n\n" + qsTr("Please check your wallet and daemon log for errors. You can also try to start %1 manually.").arg((isWindows)? "monzerod.exe" : "monzerod") if (middlePanel.advancedView.miningView.stopMiningEnabled == true) { walletManager.stopMining() p2poolManager.exit() @@ -1137,10 +1137,10 @@ ApplicationWindow { informationPopup.icon = StandardIcon.Critical; } else if (received > 0) { if (in_pool) { - informationPopup.text = qsTr("This address received %1 monero, but the transaction is not yet mined").arg(walletManager.displayAmount(received)); + informationPopup.text = qsTr("This address received %1 XMZ, but the transaction is not yet mined").arg(walletManager.displayAmount(received)); } else { - informationPopup.text = qsTr("This address received %1 monero, with %2 confirmation(s).").arg(walletManager.displayAmount(received)).arg(confirmations); + informationPopup.text = qsTr("This address received %1 XMZ, with %2 confirmation(s).").arg(walletManager.displayAmount(received)).arg(confirmations); } } else { @@ -1199,7 +1199,7 @@ ApplicationWindow { wizard.wizardState = "wizardHome"; rootItem.state = "wizard" // reset balance, clear spendable funds message - clearMoneroCardLabelText(); + clearMonzeroCardLabelText(); leftPanel.minutesToUnlock = ""; // reset fields middlePanel.addressBookView.clearFields(); @@ -1220,7 +1220,7 @@ ApplicationWindow { height: screenAvailableHeight > maxWindowHeight ? maxWindowHeight : Math.min(screenAvailableHeight, 700) - color: MoneroComponents.Style.appWindowBackgroundColor + color: MonzeroComponents.Style.appWindowBackgroundColor flags: persistentSettings.customDecorations ? Windows.flagsCustomDecorations : Windows.flags Timer { @@ -1240,7 +1240,7 @@ ApplicationWindow { return; } - var key = currency === "xmreur" ? "XXMRZEUR" : "XXMRZUSD"; + var key = currency === "xmreur" ? "XXMZZEUR" : "XXMZZUSD"; var ticker = resp.result[key]["c"][0]; return ticker; } else if(url.startsWith("https://api.coingecko.com/api/v3/")){ @@ -1350,7 +1350,7 @@ ApplicationWindow { return (amount * ticker).toFixed(2); } - function fiatApiConvertToXMR(amount) { + function fiatApiConvertToXMZ(amount) { const ticker = appWindow.fiatPrice; if(ticker <= 0){ fiatApiError("Invalid ticker value: " + ticker); @@ -1431,7 +1431,7 @@ ApplicationWindow { oshelper.createDesktopEntry(); } else if (isLinux) { confirmationDialog.title = qsTr("Desktop entry") + translationManager.emptyString; - confirmationDialog.text = qsTr("Would you like to register Monero GUI Desktop entry?") + translationManager.emptyString; + confirmationDialog.text = qsTr("Would you like to register Monzero GUI Desktop entry?") + translationManager.emptyString; confirmationDialog.icon = StandardIcon.Question; confirmationDialog.cancelText = qsTr("No") + translationManager.emptyString; confirmationDialog.okText = qsTr("Yes") + translationManager.emptyString; @@ -1446,11 +1446,11 @@ ApplicationWindow { remoteNodesModel.initialize(); } - MoneroSettings { + MonzeroSettings { id: persistentSettings fileName: { if(isTails && tailsUsePersistence) - return homePath + "/Persistent/Monero/monero-core.conf"; + return homePath + "/Persistent/Monzero/monero-core.conf"; return ""; } @@ -1508,7 +1508,7 @@ ApplicationWindow { property bool lockOnUserInActivity: true property int walletMode: 2 property int lockOnUserInActivityInterval: 10 // minutes - property bool blackTheme: MoneroComponents.Style.blackTheme + property bool blackTheme: MonzeroComponents.Style.blackTheme property bool checkForUpdates: true property bool autosave: true property int autosaveMinutes: 10 @@ -1546,7 +1546,7 @@ ApplicationWindow { } Component.onCompleted: { - MoneroComponents.Style.blackTheme = persistentSettings.blackTheme + MonzeroComponents.Style.blackTheme = persistentSettings.blackTheme } } @@ -1704,7 +1704,7 @@ ApplicationWindow { } } - MoneroComponents.UpdateDialog { + MonzeroComponents.UpdateDialog { id: updateDialog allowed: !passwordDialog.visible && !inputDialog.visible && !splash.visible && !devicePassphraseDialog.visible @@ -1712,7 +1712,7 @@ ApplicationWindow { y: (parent.height - height) / 2 } - MoneroComponents.RemoteNodeDialog { + MonzeroComponents.RemoteNodeDialog { id: remoteNodeDialog } @@ -1934,7 +1934,7 @@ ApplicationWindow { WizardController { id: wizard anchors.fill: parent - onUseMoneroClicked: { + onUseMonzeroClicked: { rootItem.state = "normal"; appWindow.openWallet("wizard"); } @@ -1964,11 +1964,11 @@ ApplicationWindow { height: 34 width: 34 - MoneroEffects.ImageMask { + MonzeroEffects.ImageMask { anchors.centerIn: parent visible: persistentSettings.customDecorations image: "qrc:///images/resize.png" - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor width: 12 height: 12 opacity: (parent.containsMouse || parent.pressed) ? 0.5 : 1.0 @@ -2012,7 +2012,7 @@ ApplicationWindow { onMinimizeClicked: appWindow.visibility = Window.Minimized } - MoneroMerchant.MerchantTitlebar { + MonzeroMerchant.MerchantTitlebar { id: titleBarOrange visible: persistentSettings.customDecorations && middlePanel.state === "Merchant" anchors.left: parent.left @@ -2040,7 +2040,7 @@ ApplicationWindow { source: "qrc:///images/tip.png" } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: content anchors.horizontalCenter: parent.horizontalCenter y: 6 @@ -2157,14 +2157,14 @@ ApplicationWindow { anchors.bottom: parent.bottom width: statusMessageText.contentWidth + 20 anchors.horizontalCenter: parent.horizontalCenter - color: MoneroComponents.Style.blackTheme ? "black" : "white" + color: MonzeroComponents.Style.blackTheme ? "black" : "white" height: 40 - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: statusMessageText anchors.fill: parent anchors.margins: 10 font.pixelSize: 14 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor themeTransition: false } } @@ -2299,14 +2299,14 @@ ApplicationWindow { } // reset label text. othewise potential privacy leak showing unlock time when switching wallets - function clearMoneroCardLabelText(){ + function clearMonzeroCardLabelText(){ leftPanel.balanceString = "?.??" leftPanel.balanceFiatString = "?.??" } // some fields need an extra nudge when changing languages function resetLanguageFields(){ - clearMoneroCardLabelText() + clearMonzeroCardLabelText() if (currentWallet) { onWalletRefresh(); } @@ -2361,11 +2361,11 @@ ApplicationWindow { function getDefaultDaemonRpcPort(networkType) { switch (parseInt(networkType)) { case NetworkType.STAGENET: - return 38081; + return 26175; case NetworkType.TESTNET: - return 28081; + return 16175; default: - return 18081; + return 6175; } } @@ -2391,10 +2391,10 @@ ApplicationWindow { visible: blur.visible anchors.fill: parent anchors.topMargin: titleBar.height - color: MoneroComponents.Style.blackTheme ? "black" : "white" + color: MonzeroComponents.Style.blackTheme ? "black" : "white" opacity: isOpenGL ? 0.3 : inputDialog.visible || splash.visible ? 0.7 : 1.0 - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: parent blackColor: "black" whiteColor: "white" @@ -2408,77 +2408,77 @@ ApplicationWindow { // borders on white theme + linux Rectangle { - visible: isLinux && !MoneroComponents.Style.blackTheme && middlePanel.state !== "Merchant" + visible: isLinux && !MonzeroComponents.Style.blackTheme && middlePanel.state !== "Merchant" z: parent.z + 1 anchors.left: parent.left anchors.top: parent.top anchors.bottom: parent.bottom width: 1 - color: MoneroComponents.Style.appWindowBorderColor + color: MonzeroComponents.Style.appWindowBorderColor - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: parent - blackColor: MoneroComponents.Style._b_appWindowBorderColor - whiteColor: MoneroComponents.Style._w_appWindowBorderColor + blackColor: MonzeroComponents.Style._b_appWindowBorderColor + whiteColor: MonzeroComponents.Style._w_appWindowBorderColor } } Rectangle { - visible: isLinux && !MoneroComponents.Style.blackTheme && middlePanel.state !== "Merchant" + visible: isLinux && !MonzeroComponents.Style.blackTheme && middlePanel.state !== "Merchant" z: parent.z + 1 anchors.right: parent.right anchors.top: parent.top anchors.bottom: parent.bottom width: 1 - color: MoneroComponents.Style.appWindowBorderColor + color: MonzeroComponents.Style.appWindowBorderColor - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: parent - blackColor: MoneroComponents.Style._b_appWindowBorderColor - whiteColor: MoneroComponents.Style._w_appWindowBorderColor + blackColor: MonzeroComponents.Style._b_appWindowBorderColor + whiteColor: MonzeroComponents.Style._w_appWindowBorderColor } } Rectangle { - visible: isLinux && !MoneroComponents.Style.blackTheme && middlePanel.state !== "Merchant" + visible: isLinux && !MonzeroComponents.Style.blackTheme && middlePanel.state !== "Merchant" z: parent.z + 1 anchors.right: parent.right anchors.top: parent.top anchors.left: parent.left height: 1 - color: MoneroComponents.Style.appWindowBorderColor + color: MonzeroComponents.Style.appWindowBorderColor - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: parent - blackColor: MoneroComponents.Style._b_appWindowBorderColor - whiteColor: MoneroComponents.Style._w_appWindowBorderColor + blackColor: MonzeroComponents.Style._b_appWindowBorderColor + whiteColor: MonzeroComponents.Style._w_appWindowBorderColor } } Rectangle { - visible: isLinux && !MoneroComponents.Style.blackTheme && middlePanel.state !== "Merchant" + visible: isLinux && !MonzeroComponents.Style.blackTheme && middlePanel.state !== "Merchant" z: parent.z + 1 anchors.right: parent.right anchors.bottom: parent.bottom anchors.left: parent.left height: 1 - color: MoneroComponents.Style.appWindowBorderColor + color: MonzeroComponents.Style.appWindowBorderColor - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: parent - blackColor: MoneroComponents.Style._b_appWindowBorderColor - whiteColor: MoneroComponents.Style._w_appWindowBorderColor + blackColor: MonzeroComponents.Style._b_appWindowBorderColor + whiteColor: MonzeroComponents.Style._w_appWindowBorderColor } } - MoneroComponents.LanguageSidebar { + MonzeroComponents.LanguageSidebar { id: languageSidebar dragMargin: 0 onAboutToShow: previousActiveFocusItem = activeFocusItem; onClosed: { if (previousActiveFocusItem) previousActiveFocusItem.forceActiveFocus() } } - MoneroComponents.MenuBar { } + MonzeroComponents.MenuBar { } Network { id: network diff --git a/monero b/monero -Subproject 4f92268d7c16741cfb41e5bbe2aa46cc260a9ea +Subproject 28f1919249465d3230f45ed21686c5a836d56df diff --git a/pages/Account.qml b/pages/Account.qml index 9bf0fe9c..4fbd6a88 100644 --- a/pages/Account.qml +++ b/pages/Account.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -33,8 +33,8 @@ import QtQuick.Layouts 1.1 import QtQuick.Dialogs 1.2 import FontAwesome 1.0 -import "../components" as MoneroComponents -import "../components/effects/" as MoneroEffects +import "../components" as MonzeroComponents +import "../components/effects/" as MonzeroEffects import moneroComponents.Clipboard 1.0 import moneroComponents.Wallet 1.0 @@ -82,7 +82,7 @@ Rectangle { visible: !selectAndSend spacing: 0 - MoneroComponents.LabelSubheader { + MonzeroComponents.LabelSubheader { Layout.fillWidth: true fontSize: 24 textFormat: Text.RichText @@ -92,28 +92,28 @@ Rectangle { RowLayout { Layout.topMargin: 22 - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { text: qsTr("Total balance: ") + translationManager.emptyString Layout.fillWidth: true - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor font.pixelSize: 16 - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name themeTransition: false } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: balanceAll Layout.rightMargin: 87 - font.family: MoneroComponents.Style.fontMonoRegular.name; + font.family: MonzeroComponents.Style.fontMonoRegular.name; font.pixelSize: 16 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor MouseArea { hoverEnabled: true anchors.fill: parent cursorShape: Qt.PointingHandCursor - onEntered: parent.color = MoneroComponents.Style.orange - onExited: parent.color = MoneroComponents.Style.defaultFontColor + onEntered: parent.color = MonzeroComponents.Style.orange + onExited: parent.color = MonzeroComponents.Style.defaultFontColor onClicked: { console.log("Copied to clipboard"); var balanceAllNumberOnly = parent.text.slice(0, -4); @@ -127,28 +127,28 @@ Rectangle { RowLayout { Layout.topMargin: 10 - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { text: qsTr("Total unlocked balance: ") + translationManager.emptyString Layout.fillWidth: true - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor font.pixelSize: 16 - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name themeTransition: false } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: unlockedBalanceAll Layout.rightMargin: 87 - font.family: MoneroComponents.Style.fontMonoRegular.name; + font.family: MonzeroComponents.Style.fontMonoRegular.name; font.pixelSize: 16 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor MouseArea { hoverEnabled: true anchors.fill: parent cursorShape: Qt.PointingHandCursor - onEntered: parent.color = MoneroComponents.Style.orange - onExited: parent.color = MoneroComponents.Style.defaultFontColor + onEntered: parent.color = MonzeroComponents.Style.orange + onExited: parent.color = MonzeroComponents.Style.defaultFontColor onClicked: { console.log("Copied to clipboard"); var unlockedBalanceAllNumberOnly = parent.text.slice(0, -4); @@ -167,14 +167,14 @@ Rectangle { RowLayout { spacing: 0 - MoneroComponents.LabelSubheader { + MonzeroComponents.LabelSubheader { Layout.fillWidth: true fontSize: 24 textFormat: Text.RichText text: qsTr("Accounts") + translationManager.emptyString } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: createNewAccountButton visible: !selectAndSend small: true @@ -197,12 +197,12 @@ Rectangle { anchors.left: createNewAccountButton.left anchors.right: createNewAccountButton.right height: 2 - color: MoneroComponents.Style.appWindowBorderColor + color: MonzeroComponents.Style.appWindowBorderColor - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: parent - blackColor: MoneroComponents.Style._b_appWindowBorderColor - whiteColor: MoneroComponents.Style._w_appWindowBorderColor + blackColor: MonzeroComponents.Style._b_appWindowBorderColor + whiteColor: MonzeroComponents.Style._w_appWindowBorderColor } } } @@ -231,29 +231,29 @@ Rectangle { height: subaddressAccountListRow.subaddressAccountListItemHeight width: parent ? parent.width : undefined Layout.fillWidth: true - color: itemMouseArea.containsMouse || index === currentAccountIndex ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent" + color: itemMouseArea.containsMouse || index === currentAccountIndex ? MonzeroComponents.Style.titleBarButtonHoverColor : "transparent" Rectangle { visible: index === currentAccountIndex Layout.fillHeight: true anchors.top: parent.top anchors.bottom: parent.bottom - color: MoneroComponents.Style.accountColors[currentAccountIndex % MoneroComponents.Style.accountColors.length] + color: MonzeroComponents.Style.accountColors[currentAccountIndex % MonzeroComponents.Style.accountColors.length] width: 2 } Rectangle { - color: MoneroComponents.Style.appWindowBorderColor + color: MonzeroComponents.Style.appWindowBorderColor anchors.right: parent.right anchors.left: parent.left anchors.top: parent.top height: 1 visible: index !== 0 - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: parent - blackColor: MoneroComponents.Style._b_appWindowBorderColor - whiteColor: MoneroComponents.Style._w_appWindowBorderColor + blackColor: MonzeroComponents.Style._b_appWindowBorderColor + whiteColor: MonzeroComponents.Style._w_appWindowBorderColor } } @@ -263,9 +263,9 @@ Rectangle { anchors.rightMargin: 80 color: "transparent" - MoneroComponents.Label { + MonzeroComponents.Label { id: idLabel - color: index === currentAccountIndex ? MoneroComponents.Style.defaultFontColor : "#757575" + color: index === currentAccountIndex ? MonzeroComponents.Style.defaultFontColor : "#757575" anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.leftMargin: 6 @@ -274,9 +274,9 @@ Rectangle { themeTransition: false } - MoneroComponents.Label { + MonzeroComponents.Label { id: nameLabel - color: index === currentAccountIndex ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor + color: index === currentAccountIndex ? MonzeroComponents.Style.defaultFontColor : MonzeroComponents.Style.dimmedFontColor anchors.verticalCenter: parent.verticalCenter anchors.left: idLabel.right anchors.leftMargin: 6 @@ -287,27 +287,27 @@ Rectangle { themeTransition: false } - MoneroComponents.Label { + MonzeroComponents.Label { id: addressLabel - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter anchors.left: balanceNumberLabel.left anchors.leftMargin: -addressLabel.width - 30 fontSize: 16 - fontFamily: MoneroComponents.Style.fontMonoRegular.name; + fontFamily: MonzeroComponents.Style.fontMonoRegular.name; text: TxUtils.addressTruncatePretty(address, mainLayout.width < 740 ? 1 : (mainLayout.width < 900 ? 2 : 3)) themeTransition: false } - MoneroComponents.Label { + MonzeroComponents.Label { id: balanceNumberLabel - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter anchors.left: parent.right anchors.leftMargin: -balanceNumberLabel.width fontSize: 16 - fontFamily: MoneroComponents.Style.fontMonoRegular.name; - text: balance + " XMR" + fontFamily: MonzeroComponents.Style.fontMonoRegular.name; + text: balance + " XMZ" elide: Text.ElideRight textWidth: 180 themeTransition: false @@ -333,12 +333,12 @@ Rectangle { height: 21 spacing: 10 - MoneroComponents.IconButton { + MonzeroComponents.IconButton { id: renameButton image: "qrc:///images/edit.svg" fontAwesomeFallbackIcon: FontAwesome.edit fontAwesomeFallbackSize: 22 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor opacity: isOpenGL ? 0.5 : 1 fontAwesomeFallbackOpacity: 0.5 Layout.preferredWidth: 23 @@ -348,12 +348,12 @@ Rectangle { onClicked: pageAccount.renameSubaddressAccountLabel(index); } - MoneroComponents.IconButton { + MonzeroComponents.IconButton { id: copyButton image: "qrc:///images/copy.svg" fontAwesomeFallbackIcon: FontAwesome.clipboard fontAwesomeFallbackSize: 22 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor opacity: isOpenGL ? 0.5 : 1 fontAwesomeFallbackOpacity: 0.5 Layout.preferredWidth: 16 @@ -376,14 +376,14 @@ Rectangle { } Rectangle { - color: MoneroComponents.Style.appWindowBorderColor + color: MonzeroComponents.Style.appWindowBorderColor Layout.fillWidth: true height: 1 - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: parent - blackColor: MoneroComponents.Style._b_appWindowBorderColor - whiteColor: MoneroComponents.Style._w_appWindowBorderColor + blackColor: MonzeroComponents.Style._b_appWindowBorderColor + whiteColor: MonzeroComponents.Style._w_appWindowBorderColor } } } @@ -396,8 +396,8 @@ Rectangle { subaddressAccountListView.model = appWindow.currentWallet.subaddressAccountModel; appWindow.currentWallet.subaddress.refresh(appWindow.currentWallet.currentSubaddressAccount) - balanceAll.text = walletManager.displayAmount(appWindow.currentWallet.balanceAll()) + " XMR" - unlockedBalanceAll.text = walletManager.displayAmount(appWindow.currentWallet.unlockedBalanceAll()) + " XMR" + balanceAll.text = walletManager.displayAmount(appWindow.currentWallet.balanceAll()) + " XMZ" + unlockedBalanceAll.text = walletManager.displayAmount(appWindow.currentWallet.unlockedBalanceAll()) + " XMZ" } } diff --git a/pages/AddressBook.qml b/pages/AddressBook.qml index 65e315e2..6af941d3 100644 --- a/pages/AddressBook.qml +++ b/pages/AddressBook.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -31,8 +31,8 @@ import QtQuick.Controls 2.0 import QtQuick.Layouts 1.1 import QtQuick.Dialogs 1.2 -import "../components" as MoneroComponents -import "../components/effects/" as MoneroEffects +import "../components" as MonzeroComponents +import "../components/effects/" as MonzeroEffects import "../js/TxUtils.js" as TxUtils import moneroComponents.AddressBook 1.0 @@ -70,8 +70,8 @@ Rectangle { Text { id: titleLabel Layout.fillWidth: true - color: MoneroComponents.Style.defaultFontColor - font.family: MoneroComponents.Style.fontRegular.name + color: MonzeroComponents.Style.defaultFontColor + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 32 horizontalAlignment: TextInput.AlignLeft wrapMode: Text.WordWrap; @@ -83,18 +83,18 @@ Rectangle { Text { Layout.fillWidth: true - color: MoneroComponents.Style.dimmedFontColor - font.family: MoneroComponents.Style.fontRegular.name + color: MonzeroComponents.Style.dimmedFontColor + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 16 horizontalAlignment: TextInput.AlignLeft wrapMode: Text.WordWrap; leftPadding: 0 topPadding: 0 - text: qsTr("This makes it easier to send or receive Monero and reduces errors when typing in addresses manually.") + translationManager.emptyString + text: qsTr("This makes it easier to send or receive Monzero and reduces errors when typing in addresses manually.") + translationManager.emptyString width: parent.width } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: addFirstEntryButton Layout.topMargin: 20 Layout.alignment: Qt.AlignHCenter @@ -111,13 +111,13 @@ Rectangle { visible: addressBookListView.count >= 1 spacing: 0 - MoneroComponents.Label { + MonzeroComponents.Label { Layout.bottomMargin: 20 fontSize: 32 text: qsTr("Address book") + translationManager.emptyString } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: addAddressButton Layout.bottomMargin: 8 Layout.alignment: Qt.AlignRight @@ -148,7 +148,7 @@ Rectangle { height: addressBookListRow.addressBookListItemHeight width: parent ? parent.width : undefined Layout.fillWidth: true - color: itemMouseArea.containsMouse ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent" + color: itemMouseArea.containsMouse ? MonzeroComponents.Style.titleBarButtonHoverColor : "transparent" function doSend() { console.log("Sending to: ", address +" "+ paymentId); @@ -157,16 +157,16 @@ Rectangle { } Rectangle { - color: MoneroComponents.Style.appWindowBorderColor + color: MonzeroComponents.Style.appWindowBorderColor anchors.right: parent.right anchors.left: parent.left anchors.top: parent.top height: 1 - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: parent - blackColor: MoneroComponents.Style._b_appWindowBorderColor - whiteColor: MoneroComponents.Style._w_appWindowBorderColor + blackColor: MonzeroComponents.Style._b_appWindowBorderColor + whiteColor: MonzeroComponents.Style._w_appWindowBorderColor } } @@ -176,9 +176,9 @@ Rectangle { anchors.rightMargin: 125 color: "transparent" - MoneroComponents.Label { + MonzeroComponents.Label { id: descriptionLabel - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.leftMargin: 6 @@ -188,15 +188,15 @@ Rectangle { textWidth: addressLabel.x - descriptionLabel.x - 1 } - MoneroComponents.Label { + MonzeroComponents.Label { id: addressLabel - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter anchors.left: parent.right anchors.leftMargin: -addressLabel.width - 5 fontSize: 16 - fontFamily: MoneroComponents.Style.fontMonoRegular.name; + fontFamily: MonzeroComponents.Style.fontMonoRegular.name; text: TxUtils.addressTruncatePretty(address, mainLayout.width < 540 ? 1 : (mainLayout.width < 700 ? 2 : 3)); } @@ -219,10 +219,10 @@ Rectangle { height: 21 spacing: 10 - MoneroComponents.IconButton { + MonzeroComponents.IconButton { id: sendToButton image: "qrc:///images/arrow-right-in-circle-outline-medium-white.svg" - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor opacity: isOpenGL ? 0.5 : 1 fontAwesomeFallbackIcon: FontAwesome.arrowRight fontAwesomeFallbackSize: 22 @@ -236,10 +236,10 @@ Rectangle { } } - MoneroComponents.IconButton { + MonzeroComponents.IconButton { fontAwesomeFallbackIcon: FontAwesome.searchPlus fontAwesomeFallbackSize: 22 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor fontAwesomeFallbackOpacity: 0.5 Layout.preferredWidth: 23 Layout.preferredHeight: 21 @@ -248,10 +248,10 @@ Rectangle { onClicked: doSearchInHistory(address) } - MoneroComponents.IconButton { + MonzeroComponents.IconButton { id: editEntryButton image: "qrc:///images/edit.svg" - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor opacity: isOpenGL ? 0.5 : 1 fontAwesomeFallbackIcon: FontAwesome.edit fontAwesomeFallbackSize: 22 @@ -266,10 +266,10 @@ Rectangle { } } - MoneroComponents.IconButton { + MonzeroComponents.IconButton { id: copyButton image: "qrc:///images/copy.svg" - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor opacity: isOpenGL ? 0.5 : 1 fontAwesomeFallbackIcon: FontAwesome.clipboard fontAwesomeFallbackSize: 22 @@ -291,14 +291,14 @@ Rectangle { Rectangle { id: border2 - color: MoneroComponents.Style.appWindowBorderColor + color: MonzeroComponents.Style.appWindowBorderColor Layout.fillWidth: true height: 1 - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: border2 - blackColor: MoneroComponents.Style._b_appWindowBorderColor - whiteColor: MoneroComponents.Style._w_appWindowBorderColor + blackColor: MonzeroComponents.Style._b_appWindowBorderColor + whiteColor: MonzeroComponents.Style._w_appWindowBorderColor } } } @@ -307,13 +307,13 @@ Rectangle { visible: false spacing: 0 - MoneroComponents.Label { + MonzeroComponents.Label { fontSize: 32 wrapMode: Text.WordWrap text: (root.editEntry ? qsTr("Edit entry") : qsTr("Add an address")) + translationManager.emptyString } - MoneroComponents.LineEditMulti { + MonzeroComponents.LineEditMulti { id: addressLine visible: !root.editEntry Layout.topMargin: 20 @@ -323,11 +323,11 @@ Rectangle { .arg(qsTr("Address")) + translationManager.emptyString placeholderText: { if(persistentSettings.nettype == NetworkType.MAINNET){ - return "4.. / 8.. / monero:.. / OpenAlias"; + return "F.. / monzero:.. / OpenAlias"; } else if (persistentSettings.nettype == NetworkType.STAGENET){ - return "5.. / 7.. / monero:.."; + return "F.. / monzero:.."; } else if(persistentSettings.nettype == NetworkType.TESTNET){ - return "9.. / B.. / monero:.."; + return "F.. / monzero:.."; } } wrapMode: Text.WrapAnywhere @@ -343,7 +343,7 @@ Rectangle { onEnterPressed: addButton.enabled ? addButton.clicked() : "" onReturnPressed: addButton.enabled ? addButton.clicked() : "" - MoneroComponents.InlineButton { + MonzeroComponents.InlineButton { fontFamily: FontAwesome.fontFamilySolid fontStyleName: "Solid" fontPixelSize: 18 @@ -366,8 +366,8 @@ Rectangle { } } - MoneroComponents.InlineButton { - buttonColor: MoneroComponents.Style.orange + MonzeroComponents.InlineButton { + buttonColor: MonzeroComponents.Style.orange fontFamily: FontAwesome.fontFamily text: FontAwesome.qrcode visible : appWindow.qrScannerEnabled && !addressLine.text @@ -378,7 +378,7 @@ Rectangle { } } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: resolveButton KeyNavigation.backtab: addressLine KeyNavigation.tab: descriptionLine @@ -414,7 +414,7 @@ Rectangle { } } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: descriptionLine KeyNavigation.backtab: resolveButton.visible ? resolveButton : addressLine KeyNavigation.tab: addButton.enabled ? addButton : cancelButton @@ -431,7 +431,7 @@ Rectangle { Layout.topMargin: 20 Layout.alignment: Qt.AlignRight - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: cancelButton KeyNavigation.backtab: addButton KeyNavigation.tab: deleteButton.visible ? deleteButton : addressLine @@ -441,7 +441,7 @@ Rectangle { onClicked: root.showAddressBook(); } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: deleteButton KeyNavigation.backtab: cancelButton KeyNavigation.tab: addressLine @@ -455,7 +455,7 @@ Rectangle { } } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: addButton KeyNavigation.backtab: descriptionLine KeyNavigation.tab: cancelButton @@ -558,7 +558,7 @@ Rectangle { confirmationDialog.open() } - MoneroComponents.StandardDialog { + MonzeroComponents.StandardDialog { // dynamically change onclose handler property var onCloseCallback id: oaPopup diff --git a/pages/Advanced.qml b/pages/Advanced.qml index 5cb0d3d8..22ee5d7c 100644 --- a/pages/Advanced.qml +++ b/pages/Advanced.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2021-2024, The Monero Project +// Copyright (c) 2021-2024, The Monzero Project // // All rights reserved. // @@ -30,7 +30,7 @@ import QtQuick 2.9 import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Layouts 1.1 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents import "." ColumnLayout { @@ -44,29 +44,29 @@ ColumnLayout { property alias prooveView: stateView.prooveView property alias state: stateView.state - MoneroComponents.Navbar { + MonzeroComponents.Navbar { id: navbarId Layout.alignment: Qt.AlignHCenter Layout.topMargin: height Layout.bottomMargin: height - MoneroComponents.NavbarItem { + MonzeroComponents.NavbarItem { active: state == "Mining" text: qsTr("Mining") + translationManager.emptyString onSelected: state = "Mining" visible: !isAndroid } - MoneroComponents.NavbarItem { + MonzeroComponents.NavbarItem { active: state == "Prove" text: qsTr("Prove/check") + translationManager.emptyString onSelected: state = "Prove" } - MoneroComponents.NavbarItem { + MonzeroComponents.NavbarItem { active: state == "SharedRingDB" text: qsTr("Shared RingDB") + translationManager.emptyString onSelected: state = "SharedRingDB" } - MoneroComponents.NavbarItem { + MonzeroComponents.NavbarItem { active: state == "Sign" text: qsTr("Sign/verify") + translationManager.emptyString onSelected: state = "Sign" diff --git a/pages/History.qml b/pages/History.qml index 6871405d..f928fd5b 100644 --- a/pages/History.qml +++ b/pages/History.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -38,8 +38,8 @@ import moneroComponents.TransactionHistoryModel 1.0 import moneroComponents.Clipboard 1.0 import FontAwesome 1.0 -import "../components/effects/" as MoneroEffects -import "../components" as MoneroComponents +import "../components/effects/" as MonzeroEffects +import "../components" as MonzeroComponents import "../js/Utils.js" as Utils import "../js/TxUtils.js" as TxUtils @@ -84,7 +84,7 @@ Rectangle { Layout.rightMargin: sideMargin Layout.bottomMargin: 10 - MoneroComponents.Label { + MonzeroComponents.Label { fontSize: 24 text: qsTr("Transactions") + translationManager.emptyString } @@ -102,12 +102,12 @@ Rectangle { Layout.preferredHeight: 15 spacing: 8 - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { Layout.alignment: Qt.AlignVCenter - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: qsTr("Sort & filter") + translationManager.emptyString - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor MouseArea { anchors.fill: parent @@ -119,7 +119,7 @@ Rectangle { } } - MoneroEffects.ImageMask { + MonzeroEffects.ImageMask { id: sortCollapsedIcon Layout.alignment: Qt.AlignVCenter height: 8 @@ -128,7 +128,7 @@ Rectangle { fontAwesomeFallbackIcon: FontAwesome.arrowDown fontAwesomeFallbackSize: 14 rotation: sortAndFilter.collapsed ? 180 : 0 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor MouseArea { anchors.fill: parent @@ -149,7 +149,7 @@ Rectangle { Layout.rightMargin: sideMargin visible: sortAndFilter.collapsed - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: searchInput Layout.fillWidth: true input.topPadding: 6 @@ -181,7 +181,7 @@ Rectangle { Layout.rightMargin: -8 Layout.leftMargin: -2 - MoneroComponents.InlineButton { + MonzeroComponents.InlineButton { id: cleanButton buttonColor: "transparent" fontFamily: FontAwesome.fontFamilySolid @@ -206,7 +206,7 @@ Rectangle { columns: 2 columnSpacing: 20 - MoneroComponents.DatePicker { + MonzeroComponents.DatePicker { id: fromDatePicker Layout.fillWidth: true width: 100 @@ -220,7 +220,7 @@ Rectangle { } } - MoneroComponents.DatePicker { + MonzeroComponents.DatePicker { id: toDatePicker Layout.fillWidth: true width: 100 @@ -248,11 +248,11 @@ Rectangle { Layout.preferredWidth: childrenRect.width + 38 Layout.preferredHeight: 20 - MoneroComponents.TextPlain { - font.family: MoneroComponents.Style.fontRegular.name + MonzeroComponents.TextPlain { + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: qsTr("Sort by") + ":" + translationManager.emptyString - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter } } @@ -268,16 +268,16 @@ Rectangle { clip: true anchors.fill: parent - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: sortBlockheightText - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: qsTr("Blockheight") + translationManager.emptyString - color: root.sortBy === "blockheight" ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor + color: root.sortBy === "blockheight" ? MonzeroComponents.Style.defaultFontColor : MonzeroComponents.Style.dimmedFontColor themeTransition: false } - MoneroEffects.ImageMask { + MonzeroEffects.ImageMask { height: 8 width: 12 visible: root.sortBy === "blockheight" ? true : false @@ -285,7 +285,7 @@ Rectangle { image: "qrc:///images/whiteDropIndicator.png" fontAwesomeFallbackIcon: FontAwesome.arrowDown fontAwesomeFallbackSize: 14 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor rotation: { if(root.sortBy === "blockheight"){ return root.sortDirection ? 0 : 180 @@ -327,16 +327,16 @@ Rectangle { clip: true anchors.fill: parent - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: sortDateText - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: qsTr("Date") + translationManager.emptyString - color: root.sortBy === "timestamp" ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor + color: root.sortBy === "timestamp" ? MonzeroComponents.Style.defaultFontColor : MonzeroComponents.Style.dimmedFontColor themeTransition: false } - MoneroEffects.ImageMask { + MonzeroEffects.ImageMask { height: 8 width: 12 visible: root.sortBy === "timestamp" ? true : false @@ -344,7 +344,7 @@ Rectangle { image: "qrc:///images/whiteDropIndicator.png" fontAwesomeFallbackIcon: FontAwesome.arrowDown fontAwesomeFallbackSize: 14 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor rotation: { if(root.sortBy === "timestamp"){ return root.sortDirection ? 0 : 180 @@ -386,16 +386,16 @@ Rectangle { clip: true anchors.fill: parent - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: sortAmountText - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: qsTr("Amount") + translationManager.emptyString - color: root.sortBy === "amount" ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor + color: root.sortBy === "amount" ? MonzeroComponents.Style.defaultFontColor : MonzeroComponents.Style.dimmedFontColor themeTransition: false } - MoneroEffects.ImageMask { + MonzeroEffects.ImageMask { height: 8 width: 12 visible: root.sortBy === "amount" ? true : false @@ -403,7 +403,7 @@ Rectangle { image: "qrc:///images/whiteDropIndicator.png" fontAwesomeFallbackIcon: FontAwesome.arrowDown fontAwesomeFallbackSize: 14 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor rotation: { if(root.sortBy === "amount"){ return root.sortDirection ? 0 : 180 @@ -439,13 +439,13 @@ Rectangle { visible: !sortAndFilter.collapsed Layout.preferredHeight: 20 - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { // status message - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: root.historyStatusMessage - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter } } @@ -467,11 +467,11 @@ Rectangle { Layout.preferredWidth: childrenRect.width + 2 Layout.preferredHeight: 20 - MoneroComponents.TextPlain { - font.family: MoneroComponents.Style.fontRegular.name + MonzeroComponents.TextPlain { + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: qsTr("Page") + ":" + translationManager.emptyString - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter } } @@ -482,10 +482,10 @@ Rectangle { Layout.leftMargin: 4 Layout.preferredHeight: 20 - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: paginationText text: root.txPage + "/" + Math.ceil(root.txCount / root.txMax) - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter MouseArea { @@ -494,8 +494,8 @@ Rectangle { anchors.fill: parent hoverEnabled: pages > 1 cursorShape: hoverEnabled ? Qt.PointingHandCursor : Qt.ArrowCursor - onEntered: parent.color = MoneroComponents.Style.orange - onExited: parent.color = MoneroComponents.Style.defaultFontColor + onEntered: parent.color = MonzeroComponents.Style.orange + onExited: parent.color = MonzeroComponents.Style.defaultFontColor onClicked: { if(pages === 1) return; @@ -525,7 +525,7 @@ Rectangle { opacity: enabled ? 1.0 : 0.2 enabled: false - MoneroEffects.ImageMask { + MonzeroEffects.ImageMask { id: prevIcon anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left @@ -534,7 +534,7 @@ Rectangle { image: "qrc:///images/whiteDropIndicator.png" fontAwesomeFallbackIcon: FontAwesome.arrowDown fontAwesomeFallbackSize: 14 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor rotation: 90 } @@ -557,7 +557,7 @@ Rectangle { opacity: enabled ? 1.0 : 0.2 enabled: false - MoneroEffects.ImageMask { + MonzeroEffects.ImageMask { id: nextIcon anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right @@ -567,7 +567,7 @@ Rectangle { fontAwesomeFallbackIcon: FontAwesome.arrowDown fontAwesomeFallbackSize: 14 rotation: 270 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor } MouseArea { @@ -601,7 +601,7 @@ Rectangle { } color: { if(!collapsed) return "transparent" - return MoneroComponents.Style.blackTheme ? "#06FFFFFF" : "#04000000" + return MonzeroComponents.Style.blackTheme ? "#06FFFFFF" : "#04000000" } Rectangle { @@ -622,7 +622,7 @@ Rectangle { color: isout ? "#d85a00" : "#2eb358" } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { visible: isFailed || isPending anchors.top: parent.top anchors.topMargin: 24 @@ -631,7 +631,7 @@ Rectangle { font.styleName: isFailed ? "Solid" : "" font.pixelSize: 15 text: isFailed ? FontAwesome.times : FontAwesome.clockO - color: isFailed ? "#FF0000" : MoneroComponents.Style.defaultFontColor + color: isFailed ? "#FF0000" : MonzeroComponents.Style.defaultFontColor themeTransition: false } } @@ -668,14 +668,14 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 20 - MoneroComponents.TextPlain { - font.family: MoneroComponents.Style.fontRegular.name + MonzeroComponents.TextPlain { + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: (isout ? qsTr("Sent") : qsTr("Received")) + (isFailed ? " (" + qsTr("Failed") + ")" : (isPending ? " (" + qsTr("Pending") + ")" : "")) + translationManager.emptyString - color: MoneroComponents.Style.historyHeaderTextColor + color: MonzeroComponents.Style.historyHeaderTextColor anchors.verticalCenter: parent.verticalCenter - themeTransitionBlackColor: MoneroComponents.Style._b_historyHeaderTextColor - themeTransitionWhiteColor: MoneroComponents.Style._w_historyHeaderTextColor + themeTransitionBlackColor: MonzeroComponents.Style._b_historyHeaderTextColor + themeTransitionWhiteColor: MonzeroComponents.Style._w_historyHeaderTextColor } } @@ -684,19 +684,19 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 20 - MoneroComponents.TextPlain { - font.family: MoneroComponents.Style.fontRegular.name + MonzeroComponents.TextPlain { + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: (amount == 0 ? qsTr("Unknown amount") : displayAmount) + translationManager.emptyString - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter MouseArea { state: "copyable" anchors.fill: parent hoverEnabled: true - onEntered: parent.color = MoneroComponents.Style.orange - onExited: parent.color = MoneroComponents.Style.defaultFontColor + onEntered: parent.color = MonzeroComponents.Style.orange + onExited: parent.color = MonzeroComponents.Style.defaultFontColor } } } @@ -718,13 +718,13 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 20 - MoneroComponents.TextPlain { - font.family: MoneroComponents.Style.fontRegular.name + MonzeroComponents.TextPlain { + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: isout ? qsTr("Fee") : confirmationsRequired === 60 ? qsTr("Mined") : qsTr("Fee") + translationManager.emptyString - color: MoneroComponents.Style.historyHeaderTextColor - themeTransitionBlackColor: MoneroComponents.Style._b_historyHeaderTextColor - themeTransitionWhiteColor: MoneroComponents.Style._w_historyHeaderTextColor + color: MonzeroComponents.Style.historyHeaderTextColor + themeTransitionBlackColor: MonzeroComponents.Style._b_historyHeaderTextColor + themeTransitionWhiteColor: MonzeroComponents.Style._w_historyHeaderTextColor anchors.verticalCenter: parent.verticalCenter } } @@ -734,24 +734,24 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 20 - MoneroComponents.TextPlain { - font.family: MoneroComponents.Style.fontRegular.name + MonzeroComponents.TextPlain { + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: { if(!isout && confirmationsRequired === 60) return qsTr("Yes") + translationManager.emptyString; - if(fee !== "") return Utils.removeTrailingZeros(fee) + " XMR"; + if(fee !== "") return Utils.removeTrailingZeros(fee) + " XMZ"; return "-"; } - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter MouseArea { state: "copyable" anchors.fill: parent hoverEnabled: true - onEntered: parent.color = MoneroComponents.Style.orange - onExited: parent.color = MoneroComponents.Style.defaultFontColor + onEntered: parent.color = MonzeroComponents.Style.orange + onExited: parent.color = MonzeroComponents.Style.defaultFontColor } } } @@ -780,13 +780,13 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 20 - MoneroComponents.TextPlain { - font.family: MoneroComponents.Style.fontRegular.name + MonzeroComponents.TextPlain { + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: (isout ? qsTr("To") : qsTr("In")) + translationManager.emptyString - color: MoneroComponents.Style.historyHeaderTextColor - themeTransitionBlackColor: MoneroComponents.Style._b_historyHeaderTextColor - themeTransitionWhiteColor: MoneroComponents.Style._w_historyHeaderTextColor + color: MonzeroComponents.Style.historyHeaderTextColor + themeTransitionBlackColor: MonzeroComponents.Style._b_historyHeaderTextColor + themeTransitionWhiteColor: MonzeroComponents.Style._w_historyHeaderTextColor anchors.verticalCenter: parent.verticalCenter } } @@ -796,9 +796,9 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 20 - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: addressField - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: { if (isout) { @@ -827,15 +827,15 @@ Rectangle { } } - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter MouseArea { state: isout ? "copyable_address" : "copyable_receiving_address" anchors.fill: parent hoverEnabled: true - onEntered: parent.color = MoneroComponents.Style.orange - onExited: parent.color = MoneroComponents.Style.defaultFontColor + onEntered: parent.color = MonzeroComponents.Style.orange + onExited: parent.color = MonzeroComponents.Style.defaultFontColor } } } @@ -857,13 +857,13 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 20 - MoneroComponents.TextPlain { - font.family: MoneroComponents.Style.fontRegular.name + MonzeroComponents.TextPlain { + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: qsTr("Confirmations") + translationManager.emptyString - color: MoneroComponents.Style.historyHeaderTextColor - themeTransitionBlackColor: MoneroComponents.Style._b_historyHeaderTextColor - themeTransitionWhiteColor: MoneroComponents.Style._w_historyHeaderTextColor + color: MonzeroComponents.Style.historyHeaderTextColor + themeTransitionBlackColor: MonzeroComponents.Style._b_historyHeaderTextColor + themeTransitionWhiteColor: MonzeroComponents.Style._w_historyHeaderTextColor anchors.verticalCenter: parent.verticalCenter } } @@ -873,20 +873,20 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 20 - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { property bool confirmed: confirmations < confirmationsRequired ? false : true - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: confirmed ? confirmations : confirmations + "/" + confirmationsRequired - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter MouseArea { state: "copyable" anchors.fill: parent hoverEnabled: true - onEntered: parent.color = MoneroComponents.Style.orange - onExited: parent.color = MoneroComponents.Style.defaultFontColor + onEntered: parent.color = MonzeroComponents.Style.orange + onExited: parent.color = MonzeroComponents.Style.defaultFontColor } } } @@ -915,13 +915,13 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 20 - MoneroComponents.TextPlain { - font.family: MoneroComponents.Style.fontRegular.name + MonzeroComponents.TextPlain { + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: qsTr("Date") - color: MoneroComponents.Style.historyHeaderTextColor - themeTransitionBlackColor: MoneroComponents.Style._b_historyHeaderTextColor - themeTransitionWhiteColor: MoneroComponents.Style._w_historyHeaderTextColor + color: MonzeroComponents.Style.historyHeaderTextColor + themeTransitionBlackColor: MonzeroComponents.Style._b_historyHeaderTextColor + themeTransitionWhiteColor: MonzeroComponents.Style._w_historyHeaderTextColor anchors.verticalCenter: parent.verticalCenter } } @@ -931,12 +931,12 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 20 - MoneroComponents.TextPlain { - font.family: MoneroComponents.Style.fontRegular.name + MonzeroComponents.TextPlain { + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: persistentSettings.historyHumanDates ? dateHuman : dateTime - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter MouseArea { @@ -944,13 +944,13 @@ Rectangle { anchors.fill: parent hoverEnabled: true onEntered: { - parent.color = MoneroComponents.Style.orange + parent.color = MonzeroComponents.Style.orange if (persistentSettings.historyHumanDates) { parent.text = dateTime; } } onExited: { - parent.color = MoneroComponents.Style.defaultFontColor + parent.color = MonzeroComponents.Style.defaultFontColor if (persistentSettings.historyHumanDates) { parent.text = dateHuman } @@ -975,7 +975,7 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 50 - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: btnDetails text: FontAwesome.info small: true @@ -1011,7 +1011,7 @@ Rectangle { source: "qrc:///images/miningxmr.png" } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { visible: isout enabled: currentWallet ? !currentWallet.isHwBacked() : false anchors.left: btnDetails.right @@ -1054,13 +1054,13 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 20 - MoneroComponents.TextPlain { - font.family: MoneroComponents.Style.fontRegular.name + MonzeroComponents.TextPlain { + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: qsTr("Description") + translationManager.emptyString - color: MoneroComponents.Style.historyHeaderTextColor - themeTransitionBlackColor: MoneroComponents.Style._b_historyHeaderTextColor - themeTransitionWhiteColor: MoneroComponents.Style._w_historyHeaderTextColor + color: MonzeroComponents.Style.historyHeaderTextColor + themeTransitionBlackColor: MonzeroComponents.Style._b_historyHeaderTextColor + themeTransitionWhiteColor: MonzeroComponents.Style._w_historyHeaderTextColor anchors.verticalCenter: parent.verticalCenter } } @@ -1070,31 +1070,31 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 20 - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: txNoteText - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: tx_note !== "" ? tx_note : "-" - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter MouseArea { state: "copyable" anchors.fill: parent hoverEnabled: true - onEntered: parent.color = MoneroComponents.Style.orange - onExited: parent.color = MoneroComponents.Style.defaultFontColor + onEntered: parent.color = MonzeroComponents.Style.orange + onExited: parent.color = MonzeroComponents.Style.defaultFontColor } } - MoneroEffects.ImageMask { + MonzeroEffects.ImageMask { anchors.top: parent.top anchors.left: txNoteText.right anchors.leftMargin: 12 image: "qrc:///images/edit.svg" fontAwesomeFallbackIcon: FontAwesome.pencilSquare fontAwesomeFallbackSize: 22 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor opacity: 0.75 width: 23 height: 21 @@ -1122,13 +1122,13 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 20 - MoneroComponents.TextPlain { - font.family: MoneroComponents.Style.fontRegular.name + MonzeroComponents.TextPlain { + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: qsTr("Transaction ID") + translationManager.emptyString - color: MoneroComponents.Style.historyHeaderTextColor - themeTransitionBlackColor: MoneroComponents.Style._b_historyHeaderTextColor - themeTransitionWhiteColor: MoneroComponents.Style._w_historyHeaderTextColor + color: MonzeroComponents.Style.historyHeaderTextColor + themeTransitionBlackColor: MonzeroComponents.Style._b_historyHeaderTextColor + themeTransitionWhiteColor: MonzeroComponents.Style._w_historyHeaderTextColor anchors.verticalCenter: parent.verticalCenter } } @@ -1138,19 +1138,19 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 20 - MoneroComponents.TextPlain { - font.family: MoneroComponents.Style.fontRegular.name + MonzeroComponents.TextPlain { + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: hash - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter MouseArea { state: "copyable" anchors.fill: parent hoverEnabled: true - onEntered: parent.color = MoneroComponents.Style.orange - onExited: parent.color = MoneroComponents.Style.defaultFontColor + onEntered: parent.color = MonzeroComponents.Style.orange + onExited: parent.color = MonzeroComponents.Style.defaultFontColor } } } @@ -1166,13 +1166,13 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 20 - MoneroComponents.TextPlain { - font.family: MoneroComponents.Style.fontRegular.name + MonzeroComponents.TextPlain { + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: qsTr("Transaction key") + translationManager.emptyString - color: MoneroComponents.Style.historyHeaderTextColor - themeTransitionBlackColor: MoneroComponents.Style._b_historyHeaderTextColor - themeTransitionWhiteColor: MoneroComponents.Style._w_historyHeaderTextColor + color: MonzeroComponents.Style.historyHeaderTextColor + themeTransitionBlackColor: MonzeroComponents.Style._b_historyHeaderTextColor + themeTransitionWhiteColor: MonzeroComponents.Style._w_historyHeaderTextColor anchors.verticalCenter: parent.verticalCenter } } @@ -1182,11 +1182,11 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 20 - MoneroComponents.TextPlain { - font.family: MoneroComponents.Style.fontRegular.name + MonzeroComponents.TextPlain { + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: qsTr("Click to reveal") - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter state: "txkey_hidden" @@ -1194,8 +1194,8 @@ Rectangle { state: "copyable_txkey" anchors.fill: parent hoverEnabled: true - onEntered: parent.color = MoneroComponents.Style.orange - onExited: parent.color = MoneroComponents.Style.defaultFontColor + onEntered: parent.color = MonzeroComponents.Style.orange + onExited: parent.color = MonzeroComponents.Style.defaultFontColor } } } @@ -1211,13 +1211,13 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 20 - MoneroComponents.TextPlain { - font.family: MoneroComponents.Style.fontRegular.name + MonzeroComponents.TextPlain { + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: qsTr("Blockheight") + translationManager.emptyString - color: MoneroComponents.Style.historyHeaderTextColor - themeTransitionBlackColor: MoneroComponents.Style._b_historyHeaderTextColor - themeTransitionWhiteColor: MoneroComponents.Style._w_historyHeaderTextColor + color: MonzeroComponents.Style.historyHeaderTextColor + themeTransitionBlackColor: MonzeroComponents.Style._b_historyHeaderTextColor + themeTransitionWhiteColor: MonzeroComponents.Style._w_historyHeaderTextColor anchors.verticalCenter: parent.verticalCenter } } @@ -1227,20 +1227,20 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 20 - MoneroComponents.TextPlain { - font.family: MoneroComponents.Style.fontRegular.name + MonzeroComponents.TextPlain { + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 text: (blockheight > 0 ? blockheight : qsTr('Pending')) + translationManager.emptyString; - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter MouseArea { state: "copyable" anchors.fill: parent hoverEnabled: true - onEntered: parent.color = MoneroComponents.Style.orange - onExited: parent.color = MoneroComponents.Style.defaultFontColor + onEntered: parent.color = MonzeroComponents.Style.orange + onExited: parent.color = MonzeroComponents.Style.defaultFontColor } } } @@ -1302,7 +1302,7 @@ Rectangle { color: "transparent" - MoneroEffects.ImageMask { + MonzeroEffects.ImageMask { id: collapsedIcon anchors.top: parent.top anchors.topMargin: 24 @@ -1311,7 +1311,7 @@ Rectangle { width: 12 image: "qrc:///images/whiteDropIndicator.png" rotation: delegate.collapsed ? 180 : 0 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor fontAwesomeFallbackIcon: FontAwesome.arrowDown fontAwesomeFallbackSize: 14 } @@ -1322,12 +1322,12 @@ Rectangle { anchors.right: parent.right anchors.top: parent.top height: 1 - color: MoneroComponents.Style.appWindowBorderColor + color: MonzeroComponents.Style.appWindowBorderColor - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: parent - blackColor: MoneroComponents.Style._b_appWindowBorderColor - whiteColor: MoneroComponents.Style._w_appWindowBorderColor + blackColor: MonzeroComponents.Style._b_appWindowBorderColor + whiteColor: MonzeroComponents.Style._w_appWindowBorderColor } } @@ -1336,12 +1336,12 @@ Rectangle { anchors.right: parent.right anchors.top: parent.bottom height: 1 - color: MoneroComponents.Style.appWindowBorderColor + color: MonzeroComponents.Style.appWindowBorderColor - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: parent - blackColor: MoneroComponents.Style._b_appWindowBorderColor - whiteColor: MoneroComponents.Style._w_appWindowBorderColor + blackColor: MonzeroComponents.Style._b_appWindowBorderColor + whiteColor: MonzeroComponents.Style._w_appWindowBorderColor } } } @@ -1354,20 +1354,20 @@ Rectangle { Layout.leftMargin: sideMargin Layout.rightMargin: sideMargin - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { // status message Layout.fillWidth: true Layout.alignment: Qt.AlignHCenter - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 text: root.historyStatusMessage; - color: MoneroComponents.Style.dimmedFontColor - themeTransitionBlackColor: MoneroComponents.Style._b_dimmedFontColor - themeTransitionWhiteColor: MoneroComponents.Style._w_dimmedFontColor + color: MonzeroComponents.Style.dimmedFontColor + themeTransitionBlackColor: MonzeroComponents.Style._b_dimmedFontColor + themeTransitionWhiteColor: MonzeroComponents.Style._w_dimmedFontColor } } - MoneroComponents.CheckBox2 { + MonzeroComponents.CheckBox2 { id: showAdvancedCheckbox Layout.topMargin: 30 Layout.bottomMargin: 20 @@ -1384,7 +1384,7 @@ Rectangle { Layout.rightMargin: sideMargin spacing: 20 - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { id: humanDatesCheckBox checked: persistentSettings.historyHumanDates onClicked: { @@ -1394,7 +1394,7 @@ Rectangle { text: qsTr("Human readable date format") + translationManager.emptyString } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { visible: !isIOS small: true text: qsTr("Export all history") + translationManager.emptyString @@ -1574,7 +1574,7 @@ Rectangle { // has the correct amount, so we try to fetch it from that instead. amount = Number(TxUtils.destinationsToAmount(destinations)); } - var displayAmount = Utils.removeTrailingZeros(amount.toFixed(12)) + " XMR"; + var displayAmount = Utils.removeTrailingZeros(amount.toFixed(12)) + " XMZ"; var tx_note = currentWallet.getUserNote(hash); var address = ""; diff --git a/pages/Keys.qml b/pages/Keys.qml index 99618d90..a4a842d7 100644 --- a/pages/Keys.qml +++ b/pages/Keys.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -33,7 +33,7 @@ import QtQuick.Layouts 1.1 import QtQuick.Dialogs 1.2 import moneroComponents.Clipboard 1.0 import "../version.js" as Version -import "../components" as MoneroComponents +import "../components" as MonzeroComponents import "." 1.0 @@ -58,15 +58,15 @@ Rectangle { spacing: 30 Layout.fillWidth: true - MoneroComponents.WarningBox { - text: qsTr("WARNING: Do not reuse your Monero keys on another fork, UNLESS this fork has key reuse mitigations built in. Doing so will harm your privacy.") + translationManager.emptyString; + MonzeroComponents.WarningBox { + text: qsTr("WARNING: Do not reuse your Monzero keys on another fork, UNLESS this fork has key reuse mitigations built in. Doing so will harm your privacy.") + translationManager.emptyString; } //! Manage wallet ColumnLayout { Layout.fillWidth: true - MoneroComponents.Label { + MonzeroComponents.Label { Layout.fillWidth: true fontSize: 22 Layout.topMargin: 10 @@ -76,30 +76,30 @@ Rectangle { Rectangle { Layout.fillWidth: true height: 2 - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity Layout.bottomMargin: 10 } - MoneroComponents.WarningBox { - text: qsTr("WARNING: Copying your seed to clipboard can expose you to malicious software, which may record your seed and steal your Monero. Please write down your seed manually.") + translationManager.emptyString + MonzeroComponents.WarningBox { + text: qsTr("WARNING: Copying your seed to clipboard can expose you to malicious software, which may record your seed and steal your Monzero. Please write down your seed manually.") + translationManager.emptyString } - MoneroComponents.LineEditMulti { + MonzeroComponents.LineEditMulti { id: seedText spacing: 0 copyButton: true addressValidation: false readOnly: true wrapMode: Text.WordWrap - fontColor: MoneroComponents.Style.defaultFontColor + fontColor: MonzeroComponents.Style.defaultFontColor } } ColumnLayout { Layout.fillWidth: true - MoneroComponents.Label { + MonzeroComponents.Label { Layout.fillWidth: true fontSize: 22 Layout.topMargin: 10 @@ -109,12 +109,12 @@ Rectangle { Rectangle { Layout.fillWidth: true height: 2 - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity Layout.bottomMargin: 10 } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { Layout.fillWidth: true id: walletCreationHeight readOnly: true @@ -127,7 +127,7 @@ Rectangle { ColumnLayout { Layout.fillWidth: true - MoneroComponents.Label { + MonzeroComponents.Label { Layout.fillWidth: true fontSize: 22 Layout.topMargin: 10 @@ -136,11 +136,11 @@ Rectangle { Rectangle { Layout.fillWidth: true height: 2 - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity Layout.bottomMargin: 10 } - MoneroComponents.LineEditMulti { + MonzeroComponents.LineEditMulti { Layout.fillWidth: true id: primaryAddress readOnly: true @@ -149,7 +149,7 @@ Rectangle { labelText: qsTr("Primary address") + translationManager.emptyString fontSize: 16 } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { Layout.fillWidth: true Layout.topMargin: 25 id: secretViewKey @@ -158,7 +158,7 @@ Rectangle { labelText: qsTr("Secret view key") + translationManager.emptyString fontSize: 16 } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { Layout.fillWidth: true Layout.topMargin: 25 id: publicViewKey @@ -167,7 +167,7 @@ Rectangle { labelText: qsTr("Public view key") + translationManager.emptyString fontSize: 16 } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { Layout.fillWidth: true Layout.topMargin: 25 id: secretSpendKey @@ -176,7 +176,7 @@ Rectangle { labelText: qsTr("Secret spend key") + translationManager.emptyString fontSize: 16 } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { Layout.fillWidth: true Layout.topMargin: 25 id: publicSpendKey @@ -190,7 +190,7 @@ Rectangle { ColumnLayout { Layout.fillWidth: true - MoneroComponents.Label { + MonzeroComponents.Label { Layout.fillWidth: true fontSize: 22 Layout.topMargin: 10 @@ -199,13 +199,13 @@ Rectangle { Rectangle { Layout.fillWidth: true height: 2 - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity Layout.bottomMargin: 10 } ColumnLayout { - MoneroComponents.RadioButton { + MonzeroComponents.RadioButton { id: showFullQr enabled: !this.checked checked: fullWalletQRCode.visible @@ -215,7 +215,7 @@ Rectangle { showViewOnlyQr.checked = false } } - MoneroComponents.RadioButton { + MonzeroComponents.RadioButton { enabled: !this.checked id: showViewOnlyQr checked: viewOnlyQRCode.visible @@ -246,16 +246,16 @@ Rectangle { fillMode: Image.PreserveAspectFit } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { Layout.fillWidth: true font.bold: true font.pixelSize: 16 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor text: (viewOnlyQRCode.visible) ? qsTr("View Only Wallet") + translationManager.emptyString : qsTr("Spendable Wallet") + translationManager.emptyString horizontalAlignment: Text.AlignHCenter } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { small: true text: qsTr("Done") + translationManager.emptyString onClicked: { @@ -281,7 +281,7 @@ Rectangle { seedText.text = currentWallet.seed === "" ? qsTr("Mnemonic seed protected by hardware device.") + translationManager.emptyString : currentWallet.seed if(typeof currentWallet != "undefined") { - viewOnlyQRCode.source = "image://qrcode/monero_wallet:" + currentWallet.address(0, 0) + "?view_key="+currentWallet.secretViewKey+"&height="+currentWallet.walletCreationHeight + viewOnlyQRCode.source = "image://qrcode/monzero_wallet:" + currentWallet.address(0, 0) + "?view_key="+currentWallet.secretViewKey+"&height="+currentWallet.walletCreationHeight fullWalletQRCode.source = viewOnlyQRCode.source +"&spend_key="+currentWallet.secretSpendKey if(currentWallet.viewOnly) { @@ -311,4 +311,3 @@ Rectangle { - diff --git a/pages/Mining.qml b/pages/Mining.qml index 85bd4d0a..8f073815 100644 --- a/pages/Mining.qml +++ b/pages/Mining.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -30,7 +30,7 @@ import QtQml.Models 2.2 import QtQuick 2.9 import QtQuick.Layouts 1.1 import QtQuick.Dialogs 1.2 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents import moneroComponents.Wallet 1.0 import moneroComponents.P2PoolManager 1.0 import moneroComponents.DaemonManager 1.0 @@ -53,43 +53,44 @@ Rectangle { anchors.right: parent.right spacing: 20 - MoneroComponents.Label { + MonzeroComponents.Label { id: soloTitleLabel fontSize: 24 text: qsTr("Mining") + translationManager.emptyString } - MoneroComponents.WarningBox { + MonzeroComponents.WarningBox { Layout.bottomMargin: 8 id: localDaemonWarning text: qsTr("Mining is only available on local daemons.") + translationManager.emptyString - visible: persistentSettings.useRemoteNode && !persistentSettings.allowRemoteNodeMining + visible: false } - MoneroComponents.WarningBox { + MonzeroComponents.WarningBox { Layout.bottomMargin: 8 text: qsTr("Your daemon must be synchronized before you can start mining") + translationManager.emptyString - visible: !persistentSettings.useRemoteNode && !appWindow.daemonSynced + visible: false } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: soloMainLabel - text: qsTr("Mining with your computer helps strengthen the Monero network. The more people mine, the harder it is for the network to be attacked, and every little bit helps.\n\nMining also gives you a small chance to earn some Monero. Your computer will create hashes looking for block solutions. If you find a block, you will get the associated reward. Good luck!") + "\n\n" + qsTr("P2Pool mining is a decentralized way to pool mine that pays out more frequently compared to solo mining, while also supporting the network.") + translationManager.emptyString + text: qsTr("Mining is managed separately from the Monzero wallet. Keeping the miner independent lets you close this GUI without interrupting mining and prevents the wallet from silently starting CPU work.\n\nStart the node with ./start-node.sh, then run ./start-mining.sh YOUR_MONZERO_ADDRESS THREADS from the Genesis pre2 package. Use ./stop-mining.sh to stop mining. Coinbase rewards will appear in this wallet after refresh and unlock after 60 blocks.") + translationManager.emptyString wrapMode: Text.Wrap Layout.fillWidth: true - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor } - MoneroComponents.WarningBox { + MonzeroComponents.WarningBox { id: warningLabel Layout.topMargin: 8 Layout.bottomMargin: 8 - text: qsTr("Mining may reduce the performance of other running applications and processes.") + translationManager.emptyString + text: qsTr("This GUI does not start or stop the miner. Mining continues independently when the wallet is closed.") + translationManager.emptyString } GridLayout { + visible: false columns: 2 Layout.fillWidth: true columnSpacing: 20 @@ -106,9 +107,9 @@ Rectangle { Layout.fillWidth: true Layout.alignment : Qt.AlignTop | Qt.AlignLeft - MoneroComponents.Label { + MonzeroComponents.Label { id: miningModeLabel - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor text: qsTr("Mining mode") + translationManager.emptyString fontSize: 16 } @@ -118,7 +119,7 @@ Rectangle { Layout.topMargin: 5 spacing: 10 - MoneroComponents.StandardDropdown { + MonzeroComponents.StandardDropdown { Layout.maximumWidth: 200 id: miningModeDropdown visible: true @@ -137,9 +138,9 @@ Rectangle { Layout.fillWidth: true Layout.alignment : Qt.AlignTop | Qt.AlignLeft - MoneroComponents.Label { + MonzeroComponents.Label { id: soloMinerThreadsLabel - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor text: qsTr("CPU threads") + translationManager.emptyString fontSize: 16 wrapMode: Text.WordWrap @@ -151,7 +152,7 @@ Rectangle { spacing: 16 RowLayout { - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: removeThreadButton small: true primary: false @@ -160,10 +161,10 @@ Rectangle { onClicked: threads-- } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { Layout.bottomMargin: 1 Layout.minimumWidth: 45 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor text: threads horizontalAlignment: Text.AlignHCenter font.pixelSize: 16 @@ -181,7 +182,7 @@ Rectangle { } } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: addThreadButton small: true primary: false @@ -192,7 +193,7 @@ Rectangle { } RowLayout { - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: autoRecommendedThreadsButton small: true primary: false @@ -204,7 +205,7 @@ Rectangle { } } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: autoSetMaxThreadsButton small: true primary: false @@ -220,7 +221,7 @@ Rectangle { RowLayout { // Disable this option until stable visible: false - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { id: ignoreBattery enabled: startSoloMinerButton.enabled checked: !persistentSettings.miningIgnoreBattery @@ -234,9 +235,9 @@ Rectangle { Layout.alignment: Qt.AlignTop | Qt.AlignLeft Layout.minimumWidth: 140 - MoneroComponents.Label { + MonzeroComponents.Label { id: optionsLabel - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor visible: !persistentSettings.allow_p2pool_mining text: qsTr("Options") + translationManager.emptyString fontSize: 16 @@ -250,7 +251,7 @@ Rectangle { spacing: 16 RowLayout { - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { id: backgroundMining visible: !persistentSettings.allow_p2pool_mining enabled: startSoloMinerButton.enabled && !persistentSettings.allow_p2pool_mining @@ -264,9 +265,9 @@ Rectangle { ColumnLayout { Layout.alignment : Qt.AlignTop | Qt.AlignLeft - MoneroComponents.Label { + MonzeroComponents.Label { id: manageSoloMinerLabel - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor text: qsTr("Manage miner") + translationManager.emptyString fontSize: 16 wrapMode: Text.Wrap @@ -279,7 +280,7 @@ Rectangle { spacing: 16 RowLayout { - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { visible: true id: startSoloMinerButton small: true @@ -337,7 +338,7 @@ Rectangle { } } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { visible: true id: stopSoloMinerButton small: true @@ -356,9 +357,9 @@ Rectangle { Layout.fillWidth: true Layout.alignment : Qt.AlignTop | Qt.AlignLeft - MoneroComponents.Label { + MonzeroComponents.Label { id: statusLabel - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor text: qsTr("Status") + translationManager.emptyString fontSize: 16 } @@ -368,7 +369,7 @@ Rectangle { Layout.fillWidth: true spacing: 16 - MoneroComponents.LineEditMulti { + MonzeroComponents.LineEditMulti { id: statusText Layout.minimumWidth: 300 text: qsTr("Not mining") + translationManager.emptyString @@ -391,15 +392,15 @@ Rectangle { Layout.fillWidth: true Layout.alignment : Qt.AlignTop | Qt.AlignLeft - MoneroComponents.Label { + MonzeroComponents.Label { id: chainLabel - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor visible: persistentSettings.allow_p2pool_mining text: qsTr("Chain") + translationManager.emptyString fontSize: 16 } - MoneroComponents.Tooltip { + MonzeroComponents.Tooltip { id: chainsHelpTooltip text: qsTr("Use the mini or nano chains if you have a low hashrate.") + translationManager.emptyString } @@ -423,7 +424,7 @@ Rectangle { Layout.topMargin: 5 spacing: 10 - MoneroComponents.StandardDropdown { + MonzeroComponents.StandardDropdown { Layout.maximumWidth: 200 id: chainDropdown visible: persistentSettings.allow_p2pool_mining @@ -437,22 +438,22 @@ Rectangle { Layout.fillWidth: true Layout.alignment : Qt.AlignTop | Qt.AlignLeft - MoneroComponents.Label { + MonzeroComponents.Label { id: flagsLabel visible: persistentSettings.allow_p2pool_mining - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor text: qsTr("Flags") + translationManager.emptyString fontSize: 16 } - MoneroComponents.Tooltip { + MonzeroComponents.Tooltip { id: flagsHelpTooltip text: " Usage:<br> --wallet Wallet address to mine to. Subaddresses and integrated addresses are not supported!<br> - --host IP address of your Monero node, default is 127.0.0.1<br> - --rpc-port monerod RPC API port number, default is 18081<br> - --zmq-port monerod ZMQ pub port number, default is 18083 (same port as in monerod\'s \"--zmq-pub\" command line parameter)<br> + --host IP address of your Monzero node, default is 127.0.0.1<br> + --rpc-port monzerod RPC API port number, default is 6175<br> + --zmq-port monzerod ZMQ pub port number, default is 6176 (same port as in monzerod\'s \"--zmq-pub\" command line parameter)<br> --stratum Comma-separated list of IP:port for stratum server to listen on<br> --p2p Comma-separated list of IP:port for p2p server to listen on<br> --addpeers Comma-separated list of IP:port of other p2pool nodes to connect to<br> @@ -466,12 +467,12 @@ Rectangle { --stratum-api An alias for --local-api<br> --no-cache Disable p2pool.cache<br> --no-color Disable colors in console output<br> - --no-randomx Disable internal RandomX hasher: p2pool will use RPC calls to monerod to check PoW hashes<br> + --no-randomx Disable internal RandomX hasher: p2pool will use RPC calls to monzerod to check PoW hashes<br> --out-peers N Maximum number of outgoing connections for p2p server (any value between 10 and 1000)<br> --in-peers N Maximum number of incoming connections for p2p server (any value between 10 and 1000)<br> --start-mining N Start built-in miner using N threads (any value between 1 and 64)<br> --no-autodiff Disable automatic difficulty adjustment for miners connected to stratum (WARNING: incompatible with Nicehash and MRR)<br> - --rpc-login Specify username[:password] required for Monero RPC server<br> + --rpc-login Specify username[:password] required for Monzero RPC server<br> --socks5 Specify IP:port of a SOCKS5 proxy to use for outgoing connections<br> --no-dns Disable DNS queries, use only IP addresses to connect to peers (seed node DNS will be unavailable too)<br> --p2p-external-port Port number that your router uses for mapping to your local p2p port. Use it if you are behind a NAT and still want to accept incoming connections<br> @@ -482,8 +483,8 @@ Rectangle { --version Print p2pool's version and build details<br> --tls-cert file Load TLS certificate chain from \"file\" in the PEM format<br> --tls-cert-key file Load TLS certificate private key from \"file\" in the PEM format<br> - --rpc-ssl Enable SSL on RPC connections to the Monero node<br> - --rpc-ssl-fingerprint base64-encoded fingerprint of the Monero node's certificate (optional, use it for certificate pinning)<br> + --rpc-ssl Enable SSL on RPC connections to the Monzero node<br> + --rpc-ssl-fingerprint base64-encoded fingerprint of the Monzero node's certificate (optional, use it for certificate pinning)<br> --no-stratum-http Disable HTTP on Stratum ports<br> --help Show this help message " @@ -506,7 +507,7 @@ Rectangle { ColumnLayout { Layout.fillWidth: true - MoneroComponents.LineEditMulti { + MonzeroComponents.LineEditMulti { id: p2poolFlags Layout.minimumWidth: 100 Layout.bottomMargin: 20 @@ -590,7 +591,7 @@ Rectangle { errorPopup.open() } - MoneroComponents.StandardDialog { + MonzeroComponents.StandardDialog { id: errorPopup cancelVisible: false } diff --git a/pages/Receive.qml b/pages/Receive.qml index 9a36a279..9d0f0ccb 100644 --- a/pages/Receive.qml +++ b/pages/Receive.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -33,8 +33,8 @@ import QtQuick.Layouts 1.1 import QtQuick.Dialogs 1.2 import FontAwesome 1.0 -import "../components" as MoneroComponents -import "../components/effects/" as MoneroEffects +import "../components" as MonzeroComponents +import "../components/effects/" as MonzeroEffects import moneroComponents.Clipboard 1.0 import moneroComponents.Wallet 1.0 @@ -64,7 +64,7 @@ Rectangle { function generateQRCodeString() { if (pageReceive.state == "PaymentRequest") { return walletManager.make_uri(appWindow.current_address, - walletManager.amountFromString(amountToReceiveXMR.text), + walletManager.amountFromString(amountToReceiveXMZ.text), txDescriptionInput.text, receiverNameInput.text); } else { return walletManager.make_uri(appWindow.current_address); @@ -91,17 +91,17 @@ Rectangle { spacing: 0 property int qrSize: 220 - MoneroComponents.Navbar { + MonzeroComponents.Navbar { Layout.alignment: Qt.AlignHCenter Layout.bottomMargin: 10 - MoneroComponents.NavbarItem { + MonzeroComponents.NavbarItem { active: state == "Address" text: qsTr("Address") + translationManager.emptyString onSelected: state = "Address" } - MoneroComponents.NavbarItem { + MonzeroComponents.NavbarItem { active: state == "PaymentRequest" text: qsTr("Payment request") + translationManager.emptyString onSelected: { @@ -113,7 +113,7 @@ Rectangle { Rectangle { id: qrContainer - color: MoneroComponents.Style.blackTheme ? "white" : "transparent" + color: MonzeroComponents.Style.blackTheme ? "white" : "transparent" Layout.fillWidth: true Layout.alignment: Qt.AlignHCenter Layout.maximumWidth: parent.qrSize @@ -166,13 +166,13 @@ Rectangle { } } - MoneroComponents.Tooltip { + MonzeroComponents.Tooltip { id: qrCodeTooltip text: qsTr("Left click: copy QR code to clipboard") + "<br>" + qsTr("Right click: save QR code as image file") + translationManager.emptyString } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: qrCodeText Layout.alignment: Qt.AlignHCenter Layout.topMargin: 6 @@ -181,7 +181,7 @@ Rectangle { verticalAlignment: Text.AlignVCenter visible: paymentRequestGridLayout.visible font.pixelSize: 12 - color: qrCodeTextMouseArea.containsMouse ? MoneroComponents.Style.orange : MoneroComponents.Style.defaultFontColor + color: qrCodeTextMouseArea.containsMouse ? MonzeroComponents.Style.orange : MonzeroComponents.Style.defaultFontColor text: generateQRCodeString(); wrapMode: Text.WrapAnywhere tooltip: qsTr("Copy payment request to clipboard") + translationManager.emptyString @@ -211,7 +211,7 @@ Rectangle { Layout.preferredWidth: 285 Layout.maximumWidth: 285 - MoneroComponents.Label { + MonzeroComponents.Label { id: amountTitleFiat Layout.bottomMargin: 3 Layout.preferredWidth: 90 @@ -220,26 +220,26 @@ Rectangle { text: qsTr("Amount") + translationManager.emptyString } - MoneroComponents.Input { + MonzeroComponents.Input { id: amountToReceiveFiat Layout.preferredWidth: 165 Layout.maximumWidth: 165 visible: persistentSettings.fiatPriceEnabled topPadding: 5 leftPadding: 5 - font.family: MoneroComponents.Style.fontMonoRegular.name + font.family: MonzeroComponents.Style.fontMonoRegular.name font.pixelSize: 14 font.bold: false horizontalAlignment: TextInput.AlignLeft verticalAlignment: TextInput.AlignVCenter selectByMouse: true - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor placeholderText: "0.00" background: Rectangle { - color: MoneroComponents.Style.blackTheme ? "transparent" : "white" + color: MonzeroComponents.Style.blackTheme ? "transparent" : "white" radius: 3 - border.color: parent.activeFocus ? MoneroComponents.Style.inputBorderColorActive : MoneroComponents.Style.inputBorderColorInActive + border.color: parent.activeFocus ? MonzeroComponents.Style.inputBorderColorActive : MonzeroComponents.Style.inputBorderColorInActive border.width: 1 } onTextEdited: { @@ -256,9 +256,9 @@ Rectangle { } } if (amountToReceiveFiat.text == "") { - amountToReceiveXMR.text = ""; + amountToReceiveXMZ.text = ""; } else { - amountToReceiveXMR.text = fiatApiConvertToXMR(amountToReceiveFiat.text); + amountToReceiveXMZ.text = fiatApiConvertToXMZ(amountToReceiveFiat.text); } } validator: RegExpValidator { @@ -266,40 +266,40 @@ Rectangle { } } - MoneroComponents.Label { + MonzeroComponents.Label { Layout.bottomMargin: 3 visible: persistentSettings.fiatPriceEnabled fontSize: 14 text: appWindow.fiatApiCurrencySymbol(); } - MoneroComponents.Label { - id: amountTitleXMR + MonzeroComponents.Label { + id: amountTitleXMZ Layout.bottomMargin: 3 Layout.preferredWidth: 90 fontSize: 14 text: persistentSettings.fiatPriceEnabled ? "" : qsTr("Amount") + translationManager.emptyString } - MoneroComponents.Input { - id: amountToReceiveXMR + MonzeroComponents.Input { + id: amountToReceiveXMZ Layout.preferredWidth: 165 Layout.maximumWidth: 165 topPadding: 5 leftPadding: 5 - font.family: MoneroComponents.Style.fontMonoRegular.name + font.family: MonzeroComponents.Style.fontMonoRegular.name font.pixelSize: 14 font.bold: false horizontalAlignment: TextInput.AlignLeft verticalAlignment: TextInput.AlignVCenter selectByMouse: true - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor placeholderText: "0.000000000000" background: Rectangle { - color: MoneroComponents.Style.blackTheme ? "transparent" : "white" + color: MonzeroComponents.Style.blackTheme ? "transparent" : "white" radius: 3 - border.color: parent.activeFocus ? MoneroComponents.Style.inputBorderColorActive : MoneroComponents.Style.inputBorderColorInActive + border.color: parent.activeFocus ? MonzeroComponents.Style.inputBorderColorActive : MonzeroComponents.Style.inputBorderColorInActive border.width: 1 } onTextEdited: { @@ -315,10 +315,10 @@ Rectangle { cursorPosition = 1; } } - if (amountToReceiveXMR.text == "") { + if (amountToReceiveXMZ.text == "") { amountToReceiveFiat.text = ""; } else { - amountToReceiveFiat.text = fiatApiConvertToFiat(amountToReceiveXMR.text); + amountToReceiveFiat.text = fiatApiConvertToFiat(amountToReceiveXMZ.text); } } validator: RegExpValidator { @@ -326,13 +326,13 @@ Rectangle { } } - MoneroComponents.Label { + MonzeroComponents.Label { Layout.bottomMargin: 3 fontSize: 14 - text: "XMR" + text: "XMZ" } - MoneroComponents.Label { + MonzeroComponents.Label { id: txDescription Layout.bottomMargin: 3 Layout.preferredWidth: 90 @@ -342,7 +342,7 @@ Rectangle { tooltipIconVisible: true } - MoneroComponents.Input { + MonzeroComponents.Input { id: txDescriptionInput Layout.preferredWidth: 165 Layout.maximumWidth: 165 @@ -354,24 +354,24 @@ Rectangle { horizontalAlignment: TextInput.AlignLeft verticalAlignment: TextInput.AlignVCenter selectByMouse: true - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor placeholderText: qsTr("Visible to the sender") + translationManager.emptyString background: Rectangle { - color: MoneroComponents.Style.blackTheme ? "transparent" : "white" + color: MonzeroComponents.Style.blackTheme ? "transparent" : "white" radius: 3 - border.color: parent.activeFocus ? MoneroComponents.Style.inputBorderColorActive : MoneroComponents.Style.inputBorderColorInActive + border.color: parent.activeFocus ? MonzeroComponents.Style.inputBorderColorActive : MonzeroComponents.Style.inputBorderColorInActive border.width: 1 } } - MoneroComponents.Label { + MonzeroComponents.Label { Layout.bottomMargin: 3 fontSize: 14 text: "" } - MoneroComponents.Label { + MonzeroComponents.Label { id: receiverNameLabel Layout.bottomMargin: 3 Layout.preferredWidth: 90 @@ -381,7 +381,7 @@ Rectangle { tooltipIconVisible: true } - MoneroComponents.Input { + MonzeroComponents.Input { id: receiverNameInput Layout.preferredWidth: 165 Layout.maximumWidth: 165 @@ -392,26 +392,26 @@ Rectangle { horizontalAlignment: TextInput.AlignLeft verticalAlignment: TextInput.AlignVCenter selectByMouse: true - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor placeholderText: qsTr("Visible to the sender") + translationManager.emptyString maximumLength: 100 background: Rectangle { - color: MoneroComponents.Style.blackTheme ? "transparent" : "white" + color: MonzeroComponents.Style.blackTheme ? "transparent" : "white" radius: 3 - border.color: parent.activeFocus ? MoneroComponents.Style.inputBorderColorActive : MoneroComponents.Style.inputBorderColorInActive + border.color: parent.activeFocus ? MonzeroComponents.Style.inputBorderColorActive : MonzeroComponents.Style.inputBorderColorInActive border.width: 1 } } - MoneroComponents.Label { + MonzeroComponents.Label { Layout.bottomMargin: 3 fontSize: 14 text: "" } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: selectedaddressIndex Layout.alignment: Qt.AlignHCenter Layout.preferredWidth: 220 @@ -421,14 +421,14 @@ Rectangle { horizontalAlignment: Text.AlignHCenter text: qsTr("Address #") + subaddressListView.currentIndex + translationManager.emptyString wrapMode: Text.WordWrap - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 17 textFormat: Text.RichText - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor themeTransition: false } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: selectedAddressDrescription Layout.alignment: Qt.AlignHCenter Layout.preferredWidth: 220 @@ -438,10 +438,10 @@ Rectangle { horizontalAlignment: Text.AlignHCenter text: "(" + qsTr("no label") + ")" + translationManager.emptyString wrapMode: Text.WordWrap - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 17 textFormat: Text.RichText - color: selectedAddressDrescriptionMouseArea.containsMouse ? MoneroComponents.Style.orange : MoneroComponents.Style.dimmedFontColor + color: selectedAddressDrescriptionMouseArea.containsMouse ? MonzeroComponents.Style.orange : MonzeroComponents.Style.dimmedFontColor themeTransition: false tooltip: subaddressListView.currentIndex > 0 ? qsTr("Edit address label") : "" + translationManager.emptyString MouseArea { @@ -458,7 +458,7 @@ Rectangle { } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: selectedAddress Layout.alignment: Qt.AlignHCenter Layout.maximumWidth: 300 @@ -468,9 +468,9 @@ Rectangle { horizontalAlignment: TextInput.AlignHCenter wrapMode: Text.Wrap textFormat: Text.RichText - color: selectedAddressMouseArea.containsMouse ? MoneroComponents.Style.orange : MoneroComponents.Style.defaultFontColor + color: selectedAddressMouseArea.containsMouse ? MonzeroComponents.Style.orange : MonzeroComponents.Style.defaultFontColor font.pixelSize: 15 - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name themeTransition: false tooltip: qsTr("Copy address to clipboard") + translationManager.emptyString MouseArea { @@ -487,7 +487,7 @@ Rectangle { } } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { Layout.preferredWidth: 220 Layout.alignment: Qt.AlignHCenter Layout.topMargin: 18 @@ -511,14 +511,14 @@ Rectangle { RowLayout { spacing: 0 - MoneroComponents.LabelSubheader { + MonzeroComponents.LabelSubheader { Layout.fillWidth: true fontSize: 24 textFormat: Text.RichText text: qsTr("Addresses") + translationManager.emptyString } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: createAddressButton small: true text: qsTr("Create new address") + translationManager.emptyString @@ -540,12 +540,12 @@ Rectangle { anchors.left: createAddressButton.left anchors.right: createAddressButton.right height: 2 - color: MoneroComponents.Style.appWindowBorderColor + color: MonzeroComponents.Style.appWindowBorderColor - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: parent - blackColor: MoneroComponents.Style._b_appWindowBorderColor - whiteColor: MoneroComponents.Style._w_appWindowBorderColor + blackColor: MonzeroComponents.Style._b_appWindowBorderColor + whiteColor: MonzeroComponents.Style._w_appWindowBorderColor } } } @@ -573,7 +573,7 @@ Rectangle { height: subaddressListRow.subaddressListItemHeight width: parent ? parent.width : undefined Layout.fillWidth: true - color: itemMouseArea.containsMouse || index === appWindow.current_subaddress_table_index ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent" + color: itemMouseArea.containsMouse || index === appWindow.current_subaddress_table_index ? MonzeroComponents.Style.titleBarButtonHoverColor : "transparent" Rectangle { visible: index === appWindow.current_subaddress_table_index @@ -581,7 +581,7 @@ Rectangle { anchors.top: parent.top anchors.bottom: parent.bottom property int currentAccountIndex: currentWallet ? currentWallet.currentSubaddressAccount : 0 - color: MoneroComponents.Style.accountColors[currentAccountIndex % MoneroComponents.Style.accountColors.length] + color: MonzeroComponents.Style.accountColors[currentAccountIndex % MonzeroComponents.Style.accountColors.length] width: 2 } @@ -590,13 +590,13 @@ Rectangle { anchors.left: parent.left anchors.top: parent.top height: 1 - color: MoneroComponents.Style.appWindowBorderColor + color: MonzeroComponents.Style.appWindowBorderColor visible: index !== 0 - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: parent - blackColor: MoneroComponents.Style._b_appWindowBorderColor - whiteColor: MoneroComponents.Style._w_appWindowBorderColor + blackColor: MonzeroComponents.Style._b_appWindowBorderColor + whiteColor: MonzeroComponents.Style._w_appWindowBorderColor } } @@ -606,9 +606,9 @@ Rectangle { anchors.rightMargin: 90 color: "transparent" - MoneroComponents.Label { + MonzeroComponents.Label { id: idLabel - color: index === appWindow.current_subaddress_table_index ? MoneroComponents.Style.defaultFontColor : "#757575" + color: index === appWindow.current_subaddress_table_index ? MonzeroComponents.Style.defaultFontColor : "#757575" anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.leftMargin: 6 @@ -617,9 +617,9 @@ Rectangle { themeTransition: false } - MoneroComponents.Label { + MonzeroComponents.Label { id: nameLabel - color: index === appWindow.current_subaddress_table_index ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor + color: index === appWindow.current_subaddress_table_index ? MonzeroComponents.Style.defaultFontColor : MonzeroComponents.Style.dimmedFontColor anchors.verticalCenter: parent.verticalCenter anchors.left: idLabel.right anchors.leftMargin: 6 @@ -630,14 +630,14 @@ Rectangle { themeTransition: false } - MoneroComponents.Label { + MonzeroComponents.Label { id: addressLabel - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter anchors.left: parent.right anchors.leftMargin: -addressLabel.width - 5 fontSize: 16 - fontFamily: MoneroComponents.Style.fontMonoRegular.name; + fontFamily: MonzeroComponents.Style.fontMonoRegular.name; text: TxUtils.addressTruncatePretty(address, mainLayout.width < 520 ? 1 : (mainLayout.width < 650 ? 2 : 3)) themeTransition: false } @@ -658,10 +658,10 @@ Rectangle { height: 21 spacing: 10 - MoneroComponents.IconButton { + MonzeroComponents.IconButton { fontAwesomeFallbackIcon: FontAwesome.searchPlus fontAwesomeFallbackSize: 22 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor fontAwesomeFallbackOpacity: 0.5 Layout.preferredWidth: 23 Layout.preferredHeight: 21 @@ -670,12 +670,12 @@ Rectangle { onClicked: doSearchInHistory(address) } - MoneroComponents.IconButton { + MonzeroComponents.IconButton { id: renameButton image: "qrc:///images/edit.svg" fontAwesomeFallbackIcon: FontAwesome.edit fontAwesomeFallbackSize: 22 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor opacity: isOpenGL ? 0.5 : 1 fontAwesomeFallbackOpacity: 0.5 Layout.preferredWidth: 23 @@ -688,12 +688,12 @@ Rectangle { } } - MoneroComponents.IconButton { + MonzeroComponents.IconButton { id: copyButton image: "qrc:///images/copy.svg" fontAwesomeFallbackIcon: FontAwesome.clipboard fontAwesomeFallbackSize: 22 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor opacity: isOpenGL ? 0.5 : 1 fontAwesomeFallbackOpacity: 0.5 Layout.preferredWidth: 16 @@ -730,14 +730,14 @@ Rectangle { } Rectangle { - color: MoneroComponents.Style.appWindowBorderColor + color: MonzeroComponents.Style.appWindowBorderColor Layout.fillWidth: true height: 1 - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: parent - blackColor: MoneroComponents.Style._b_appWindowBorderColor - whiteColor: MoneroComponents.Style._w_appWindowBorderColor + blackColor: MonzeroComponents.Style._b_appWindowBorderColor + whiteColor: MonzeroComponents.Style._w_appWindowBorderColor } } } @@ -783,7 +783,7 @@ Rectangle { function clearFields() { amountToReceiveFiat.text = ""; - amountToReceiveXMR.text = ""; + amountToReceiveXMZ.text = ""; txDescriptionInput.text = ""; receiverNameInput.text = ""; } diff --git a/pages/SharedRingDB.qml b/pages/SharedRingDB.qml index cfe1e253..aaf8ec28 100644 --- a/pages/SharedRingDB.qml +++ b/pages/SharedRingDB.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2024, The Monero Project +// Copyright (c) 2018-2024, The Monzero Project // // All rights reserved. // @@ -32,7 +32,7 @@ import QtQuick.Controls.Styles 1.4 import QtQuick.Layouts 1.1 import QtQuick.Dialogs 1.2 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents import moneroComponents.Clipboard 1.0 Rectangle { @@ -84,53 +84,53 @@ Rectangle { standardButtons: StandardButton.Ok } - MoneroComponents.Label { + MonzeroComponents.Label { id: signTitleLabel fontSize: 24 text: qsTr("Shared RingDB") + translationManager.emptyString } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { text: qsTr("This page allows you to interact with the shared ring database. " + - "This database is meant for use by Monero wallets as well as wallets from Monero clones which reuse the Monero keys.") + translationManager.emptyString + "This database is meant for use by Monzero wallets as well as wallets from Monzero clones which reuse the Monzero keys.") + translationManager.emptyString wrapMode: Text.Wrap Layout.fillWidth: true - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor } - MoneroComponents.LabelSubheader { + MonzeroComponents.LabelSubheader { Layout.fillWidth: true Layout.topMargin: 24 textFormat: Text.RichText text: qsTr("Rings") + translationManager.emptyString tooltip: qsTr( - "In order to avoid nullifying the protection afforded by Monero's ring signatures, an output should not " + + "In order to avoid nullifying the protection afforded by Monzero's ring signatures, an output should not " + "be spent with different rings on different blockchains. While this is normally not a concern, it can become one " + - "when a key-reusing Monero clone allows you to spend existing outputs. In this case, you need to ensure this " + + "when a key-reusing Monzero clone allows you to spend existing outputs. In this case, you need to ensure this " + "existing outputs uses the same ring on both chains.<br>" + - "This will be done automatically by Monero and any key-reusing software which is not trying to actively strip " + + "This will be done automatically by Monzero and any key-reusing software which is not trying to actively strip " + "you of your privacy.<br>" + - "If you are using a key-reusing Monero clone too, and this clone does not include this protection, you can still " + + "If you are using a key-reusing Monzero clone too, and this clone does not include this protection, you can still " + "ensure your transactions are protected by spending on the clone first, then manually adding the ring on this page, " + - "which allows you to then spend your Monero safely.<br>" + - "If you do not use a key-reusing Monero clone without these safety features, then you do not need to do anything " + + "which allows you to then spend your Monzero safely.<br>" + + "If you do not use a key-reusing Monzero clone without these safety features, then you do not need to do anything " + "as it is all automated.<br>" ) + translationManager.emptyString } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { textFormat: Text.RichText - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 - text: qsTr("This records rings used by outputs spent on Monero on a key reusing chain, so that the same ring may be reused to avoid privacy issues.") + translationManager.emptyString + text: qsTr("This records rings used by outputs spent on Monzero on a key reusing chain, so that the same ring may be reused to avoid privacy issues.") + translationManager.emptyString wrapMode: Text.Wrap Layout.fillWidth: true; - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: keyImageLine Layout.fillWidth: true fontSize: 16 @@ -149,7 +149,7 @@ Rectangle { ColumnLayout { RowLayout { - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: getRingLine Layout.fillWidth: true fontSize: 16 @@ -164,7 +164,7 @@ Rectangle { Layout.fillWidth: true Layout.topMargin: 18 - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: getRingButton text: qsTr("Get Ring") + translationManager.emptyString small: true @@ -184,7 +184,7 @@ Rectangle { ColumnLayout { RowLayout { - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: setRingLine Layout.fillWidth: true fontSize: 16 @@ -200,7 +200,7 @@ Rectangle { Layout.fillWidth: true Layout.topMargin: 18 - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: setRingButton text: qsTr("Set Ring") + translationManager.emptyString small: true @@ -218,7 +218,7 @@ Rectangle { columnSpacing: 20 columns: 2 - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { id: segregatePreForkOutputs checked: persistentSettings.segregatePreForkOutputs text: qsTr("I intend to spend on key-reusing fork(s)") + translationManager.emptyString @@ -230,7 +230,7 @@ Rectangle { } } - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { id: keyReuseMitigation2 checked: persistentSettings.keyReuseMitigation2 text: qsTr("I might want to spend on key-reusing fork(s)") + translationManager.emptyString @@ -242,7 +242,7 @@ Rectangle { } } - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { id: setRingRelative checked: true text: qsTr("Relative") + translationManager.emptyString @@ -256,7 +256,7 @@ Rectangle { columns: 2 columnSpacing: 32 - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: segregationHeightLine property bool edited: false Layout.fillWidth: true diff --git a/pages/Sign.qml b/pages/Sign.qml index 7fcc1219..10682581 100644 --- a/pages/Sign.qml +++ b/pages/Sign.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -34,7 +34,7 @@ import QtQuick.Dialogs 1.2 import moneroComponents.Clipboard 1.0 import moneroComponents.WalletManager 1.0 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Rectangle { property alias signHeight: mainLayout.height @@ -96,41 +96,41 @@ Rectangle { spacing: 20 - MoneroComponents.Label { + MonzeroComponents.Label { fontSize: 24 text: qsTr("Sign/verify") + translationManager.emptyString } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { text: qsTr("This page lets you sign/verify a message (or file contents) with your address.") + translationManager.emptyString wrapMode: Text.Wrap Layout.fillWidth: true - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor } ColumnLayout { id: modeRow Layout.fillWidth: true - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: modeText Layout.fillWidth: true Layout.topMargin: 12 text: qsTr("Mode") + translationManager.emptyString wrapMode: Text.Wrap - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 20 textFormat: Text.RichText - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor } ColumnLayout { id: modeButtonsColumn Layout.topMargin: 10 - MoneroComponents.RadioButton { + MonzeroComponents.RadioButton { id: handleMessageButton text: qsTr("Message") + translationManager.emptyString fontSize: 16 @@ -143,7 +143,7 @@ Rectangle { } } - MoneroComponents.RadioButton { + MonzeroComponents.RadioButton { id: handleFileButton text: qsTr("File") + translationManager.emptyString fontSize: 16 @@ -162,7 +162,7 @@ Rectangle { id: signSection spacing: 10 - MoneroComponents.LabelSubheader { + MonzeroComponents.LabelSubheader { Layout.fillWidth: true Layout.topMargin: 12 Layout.bottomMargin: 24 @@ -176,7 +176,7 @@ Rectangle { spacing: 10 visible: messageMode - MoneroComponents.LineEditMulti{ + MonzeroComponents.LineEditMulti{ id: signMessageLine Layout.fillWidth: true labelFontSize: 14 @@ -194,7 +194,7 @@ Rectangle { Layout.fillWidth: true visible: fileMode - MoneroComponents.LineEditMulti { + MonzeroComponents.LineEditMulti { id: signFileLine labelFontSize: 14 labelText: qsTr("File") + translationManager.emptyString @@ -207,7 +207,7 @@ Rectangle { text: '' } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: loadFileToSignButton Layout.alignment: Qt.AlignBottom small: false @@ -222,7 +222,7 @@ Rectangle { ColumnLayout { id: signSignatureRow - MoneroComponents.LineEditMulti { + MonzeroComponents.LineEditMulti { id: signSignatureLine labelFontSize: 14 labelText: qsTr("Signature") + translationManager.emptyString @@ -239,7 +239,7 @@ Rectangle { Layout.fillWidth: true Layout.alignment: Qt.AlignRight - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: clearSignButton text: qsTr("Clear") + translationManager.emptyString enabled: signMessageLine.text !== '' || signFileLine.text !== '' @@ -251,7 +251,7 @@ Rectangle { } } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: signMessageButton visible: messageMode text: qsTr("Sign Message") + translationManager.emptyString @@ -263,7 +263,7 @@ Rectangle { } } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: signFileButton visible: fileMode small: true @@ -282,14 +282,14 @@ Rectangle { id: verifySection spacing: 16 - MoneroComponents.LabelSubheader { + MonzeroComponents.LabelSubheader { Layout.fillWidth: true Layout.bottomMargin: 24 textFormat: Text.RichText text: fileMode ? qsTr("Verify file") + translationManager.emptyString : qsTr("Verify message") + translationManager.emptyString } - MoneroComponents.LineEditMulti { + MonzeroComponents.LineEditMulti { id: verifyMessageLine visible: messageMode Layout.fillWidth: true @@ -307,7 +307,7 @@ Rectangle { Layout.fillWidth: true visible: fileMode - MoneroComponents.LineEditMulti { + MonzeroComponents.LineEditMulti { id: verifyFileLine labelFontSize: 14 labelText: qsTr("File") + translationManager.emptyString @@ -319,7 +319,7 @@ Rectangle { text: '' } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: loadFileToVerifyButton Layout.alignment: Qt.AlignBottom small: false @@ -331,19 +331,19 @@ Rectangle { } } - MoneroComponents.LineEditMulti { + MonzeroComponents.LineEditMulti { id: verifyAddressLine Layout.fillWidth: true labelFontSize: 14 labelText: qsTr("Address") + translationManager.emptyString addressValidation: true placeholderFontSize: 16 - placeholderText: qsTr("Enter the Monero Address (example: 44AFFq5kSiGBoZ...)") + translationManager.emptyString + placeholderText: qsTr("Enter the Monzero Address (example: 44AFFq5kSiGBoZ...)") + translationManager.emptyString wrapMode: Text.WrapAnywhere text: '' } - MoneroComponents.LineEditMulti { + MonzeroComponents.LineEditMulti { id: verifySignatureLine labelFontSize: 14 labelText: qsTr("Signature") + translationManager.emptyString @@ -359,7 +359,7 @@ Rectangle { Layout.topMargin: 12 Layout.alignment: Qt.AlignRight - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: clearVerifyButton text: qsTr("Clear") + translationManager.emptyString enabled: verifyMessageLine.text !== '' || verifyFileLine.text !== '' || verifyAddressLine.text !== '' || verifySignatureLine.text !== '' @@ -372,7 +372,7 @@ Rectangle { } } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: verifyFileButton visible: fileMode small: true @@ -384,7 +384,7 @@ Rectangle { } } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: verifyMessageButton visible: messageMode small: true diff --git a/pages/Transfer.qml b/pages/Transfer.qml index 9641139f..640849fb 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -37,7 +37,7 @@ import moneroComponents.Wallet 1.0 import moneroComponents.NetworkType 1.0 import FontAwesome 1.0 import "../components" -import "../components" as MoneroComponents +import "../components" as MonzeroComponents import "." 1.0 import "../js/TxUtils.js" as TxUtils import "../js/Utils.js" as Utils @@ -181,7 +181,7 @@ Rectangle { RowLayout { visible: root.warningContent !== "" - MoneroComponents.WarningBox { + MonzeroComponents.WarningBox { text: warningContent onLinkActivated: { appWindow.startDaemon(appWindow.persistentSettings.daemonFlags); @@ -192,8 +192,8 @@ Rectangle { RowLayout { visible: leftPanel.minutesToUnlock !== "" - MoneroComponents.WarningBox { - text: qsTr("Spendable funds: %1 XMR. Please wait ~%2 minutes for your whole balance to become spendable.").arg(leftPanel.balanceUnlockedString).arg(leftPanel.minutesToUnlock) + MonzeroComponents.WarningBox { + text: qsTr("Spendable funds: %1 XMZ. Please wait ~%2 minutes for your whole balance to become spendable.").arg(leftPanel.balanceUnlockedString).arg(leftPanel.minutesToUnlock) } } @@ -291,14 +291,14 @@ Rectangle { spacing: 6 Layout.fillWidth: true - MoneroComponents.TextPlain { - font.family: MoneroComponents.Style.fontRegular.name + MonzeroComponents.TextPlain { + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 16 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor text: qsTr("Address") + translationManager.emptyString } - MoneroComponents.InlineButton { + MonzeroComponents.InlineButton { fontFamily: FontAwesome.fontFamilySolid fontStyleName: "Solid" fontPixelSize: 18 @@ -320,7 +320,7 @@ Rectangle { } } - MoneroComponents.InlineButton { + MonzeroComponents.InlineButton { fontFamily: FontAwesome.fontFamilySolid fontStyleName: "Solid" text: FontAwesome.qrcode @@ -332,7 +332,7 @@ Rectangle { } } - MoneroComponents.InlineButton { + MonzeroComponents.InlineButton { fontFamily: FontAwesome.fontFamily text: FontAwesome.addressBook tooltip: qsTr("Import from address book") + translationManager.emptyString @@ -353,14 +353,14 @@ Rectangle { Layout.preferredWidth: 125 Layout.maximumWidth: recipientLayout.secondRowWidth - MoneroComponents.TextPlain { - font.family: MoneroComponents.Style.fontRegular.name + MonzeroComponents.TextPlain { + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 16 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor text: qsTr("Amount") + translationManager.emptyString } - MoneroComponents.InlineButton { + MonzeroComponents.InlineButton { fontFamily: FontAwesome.fontFamilySolid fontStyleName: "Solid" fontPixelSize: 16 @@ -392,7 +392,7 @@ Rectangle { Layout.topMargin: -1 Layout.leftMargin: 1 Layout.rightMargin: recipientLayout.thirdRowWidth + 1 - color: MoneroComponents.Style.inputBorderColorInActive + color: MonzeroComponents.Style.inputBorderColorInActive height: 1 visible: index > 0 } @@ -400,7 +400,7 @@ Rectangle { RowLayout { spacing: 0 - MoneroComponents.LineEditMulti { + MonzeroComponents.LineEditMulti { KeyNavigation.backtab: index > 0 ? recipientRepeater.itemAt(index - 1).children[1].children[2] : sendButton KeyNavigation.tab: parent.children[2] Layout.alignment: Qt.AlignVCenter @@ -409,23 +409,23 @@ Rectangle { Layout.fillWidth: true addressValidation: true borderDisabled: true - fontColor: error && text != "" ? MoneroComponents.Style.errorColor : MoneroComponents.Style.defaultFontColor - fontFamily: MoneroComponents.Style.fontMonoRegular.name + fontColor: error && text != "" ? MonzeroComponents.Style.errorColor : MonzeroComponents.Style.defaultFontColor + fontFamily: MonzeroComponents.Style.fontMonoRegular.name fontSize: 14 inputPaddingBottom: 0 inputPaddingTop: 0 inputPaddingRight: 0 - placeholderFontFamily: MoneroComponents.Style.fontMonoRegular.name + placeholderFontFamily: MonzeroComponents.Style.fontMonoRegular.name placeholderFontSize: 14 spacing: 0 wrapMode: Text.WrapAnywhere placeholderText: { if(persistentSettings.nettype == NetworkType.MAINNET){ - return "4.. / 8.. / monero:.. / OpenAlias"; + return "F.. / monzero:.. / OpenAlias"; } else if (persistentSettings.nettype == NetworkType.STAGENET){ - return "5.. / 7.. / monero:.."; + return "F.. / monzero:.."; } else if(persistentSettings.nettype == NetworkType.TESTNET){ - return "9.. / B.. / monero:.."; + return "F.. / monzero:.."; } } onTextChanged: { @@ -437,7 +437,7 @@ Rectangle { } text: address - MoneroComponents.InlineButton { + MonzeroComponents.InlineButton { small: true text: qsTr("Resolve") + translationManager.emptyString visible: TxUtils.isValidOpenAliasAddress(address) @@ -478,11 +478,11 @@ Rectangle { Layout.bottomMargin: 1 Layout.leftMargin: recipientLayout.colSpacing / 2 - width Layout.rightMargin: recipientLayout.colSpacing / 2 - color: MoneroComponents.Style.inputBorderColorInActive + color: MonzeroComponents.Style.inputBorderColorInActive width: 1 } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { KeyNavigation.backtab: parent.children[0] KeyNavigation.tab: index + 1 < recipientRepeater.count ? recipientRepeater.itemAt(index + 1).children[1].children[0] : sendButton Layout.alignment: Qt.AlignVCenter @@ -492,13 +492,13 @@ Rectangle { Layout.preferredWidth: 125 Layout.maximumWidth: 125 borderDisabled: true - fontFamily: MoneroComponents.Style.fontMonoRegular.name + fontFamily: MonzeroComponents.Style.fontMonoRegular.name fontSize: 14 inputPaddingLeft: 0 inputPaddingRight: 0 inputPaddingTop: 0 inputPaddingBottom: 0 - placeholderFontFamily: MoneroComponents.Style.fontMonoRegular.name + placeholderFontFamily: MonzeroComponents.Style.fontMonoRegular.name placeholderFontSize: 14 placeholderLeftMargin: 0 placeholderText: "0.00" @@ -525,7 +525,7 @@ Rectangle { } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { Layout.leftMargin: recipientLayout.colSpacing / 2 Layout.preferredWidth: recipientLayout.thirdRowWidth font.family: FontAwesome.fontFamilySolid @@ -548,12 +548,12 @@ Rectangle { } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { Layout.leftMargin: recipientLayout.colSpacing / 2 Layout.preferredWidth: recipientLayout.thirdRowWidth horizontalAlignment: Text.AlignHCenter - font.family: MoneroComponents.Style.fontRegular.name - text: "XMR" + font.family: MonzeroComponents.Style.fontRegular.name + text: "XMZ" visible: recipientModel.count == 1 } } @@ -598,16 +598,16 @@ Rectangle { } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { Layout.fillWidth: true horizontalAlignment: Text.AlignRight - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 16 text: recipientModel.count > 1 ? qsTr("Total") + translationManager.emptyString : "" } } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: totalValue Layout.column: 1 Layout.row: 0 @@ -615,7 +615,7 @@ Rectangle { Layout.topMargin: recipientModel.count > 1 ? 0 : -1 Layout.maximumWidth: recipientLayout.secondRowWidth borderDisabled: true - fontFamily: MoneroComponents.Style.fontMonoRegular.name + fontFamily: MonzeroComponents.Style.fontMonoRegular.name fontSize: 14 inputHeight: 30 inputPaddingLeft: 0 @@ -627,25 +627,25 @@ Rectangle { visible: recipientModel.count > 1 } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { Layout.column: 2 Layout.row: 0 Layout.preferredWidth: recipientLayout.thirdRowWidth Layout.maximumWidth: recipientLayout.thirdRowWidth horizontalAlignment: Text.AlignHCenter - font.family: MoneroComponents.Style.fontRegular.name - text: "XMR" + font.family: MonzeroComponents.Style.fontRegular.name + text: "XMZ" visible: recipientModel.count > 1 } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { Layout.column: 1 Layout.row: recipientModel.count > 1 ? 1 : 0 Layout.preferredWidth: recipientLayout.secondRowWidth Layout.topMargin: recipientModel.count > 1 ? 0 : -1 Layout.maximumWidth: recipientLayout.secondRowWidth borderDisabled: true - fontFamily: MoneroComponents.Style.fontMonoRegular.name + fontFamily: MonzeroComponents.Style.fontMonoRegular.name fontSize: 14 inputHeight: 30 inputPaddingLeft: 0 @@ -658,13 +658,13 @@ Rectangle { visible: persistentSettings.fiatPriceEnabled } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { Layout.column: 2 Layout.row: recipientModel.count > 1 ? 1 : 0 Layout.preferredWidth: recipientLayout.thirdRowWidth Layout.topMargin: recipientModel.count > 1 ? 0 : -1 Layout.maximumWidth: recipientLayout.thirdRowWidth - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name horizontalAlignment: Text.AlignHCenter opacity: 0.7 text: fiatApiCurrencySymbol() @@ -682,7 +682,7 @@ Rectangle { anchors.right: recipientLayout.right anchors.rightMargin: recipientLayout.thirdRowWidth color: "transparent" - border.color: MoneroComponents.Style.inputBorderColorInActive + border.color: MonzeroComponents.Style.inputBorderColorInActive border.width: 1 radius: 4 } @@ -723,13 +723,13 @@ Rectangle { labelFontSize: 16 } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: feeLabel Layout.alignment: Qt.AlignBottom Layout.bottomMargin: 11 - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor opacity: 0.7 property bool estimating: false property var estimatedFee: null @@ -768,7 +768,7 @@ Rectangle { if (!sendButton.enabled || estimatedFee == null) { return "" } - return "~%1 XMR%2 %3".arg(estimatedFee) + return "~%1 XMZ%2 %3".arg(estimatedFee) .arg(estimatedFeeFiat) .arg(qsTr("fee") + translationManager.emptyString); } @@ -783,7 +783,7 @@ Rectangle { } } - MoneroComponents.WarningBox { + MonzeroComponents.WarningBox { text: qsTr("Description field contents match long payment ID format. \ Please don't paste long payment ID into description field, your funds might be lost.") + translationManager.emptyString; visible: warningLongPidDescription @@ -854,7 +854,7 @@ Rectangle { } } - MoneroComponents.WarningBox { + MonzeroComponents.WarningBox { id: paymentIdWarningBox text: qsTr("Long payment IDs are obsolete. \ Long payment IDs were not encrypted on the blockchain and would harm your privacy. \ @@ -862,7 +862,7 @@ Rectangle { visible: root.paymentIdBlocked } - MoneroComponents.WarningBox { + MonzeroComponents.WarningBox { id: sendButtonWarningBox text: root.sendButtonWarning visible: root.sendButtonWarning !== "" @@ -992,7 +992,7 @@ Rectangle { if (appWindow.viewOnly && !root.hasValidTransferInfo) { errorMessage = "<p class='orange'>" + qsTr("* To create a transaction file, please enter address and amount above") + "</p>"; } - var header = qsTr("Spend XMR from a cold (offline) wallet") + translationManager.emptyString; + var header = qsTr("Spend XMZ from a cold (offline) wallet") + translationManager.emptyString; return "<style type='text/css'>.header{ font-size: 13px; } p{line-height:20px; margin-top:0px; margin-bottom:0px; " + ";} p.orange{color:#ff9323;}</style>" + "<div class='header'>" + header + "</div>" + @@ -1078,7 +1078,7 @@ Rectangle { informationPopup.open(); } else { informationPopup.title = qsTr("Information") + translationManager.emptyString - informationPopup.text = qsTr("Monero sent successfully") + translationManager.emptyString + informationPopup.text = qsTr("Monzero sent successfully") + translationManager.emptyString informationPopup.icon = StandardIcon.Information informationPopup.onCloseCallback = null informationPopup.open(); diff --git a/pages/TxKey.qml b/pages/TxKey.qml index e2808e2a..45bd6e3a 100644 --- a/pages/TxKey.qml +++ b/pages/TxKey.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -31,7 +31,7 @@ import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Layouts 1.1 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents import moneroComponents.Clipboard 1.0 import "../js/TxUtils.js" as TxUtils @@ -57,23 +57,23 @@ Rectangle { id: soloBox spacing: 20 - MoneroComponents.Label { + MonzeroComponents.Label { id: soloTitleLabel fontSize: 24 text: qsTr("Prove Transaction") + " / " + qsTr("Reserve") + translationManager.emptyString } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { Layout.fillWidth: true text: qsTr("Generate a proof of your incoming/outgoing payment by supplying the transaction ID, the recipient address and an optional message. \n" + "For the case of outgoing payments, you can get a 'Spend Proof' that proves the authorship of a transaction. In this case, you don't need to specify the recipient address.") + qsTr("\nFor reserve proofs you don't need to specify tx id or address.") + translationManager.emptyString wrapMode: Text.Wrap - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: getProofTxIdLine Layout.fillWidth: true labelFontSize: 14 @@ -86,7 +86,7 @@ Rectangle { enabled: getReserveProofAmtLine.text.length === 0 } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: getProofAddressLine Layout.fillWidth: true labelFontSize: 14 @@ -99,14 +99,14 @@ Rectangle { enabled: getReserveProofAmtLine.text.length === 0 } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: getReserveProofAmtLine Layout.fillWidth: true labelFontSize: 14 labelText: qsTr("Amount") + translationManager.emptyString fontSize: 16 placeholderFontSize: 16 - placeholderText: qsTr("Paste amount of XMR (reserve proof only)") + translationManager.emptyString + placeholderText: qsTr("Paste amount of XMZ (reserve proof only)") + translationManager.emptyString readOnly: false copyButton: true enabled: getProofAddressLine.text.length === 0 && getProofTxIdLine.text.length === 0 @@ -130,7 +130,7 @@ Rectangle { } } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: getProofMessageLine Layout.fillWidth: true fontSize: 16 @@ -142,7 +142,7 @@ Rectangle { copyButton: true } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { Layout.topMargin: 16 small: true text: qsTr("Generate") + translationManager.emptyString @@ -156,30 +156,30 @@ Rectangle { // underline Rectangle { height: 1 - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity Layout.fillWidth: true Layout.alignment: Qt.AlignHCenter anchors.bottomMargin: 3 } - MoneroComponents.Label { + MonzeroComponents.Label { id: soloTitleLabel2 fontSize: 24 text: qsTr("Check Transaction") + " / " + qsTr("Reserve") + translationManager.emptyString } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { text: qsTr("Verify that funds were paid to an address by supplying the transaction ID, the recipient address, the message used for signing and the signature.\n" + "For the case with Spend Proof, you don't need to specify the recipient address.") + "\n" + qsTr("Transaction is not needed for reserve proof.") + translationManager.emptyString wrapMode: Text.Wrap Layout.fillWidth: true - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: checkProofTxIdLine Layout.fillWidth: true labelFontSize: 14 @@ -191,7 +191,7 @@ Rectangle { copyButton: true } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: checkProofAddressLine Layout.fillWidth: true labelFontSize: 14 @@ -203,7 +203,7 @@ Rectangle { copyButton: true } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: checkProofMessageLine Layout.fillWidth: true fontSize: 16 @@ -215,7 +215,7 @@ Rectangle { copyButton: true } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: checkProofSignatureLine Layout.fillWidth: true fontSize: 16 @@ -227,7 +227,7 @@ Rectangle { copyButton: true } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { Layout.topMargin: 16 small: true text: qsTr("Check") + translationManager.emptyString @@ -241,20 +241,20 @@ Rectangle { // underline Rectangle { height: 1 - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity Layout.fillWidth: true Layout.alignment: Qt.AlignHCenter anchors.bottomMargin: 3 } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { text: qsTr("If a payment had several transactions then each must be checked and the results combined.") + translationManager.emptyString wrapMode: Text.Wrap Layout.fillWidth: true - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor } } } diff --git a/pages/merchant/Merchant.qml b/pages/merchant/Merchant.qml index 86d47560..4d4b2d3a 100644 --- a/pages/merchant/Merchant.qml +++ b/pages/merchant/Merchant.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2026, The Monero Project +// Copyright (c) 2014-2026, The Monzero Project // // All rights reserved. // @@ -44,7 +44,7 @@ import moneroComponents.SubaddressModel 1.0 import "../../js/Windows.js" as Windows import "../../js/TxUtils.js" as TxUtils import "../../js/Utils.js" as Utils -import "../../components" as MoneroComponents +import "../../components" as MonzeroComponents import "../../pages" import "." @@ -153,7 +153,7 @@ Item { Layout.preferredWidth: 10 } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { font.pixelSize: 16 font.bold: true color: "#767676" @@ -287,7 +287,7 @@ Item { width: (parent.width - qrImg.width) - (50) height: 32 - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter font.pixelSize: 12 @@ -315,7 +315,7 @@ Item { width: 220 height: 32 - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter font.pixelSize: 12 @@ -361,7 +361,7 @@ Item { Layout.preferredWidth: 10 } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { font.pixelSize: 14 font.bold: true color: "#767676" @@ -382,7 +382,7 @@ Item { // Layout.fillHeight: true // color: "transparent" -// MoneroComponents.TextPlain { +// MonzeroComponents.TextPlain { // anchors.verticalCenter: parent.verticalCenter // anchors.right: parent.right // anchors.rightMargin: 20 @@ -416,7 +416,7 @@ Item { color: "#d9d9d9" } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { property string _color: "#767676" Layout.fillWidth: true Layout.margins: 20 @@ -436,7 +436,7 @@ Item { hoverEnabled: true cursorShape: Qt.PointingHandCursor onEntered: { - parent.color = MoneroComponents.Style.orange + parent.color = MonzeroComponents.Style.orange } onExited: { parent.color = parent._color @@ -473,11 +473,11 @@ Item { anchors.left: parent.left anchors.right: parent.right - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { font.pixelSize: 14 font.bold: false color: "white" - text: qsTr("Amount to receive") + " (XMR)" + translationManager.emptyString + text: qsTr("Amount to receive") + " (XMZ)" + translationManager.emptyString themeTransition: false } @@ -486,7 +486,7 @@ Item { width: 220 source: "qrc:///images/merchant/input_box.png" - MoneroComponents.Input { + MonzeroComponents.Input { id: amountToReceive topPadding: 0 leftPadding: 10 @@ -524,8 +524,8 @@ Item { width: 220 } - MoneroComponents.TextPlain { - // @TODO: When we have XMR/USD rate avi. in the future. + MonzeroComponents.TextPlain { + // @TODO: When we have XMZ/USD rate avi. in the future. visible: false font.pixelSize: 14 font.bold: false @@ -564,7 +564,7 @@ Item { } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: content font.pixelSize: 14 font.bold: false @@ -593,12 +593,12 @@ Item { width: 400 radius: 5 - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter font.pixelSize: 14 font.bold: true - color: MoneroComponents.Style.moneroGrey + color: MonzeroComponents.Style.moneroGrey text: qsTr("The merchant page requires a larger window") + translationManager.emptyString themeTransition: false } diff --git a/pages/merchant/MerchantCheckbox.qml b/pages/merchant/MerchantCheckbox.qml index bed9dea1..191e098b 100644 --- a/pages/merchant/MerchantCheckbox.qml +++ b/pages/merchant/MerchantCheckbox.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2026, The Monero Project +// Copyright (c) 2014-2026, The Monzero Project // // All rights reserved. // @@ -30,7 +30,7 @@ import QtQuick 2.9 import QtQuick.Layouts 1.1 import QtGraphicalEffects 1.0 -import "../../components" as MoneroComponents +import "../../components" as MonzeroComponents Item { id: root @@ -72,7 +72,7 @@ Item { source: checkbox } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: content font.pixelSize: 14 font.bold: false diff --git a/pages/merchant/MerchantTitlebar.qml b/pages/merchant/MerchantTitlebar.qml index 485ff4f1..5258e9c4 100644 --- a/pages/merchant/MerchantTitlebar.qml +++ b/pages/merchant/MerchantTitlebar.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -32,8 +32,8 @@ import QtGraphicalEffects 1.0 import QtQuick.Layouts 1.2 import FontAwesome 1.0 -import "../../components/" as MoneroComponents -import "../../components/effects/" as MoneroEffects +import "../../components/" as MonzeroComponents +import "../../components/effects/" as MonzeroEffects Rectangle { id: root @@ -85,7 +85,8 @@ Rectangle { anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter - source: "qrc:///images/moneroLogo_white.png" + source: "qrc:///images/monzero-xmz-coin.png" + fillMode: Image.PreserveAspectFit } } @@ -96,13 +97,13 @@ Rectangle { Layout.preferredWidth: parent.height Layout.preferredHeight: parent.height - MoneroEffects.ImageMask { + MonzeroEffects.ImageMask { anchors.bottom: parent.bottom anchors.bottomMargin: 18 anchors.horizontalCenter: parent.horizontalCenter height: 3 width: 15 - image: MoneroComponents.Style.titleBarMinimizeSource + image: MonzeroComponents.Style.titleBarMinimizeSource color: "white" opacity: 0.75 } @@ -128,7 +129,7 @@ Rectangle { Image { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter - source: MoneroComponents.Style._b_titleBarFullscreenSource + source: MonzeroComponents.Style._b_titleBarFullscreenSource sourceSize.width: 16 sourceSize.height: 16 smooth: true @@ -155,12 +156,12 @@ Rectangle { Layout.preferredWidth: parent.height Layout.preferredHeight: parent.height - MoneroEffects.ImageMask { + MonzeroEffects.ImageMask { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter height: 16 width: 16 - image: MoneroComponents.Style._b_titleBarCloseSource + image: MonzeroComponents.Style._b_titleBarCloseSource color: "white" opacity: 0.75 } diff --git a/pages/merchant/MerchantTrackingList.qml b/pages/merchant/MerchantTrackingList.qml index 611df81e..784afa55 100644 --- a/pages/merchant/MerchantTrackingList.qml +++ b/pages/merchant/MerchantTrackingList.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2026, The Monero Project +// Copyright (c) 2014-2026, The Monzero Project // // All rights reserved. // @@ -33,7 +33,7 @@ import QtQuick.Layouts 1.1 import QtQuick.Dialogs 1.2 import "../../js/Utils.js" as Utils -import "../../components" as MoneroComponents +import "../../components" as MonzeroComponents ListView { id: trackingListView @@ -65,7 +65,7 @@ ListView { color: "#767676" textFormat: Text.RichText text: parent.message - selectionColor: MoneroComponents.Style.textSelectionColor + selectionColor: MonzeroComponents.Style.textSelectionColor selectByMouse: true readOnly: true onFocusChanged: {if(focus === false) deselect() } @@ -105,7 +105,7 @@ ListView { font.bold: false color: "#707070" text: time_date + " (" + Utils.ago(time_epoch) + ") " - selectionColor: MoneroComponents.Style.textSelectionColor + selectionColor: MonzeroComponents.Style.textSelectionColor selectByMouse: true readOnly: true onFocusChanged: {if(focus === false) deselect() } @@ -154,7 +154,7 @@ ListView { font.bold: true color: hide_amount ? "#707070" : "#009F1E" text: hide_amount ? '-' : '+' + amount + (in_txpool ? ' (%1)'.arg(qsTr('unconfirmed')) : '') - selectionColor: MoneroComponents.Style.textSelectionColor + selectionColor: MonzeroComponents.Style.textSelectionColor selectByMouse: true readOnly: true onFocusChanged: {if(focus === false) deselect() } @@ -201,7 +201,7 @@ ListView { } } } - selectionColor: MoneroComponents.Style.textSelectionColor + selectionColor: MonzeroComponents.Style.textSelectionColor selectByMouse: true readOnly: true onFocusChanged: {if(focus === false) deselect() } diff --git a/pages/settings/Settings.qml b/pages/settings/Settings.qml index 17457f98..df149311 100644 --- a/pages/settings/Settings.qml +++ b/pages/settings/Settings.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -33,7 +33,7 @@ import QtQuick.Layouts 1.1 import QtQuick.Dialogs 1.2 import "../../js/Windows.js" as Windows import "../../js/Utils.js" as Utils -import "../../components" as MoneroComponents +import "../../components" as MonzeroComponents import "../../pages" import "." import moneroComponents.Clipboard 1.0 @@ -48,35 +48,35 @@ ColumnLayout { property int settingsHeight: 900 property alias settingsStateViewState: settingsStateView.state - MoneroComponents.Navbar { + MonzeroComponents.Navbar { id: navbarId Layout.alignment: Qt.AlignHCenter Layout.topMargin: height Layout.bottomMargin: height - MoneroComponents.NavbarItem { + MonzeroComponents.NavbarItem { active: settingsStateView.state == "Wallet" text: qsTr("Wallet") + translationManager.emptyString onSelected: settingsStateView.state = "Wallet" } - MoneroComponents.NavbarItem { + MonzeroComponents.NavbarItem { active: settingsStateView.state == "UI" text: qsTr("Interface") + translationManager.emptyString onSelected: settingsStateView.state = "UI" } - MoneroComponents.NavbarItem { + MonzeroComponents.NavbarItem { active: settingsStateView.state == "Node" text: qsTr("Node") + translationManager.emptyString visible: appWindow.walletMode >= 2 onSelected: settingsStateView.state = "Node" } - MoneroComponents.NavbarItem { + MonzeroComponents.NavbarItem { active: settingsStateView.state == "Log" text: qsTr("Log") + translationManager.emptyString onSelected: settingsStateView.state = "Log" visible: !isAndroid } - MoneroComponents.NavbarItem { + MonzeroComponents.NavbarItem { active: settingsStateView.state == "Info" text: qsTr("Info") + translationManager.emptyString onSelected: settingsStateView.state = "Info" diff --git a/pages/settings/SettingsInfo.qml b/pages/settings/SettingsInfo.qml index e126383a..b366446f 100644 --- a/pages/settings/SettingsInfo.qml +++ b/pages/settings/SettingsInfo.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -34,7 +34,7 @@ import QtQuick.Dialogs 1.2 import "../../js/Wizard.js" as Wizard import "../../js/Utils.js" as Utils import "../../version.js" as Version -import "../../components" as MoneroComponents +import "../../components" as MonzeroComponents Rectangle { @@ -67,14 +67,14 @@ Rectangle { columns: 2 columnSpacing: 0 - MoneroComponents.TextBlock { + MonzeroComponents.TextBlock { font.pixelSize: 14 text: qsTr("GUI version: ") + translationManager.emptyString } - MoneroComponents.TextBlock { + MonzeroComponents.TextBlock { font.pixelSize: 14 - color: MoneroComponents.Style.dimmedFontColor + color: MonzeroComponents.Style.dimmedFontColor text: Version.GUI_VERSION + " (Qt " + qtRuntimeVersion + ")" + translationManager.emptyString } @@ -83,8 +83,8 @@ Rectangle { Layout.topMargin: 2 Layout.bottomMargin: 2 Layout.fillWidth: true - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } Rectangle { @@ -92,19 +92,19 @@ Rectangle { Layout.topMargin: 2 Layout.bottomMargin: 2 Layout.fillWidth: true - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } - MoneroComponents.TextBlock { - id: guiMoneroVersion + MonzeroComponents.TextBlock { + id: guiMonzeroVersion font.pixelSize: 14 - text: qsTr("Embedded Monero version: ") + translationManager.emptyString + text: qsTr("Embedded Monzero version: ") + translationManager.emptyString } - MoneroComponents.TextBlock { + MonzeroComponents.TextBlock { font.pixelSize: 14 - color: MoneroComponents.Style.dimmedFontColor + color: MonzeroComponents.Style.dimmedFontColor text: moneroVersion } @@ -113,8 +113,8 @@ Rectangle { Layout.topMargin: 2 Layout.bottomMargin: 2 Layout.fillWidth: true - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } Rectangle { @@ -122,20 +122,20 @@ Rectangle { Layout.topMargin: 2 Layout.bottomMargin: 2 Layout.fillWidth: true - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } - MoneroComponents.TextBlock { + MonzeroComponents.TextBlock { Layout.fillWidth: true font.pixelSize: 14 text: qsTr("Wallet path: ") + translationManager.emptyString } - MoneroComponents.TextBlock { + MonzeroComponents.TextBlock { id: walletLocation Layout.fillWidth: true - color: MoneroComponents.Style.dimmedFontColor + color: MonzeroComponents.Style.dimmedFontColor font.pixelSize: 14 property string walletPath: (isIOS ? appWindow.accountsDir : "") + persistentSettings.wallet_path text: "\ @@ -158,8 +158,8 @@ Rectangle { Layout.topMargin: 2 Layout.bottomMargin: 2 Layout.fillWidth: true - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } Rectangle { @@ -167,22 +167,22 @@ Rectangle { Layout.topMargin: 2 Layout.bottomMargin: 2 Layout.fillWidth: true - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } - MoneroComponents.TextBlock { + MonzeroComponents.TextBlock { id: restoreHeight font.pixelSize: 14 textFormat: Text.RichText text: (typeof currentWallet == "undefined") ? "" : qsTr("Wallet restore height: ") + translationManager.emptyString } - MoneroComponents.TextBlock { + MonzeroComponents.TextBlock { id: restoreHeightText Layout.fillWidth: true textFormat: Text.RichText - color: MoneroComponents.Style.dimmedFontColor + color: MonzeroComponents.Style.dimmedFontColor font.pixelSize: 14 property var style: "<style type='text/css'>a {cursor:pointer;text-decoration: none; color: #FF6C3C}</style>" text: (currentWallet ? currentWallet.walletCreationHeight : "") + style + " <a href='#'> (%1)</a>".arg(qsTr("Change")) + translationManager.emptyString @@ -241,8 +241,8 @@ Rectangle { Layout.topMargin: 2 Layout.bottomMargin: 2 Layout.fillWidth: true - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } Rectangle { @@ -250,19 +250,19 @@ Rectangle { Layout.topMargin: 2 Layout.bottomMargin: 2 Layout.fillWidth: true - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } - MoneroComponents.TextBlock { + MonzeroComponents.TextBlock { Layout.fillWidth: true font.pixelSize: 14 text: qsTr("Wallet log path: ") + translationManager.emptyString } - MoneroComponents.TextBlock { + MonzeroComponents.TextBlock { Layout.fillWidth: true - color: MoneroComponents.Style.dimmedFontColor + color: MonzeroComponents.Style.dimmedFontColor font.pixelSize: 14 text: "\ <style type='text/css'>\ @@ -284,8 +284,8 @@ Rectangle { Layout.topMargin: 2 Layout.bottomMargin: 2 Layout.fillWidth: true - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } Rectangle { @@ -293,19 +293,19 @@ Rectangle { Layout.topMargin: 2 Layout.bottomMargin: 2 Layout.fillWidth: true - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } - MoneroComponents.TextBlock { + MonzeroComponents.TextBlock { Layout.fillWidth: true font.pixelSize: 14 text: qsTr("Wallet mode: ") + translationManager.emptyString } - MoneroComponents.TextBlock { + MonzeroComponents.TextBlock { Layout.fillWidth: true - color: MoneroComponents.Style.dimmedFontColor + color: MonzeroComponents.Style.dimmedFontColor font.pixelSize: 14 text: walletModeString } @@ -315,8 +315,8 @@ Rectangle { Layout.topMargin: 2 Layout.bottomMargin: 2 Layout.fillWidth: true - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } Rectangle { @@ -324,19 +324,19 @@ Rectangle { Layout.topMargin: 2 Layout.bottomMargin: 2 Layout.fillWidth: true - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } - MoneroComponents.TextBlock { + MonzeroComponents.TextBlock { Layout.fillWidth: true font.pixelSize: 14 text: qsTr("Graphics mode: ") + translationManager.emptyString } - MoneroComponents.TextBlock { + MonzeroComponents.TextBlock { Layout.fillWidth: true - color: MoneroComponents.Style.dimmedFontColor + color: MonzeroComponents.Style.dimmedFontColor font.pixelSize: 14 text: isOpenGL ? "OpenGL" : "Low graphics mode" } @@ -347,8 +347,8 @@ Rectangle { Layout.topMargin: 2 Layout.bottomMargin: 2 Layout.fillWidth: true - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } Rectangle { @@ -357,21 +357,21 @@ Rectangle { Layout.topMargin: 2 Layout.bottomMargin: 2 Layout.fillWidth: true - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } - MoneroComponents.TextBlock { + MonzeroComponents.TextBlock { visible: isTails Layout.fillWidth: true font.pixelSize: 14 text: qsTr("Tails: ") + translationManager.emptyString } - MoneroComponents.TextBlock { + MonzeroComponents.TextBlock { visible: isTails Layout.fillWidth: true - color: MoneroComponents.Style.dimmedFontColor + color: MonzeroComponents.Style.dimmedFontColor font.pixelSize: 14 text: tailsUsePersistence ? qsTr("persistent") + translationManager.emptyString : qsTr("persistence disabled") + translationManager.emptyString; } @@ -380,13 +380,13 @@ Rectangle { RowLayout { spacing: 20; - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { small: true text: qsTr("Copy to clipboard") + translationManager.emptyString onClicked: { var data = ""; data += "GUI version: " + Version.GUI_VERSION + " (Qt " + qtRuntimeVersion + ")"; - data += "\nEmbedded Monero version: " + moneroVersion; + data += "\nEmbedded Monzero version: " + moneroVersion; data += "\nWallet path: " + walletLocation.walletPath; data += "\nWallet restore height: "; @@ -405,11 +405,11 @@ Rectangle { } } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { small: true - text: qsTr("Donate to Monero") + translationManager.emptyString + text: qsTr("Donate to Monzero") + translationManager.emptyString onClicked: { - middlePanel.sendTo("888tNkZrPN6JsEgekjMnABU4TBzc2Dt29EPAvkRxbANsAnjyPbb3iQ1YBRk1UXcdRsiKc9dhwMVgN5S9cQUiyoogDavup3H", "", qsTr("Donation to Monero Core Team") + translationManager.emptyString); + middlePanel.sendTo("888tNkZrPN6JsEgekjMnABU4TBzc2Dt29EPAvkRxbANsAnjyPbb3iQ1YBRk1UXcdRsiKc9dhwMVgN5S9cQUiyoogDavup3H", "", qsTr("Donation to Monzero Core Team") + translationManager.emptyString); } } } diff --git a/pages/settings/SettingsLayout.qml b/pages/settings/SettingsLayout.qml index e73355ae..29f1c202 100644 --- a/pages/settings/SettingsLayout.qml +++ b/pages/settings/SettingsLayout.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -35,7 +35,7 @@ import moneroComponents.Wallet 1.0 import "../../js/Utils.js" as Utils import "../../js/Windows.js" as Windows -import "../../components" as MoneroComponents +import "../../components" as MonzeroComponents Rectangle { color: "transparent" @@ -53,14 +53,14 @@ Rectangle { anchors.topMargin: 0 spacing: 6 - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { id: customDecorationsCheckBox checked: persistentSettings.customDecorations onClicked: Windows.setCustomWindowDecorations(checked) text: qsTr("Custom decorations") + translationManager.emptyString } - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { id: checkForUpdatesCheckBox enabled: !disableCheckUpdatesFlag checked: persistentSettings.checkForUpdates && !disableCheckUpdatesFlag @@ -68,13 +68,13 @@ Rectangle { text: qsTr("Check for updates periodically") + translationManager.emptyString } - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { checked: persistentSettings.displayWalletNameInTitleBar onClicked: persistentSettings.displayWalletNameInTitleBar = !persistentSettings.displayWalletNameInTitleBar text: qsTr("Display wallet name in title bar") + translationManager.emptyString } - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { id: hideBalanceCheckBox checked: persistentSettings.hideBalance onClicked: { @@ -84,17 +84,17 @@ Rectangle { text: qsTr("Hide balance") + translationManager.emptyString } - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { id: themeCheckbox - checked: !MoneroComponents.Style.blackTheme + checked: !MonzeroComponents.Style.blackTheme text: qsTr("Light theme") + translationManager.emptyString toggleOnClick: false onClicked: { - MoneroComponents.Style.blackTheme = !MoneroComponents.Style.blackTheme; + MonzeroComponents.Style.blackTheme = !MonzeroComponents.Style.blackTheme; } } - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { checked: persistentSettings.askPasswordBeforeSending text: qsTr("Ask for password before sending a transaction") + translationManager.emptyString toggleOnClick: false @@ -115,13 +115,13 @@ Rectangle { } } - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { checked: persistentSettings.autosave onClicked: persistentSettings.autosave = !persistentSettings.autosave text: qsTr("Autosave") + translationManager.emptyString } - MoneroComponents.Slider { + MonzeroComponents.Slider { Layout.fillWidth: true Layout.leftMargin: 35 Layout.topMargin: 6 @@ -134,14 +134,14 @@ Rectangle { onMoved: persistentSettings.autosaveMinutes = value } - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { id: userInActivityCheckbox checked: persistentSettings.lockOnUserInActivity onClicked: persistentSettings.lockOnUserInActivity = !persistentSettings.lockOnUserInActivity text: qsTr("Lock wallet on inactivity") + translationManager.emptyString } - MoneroComponents.Slider { + MonzeroComponents.Slider { visible: userInActivityCheckbox.checked Layout.fillWidth: true Layout.topMargin: 6 @@ -157,7 +157,7 @@ Rectangle { onMoved: persistentSettings.lockOnUserInActivityInterval = value } - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { id: backgroundSyncCheckbox visible: !!currentWallet && !currentWallet.isHwBacked() && !appWindow.viewOnly checked: appWindow.backgroundSyncType != Wallet.BackgroundSync_Off @@ -179,7 +179,7 @@ Rectangle { } } - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { checked: persistentSettings.askStopLocalNode onClicked: persistentSettings.askStopLocalNode = !persistentSettings.askStopLocalNode text: qsTr("Ask to stop local node during program exit") + translationManager.emptyString @@ -187,7 +187,7 @@ Rectangle { //! Manage pricing RowLayout { - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { id: enableConvertCurrency text: qsTr("Enable displaying balance in other currencies") + translationManager.emptyString checked: persistentSettings.fiatPriceEnabled @@ -207,7 +207,7 @@ Rectangle { Layout.leftMargin: 36 columnSpacing: 32 - MoneroComponents.StandardDropdown { + MonzeroComponents.StandardDropdown { id: fiatPriceProviderDropDown Layout.maximumWidth: 200 labelText: qsTr("Price source") + translationManager.emptyString @@ -222,7 +222,7 @@ Rectangle { } } - MoneroComponents.StandardDropdown { + MonzeroComponents.StandardDropdown { id: fiatPriceCurrencyDropdown Layout.maximumWidth: 100 labelText: qsTr("Currency") + translationManager.emptyString @@ -248,11 +248,11 @@ Rectangle { Layout.topMargin: 5 Layout.leftMargin: 36 - MoneroComponents.WarningBox { + MonzeroComponents.WarningBox { text: qsTr("Enabling price conversion exposes your IP address to the selected price source.") + translationManager.emptyString; } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { Layout.topMargin: 10 Layout.bottomMargin: 10 small: true @@ -265,7 +265,7 @@ Rectangle { } } - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { id: proxyCheckbox Layout.topMargin: 6 enabled: !socksProxyFlagSet @@ -278,7 +278,7 @@ Rectangle { .arg(qsTr("updates downloading, fetching price sources")) + translationManager.emptyString } - MoneroComponents.RemoteNodeEdit { + MonzeroComponents.RemoteNodeEdit { id: proxyEdit enabled: proxyCheckbox.enabled Layout.leftMargin: 36 @@ -296,7 +296,7 @@ Rectangle { } } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { visible: !persistentSettings.customDecorations Layout.topMargin: 10 small: true diff --git a/pages/settings/SettingsLog.qml b/pages/settings/SettingsLog.qml index efe06f0e..c0100c2a 100644 --- a/pages/settings/SettingsLog.qml +++ b/pages/settings/SettingsLog.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -31,7 +31,7 @@ import QtQuick.Layouts 1.1 import QtQuick.Controls 2.2 import "../../js/Utils.js" as Utils -import "../../components" as MoneroComponents +import "../../components" as MonzeroComponents Rectangle { @@ -56,15 +56,15 @@ Rectangle { // Layout.preferredHeight: 1 // Layout.fillWidth: true // Layout.bottomMargin: 8 -// color: MoneroComponents.Style.dividerColor -// opacity: MoneroComponents.Style.dividerOpacity +// color: MonzeroComponents.Style.dividerColor +// opacity: MonzeroComponents.Style.dividerOpacity // } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { Layout.bottomMargin: 2 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor font.pixelSize: 18 - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name text: qsTr("Log level") + translationManager.emptyString } @@ -84,7 +84,7 @@ Rectangle { ListElement { column1: "custom"; } } - MoneroComponents.StandardDropdown { + MonzeroComponents.StandardDropdown { id: logLevelDropdown dataModel: logLevel itemTopMargin: 2 @@ -105,7 +105,7 @@ Rectangle { z: parent.z + 1 } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: logCategories visible: logLevelDropdown.currentIndex === 5 Layout.fillWidth: true @@ -125,19 +125,19 @@ Rectangle { } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { Layout.topMargin: 10 Layout.bottomMargin: 2 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor font.pixelSize: 18 - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name text: qsTr("Daemon log") + translationManager.emptyString themeTransition: false onColorChanged: { var flickableContentYBefore = flickable.contentY var daemonLogText = consoleArea.text consoleArea.clear(); - if (MoneroComponents.Style.blackTheme) { + if (MonzeroComponents.Style.blackTheme) { consoleArea.append(daemonLogText.replace(/#000000/g, '#ffffff').replace(/#008000/g, '#00ff00')); } else { consoleArea.append(daemonLogText.replace(/#ffffff/g, '#000000').replace(/#00ff00/g, '#008000')); @@ -154,7 +154,7 @@ Rectangle { Rectangle { anchors.fill: parent color: "transparent" - border.color: MoneroComponents.Style.inputBorderColorInActive + border.color: MonzeroComponents.Style.inputBorderColorInActive border.width: 1 radius: 4 } @@ -166,24 +166,24 @@ Rectangle { TextArea.flickable: TextArea { id : consoleArea - color: MoneroComponents.Style.defaultFontColor - selectionColor: MoneroComponents.Style.textSelectionColor + color: MonzeroComponents.Style.defaultFontColor + selectionColor: MonzeroComponents.Style.textSelectionColor textFormat: TextEdit.RichText selectByMouse: true selectByKeyboard: true - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 wrapMode: TextEdit.Wrap readOnly: true function logCommand(msg){ - msg = log_color(msg, MoneroComponents.Style.blackTheme ? "lime" : "green"); + msg = log_color(msg, MonzeroComponents.Style.blackTheme ? "lime" : "green"); consoleArea.append(msg); } function logMessage(msg){ msg = Utils.htmlEscape(msg.trim()); - var color = MoneroComponents.Style.defaultFontColor; + var color = MonzeroComponents.Style.defaultFontColor; if(msg.toLowerCase().indexOf('error') >= 0){ - color = MoneroComponents.Style.errorColor; + color = MonzeroComponents.Style.errorColor; } else if (msg.toLowerCase().indexOf('warning') >= 0){ color = "#fa6800" } @@ -205,7 +205,7 @@ Rectangle { timeZoneName: undefined }); - var _timestamp = log_color("[" + timestamp + "]", MoneroComponents.Style.defaultFontColor); + var _timestamp = log_color("[" + timestamp + "]", MonzeroComponents.Style.defaultFontColor); var _msg = log_color(msg, color); consoleArea.append(_timestamp + " " + _msg); @@ -223,7 +223,7 @@ Rectangle { } } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: sendCommandText Layout.fillWidth: true inputPaddingTop: 0 diff --git a/pages/settings/SettingsNode.qml b/pages/settings/SettingsNode.qml index 28480419..63902207 100644 --- a/pages/settings/SettingsNode.qml +++ b/pages/settings/SettingsNode.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -31,8 +31,8 @@ import QtQuick.Layouts 1.1 import QtQuick.Controls 2.0 import FontAwesome 1.0 -import "../../components" as MoneroComponents -import "../../components/effects" as MoneroEffects +import "../../components" as MonzeroComponents +import "../../components/effects" as MonzeroEffects Rectangle{ color: "transparent" @@ -64,8 +64,8 @@ Rectangle{ anchors.left: parent.left anchors.right: parent.right height: 1 - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } Rectangle { @@ -93,25 +93,25 @@ Rectangle{ anchors.leftMargin: 16 anchors.verticalCenter: parent.verticalCenter - MoneroComponents.Label { + MonzeroComponents.Label { fontSize: 32 text: FontAwesome.home fontFamily: FontAwesome.fontFamilySolid anchors.centerIn: parent - fontColor: MoneroComponents.Style.defaultFontColor + fontColor: MonzeroComponents.Style.defaultFontColor styleName: "Solid" } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: localNodeHeader anchors.left: localNodeIcon.right anchors.leftMargin: 14 anchors.top: parent.top - color: MoneroComponents.Style.defaultFontColor - opacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.8 + color: MonzeroComponents.Style.defaultFontColor + opacity: MonzeroComponents.Style.blackTheme ? 1.0 : 0.8 font.bold: true - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 16 text: qsTr("Local node") + translationManager.emptyString } @@ -122,8 +122,8 @@ Rectangle{ anchors.topMargin: 4 anchors.left: localNodeIcon.right anchors.leftMargin: 14 - color: MoneroComponents.Style.dimmedFontColor - font.family: MoneroComponents.Style.fontRegular.name + color: MonzeroComponents.Style.dimmedFontColor + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 horizontalAlignment: TextInput.AlignLeft wrapMode: Text.WordWrap; @@ -157,8 +157,8 @@ Rectangle{ anchors.left: parent.left anchors.right: parent.right height: 1 - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } Rectangle { @@ -186,25 +186,25 @@ Rectangle{ anchors.leftMargin: 16 anchors.verticalCenter: parent.verticalCenter - MoneroComponents.Label { + MonzeroComponents.Label { fontSize: 28 text: FontAwesome.cloud fontFamily: FontAwesome.fontFamilySolid styleName: "Solid" anchors.centerIn: parent - fontColor: MoneroComponents.Style.defaultFontColor + fontColor: MonzeroComponents.Style.defaultFontColor } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: remoteNodeHeader anchors.left: remoteNodeIcon.right anchors.leftMargin: 14 anchors.top: parent.top - color: MoneroComponents.Style.defaultFontColor - opacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.8 + color: MonzeroComponents.Style.defaultFontColor + opacity: MonzeroComponents.Style.blackTheme ? 1.0 : 0.8 font.bold: true - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 16 text: qsTr("Remote node") + translationManager.emptyString } @@ -215,14 +215,14 @@ Rectangle{ anchors.topMargin: 4 anchors.left: remoteNodeIcon.right anchors.leftMargin: 14 - color: MoneroComponents.Style.dimmedFontColor - font.family: MoneroComponents.Style.fontRegular.name + color: MonzeroComponents.Style.dimmedFontColor + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 horizontalAlignment: TextInput.AlignLeft wrapMode: Text.WordWrap; leftPadding: 0 topPadding: 0 - text: qsTr("Uses a third-party server to connect to the Monero network. Less secure, but easier on your computer.") + translationManager.emptyString + text: qsTr("Uses a third-party server to connect to the Monzero network. Less secure, but easier on your computer.") + translationManager.emptyString width: parent.width - (remoteNodeIcon.width + remoteNodeIcon.anchors.leftMargin + anchors.leftMargin) } @@ -244,18 +244,18 @@ Rectangle{ anchors.right: parent.right anchors.bottom: parent.bottom height: 1 - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } } - MoneroComponents.WarningBox { + MonzeroComponents.WarningBox { Layout.topMargin: 46 - text: qsTr("To find a remote node, type 'Monero remote node' into your favorite search engine. Please ensure the node is run by a trusted third-party.") + translationManager.emptyString + text: qsTr("To find a remote node, type 'Monzero remote node' into your favorite search engine. Please ensure the node is run by a trusted third-party.") + translationManager.emptyString visible: persistentSettings.useRemoteNode } - MoneroComponents.RemoteNodeList { + MonzeroComponents.RemoteNodeList { Layout.fillWidth: true Layout.topMargin: 26 visible: persistentSettings.useRemoteNode @@ -267,7 +267,7 @@ Rectangle{ Layout.topMargin: 40 visible: !persistentSettings.useRemoteNode - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { small: true text: (appWindow.daemonRunning ? qsTr("Stop daemon") : qsTr("Start daemon")) + translationManager.emptyString onClicked: { @@ -281,7 +281,7 @@ Rectangle{ } RowLayout { - MoneroComponents.LineEditMulti { + MonzeroComponents.LineEditMulti { id: blockchainFolder Layout.preferredWidth: 200 Layout.fillWidth: true @@ -308,7 +308,7 @@ Rectangle{ } } - MoneroComponents.LineEditMulti { + MonzeroComponents.LineEditMulti { id: daemonFlags Layout.fillWidth: true labelFontSize: 14 @@ -333,7 +333,7 @@ Rectangle{ ColumnLayout { Layout.fillWidth: true - MoneroComponents.RemoteNodeEdit { + MonzeroComponents.RemoteNodeEdit { id: bootstrapNodeEdit Layout.minimumWidth: 100 Layout.bottomMargin: 20 diff --git a/pages/settings/SettingsWallet.qml b/pages/settings/SettingsWallet.qml index f43d64e2..a7fa0901 100644 --- a/pages/settings/SettingsWallet.qml +++ b/pages/settings/SettingsWallet.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -33,7 +33,7 @@ import QtQuick.Dialogs 1.2 import FontAwesome 1.0 import "../../js/Utils.js" as Utils -import "../../components" as MoneroComponents +import "../../components" as MonzeroComponents Rectangle { color: "transparent" @@ -50,7 +50,7 @@ Rectangle { anchors.topMargin: 0 spacing: 0 - MoneroComponents.SettingsListItem { + MonzeroComponents.SettingsListItem { iconText: FontAwesome.lock description: qsTr("Locks the wallet on demand.") + translationManager.emptyString title: qsTr("Lock this wallet") + translationManager.emptyString @@ -58,7 +58,7 @@ Rectangle { onClicked: appWindow.lock(); } - MoneroComponents.SettingsListItem { + MonzeroComponents.SettingsListItem { iconText: FontAwesome.signOutAlt description: qsTr("Logs out of this wallet.") + translationManager.emptyString title: qsTr("Close this wallet") + translationManager.emptyString @@ -66,7 +66,7 @@ Rectangle { onClicked: appWindow.showWizard() } - MoneroComponents.SettingsListItem { + MonzeroComponents.SettingsListItem { iconText: FontAwesome.eye description: qsTr("Creates a new wallet that can only view and initiate transactions, but requires a spendable wallet to sign transactions before sending.") + translationManager.emptyString title: qsTr("Create a view-only wallet") + translationManager.emptyString @@ -88,7 +88,7 @@ Rectangle { } } - MoneroComponents.SettingsListItem { + MonzeroComponents.SettingsListItem { iconText: FontAwesome.key description: qsTr("Store this information safely to recover your wallet in the future.") + translationManager.emptyString title: qsTr("Show seed & keys") + translationManager.emptyString @@ -98,7 +98,7 @@ Rectangle { } } - MoneroComponents.SettingsListItem { + MonzeroComponents.SettingsListItem { enabled: leftPanel.progressBar.fillLevel == 100 iconText: FontAwesome.repeat description: qsTr("Use this feature if you think the shown balance is not accurate.") + translationManager.emptyString @@ -127,7 +127,7 @@ Rectangle { } } - MoneroComponents.SettingsListItem { + MonzeroComponents.SettingsListItem { enabled: leftPanel.progressBar.fillLevel == 100 iconText: FontAwesome.magnifyingGlass description: qsTr("Use this feature if a transaction is missing in your wallet history. This will expose the transaction ID to the remote node, which can harm your privacy.") + translationManager.emptyString @@ -158,7 +158,7 @@ Rectangle { } } - MoneroComponents.SettingsListItem { + MonzeroComponents.SettingsListItem { iconText: FontAwesome.ellipsisH description: qsTr("Change the password of your wallet.") + translationManager.emptyString title: qsTr("Change wallet password") + translationManager.emptyString @@ -181,10 +181,10 @@ Rectangle { } } - MoneroComponents.SettingsListItem { + MonzeroComponents.SettingsListItem { iconText: FontAwesome.cashRegister isLast: true - description: qsTr("Receive Monero for your business, easily.") + translationManager.emptyString + description: qsTr("Receive Monzero for your business, easily.") + translationManager.emptyString title: qsTr("Enter merchant mode") + translationManager.emptyString onClicked: { @@ -158,6 +158,7 @@ <file>images/logout.png</file> <file>images/logout@2x.png</file> <file>images/moneroIcon-28x28.png</file> + <file>images/monzero-xmz-coin.png</file> <file>images/moneroIcon-28x28@2x.png</file> <file>images/lightning-white.png</file> <file>images/lightning-white@2x.png</file> diff --git a/share/org.getmonero.Monero.desktop b/share/org.getmonero.Monero.desktop index 8cd132ec..a0ee17ef 100644 --- a/share/org.getmonero.Monero.desktop +++ b/share/org.getmonero.Monero.desktop @@ -1,8 +1,8 @@ [Desktop Entry] -Name=Monero GUI +Name=Monzero GUI GenericName=Cryptocurrency wallet -Comment=Monero GUI -Exec=monero-wallet-gui +Comment=Monzero GUI wallet +Exec=monzero-wallet-gui Type=Application Terminal=false Categories=Network;Qt;Finance;Office; diff --git a/share/org.getmonero.Monero.metainfo.xml b/share/org.getmonero.Monero.metainfo.xml index 31bc2fc8..c40aa0d4 100644 --- a/share/org.getmonero.Monero.metainfo.xml +++ b/share/org.getmonero.Monero.metainfo.xml @@ -4,22 +4,22 @@ <metadata_license>CC0-1.0</metadata_license> <project_license>BSD-3-Clause</project_license> <content_rating type="oars-1.1"/> - <developer_name>The Monero Project</developer_name> + <developer_name>The Monzero Project</developer_name> <categories> <category>Network</category> <category>Qt</category> <category>Finance</category> <category>Office</category> </categories> - <name>Monero GUI</name> - <summary>Monero: the secure, private, untraceable cryptocurrency</summary> + <name>Monzero GUI</name> + <summary>Monzero: private, secure digital money</summary> <description> - <p>Monero is a private, secure, untraceable, decentralised digital currency. You + <p>Monzero is a private, secure, decentralised digital currency. You are your bank, you control your funds, and nobody can trace your transfers unless you allow them to do so.</p> - <p>Privacy: Monero uses a cryptographically sound system to allow you to send + <p>Privacy: Monzero uses a cryptographically sound system to allow you to send and receive funds without your transactions being easily revealed on the blockchain (the ledger of transactions that everyone has). This ensures that your purchases, receipts, and all transfers remain absolutely private by @@ -32,7 +32,7 @@ to ensure they are useless if stolen.</p> <p>Untraceability: By taking advantage of ring signatures, a special property of - a certain type of cryptography, Monero is able to ensure that transactions are + a certain type of cryptography, Monzero is able to ensure that transactions are not only untraceable, but have an optional measure of ambiguity that ensures that transactions cannot easily be tied back to an individual user or computer.</p> </description> @@ -41,20 +41,13 @@ <screenshots> <screenshot type="default"> - <caption>A screenshot of the Monero GUI wallet</caption> + <caption>A screenshot of the Monzero GUI wallet</caption> <image>https://raw.githubusercontent.com/monero-project/monero-site/master/img/downloads/gui.png</image> </screenshot> </screenshots> - <url type="homepage">https://getmonero.org</url> + <url type="homepage">https://monzero.org</url> <url type="bugtracker">https://github.com/monero-project/monero-gui/issues</url> - <url type="donation">https://getmonero.org/get-started/contributing</url> - <url type="faq">https://getmonero.org/get-started/faq</url> - <url type="help">https://getmonero.org/resources/user-guides</url> - <url type="translate">https://translate.getmonero.org</url> - <url type="contact">https://getmonero.org/community/hangouts</url> - <url type="contribute">https://getmonero.org/get-started/contributing</url> - <releases> <release version="<version>" date="<date>"/> </releases> diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b5718df3..81ee3c41 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -72,26 +72,26 @@ set(monero_wallet_gui_sources ) if(NOT ANDROID) - add_executable(monero-wallet-gui ${EXECUTABLE_FLAG} ${monero_wallet_gui_sources}) + add_executable(monzero-wallet-gui ${EXECUTABLE_FLAG} ${monero_wallet_gui_sources}) else() - add_library(monero-wallet-gui SHARED ${monero_wallet_gui_sources}) - set_target_properties(monero-wallet-gui PROPERTIES COMPILE_DEFINITIONS "ANDROID") + add_library(monzero-wallet-gui SHARED ${monero_wallet_gui_sources}) + set_target_properties(monzero-wallet-gui PROPERTIES COMPILE_DEFINITIONS "ANDROID") endif() -set_target_properties(monero-wallet-gui PROPERTIES +set_target_properties(monzero-wallet-gui PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" MACOSX_BUNDLE TRUE MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/share/Info.plist" ) # OpenGL -target_include_directories(monero-wallet-gui PUBLIC ${OPENGL_INCLUDE_DIR}) +target_include_directories(monzero-wallet-gui PUBLIC ${OPENGL_INCLUDE_DIR}) message(STATUS "OpenGL: include dir at ${OPENGL_INCLUDE_DIR}") message(STATUS "OpenGL: libraries at ${OPENGL_LIBRARIES}") -target_include_directories(monero-wallet-gui PUBLIC ${Qt5Gui_PRIVATE_INCLUDE_DIRS}) +target_include_directories(monzero-wallet-gui PUBLIC ${Qt5Gui_PRIVATE_INCLUDE_DIRS}) -target_include_directories(monero-wallet-gui PUBLIC +target_include_directories(monzero-wallet-gui PUBLIC ${CMAKE_SOURCE_DIR}/monero/include ${CMAKE_SOURCE_DIR}/monero/src ${CMAKE_SOURCE_DIR}/monero/external/easylogging++ @@ -107,7 +107,7 @@ target_include_directories(monero-wallet-gui PUBLIC ${X11_INCLUDE_DIR} ) -target_compile_definitions(monero-wallet-gui +target_compile_definitions(monzero-wallet-gui PUBLIC ${Qt5Widgets_DEFINITIONS} ${Qt5Qml_DEFINITIONS} @@ -118,12 +118,12 @@ if(APPLE) execute_process(COMMAND brew --prefix icu4c OUTPUT_VARIABLE ICU_ROOT OUTPUT_STRIP_TRAILING_WHITESPACE) endif() find_package(ICU REQUIRED COMPONENTS data i18n uc) - target_link_directories(monero-wallet-gui PRIVATE ${ICU_ROOT}/lib) + target_link_directories(monzero-wallet-gui PRIVATE ${ICU_ROOT}/lib) endif() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") -target_link_libraries(monero-wallet-gui +target_link_libraries(monzero-wallet-gui epee common net @@ -139,13 +139,13 @@ target_link_libraries(monero-wallet-gui ) if(X11_FOUND) - target_link_libraries(monero-wallet-gui ${X11_LIBRARIES}) + target_link_libraries(monzero-wallet-gui ${X11_LIBRARIES}) endif() if(WITH_SCANNER) - target_link_libraries(monero-wallet-gui qrscanner) + target_link_libraries(monzero-wallet-gui qrscanner) if(LINUX AND NOT ANDROID) - target_link_libraries(monero-wallet-gui + target_link_libraries(monzero-wallet-gui jpeg v4l2 v4lconvert @@ -154,10 +154,10 @@ if(WITH_SCANNER) endif() endif() -add_custom_command(TARGET monero-wallet-gui POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:daemon> $<TARGET_FILE_DIR:monero-wallet-gui>) +add_custom_command(TARGET monzero-wallet-gui POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:daemon> $<TARGET_FILE_DIR:monzero-wallet-gui>) include(Deploy) -install(TARGETS monero-wallet-gui +install(TARGETS monzero-wallet-gui DESTINATION bin ) diff --git a/src/daemon/DaemonManager.cpp b/src/daemon/DaemonManager.cpp index 60feebc7..67a75162 100644 --- a/src/daemon/DaemonManager.cpp +++ b/src/daemon/DaemonManager.cpp @@ -56,7 +56,7 @@ bool DaemonManager::start(const QString &flags, NetworkType::Type nettype, const return false; } - // prepare command line arguments and pass to monerod + // prepare command line arguments and pass to monzerod QStringList arguments; // Start daemon with --detach flag on non-windows platforms @@ -68,6 +68,8 @@ bool DaemonManager::start(const QString &flags, NetworkType::Type nettype, const arguments << "--testnet"; else if (nettype == NetworkType::STAGENET) arguments << "--stagenet"; + else if (!flags.contains("--add-priority-node", Qt::CaseSensitive)) + arguments << "--add-priority-node" << "82.165.112.237:6174"; // Custom startup flags for daemon foreach (const QString &str, flags.split(" ")) { @@ -106,7 +108,7 @@ bool DaemonManager::start(const QString &flags, NetworkType::Type nettype, const arguments << "--max-concurrency" << QString::number(concurrency); } - qDebug() << "starting monerod " + m_monerod; + qDebug() << "starting monzerod " + m_monerod; qDebug() << "With command line arguments " << arguments; QMutexLocker locker(&m_daemonMutex); @@ -117,7 +119,7 @@ bool DaemonManager::start(const QString &flags, NetworkType::Type nettype, const connect(m_daemon.get(), SIGNAL(readyReadStandardOutput()), this, SLOT(printOutput())); connect(m_daemon.get(), SIGNAL(readyReadStandardError()), this, SLOT(printError())); - // Start monerod + // Start monzerod bool started = m_daemon->startDetached(m_monerod, arguments); // add state changed listener @@ -187,9 +189,9 @@ bool DaemonManager::stopWatcher(NetworkType::Type nettype, const QString &dataDi if(counter >= 5) { qDebug() << "Killing it! "; #ifdef Q_OS_WIN - QProcess::execute("taskkill", {"/F", "/IM", "monerod.exe"}); + QProcess::execute("taskkill", {"/F", "/IM", "monzerod.exe"}); #else - QProcess::execute("pkill", {"monerod"}); + QProcess::execute("pkill", {"monzerod"}); #endif } @@ -349,7 +351,7 @@ QString DaemonManager::getArgs(const QString &dataDir) { QStringList tempArgs; #ifdef Q_OS_WIN //powershell - tempArgs << "Get-CimInstance Win32_Process -Filter \"name = 'monerod.exe'\" | select -ExpandProperty CommandLine "; + tempArgs << "Get-CimInstance Win32_Process -Filter \"name = 'monzerod.exe'\" | select -ExpandProperty CommandLine "; p.setProgram("powershell"); p.setArguments(tempArgs); p.start(); @@ -358,7 +360,7 @@ QString DaemonManager::getArgs(const QString &dataDir) { #elif defined(Q_OS_UNIX) //pgrep - tempArgs << "monerod"; + tempArgs << "monzerod"; p.setProgram("pgrep"); p.setArguments(tempArgs); p.start(); @@ -397,11 +399,11 @@ DaemonManager::DaemonManager(QObject *parent) , m_scheduler(this) { - // Platform depetent path to monerod + // Platform dependent path to the Monzero daemon. #ifdef Q_OS_WIN - m_monerod = QApplication::applicationDirPath() + "/monerod.exe"; + m_monerod = QApplication::applicationDirPath() + "/monzerod.exe"; #elif defined(Q_OS_UNIX) - m_monerod = QApplication::applicationDirPath() + "/monerod"; + m_monerod = QApplication::applicationDirPath() + "/monzerod"; #endif if (m_monerod.length() == 0) { diff --git a/src/main/Logger.cpp b/src/main/Logger.cpp index 8fa98979..56091f42 100644 --- a/src/main/Logger.cpp +++ b/src/main/Logger.cpp @@ -42,15 +42,15 @@ #include "qt/TailsOS.h" // default log path by OS (should be writable) -static const QString defaultLogName = "monero-wallet-gui.log"; +static const QString defaultLogName = "monzero-wallet-gui.log"; #if defined(Q_OS_IOS) //AppDataLocation = "<APPROOT>/Library/Application Support" static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).at(0); - static const QString appFolder = "monero-wallet-gui"; + static const QString appFolder = "monzero-wallet-gui"; #elif defined(Q_OS_WIN) //AppDataLocation = "C:/Users/<USER>/AppData/Roaming/<APPNAME>" static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).at(0); - static const QString appFolder = "monero-wallet-gui"; + static const QString appFolder = "monzero-wallet-gui"; #elif defined(Q_OS_ANDROID) //AppDataLocation = "<USER>/<APPNAME>/files" static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).at(1); @@ -123,7 +123,7 @@ Logger::Logger(QCoreApplication &parent, QString userDefinedLogFilePath) void Logger::resetLogFilePath(bool portable) { m_logFilePath = QDir::toNativeSeparators(getLogPath(m_userDefinedLogFilePath, portable)); - Monero::Wallet::init(m_applicationFilePath.c_str(), "monero-wallet-gui", m_logFilePath.toStdString(), true); + Monero::Wallet::init(m_applicationFilePath.c_str(), "monzero-wallet-gui", m_logFilePath.toStdString(), true); qWarning() << "Logging to" << m_logFilePath; emit logFilePathChanged(); } diff --git a/src/main/main.cpp b/src/main/main.cpp index cad6dded..23bc1c46 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -229,10 +229,10 @@ int main(int argc, char *argv[]) } #endif - app.setApplicationName("monero-core"); + app.setApplicationName("monzero-core"); app.setDesktopFileName("org.getmonero.Monero"); - app.setOrganizationDomain("getmonero.org"); - app.setOrganizationName("monero-project"); + app.setOrganizationDomain("monzero.org"); + app.setOrganizationName("monzero-project"); // Ask to enable Tails OS persistence mode, it affects: // - Log file location @@ -385,7 +385,7 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw qmlRegisterType<WalletManager>("moneroComponents.WalletManager", 1, 0, "WalletManager"); // Temporary Qt.labs.settings replacement - qmlRegisterType<MoneroSettings>("moneroComponents.Settings", 1, 0, "MoneroSettings"); + qmlRegisterType<MoneroSettings>("moneroComponents.Settings", 1, 0, "MonzeroSettings"); qmlRegisterUncreatableType<Wallet>("moneroComponents.Wallet", 1, 0, "Wallet", "Wallet can't be instantiated directly"); @@ -504,7 +504,7 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw if (accountName.isEmpty()) accountName = qgetenv("USERNAME"); // Windows if (accountName.isEmpty()) - accountName = "My monero Account"; + accountName = "My Monzero Account"; engine.rootContext()->setContextProperty("defaultAccountName", accountName); engine.rootContext()->setContextProperty("homePath", QDir::homePath()); diff --git a/src/qt/TailsOS.cpp b/src/qt/TailsOS.cpp index 1ab15721..099dc39d 100644 --- a/src/qt/TailsOS.cpp +++ b/src/qt/TailsOS.cpp @@ -42,9 +42,9 @@ void TailsOS::showDataPersistenceDisabledWarning() msgBox.setText(QObject::tr("Warning: persistence disabled")); msgBox.setWindowTitle(QObject::tr("Warning: persistence disabled")); msgBox.setInformativeText( - QObject::tr("Monero GUI has detected that Tails persistence is " + QObject::tr("Monzero GUI has detected that Tails persistence is " "currently disabled. Any configurations you make inside " - "the Monero GUI will not be saved." + "the Monzero GUI will not be saved." "\n\n" "In addition, make sure to not save your wallet on the " "filesystem, as it will be lost at shutdown." @@ -62,7 +62,7 @@ void TailsOS::showDataPersistenceDisabledWarning() void TailsOS::askPersistence() { QMessageBox msgBox; - msgBox.setWindowTitle(QObject::tr("Monero GUI")); + msgBox.setWindowTitle(QObject::tr("Monzero GUI")); msgBox.setText(QObject::tr("Use Tails persistence?")); msgBox.setInformativeText( QObject::tr("Persist wallet files and configuration on the encrypted volume?" diff --git a/src/qt/utils.cpp b/src/qt/utils.cpp index c5910d66..eba3affa 100644 --- a/src/qt/utils.cpp +++ b/src/qt/utils.cpp @@ -85,7 +85,7 @@ QString getAccountName(){ if (accountName.isEmpty()) accountName = qgetenv("USERNAME"); // Windows if (accountName.isEmpty()) - accountName = "My monero Account"; + accountName = "My Monzero Account"; return accountName; } @@ -93,11 +93,11 @@ QString getAccountName(){ QString xdgMime(){ return QString( "[Desktop Entry]\n" - "Name=Monero GUI\n" - "GenericName=Monero-GUI\n" - "X-GNOME-FullName=Monero-GUI\n" - "Comment=Monero GUI\n" - "Keywords=Monero;\n" + "Name=Monzero GUI\n" + "GenericName=Monzero GUI\n" + "X-GNOME-FullName=Monzero GUI\n" + "Comment=Monzero GUI\n" + "Keywords=Monzero;XMZ;\n" "Exec=\"%1\" %u\n" "Terminal=false\n" "Type=Application\n" @@ -107,7 +107,7 @@ QString xdgMime(){ "StartupNotify=true\n" "X-GNOME-Bugzilla-Bugzilla=GNOME\n" "X-GNOME-UsesNotifications=true\n" - "StartupWMClass=monero-wallet-gui\n" + "StartupWMClass=monzero-wallet-gui\n" ).arg(QCoreApplication::applicationFilePath()); } diff --git a/wizard/SeedListGrid.qml b/wizard/SeedListGrid.qml index 74355f93..3a901f5c 100644 --- a/wizard/SeedListGrid.qml +++ b/wizard/SeedListGrid.qml @@ -5,7 +5,7 @@ import QtQuick.Controls 2.0 import "../js/Wizard.js" as Wizard import "../js/Utils.js" as Utils -import "../components" as MoneroComponents +import "../components" as MonzeroComponents GridLayout { id: seedGrid diff --git a/wizard/SeedListItem.qml b/wizard/SeedListItem.qml index 71212cbd..4905211a 100644 --- a/wizard/SeedListItem.qml +++ b/wizard/SeedListItem.qml @@ -1,4 +1,4 @@ -import "../components" as MoneroComponents; +import "../components" as MonzeroComponents; import QtQuick 2.9 import QtQuick.Layouts 1.2 import FontAwesome 1.0 @@ -82,14 +82,14 @@ ColumnLayout { id: wordRow spacing: 0 - MoneroComponents.Label { - color: lineEdit.inputHasFocus ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor + MonzeroComponents.Label { + color: lineEdit.inputHasFocus ? MonzeroComponents.Style.defaultFontColor : MonzeroComponents.Style.dimmedFontColor fontSize: 13 text: (wordNumber + 1) themeTransition: false } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: lineEdit property bool firstUserInput: true inputHeight: 29 @@ -111,17 +111,17 @@ ColumnLayout { onTabPressed: focusOnNextField() } - MoneroComponents.Label { + MonzeroComponents.Label { id: wordText Layout.leftMargin: 10 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor fontSize: seedListItem.focus ? 19 : 16 fontBold: true text: word themeTransition: false } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: icon Layout.leftMargin: wordsMatch ? 10 : 0 property bool wordsMatch: lineEdit.text === wordText.text @@ -131,7 +131,7 @@ ColumnLayout { font.styleName: "Solid" font.pixelSize: 15 text: wordsMatch ? FontAwesome.checkCircle : FontAwesome.exclamationCircle - color: wordsMatch ? (MoneroComponents.Style.blackTheme ? "#00FF00" : "#008000") : "#FF0000" + color: wordsMatch ? (MonzeroComponents.Style.blackTheme ? "#00FF00" : "#008000") : "#FF0000" themeTransition: false onTextChanged: { if (wizardCreateWallet2.seedListGrid && wordsMatch) { @@ -146,7 +146,7 @@ ColumnLayout { Rectangle { id: underLine - color: lineEdit.inputHasFocus ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.appWindowBorderColor + color: lineEdit.inputHasFocus ? MonzeroComponents.Style.defaultFontColor : MonzeroComponents.Style.appWindowBorderColor Layout.fillWidth: true height: 1 } diff --git a/wizard/WizardAskPassword.qml b/wizard/WizardAskPassword.qml index ca9c94c3..48c7e38e 100644 --- a/wizard/WizardAskPassword.qml +++ b/wizard/WizardAskPassword.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -32,7 +32,7 @@ import QtQuick.Controls 2.0 import FontAwesome 1.0 import "../js/Wizard.js" as Wizard -import "../components" as MoneroComponents +import "../components" as MonzeroComponents ColumnLayout { id: root @@ -74,10 +74,10 @@ ColumnLayout { fillRect.color = "#FF0000"; } else if(strength <= 66){ strengthString = qsTr("Medium"); - fillRect.color = (MoneroComponents.Style.blackTheme ? "#FFFF00" : "#FFCC00"); + fillRect.color = (MonzeroComponents.Style.blackTheme ? "#FFFF00" : "#FFCC00"); } else { strengthString = qsTr("High"); - fillRect.color = (MoneroComponents.Style.blackTheme ? "#00FF00" : "#008000"); + fillRect.color = (MonzeroComponents.Style.blackTheme ? "#00FF00" : "#008000"); } progressText.text = passwordStrengthText + strengthString + translationManager.emptyString; @@ -90,14 +90,14 @@ ColumnLayout { subtitle: qsTr("This password cannot be recovered. If you forget it then the wallet will have to be restored from your %1.").arg(!wizardController.walletOptionsIsRecoveringFromDevice ? qsTr("25 word mnemonic seed") : qsTr("hardware wallet"))+ translationManager.emptyString } - MoneroComponents.WarningBox { + MonzeroComponents.WarningBox { text: "<b>%1</b> (%2).".arg(qsTr("Enter a strong password")).arg(qsTr("Using letters, numbers, and/or symbols")) + translationManager.emptyString } ColumnLayout { Layout.fillWidth: true - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: passwordInput Layout.fillWidth: true KeyNavigation.tab: passwordInputConfirm @@ -117,10 +117,10 @@ ColumnLayout { id: progressText Layout.topMargin: 6 Layout.bottomMargin: 6 - font.family: MoneroComponents.Style.fontMedium.name + font.family: MonzeroComponents.Style.fontMedium.name font.pixelSize: 14 font.bold: false - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor height: 18 passwordCharacter: "*" } @@ -131,7 +131,7 @@ ColumnLayout { Layout.preferredHeight: 8 radius: 8 - color: MoneroComponents.Style.progressBarBackgroundColor + color: MonzeroComponents.Style.progressBarBackgroundColor Rectangle { id: fillRect @@ -146,7 +146,7 @@ ColumnLayout { } Rectangle { - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor anchors.bottom: parent.bottom anchors.left: parent.left anchors.leftMargin: 8 @@ -158,7 +158,7 @@ ColumnLayout { ColumnLayout { Layout.fillWidth: true - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: passwordInputConfirm property bool firstUserInput: true Layout.fillWidth: true @@ -181,7 +181,7 @@ ColumnLayout { Layout.topMargin: 0 Layout.minimumHeight: passwordInputMessage.height + 3 - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { visible: passwordInputMessage.visible font.family: FontAwesome.fontFamilySolid font.styleName: "Solid" @@ -191,7 +191,7 @@ ColumnLayout { themeTransition: false } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: passwordInputMessage property bool passwordsMatch: passwordInputConfirm.text === passwordInput.text property bool partialPasswordsMatch: passwordInputConfirm.text === passwordInput.text.substring(0, passwordInputConfirm.text.length) @@ -199,8 +199,8 @@ ColumnLayout { Layout.topMargin: 3 text: passwordsMatch ? qsTr("Passwords match!") : qsTr("Passwords do not match") + translationManager.emptyString textFormat: Text.PlainText - color: passwordsMatch ? (MoneroComponents.Style.blackTheme ? "#00FF00" : "#008000") : "#FF0000" - font.family: MoneroComponents.Style.fontRegular.name + color: passwordsMatch ? (MonzeroComponents.Style.blackTheme ? "#00FF00" : "#008000") : "#FF0000" + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 themeTransition: false } diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml index a7932fd7..343e6cb9 100644 --- a/wizard/WizardController.qml +++ b/wizard/WizardController.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -39,15 +39,15 @@ import moneroComponents.Wallet 1.0 import "../js/Wizard.js" as Wizard import "../js/Windows.js" as Windows import "../js/Utils.js" as Utils -import "../components" as MoneroComponents -import "../components/effects/" as MoneroEffects +import "../components" as MonzeroComponents +import "../components/effects/" as MonzeroEffects import "../pages" Rectangle { id: wizardController anchors.fill: parent - signal useMoneroClicked() + signal useMonzeroClicked() signal walletCreatedFromDevice(bool success) function restart(generatingNewSeed) { @@ -248,15 +248,15 @@ Rectangle { } ] - MoneroEffects.GradientBackground { + MonzeroEffects.GradientBackground { anchors.fill: parent - fallBackColor: MoneroComponents.Style.middlePanelBackgroundColor - initialStartColor: MoneroComponents.Style.wizardBackgroundGradientStart - initialStopColor: MoneroComponents.Style.middlePanelBackgroundGradientStop - blackColorStart: MoneroComponents.Style._b_wizardBackgroundGradientStart - blackColorStop: MoneroComponents.Style._b_middlePanelBackgroundGradientStop - whiteColorStart: MoneroComponents.Style._w_wizardBackgroundGradientStart - whiteColorStop: MoneroComponents.Style._w_middlePanelBackgroundGradientStop + fallBackColor: MonzeroComponents.Style.middlePanelBackgroundColor + initialStartColor: MonzeroComponents.Style.wizardBackgroundGradientStart + initialStopColor: MonzeroComponents.Style.middlePanelBackgroundGradientStop + blackColorStart: MonzeroComponents.Style._b_wizardBackgroundGradientStart + blackColorStop: MonzeroComponents.Style._b_middlePanelBackgroundGradientStop + whiteColorStart: MonzeroComponents.Style._w_wizardBackgroundGradientStart + whiteColorStop: MonzeroComponents.Style._w_middlePanelBackgroundGradientStop start: Qt.point(0, 0) end: Qt.point(height, width) } diff --git a/wizard/WizardCreateDevice1.qml b/wizard/WizardCreateDevice1.qml index 268091c3..0c75a2e8 100644 --- a/wizard/WizardCreateDevice1.qml +++ b/wizard/WizardCreateDevice1.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -35,7 +35,7 @@ import moneroComponents.Wallet 1.0 import "../js/Wizard.js" as Wizard import "../js/Utils.js" as Utils import "../components" -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Rectangle { id: wizardCreateDevice1 @@ -104,16 +104,16 @@ Rectangle { Layout.fillWidth: true Layout.alignment: Qt.AlignTop - MoneroComponents.TextPlain { - font.family: MoneroComponents.Style.fontRegular.name + MonzeroComponents.TextPlain { + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor wrapMode: Text.Wrap Layout.fillWidth: true text: qsTr("Hardware wallet model") } - MoneroComponents.StandardDropdown { + MonzeroComponents.StandardDropdown { id: deviceNameDropdown dataModel: deviceNameModel Layout.preferredWidth: 450 @@ -121,7 +121,7 @@ Rectangle { z: 3 } - MoneroComponents.RadioButton { + MonzeroComponents.RadioButton { id: newDeviceWallet Layout.topMargin: 20 text: qsTr("Create a new wallet from device.") + translationManager.emptyString @@ -134,7 +134,7 @@ Rectangle { } } - MoneroComponents.RadioButton { + MonzeroComponents.RadioButton { id: restoreDeviceWallet Layout.topMargin: 10 text: qsTr("Restore a wallet from device. Use this if you used your hardware wallet before.") + translationManager.emptyString @@ -206,7 +206,7 @@ Rectangle { Layout.fillWidth: true spacing: 20 - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: restoreHeight visible: !newDeviceWallet.checked Layout.fillWidth: true @@ -227,7 +227,7 @@ Rectangle { text: qsTr("Advanced options") + translationManager.emptyString } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: lookahead Layout.fillWidth: true visible: showAdvancedCheckbox.checked @@ -244,8 +244,8 @@ Rectangle { text: qsTr("Error writing wallet from hardware device. Check application logs.") + translationManager.emptyString; visible: errorMsg.text !== "" Layout.fillWidth: true - font.family: MoneroComponents.Style.fontRegular.name - color: MoneroComponents.Style.errorColor + font.family: MonzeroComponents.Style.fontRegular.name + color: MonzeroComponents.Style.errorColor font.pixelSize: 16 wrapMode: Text.WordWrap diff --git a/wizard/WizardCreateWallet1.qml b/wizard/WizardCreateWallet1.qml index cff802df..9dbb6717 100644 --- a/wizard/WizardCreateWallet1.qml +++ b/wizard/WizardCreateWallet1.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -33,7 +33,7 @@ import QtQuick.Controls 2.0 import "../js/Wizard.js" as Wizard import "../js/Utils.js" as Utils -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Rectangle { id: wizardCreateWallet1 diff --git a/wizard/WizardCreateWallet2.qml b/wizard/WizardCreateWallet2.qml index 7664474d..4edc7818 100644 --- a/wizard/WizardCreateWallet2.qml +++ b/wizard/WizardCreateWallet2.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -34,7 +34,7 @@ import moneroComponents.Clipboard 1.0 import "../js/Wizard.js" as Wizard import "../js/Utils.js" as Utils -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Rectangle { id: wizardCreateWallet2 @@ -57,7 +57,7 @@ Rectangle { name: "verify"; when: typeof currentWallet != "undefined" && wizardStateView.state == "wizardCreateWallet2" PropertyChanges { target: header; title: qsTr("Verify your recovery phrase") + translationManager.emptyString } - PropertyChanges { target: header; imageIcon: wizardController.layoutScale != 4 ? (MoneroComponents.Style.blackTheme ? "qrc:///images/verify.png" : "qrc:///images/verify-white.png") : "" } + PropertyChanges { target: header; imageIcon: wizardController.layoutScale != 4 ? (MonzeroComponents.Style.blackTheme ? "qrc:///images/verify.png" : "qrc:///images/verify-white.png") : "" } PropertyChanges { target: header; subtitle: qsTr("Please confirm that you have written down your recover phrase by filling in the five blank fields with the correct words. If you have not written down your recovery phrase on a piece of paper, click on the Previous button and write it down right now!") + translationManager.emptyString} PropertyChanges { target: walletCreationDate; opacity: 0; enabled: false} PropertyChanges { target: walletCreationDateValue; opacity: 0; enabled: false} @@ -80,16 +80,16 @@ Rectangle { } ] - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { //PDF template text // the translation of these strings is used to create localized PDF templates visible: false text: qsTr("Print this paper, fill it out, and keep it in a safe location. Never share your recovery phrase with anybody, especially with strangers offering technical support.") + qsTr("Recovery phrase (mnemonic seed)") + - qsTr("These words are a backup of your wallet. They are the only thing needed to access your funds and restore your Monero wallet, so keep this paper in a safe place and do not disclose it to anybody! It is strongly not recommended to store your recovery phrase digitally (in an email, online service, screenshot, photo, or any other type of computer file).") + + qsTr("These words are a backup of your wallet. They are the only thing needed to access your funds and restore your Monzero wallet, so keep this paper in a safe place and do not disclose it to anybody! It is strongly not recommended to store your recovery phrase digitally (in an email, online service, screenshot, photo, or any other type of computer file).") + qsTr("Wallet creation date") + qsTr("Wallet restore height") + - qsTr("For instructions on how to restore this wallet, visit www.getmonero.org and go to Resources > User Guides > \"How to restore a wallet from mnemonic seed\". Use only Monero wallets that are trusted and recommended by the Monero community (see a list of them in www.getmonero.org/downloads).") + translationManager.emptyString + qsTr("For instructions on how to restore this wallet, visit monzero.org. Use only Monzero wallets that are trusted and recommended by the Monzero community.") + translationManager.emptyString } ColumnLayout { @@ -127,7 +127,7 @@ Rectangle { id: mobileImage Layout.alignment: Qt.AlignHCenter fillMode: Image.PreserveAspectCrop - source: MoneroComponents.Style.blackTheme ? "qrc:///images/write-down@2x.png" : "qrc:///images/write-down-white@2x.png" + source: MonzeroComponents.Style.blackTheme ? "qrc:///images/write-down@2x.png" : "qrc:///images/write-down-white@2x.png" width: 125 height: 125 sourceSize.width: 125 @@ -142,7 +142,7 @@ Rectangle { Rectangle { width: mobileImage.width height: mobileImage.height - color: mobileImage.focus ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent" + color: mobileImage.focus ? MonzeroComponents.Style.titleBarButtonHoverColor : "transparent" } } @@ -150,10 +150,10 @@ Rectangle { id: mobileText Layout.fillWidth: true Layout.alignment: Qt.AlignHCenter - color: MoneroComponents.Style.dimmedFontColor + color: MonzeroComponents.Style.dimmedFontColor text: qsTr("The next page will display your recovery phrase, also known as mnemonic seed.") + " " + qsTr("These words are a backup of your wallet. Write these words down now on a piece of paper in the same order displayed. Keep this paper in a safe place and do not disclose it to anybody! Do not store these words digitally, always use a paper!") + translationManager.emptyString - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 wrapMode: Text.WordWrap leftPadding: 0 @@ -167,11 +167,11 @@ Rectangle { Rectangle { anchors.fill: parent - color: parent.focus ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent" + color: parent.focus ? MonzeroComponents.Style.titleBarButtonHoverColor : "transparent" } } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: displaySeedButton Layout.alignment: Qt.AlignHCenter; text: qsTr("Display recovery phrase") + translationManager.emptyString @@ -198,7 +198,7 @@ Rectangle { WizardHeader { id: header - imageIcon: wizardController.layoutScale != 4 ? (MoneroComponents.Style.blackTheme ? "qrc:///images/write-down.png" : "qrc:///images/write-down-white.png") : "" + imageIcon: wizardController.layoutScale != 4 ? (MonzeroComponents.Style.blackTheme ? "qrc:///images/write-down.png" : "qrc:///images/write-down-white.png") : "" title: qsTr("Write down your recovery phrase") + translationManager.emptyString subtitleVisible: wizardController.layoutScale != 4 subtitle: qsTr("These words are a backup of your wallet. Write these words down now on a piece of paper in the same order displayed. Keep this paper in a safe place and do not disclose it to anybody! Do not store these words digitally, always use a paper!") + translationManager.emptyString @@ -223,14 +223,14 @@ Rectangle { } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: recoveryPhraseLabel visible: wizardController.layoutScale != 4 - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 font.bold: false textFormat: Text.RichText - color: MoneroComponents.Style.dimmedFontColor + color: MonzeroComponents.Style.dimmedFontColor text: qsTr("Recovery phrase (mnemonic seed)") + ":" + translationManager.emptyString themeTransition: false tooltip: qsTr("These words encode your private spend key in a human readable format.") + "<br>" + qsTr("It is expected that some words may be repeated.") + translationManager.emptyString @@ -273,7 +273,7 @@ Rectangle { } } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: createNewSeedButton visible: appWindow.walletMode >= 2 small: true @@ -294,7 +294,7 @@ Rectangle { KeyNavigation.tab: copyToClipboardButton } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: copyToClipboardButton visible: appWindow.walletMode >= 2 small: true @@ -312,7 +312,7 @@ Rectangle { KeyNavigation.tab: printPDFTemplate.visible ? printPDFTemplate : walletCreationDate } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: printPDFTemplate small: true primary: false @@ -340,13 +340,13 @@ Rectangle { spacing: 5 Layout.fillWidth: true - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: walletCreationDate - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 font.bold: false textFormat: Text.RichText - color: MoneroComponents.Style.dimmedFontColor + color: MonzeroComponents.Style.dimmedFontColor text: qsTr("Creation date") + ": " + translationManager.emptyString themeTransition: false Accessible.role: Accessible.StaticText @@ -357,15 +357,15 @@ Rectangle { KeyNavigation.tab: walletRestoreHeight } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: walletCreationDateValue property var locale: Qt.locale() property date currentDate: new Date() - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 16 font.bold: true textFormat: Text.RichText - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor text: currentDate.toLocaleDateString(locale, Locale.ShortFormat) } } @@ -374,13 +374,13 @@ Rectangle { spacing: 5 Layout.fillWidth: true - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: walletRestoreHeight - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 15 font.bold: false textFormat: Text.RichText - color: MoneroComponents.Style.dimmedFontColor + color: MonzeroComponents.Style.dimmedFontColor text: qsTr("Restore height") + ":" + translationManager.emptyString tooltip: wizardController.layoutScale != 4 ? qsTr("Enter this number when restoring the wallet to make your initial wallet synchronization faster.") : "" + translationManager.emptyString tooltipIconVisible: true @@ -393,13 +393,13 @@ Rectangle { Keys.onTabPressed: navigation.btnPrev.forceActiveFocus(); } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: walletRestoreHeightValue - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 16 font.bold: true textFormat: Text.RichText - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor text: Utils.roundDownToNearestThousand(wizardController.m_wallet ? wizardController.m_wallet.walletCreationHeight : 0) } } diff --git a/wizard/WizardCreateWallet3.qml b/wizard/WizardCreateWallet3.qml index dfb51f16..2caad66e 100644 --- a/wizard/WizardCreateWallet3.qml +++ b/wizard/WizardCreateWallet3.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -30,7 +30,7 @@ import QtQuick 2.9 import QtQuick.Layouts 1.2 import QtQuick.Controls 2.0 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Rectangle { id: wizardCreateWallet3 diff --git a/wizard/WizardCreateWallet4.qml b/wizard/WizardCreateWallet4.qml index 8919b53c..c2c9e962 100644 --- a/wizard/WizardCreateWallet4.qml +++ b/wizard/WizardCreateWallet4.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -30,7 +30,7 @@ import QtQuick 2.9 import QtQuick.Layouts 1.2 import QtQuick.Controls 2.0 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Rectangle { id: wizardCreateWallet4 @@ -57,7 +57,7 @@ Rectangle { WizardHeader { title: qsTr("Daemon settings") + translationManager.emptyString - subtitle: qsTr("To be able to communicate with the Monero network your wallet needs to be connected to a Monero node. For best privacy it's recommended to run your own node.") + translationManager.emptyString + subtitle: qsTr("To be able to communicate with the Monzero network your wallet needs to be connected to a Monzero node. For best privacy it's recommended to run your own node.") + translationManager.emptyString } WizardDaemonSettings { diff --git a/wizard/WizardCreateWallet5.qml b/wizard/WizardCreateWallet5.qml index e6cb9e93..b881316f 100644 --- a/wizard/WizardCreateWallet5.qml +++ b/wizard/WizardCreateWallet5.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -31,7 +31,7 @@ import QtQuick.Layouts 1.2 import QtQuick.Controls 2.0 import "../js/Wizard.js" as Wizard -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Rectangle { id: wizardCreateWallet5 @@ -83,7 +83,7 @@ Rectangle { wizardController.wizardStateView.wizardCreateWallet3View.pwField = ""; wizardController.wizardStateView.wizardCreateWallet3View.pwConfirmField = ""; wizardController.writeWallet(function() { - wizardController.useMoneroClicked(); + wizardController.useMonzeroClicked(); wizardController.walletOptionsIsRecoveringFromDevice = false; }); btnNext.enabled = true; diff --git a/wizard/WizardDaemonSettings.qml b/wizard/WizardDaemonSettings.qml index bada5da3..5a2d5762 100644 --- a/wizard/WizardDaemonSettings.qml +++ b/wizard/WizardDaemonSettings.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -32,7 +32,7 @@ import QtQuick.Layouts 1.2 import QtQuick.Controls 2.0 import "../js/Wizard.js" as Wizard -import "../components" as MoneroComponents +import "../components" as MonzeroComponents ColumnLayout { Layout.fillWidth: true @@ -49,7 +49,7 @@ ColumnLayout { } } - MoneroComponents.RadioButton { + MonzeroComponents.RadioButton { id: localNode Layout.fillWidth: true text: qsTr("Start a node automatically in background (recommended)") + translationManager.emptyString @@ -70,7 +70,7 @@ ColumnLayout { Layout.topMargin: 8 Layout.fillWidth: true - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: blockchainFolder Layout.fillWidth: true @@ -90,7 +90,7 @@ ColumnLayout { text: persistentSettings.blockchainDataDir onLabelLinkActivated: persistentSettings.blockchainDataDir = "" - MoneroComponents.InlineButton { + MonzeroComponents.InlineButton { small: true text: qsTr("Browse") + translationManager.emptyString onClicked: { @@ -104,7 +104,7 @@ ColumnLayout { RowLayout { id: pruningOptionRow - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { id: pruneBlockchainCheckBox checked: !existingDbWarning.visible ? persistentSettings.pruneBlockchain : false enabled: !existingDbWarning.visible @@ -119,8 +119,8 @@ ColumnLayout { id: existingDbWarning text: "A blockchain database already exists here. Select a new location to start a pruned node" visible: daemonManager ? daemonManager.checkLmdbExists(blockchainFolder.text) : false - color: MoneroComponents.Style.defaultFontColor - font.family: MoneroComponents.Style.fontRegular.name + color: MonzeroComponents.Style.defaultFontColor + font.family: MonzeroComponents.Style.fontRegular.name } } @@ -132,8 +132,8 @@ ColumnLayout { text: qsTr("Bootstrap node") + translationManager.emptyString Layout.topMargin: 10 Layout.fillWidth: true - font.family: MoneroComponents.Style.fontRegular.name - color: MoneroComponents.Style.defaultFontColor + font.family: MonzeroComponents.Style.fontRegular.name + color: MonzeroComponents.Style.defaultFontColor font.pixelSize: { if(wizardController.layoutScale === 2 ){ return 22; @@ -149,12 +149,12 @@ ColumnLayout { } Text { - text: qsTr("Additionally, you may specify a bootstrap node to use Monero immediately.") + translationManager.emptyString + text: qsTr("Additionally, you may specify a bootstrap node to use Monzero immediately.") + translationManager.emptyString Layout.topMargin: 4 Layout.fillWidth: true - font.family: MoneroComponents.Style.fontRegular.name - color: MoneroComponents.Style.dimmedFontColor + font.family: MonzeroComponents.Style.fontRegular.name + color: MonzeroComponents.Style.dimmedFontColor font.pixelSize: { if(wizardController.layoutScale === 2 ){ @@ -175,7 +175,7 @@ ColumnLayout { spacing: 8 Layout.fillWidth: true - MoneroComponents.RemoteNodeEdit { + MonzeroComponents.RemoteNodeEdit { id: bootstrapNodeEdit Layout.minimumWidth: 300 //labelText: qsTr("Bootstrap node (leave blank if not wanted)") + translationManager.emptyString @@ -185,7 +185,7 @@ ColumnLayout { } } - MoneroComponents.RadioButton { + MonzeroComponents.RadioButton { id: remoteNode Layout.fillWidth: true Layout.topMargin: 8 @@ -198,7 +198,7 @@ ColumnLayout { } } - MoneroComponents.RemoteNodeList { + MonzeroComponents.RemoteNodeList { Layout.fillWidth: true Layout.topMargin: 8 visible: remoteNode.checked diff --git a/wizard/WizardHeader.qml b/wizard/WizardHeader.qml index 3febfa49..52b967cc 100644 --- a/wizard/WizardHeader.qml +++ b/wizard/WizardHeader.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -28,7 +28,7 @@ import "../js/Wizard.js" as Wizard import "../components" -import "../components" as MoneroComponents +import "../components" as MonzeroComponents import QtQuick 2.9 import QtQuick.Layouts 1.2 @@ -56,9 +56,9 @@ ColumnLayout { Text { text: title - font.family: MoneroComponents.Style.fontRegular.name - color: MoneroComponents.Style.defaultFontColor - opacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.8 + font.family: MonzeroComponents.Style.fontRegular.name + color: MonzeroComponents.Style.defaultFontColor + opacity: MonzeroComponents.Style.blackTheme ? 1.0 : 0.8 font.pixelSize: { if (wizardController.layoutScale == 4) { return 16; @@ -76,7 +76,7 @@ ColumnLayout { Rectangle { anchors.fill: parent - color: parent.parent.parent.focus ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent" + color: parent.parent.parent.focus ? MonzeroComponents.Style.titleBarButtonHoverColor : "transparent" } } } @@ -86,10 +86,10 @@ ColumnLayout { Layout.alignment: Qt.AlignLeft visible: parent.subtitle !== "" && subtitleVisible - color: MoneroComponents.Style.dimmedFontColor + color: MonzeroComponents.Style.dimmedFontColor text: subtitle - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: { if (wizardController.layoutScale <= 2 ) { return 16; @@ -104,7 +104,7 @@ ColumnLayout { Rectangle { anchors.fill: parent - color: parent.parent.focus ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent" + color: parent.parent.focus ? MonzeroComponents.Style.titleBarButtonHoverColor : "transparent" } } } diff --git a/wizard/WizardHome.qml b/wizard/WizardHome.qml index 9d65a7f0..e21379c7 100644 --- a/wizard/WizardHome.qml +++ b/wizard/WizardHome.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -32,7 +32,7 @@ import QtQuick.Layouts 1.2 import QtQuick.Controls 2.0 import moneroComponents.NetworkType 1.0 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Rectangle { id: wizardHome @@ -63,11 +63,11 @@ Rectangle { WizardHeader { Layout.bottomMargin: 7 Layout.fillWidth: true - title: qsTr("Welcome to Monero") + translationManager.emptyString + title: qsTr("Welcome to Monzero") + translationManager.emptyString subtitle: "" } - MoneroComponents.LanguageButton { + MonzeroComponents.LanguageButton { Layout.bottomMargin: 8 } } @@ -79,7 +79,7 @@ Rectangle { : nettype === 1 ? " (" + qsTr("testnet") + ")" : "") + translationManager.emptyString } - bodyText: qsTr("Choose this option if this is your first time using Monero.") + translationManager.emptyString + bodyText: qsTr("Choose this option if this is your first time using Monzero.") + translationManager.emptyString imageIcon: "qrc:///images/create-wallet.png" onMenuClicked: { @@ -95,8 +95,8 @@ Rectangle { Layout.topMargin: 3 Layout.bottomMargin: 3 Layout.fillWidth: true - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } WizardMenuItem { @@ -106,7 +106,7 @@ Rectangle { : nettype === 1 ? " (" + qsTr("testnet") + ")" : "") + translationManager.emptyString } - bodyText: qsTr("Connect your hardware wallet to create a new Monero wallet.") + translationManager.emptyString + bodyText: qsTr("Connect your hardware wallet to create a new Monzero wallet.") + translationManager.emptyString imageIcon: "qrc:///images/restore-wallet-from-hardware.png" onMenuClicked: { @@ -120,8 +120,8 @@ Rectangle { Layout.topMargin: 3 Layout.bottomMargin: 3 Layout.fillWidth: true - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } WizardMenuItem { @@ -140,8 +140,8 @@ Rectangle { Layout.topMargin: 3 Layout.bottomMargin: 3 Layout.fillWidth: true - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } WizardMenuItem { @@ -160,7 +160,7 @@ Rectangle { Layout.topMargin: 16 spacing: 20 - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { small: true text: qsTr("Change wallet mode") + translationManager.emptyString @@ -171,7 +171,7 @@ Rectangle { } } - MoneroComponents.CheckBox2 { + MonzeroComponents.CheckBox2 { id: showAdvancedCheckbox Layout.topMargin: 30 Layout.fillWidth: true @@ -195,7 +195,7 @@ Rectangle { Layout.fillWidth: true Layout.topMargin: 10 - MoneroComponents.StandardDropdown { + MonzeroComponents.StandardDropdown { id: networkTypeDropdown currentIndex: persistentSettings.nettype dataModel: networkTypeModel @@ -218,7 +218,7 @@ Rectangle { } } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: kdfRoundsText Layout.maximumWidth: 180 diff --git a/wizard/WizardLanguage.qml b/wizard/WizardLanguage.qml index 0c5b980e..83e4c26c 100644 --- a/wizard/WizardLanguage.qml +++ b/wizard/WizardLanguage.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -31,8 +31,8 @@ import QtQuick.Layouts 1.2 import QtQuick.Controls 2.0 import "../components" -import "../components" as MoneroComponents -import "../components/effects/" as MoneroEffects +import "../components" as MonzeroComponents +import "../components/effects/" as MonzeroEffects import "../version.js" as Version Rectangle { @@ -62,10 +62,10 @@ Rectangle { opacity: 0 Layout.preferredWidth: parent.width / 1.3 Layout.alignment: Qt.AlignCenter - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor text: "Welcome - Wilkommen - Bonvenon - Bienvenido - Bienvenue - Välkommen - Selamat datang - Benvenuto - 歡迎 - Welkom - Bem Vindo - добро пожаловать" - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.bold: true font.pixelSize: 18 horizontalAlignment: TextInput.AlignHCenter @@ -152,9 +152,9 @@ Rectangle { Layout.fillWidth: true columnSpacing: 20 - MoneroComponents.LanguageButton { } + MonzeroComponents.LanguageButton { } - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: btnContinue Layout.minimumWidth: 150 text: qsTr("Continue") + translationManager.emptyString @@ -177,14 +177,14 @@ Rectangle { } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: versionText opacity: 0 Layout.alignment: Qt.AlignCenter font.bold: true font.pixelSize: 12 - font.family: MoneroComponents.Style.fontRegular.name - color: MoneroComponents.Style.defaultFontColor + font.family: MonzeroComponents.Style.fontRegular.name + color: MonzeroComponents.Style.defaultFontColor text: Version.GUI_VERSION + " (Qt " + qtRuntimeVersion + ")" Behavior on opacity { diff --git a/wizard/WizardMenuItem.qml b/wizard/WizardMenuItem.qml index 5e9964b5..149ac806 100644 --- a/wizard/WizardMenuItem.qml +++ b/wizard/WizardMenuItem.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -32,7 +32,7 @@ import QtQuick.Layouts 1.2 import QtGraphicalEffects 1.0 import QtQuick.Controls 2.0 -import "../components" as MoneroComponents +import "../components" as MonzeroComponents RowLayout { id: rowlayout @@ -50,7 +50,7 @@ RowLayout { Layout.preferredWidth: 70 Layout.preferredHeight: 70 - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { id: checkboxItem anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter @@ -60,14 +60,14 @@ RowLayout { Image { id: icon - visible: !rowlayout.checkbox && (!isOpenGL || MoneroComponents.Style.blackTheme) + visible: !rowlayout.checkbox && (!isOpenGL || MonzeroComponents.Style.blackTheme) anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter source: "" } DropShadow { - visible: !rowlayout.checkbox && (isOpenGL && !MoneroComponents.Style.blackTheme) + visible: !rowlayout.checkbox && (isOpenGL && !MonzeroComponents.Style.blackTheme) anchors.fill: icon horizontalOffset: 3 verticalOffset: 3 @@ -92,15 +92,15 @@ RowLayout { Layout.fillWidth: true spacing: 0 - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: header Layout.fillWidth: true leftPadding: parent.leftPadding topPadding: 0 - color: MoneroComponents.Style.defaultFontColor - opacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.8 + color: MonzeroComponents.Style.defaultFontColor + opacity: MonzeroComponents.Style.blackTheme ? 1.0 : 0.8 font.bold: true - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: { if (wizardController.layoutScale == 4) { return 16; @@ -120,11 +120,11 @@ RowLayout { } } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: body Layout.fillWidth: true - color: MoneroComponents.Style.dimmedFontColor - font.family: MoneroComponents.Style.fontRegular.name + color: MonzeroComponents.Style.dimmedFontColor + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: { if (wizardController.layoutScale <= 2 ){ return 16; diff --git a/wizard/WizardModeBootstrap.qml b/wizard/WizardModeBootstrap.qml index df4d8efb..19f551df 100644 --- a/wizard/WizardModeBootstrap.qml +++ b/wizard/WizardModeBootstrap.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -31,7 +31,7 @@ import QtQuick.Layouts 1.2 import QtQuick.Controls 2.0 import "../js/Wizard.js" as Wizard -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Rectangle { id: wizardModeBootstrapWarning @@ -68,36 +68,36 @@ Rectangle { Layout.topMargin: 10 Layout.fillWidth: true - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { text: qsTr("This mode will use a remote node whilst also syncing the blockchain. This is different from the first menu option (Simple mode), since it will only use the remote node until the blockchain is fully synced locally. It is a reasonable tradeoff for most people who care about privacy but also want the convenience of an automatic fallback option.") + translationManager.emptyString wrapMode: Text.Wrap Layout.topMargin: 14 Layout.fillWidth: true textFormat: Text.RichText - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 16 - color: MoneroComponents.Style.lightGreyFontColor + color: MonzeroComponents.Style.lightGreyFontColor } - MoneroComponents.TextPlain { - text: qsTr("Temporary use of remote nodes is useful in order to use Monero immediately (hence the name bootstrap), however be aware that when using remote nodes (including with the bootstrap setting), nodes could track your IP address, track your \"restore height\" and associated block request data, and send you inaccurate information to learn more about transactions you make.") + translationManager.emptyString + MonzeroComponents.TextPlain { + text: qsTr("Temporary use of remote nodes is useful in order to use Monzero immediately (hence the name bootstrap), however be aware that when using remote nodes (including with the bootstrap setting), nodes could track your IP address, track your \"restore height\" and associated block request data, and send you inaccurate information to learn more about transactions you make.") + translationManager.emptyString wrapMode: Text.Wrap Layout.topMargin: 8 Layout.fillWidth: true - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 16 - color: MoneroComponents.Style.lightGreyFontColor + color: MonzeroComponents.Style.lightGreyFontColor } - MoneroComponents.WarningBox{ + MonzeroComponents.WarningBox{ Layout.topMargin: 14 Layout.bottomMargin: 6 text: qsTr("Remain aware of these limitations. <b>Users who prioritize privacy and decentralization must use a full node instead</b>.") + translationManager.emptyString } - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { id: understoodCheckbox Layout.topMargin: 20 fontSize: 16 diff --git a/wizard/WizardModeRemoteNodeWarning.qml b/wizard/WizardModeRemoteNodeWarning.qml index e7a94773..58547838 100644 --- a/wizard/WizardModeRemoteNodeWarning.qml +++ b/wizard/WizardModeRemoteNodeWarning.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -31,7 +31,7 @@ import QtQuick.Layouts 1.2 import QtQuick.Controls 2.0 import "../js/Wizard.js" as Wizard -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Rectangle { id: wizardModeRemoteNodeWarning @@ -68,39 +68,39 @@ Rectangle { Layout.topMargin: 10 Layout.fillWidth: true - MoneroComponents.TextPlain { - text: qsTr("This mode is ideal for managing small amounts of Monero. You have access to basic features for making and managing transactions. It will automatically connect to the Monero network so you can start using Monero immediately.") + translationManager.emptyString - themeTransitionBlackColor: MoneroComponents.Style._b_lightGreyFontColor - themeTransitionWhiteColor: MoneroComponents.Style._w_lightGreyFontColor + MonzeroComponents.TextPlain { + text: qsTr("This mode is ideal for managing small amounts of Monzero. You have access to basic features for making and managing transactions. It will automatically connect to the Monzero network so you can start using Monzero immediately.") + translationManager.emptyString + themeTransitionBlackColor: MonzeroComponents.Style._b_lightGreyFontColor + themeTransitionWhiteColor: MonzeroComponents.Style._w_lightGreyFontColor wrapMode: Text.Wrap Layout.topMargin: 14 Layout.fillWidth: true - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 16 - color: MoneroComponents.Style.lightGreyFontColor + color: MonzeroComponents.Style.lightGreyFontColor } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { text: qsTr("Remote nodes are useful if you are not able/don't want to download the whole blockchain, but be advised that malicious remote nodes could compromise some privacy. They could track your IP address, track your \"restore height\" and associated block request data, and send you inaccurate information to learn more about transactions you make.") + translationManager.emptyString - themeTransitionBlackColor: MoneroComponents.Style._b_lightGreyFontColor - themeTransitionWhiteColor: MoneroComponents.Style._w_lightGreyFontColor + themeTransitionBlackColor: MonzeroComponents.Style._b_lightGreyFontColor + themeTransitionWhiteColor: MonzeroComponents.Style._w_lightGreyFontColor wrapMode: Text.Wrap Layout.topMargin: 8 Layout.fillWidth: true - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 16 - color: MoneroComponents.Style.lightGreyFontColor + color: MonzeroComponents.Style.lightGreyFontColor } - MoneroComponents.WarningBox { + MonzeroComponents.WarningBox { Layout.topMargin: 14 Layout.bottomMargin: 6 text: qsTr("Remain aware of these limitations. <b>Users who prioritize privacy and decentralization must use a full node instead</b>.") + translationManager.emptyString } - MoneroComponents.CheckBox { + MonzeroComponents.CheckBox { id: understoodCheckbox Layout.topMargin: 20 fontSize: 16 diff --git a/wizard/WizardModeSelection.qml b/wizard/WizardModeSelection.qml index 050b440f..e809f040 100644 --- a/wizard/WizardModeSelection.qml +++ b/wizard/WizardModeSelection.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -32,7 +32,7 @@ import QtQuick.Layouts 1.2 import QtQuick.Controls 2.0 import "../js/Wizard.js" as Wizard -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Rectangle { id: wizardModeSelection1 @@ -106,8 +106,8 @@ Rectangle { Layout.topMargin: 5 Layout.bottomMargin: 10 Layout.fillWidth: true - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } WizardMenuItem { @@ -139,8 +139,8 @@ Rectangle { Layout.topMargin: 5 Layout.bottomMargin: 10 Layout.fillWidth: true - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } WizardMenuItem { @@ -163,7 +163,7 @@ Rectangle { WizardMenuItem { Layout.topMargin: 20 headerText: qsTr("Portable mode") + translationManager.emptyString - bodyText: qsTr("Create portable wallets and use them on any PC. Enable if you installed Monero on a USB stick, an external drive, or any other portable storage medium.") + translationManager.emptyString + bodyText: qsTr("Create portable wallets and use them on any PC. Enable if you installed Monzero on a USB stick, an external drive, or any other portable storage medium.") + translationManager.emptyString checkbox: true checked: wizardModeSelection1.portable diff --git a/wizard/WizardNav.qml b/wizard/WizardNav.qml index b5511b3e..c55b4f59 100644 --- a/wizard/WizardNav.qml +++ b/wizard/WizardNav.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -31,7 +31,7 @@ import QtQuick.Layouts 1.2 import QtQuick.Controls 2.0 import "../js/Wizard.js" as Wizard -import "../components" as MoneroComponents +import "../components" as MonzeroComponents RowLayout { id: menuNav @@ -69,7 +69,7 @@ RowLayout { Layout.preferredHeight: parent.height color: "transparent" - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: btnPrev width: appWindow.width <= 506 ? 45 : appWindow.width <= 660 ? 120 : 180 small: true @@ -115,7 +115,7 @@ RowLayout { implicitHeight: 10 radius: 10 // @TODO: Qt 5.10+ replace === with <= - color: index === menuNav.progress ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.progressBarBackgroundColor + color: index === menuNav.progress ? MonzeroComponents.Style.defaultFontColor : MonzeroComponents.Style.progressBarBackgroundColor } Accessible.role: Accessible.Indicator Accessible.name: qsTr("Step (%1) of (%2)").arg(currentIndex + 1).arg(count) + translationManager.emptyString @@ -126,7 +126,7 @@ RowLayout { Rectangle { anchors.fill: parent - color: wizardProgress.focus ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent" + color: wizardProgress.focus ? MonzeroComponents.Style.titleBarButtonHoverColor : "transparent" } } } @@ -135,7 +135,7 @@ RowLayout { Layout.preferredHeight: parent.height color: "transparent" - MoneroComponents.StandardButton { + MonzeroComponents.StandardButton { id: btnNext width: appWindow.width <= 506 ? 45 : appWindow.width <= 660 ? 120 : 180 small: true diff --git a/wizard/WizardOpenWallet1.qml b/wizard/WizardOpenWallet1.qml index 991a72d0..b22f6b92 100644 --- a/wizard/WizardOpenWallet1.qml +++ b/wizard/WizardOpenWallet1.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -38,8 +38,8 @@ import FontAwesome 1.0 import "../js/Wizard.js" as Wizard import "../components" -import "../components" as MoneroComponents -import "../components/effects/" as MoneroEffects +import "../components" as MonzeroComponents +import "../components/effects/" as MonzeroEffects Rectangle { id: wizardOpenWallet1 @@ -90,10 +90,10 @@ Rectangle { columnSpacing: 20 columns: 2 - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { Layout.fillWidth: true text: qsTr("Recently opened") + ":" + translationManager.emptyString - font.family: MoneroComponents.Style.fontLight.name + font.family: MonzeroComponents.Style.fontLight.name font.pixelSize: 16 } @@ -169,9 +169,9 @@ Rectangle { else if(networktype === 2) return qsTr("Stagenet"); return ""; } - color: item.focus || itemMouseArea.containsMouse ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent" + color: item.focus || itemMouseArea.containsMouse ? MonzeroComponents.Style.titleBarButtonHoverColor : "transparent" border.width: item.focus ? 3 : 0 - border.color: MoneroComponents.Style.inputBorderColorActive + border.color: MonzeroComponents.Style.inputBorderColorActive Accessible.role: Accessible.ListItem Accessible.name: { @@ -192,13 +192,13 @@ Rectangle { height: 1 width: parent.width anchors.top: parent.top - color: MoneroComponents.Style.appWindowBorderColor + color: MonzeroComponents.Style.appWindowBorderColor visible: index <= 2 // top row - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: parent - blackColor: MoneroComponents.Style._b_appWindowBorderColor - whiteColor: MoneroComponents.Style._w_appWindowBorderColor + blackColor: MonzeroComponents.Style._b_appWindowBorderColor + whiteColor: MonzeroComponents.Style._w_appWindowBorderColor } } @@ -229,13 +229,13 @@ Rectangle { } visible: { if(!isOpenGL) return true; - if(MoneroComponents.Style.blackTheme) return true; + if(MonzeroComponents.Style.blackTheme) return true; return false; } } Colorize { - visible: isOpenGL && !MoneroComponents.Style.blackTheme + visible: isOpenGL && !MonzeroComponents.Style.blackTheme anchors.fill: icon source: icon lightness: 0.65 // +65% @@ -265,8 +265,8 @@ Rectangle { Layout.preferredHeight: 26 Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter Layout.fillWidth: true - font.family: MoneroComponents.Style.fontRegular.name - color: MoneroComponents.Style.defaultFontColor + font.family: MonzeroComponents.Style.fontRegular.name + color: MonzeroComponents.Style.defaultFontColor font.pixelSize: 16 wrapMode: Text.WordWrap @@ -281,8 +281,8 @@ Rectangle { Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter Layout.fillWidth: true text: item.networkType - font.family: MoneroComponents.Style.fontRegular.name - color: MoneroComponents.Style.dimmedFontColor + font.family: MonzeroComponents.Style.fontRegular.name + color: MonzeroComponents.Style.dimmedFontColor font.pixelSize: 14 wrapMode: Text.WordWrap @@ -301,13 +301,13 @@ Rectangle { Rectangle { height: 1 width: parent.width - color: MoneroComponents.Style.appWindowBorderColor + color: MonzeroComponents.Style.appWindowBorderColor anchors.bottom: parent.bottom - MoneroEffects.ColorTransition { + MonzeroEffects.ColorTransition { targetObj: parent - blackColor: MoneroComponents.Style._b_appWindowBorderColor - whiteColor: MoneroComponents.Style._w_appWindowBorderColor + blackColor: MonzeroComponents.Style._b_appWindowBorderColor + whiteColor: MonzeroComponents.Style._w_appWindowBorderColor } } diff --git a/wizard/WizardRestoreWallet1.qml b/wizard/WizardRestoreWallet1.qml index 61818c3c..4c56c637 100644 --- a/wizard/WizardRestoreWallet1.qml +++ b/wizard/WizardRestoreWallet1.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -32,7 +32,7 @@ import QtQuick.Controls 2.0 import "../js/Wizard.js" as Wizard import "../js/Utils.js" as Utils -import "../components" as MoneroComponents +import "../components" as MonzeroComponents Rectangle { id: wizardRestoreWallet1 @@ -114,7 +114,7 @@ Rectangle { spacing: 30 Layout.fillWidth: true - MoneroComponents.RadioButton { + MonzeroComponents.RadioButton { id: seedRadioButton text: qsTr("Restore from seed") + translationManager.emptyString fontSize: 16 @@ -127,7 +127,7 @@ Rectangle { } } - MoneroComponents.RadioButton { + MonzeroComponents.RadioButton { id: keysRadioButton text: qsTr("Restore from keys") + translationManager.emptyString fontSize: 16 @@ -140,7 +140,7 @@ Rectangle { } } - MoneroComponents.RadioButton { + MonzeroComponents.RadioButton { id: qrRadioButton text: qsTr("Restore from QR Code") + translationManager.emptyString fontSize: 16 @@ -173,53 +173,53 @@ Rectangle { border.width: 1 border.color: { if(seedInput.text !== "" && seedInput.error){ - return MoneroComponents.Style.inputBorderColorInvalid; + return MonzeroComponents.Style.inputBorderColorInvalid; } else if(seedInput.activeFocus){ - return MoneroComponents.Style.inputBorderColorActive; + return MonzeroComponents.Style.inputBorderColorActive; } else { - return MoneroComponents.Style.inputBorderColorInActive; + return MonzeroComponents.Style.inputBorderColorInActive; } } - MoneroComponents.InputMulti { + MonzeroComponents.InputMulti { id: seedInput property bool error: false width: parent.width height: 100 - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor textMargin: 2 text: "" - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 16 - selectionColor: MoneroComponents.Style.textSelectionColor - selectedTextColor: MoneroComponents.Style.textSelectedColor + selectionColor: MonzeroComponents.Style.textSelectionColor + selectedTextColor: MonzeroComponents.Style.textSelectedColor wrapMode: TextInput.Wrap selectByMouse: true - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: memoTextPlaceholder opacity: 0.35 anchors.fill:parent font.pixelSize: 16 anchors.margins: 8 anchors.leftMargin: 10 - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name text: qsTr("Enter your 25 word mnemonic seed") + translationManager.emptyString - color: MoneroComponents.Style.defaultFontColor + color: MonzeroComponents.Style.defaultFontColor visible: !seedInput.text } } } - MoneroComponents.CheckBox2 { + MonzeroComponents.CheckBox2 { id: seedOffsetCheckbox text: qsTr("Seed offset passphrase (optional)") + translationManager.emptyString } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: seedOffset password: true Layout.fillWidth: true @@ -229,7 +229,7 @@ Rectangle { } } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: addressLine visible: wizardController.walletRestoreMode === 'keys' Layout.fillWidth: true @@ -241,7 +241,7 @@ Rectangle { } } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: viewKeyLine visible: wizardController.walletRestoreMode === 'keys' Layout.fillWidth: true @@ -253,7 +253,7 @@ Rectangle { } } - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: spendKeyLine visible: wizardController.walletRestoreMode === 'keys' Layout.fillWidth: true @@ -266,7 +266,7 @@ Rectangle { } GridLayout{ - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: restoreHeight Layout.fillWidth: true labelText: qsTr("Wallet creation date as `YYYY-MM-DD` or restore height") + translationManager.emptyString diff --git a/wizard/WizardRestoreWallet2.qml b/wizard/WizardRestoreWallet2.qml index f66950d5..e6929e8f 100644 --- a/wizard/WizardRestoreWallet2.qml +++ b/wizard/WizardRestoreWallet2.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -27,7 +27,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import "../js/Wizard.js" as Wizard -import "../components" as MoneroComponents +import "../components" as MonzeroComponents import QtQuick 2.9 import QtQuick.Layouts 1.2 diff --git a/wizard/WizardRestoreWallet3.qml b/wizard/WizardRestoreWallet3.qml index fe433a4e..c8f8aee0 100644 --- a/wizard/WizardRestoreWallet3.qml +++ b/wizard/WizardRestoreWallet3.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -27,7 +27,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import "../js/Wizard.js" as Wizard -import "../components" as MoneroComponents +import "../components" as MonzeroComponents import QtQuick 2.9 import QtQuick.Layouts 1.2 @@ -60,7 +60,7 @@ Rectangle { WizardHeader { title: qsTr("Daemon settings") + translationManager.emptyString - subtitle: qsTr("To be able to communicate with the Monero network your wallet needs to be connected to a Monero node. For best privacy it's recommended to run your own node.\n\nIf you don't have the option to run your own node, there's an option to connect to a remote node.") + translationManager.emptyString + subtitle: qsTr("To be able to communicate with the Monzero network your wallet needs to be connected to a Monzero node. For best privacy it's recommended to run your own node.\n\nIf you don't have the option to run your own node, there's an option to connect to a remote node.") + translationManager.emptyString } WizardDaemonSettings { diff --git a/wizard/WizardRestoreWallet4.qml b/wizard/WizardRestoreWallet4.qml index d2d129b1..1c40a6d8 100644 --- a/wizard/WizardRestoreWallet4.qml +++ b/wizard/WizardRestoreWallet4.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -26,7 +26,7 @@ // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import "../components" as MoneroComponents +import "../components" as MonzeroComponents import QtQuick 2.9 import QtQuick.Layouts 1.2 @@ -85,7 +85,7 @@ Rectangle { wizardController.wizardStateView.wizardRestoreWallet2View.pwConfirmField = ""; wizardController.recoveryWallet(); wizardController.writeWallet(function() { - wizardController.useMoneroClicked(); + wizardController.useMonzeroClicked(); btnNext.enabled = true; }); } diff --git a/wizard/WizardSummary.qml b/wizard/WizardSummary.qml index 85ee174a..43b2be8a 100644 --- a/wizard/WizardSummary.qml +++ b/wizard/WizardSummary.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -33,7 +33,7 @@ import moneroComponents.NetworkType 1.0 import "../js/Wizard.js" as Wizard import "../js/Utils.js" as Utils -import "../components" as MoneroComponents +import "../components" as MonzeroComponents ColumnLayout { Layout.fillWidth: true diff --git a/wizard/WizardSummaryItem.qml b/wizard/WizardSummaryItem.qml index d3284b0d..79eedacc 100644 --- a/wizard/WizardSummaryItem.qml +++ b/wizard/WizardSummaryItem.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -32,7 +32,7 @@ import QtQuick.Controls 2.0 import "../js/Wizard.js" as Wizard import "../js/Utils.js" as Utils -import "../components" as MoneroComponents +import "../components" as MonzeroComponents ColumnLayout { property alias header: key.text @@ -50,7 +50,7 @@ ColumnLayout { Layout.preferredHeight: 20 color: "transparent" - MoneroComponents.TextBlock { + MonzeroComponents.TextBlock { id: key Layout.fillWidth: true Layout.alignment: Qt.AlignVCenter @@ -64,7 +64,7 @@ ColumnLayout { Layout.preferredHeight: 20 color: "transparent" - MoneroComponents.TextBlock { + MonzeroComponents.TextBlock { id: val Layout.fillWidth: true Layout.alignment: Qt.AlignVCenter @@ -79,7 +79,7 @@ ColumnLayout { Layout.topMargin: 2 Layout.bottomMargin: 2 Layout.fillWidth: true - color: MoneroComponents.Style.dividerColor - opacity: MoneroComponents.Style.dividerOpacity + color: MonzeroComponents.Style.dividerColor + opacity: MonzeroComponents.Style.dividerOpacity } } diff --git a/wizard/WizardWalletInput.qml b/wizard/WizardWalletInput.qml index 2054fe52..21446bf5 100644 --- a/wizard/WizardWalletInput.qml +++ b/wizard/WizardWalletInput.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2024, The Monero Project +// Copyright (c) 2014-2024, The Monzero Project // // All rights reserved. // @@ -34,7 +34,7 @@ import FontAwesome 1.0 import "../js/Wizard.js" as Wizard import "../components" -import "../components" as MoneroComponents +import "../components" as MonzeroComponents GridLayout { id: grid @@ -69,7 +69,7 @@ GridLayout { } ColumnLayout { - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: walletName Layout.fillWidth: true @@ -115,7 +115,7 @@ GridLayout { RowLayout { Layout.fillWidth: true - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { visible: errorMessageWalletName.text != "" font.family: FontAwesome.fontFamilySolid font.styleName: "Solid" @@ -125,10 +125,10 @@ GridLayout { themeTransition: false } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: errorMessageWalletName textFormat: Text.PlainText - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 color: "#FF0000" themeTransition: false @@ -145,7 +145,7 @@ GridLayout { ColumnLayout { visible: appWindow.walletMode >= 2 - MoneroComponents.LineEdit { + MonzeroComponents.LineEdit { id: walletLocation Layout.fillWidth: true @@ -181,7 +181,7 @@ GridLayout { KeyNavigation.down: browseButton KeyNavigation.tab: browseButton - MoneroComponents.InlineButton { + MonzeroComponents.InlineButton { id: browseButton fontFamily: FontAwesome.fontFamilySolid fontStyleName: "Solid" @@ -206,7 +206,7 @@ GridLayout { RowLayout { Layout.fillWidth: true - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { visible: errorMessageWalletLocation.text != "" font.family: FontAwesome.fontFamilySolid font.styleName: "Solid" @@ -216,10 +216,10 @@ GridLayout { themeTransition: false } - MoneroComponents.TextPlain { + MonzeroComponents.TextPlain { id: errorMessageWalletLocation textFormat: Text.PlainText - font.family: MoneroComponents.Style.fontRegular.name + font.family: MonzeroComponents.Style.fontRegular.name font.pixelSize: 14 color: "#FF0000" themeTransition: false |
