From 2feaa347c4012d65d2c52b6dacf9af28e9936806 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 7 Dec 2022 19:15:01 +0800 Subject: [PATCH 01/80] add selector for ticker badges in confirm swap / swap details modals --- assets/themes/Default - Dark/colors.json | 9 ++++++--- assets/themes/Default - Light/colors.json | 3 +++ atomic_defi_design/Dex/Components/PairItemBadge.qml | 3 +++ atomic_defi_design/Dex/Themes/CurrentTheme.qml | 6 ++++++ atomic_defi_design/Dex/Themes/DefaultTheme.js | 3 +++ atomic_defi_design/Dex/Themes/ThemeData.qml | 3 +++ 6 files changed, 24 insertions(+), 3 deletions(-) diff --git a/assets/themes/Default - Dark/colors.json b/assets/themes/Default - Dark/colors.json index 544b99ec49..23d3c1e8b3 100644 --- a/assets/themes/Default - Dark/colors.json +++ b/assets/themes/Default - Dark/colors.json @@ -31,8 +31,9 @@ "gradientButtonTextHoveredColor": "#FFFFFFFF", "gradientButtonTextPressedColor": "#FFFFFFFF", - "checkBoxGradientStartColor": "#8892EBFF", - "checkBoxGradientEndColor": "#9DD4F3FF", + "checkBoxTickColor": "#FFFFFFFF", + "checkBoxGradientStartColor": "#6673E3FF", + "checkBoxGradientEndColor": "#5EBBF0FF", "switchGradientStartColor": "#1D80B0FF", "switchGradientEndColor": "#5B69E6FF", @@ -66,7 +67,9 @@ "textFieldBackgroundColor": "#313555FF", "textFieldActiveBackgroundColor": "#313555CC", "textFieldPrefixColor": "#8790B2FF", - "textFieldSuffixColor": "#456078FF#", + "textFieldSuffixColor": "#456078FF", + + "tickerBadgeBackgroundColor": "#202337FF", "chartTradingLineBackgroundColor": "#24283dFF", "chartTradingLineColor": "#74fbeeFF", diff --git a/assets/themes/Default - Light/colors.json b/assets/themes/Default - Light/colors.json index de78473e02..44392ce5c3 100644 --- a/assets/themes/Default - Light/colors.json +++ b/assets/themes/Default - Light/colors.json @@ -28,6 +28,7 @@ "gradientButtonTextHoveredColor": "#FFFFFFFF", "gradientButtonTextPressedColor": "#FFFFFFFF", + "checkBoxTickColor": "#456078FF", "checkBoxGradientStartColor": "#8892EBFF", "checkBoxGradientEndColor": "#9DD4F3FF", @@ -65,6 +66,8 @@ "textFieldPrefixColor": "#45607894", "textFieldSuffixColor": "#456078FF", + "tickerBadgeBackgroundColor": "#D5DCF8FF", + "chartTradingLineBackgroundColor": "#C5F2EFFF", "chartTradingLineColor": "#53EBD7FF", diff --git a/atomic_defi_design/Dex/Components/PairItemBadge.qml b/atomic_defi_design/Dex/Components/PairItemBadge.qml index a256f6a174..3c5dd89a93 100644 --- a/atomic_defi_design/Dex/Components/PairItemBadge.qml +++ b/atomic_defi_design/Dex/Components/PairItemBadge.qml @@ -4,10 +4,12 @@ import QtQuick.Layouts 1.15 import bignumberjs 1.0 import "../Constants" +import Dex.Themes 1.0 as Dex DefaultRectangle { id: root + property alias source: icon.source property alias ticker: ticker.text property alias fullname: fullname.text property string amount @@ -15,6 +17,7 @@ DefaultRectangle width: 260 height: 66 radius: 10 + color: Dex.CurrentTheme.tickerBadgeBackgroundColor RowLayout { diff --git a/atomic_defi_design/Dex/Themes/CurrentTheme.qml b/atomic_defi_design/Dex/Themes/CurrentTheme.qml index c0e64238fa..32b9290e02 100644 --- a/atomic_defi_design/Dex/Themes/CurrentTheme.qml +++ b/atomic_defi_design/Dex/Themes/CurrentTheme.qml @@ -118,6 +118,7 @@ ThemeData gradientButtonTextHoveredColor = Dex.Color.argbStrFromRgbaStr(themeData.gradientButtonTextHoveredColor || defaultTheme.gradientButtonTextHoveredColor); gradientButtonTextPressedColor = Dex.Color.argbStrFromRgbaStr(themeData.gradientButtonTextPressedColor || defaultTheme.gradientButtonTextPressedColor); + checkBoxTickColor = Dex.Color.argbStrFromRgbaStr(themeData.checkBoxTickColor || defaultTheme.checkBoxTickColor); checkBoxGradientStartColor = Dex.Color.argbStrFromRgbaStr(themeData.checkBoxGradientStartColor || defaultTheme.checkBoxGradientStartColor); checkBoxGradientEndColor = Dex.Color.argbStrFromRgbaStr(themeData.checkBoxGradientEndColor || defaultTheme.checkBoxGradientEndColor); @@ -155,6 +156,8 @@ ThemeData textFieldPrefixColor = Dex.Color.argbStrFromRgbaStr(themeData.textFieldPrefixColor || defaultTheme.textFieldPrefixColor); textFieldSuffixColor = Dex.Color.argbStrFromRgbaStr(themeData.textFieldSuffixColor || defaultTheme.textFieldSuffixColor); + tickerBadgeBackgroundColor = Dex.Color.argbStrFromRgbaStr(themeData.tickerBadgeBackgroundColor || defaultTheme.tickerBadgeBackgroundColor); + chartTradingLineBackgroundColor = Dex.Color.argbStrFromRgbaStr(themeData.chartTradingLineBackgroundColor || defaultTheme.chartTradingLineBackgroundColor); chartTradingLineColor = Dex.Color.argbStrFromRgbaStr(themeData.chartTradingLineColor || defaultTheme.chartTradingLineColor); @@ -240,6 +243,7 @@ ThemeData console.info("Dex.Themes.CurrentTheme.printValues.gradientButtonTextHoveredColor : %1".arg(gradientButtonTextHoveredColor)); console.info("Dex.Themes.CurrentTheme.printValues.gradientButtonTextPressedColor : %1".arg(gradientButtonTextPressedColor)); + console.info("Dex.Themes.CurrentTheme.printValues.checkBoxTickColor : %1".arg(checkBoxTickColor)); console.info("Dex.Themes.CurrentTheme.printValues.checkBoxGradientStartColor : %1".arg(checkBoxGradientStartColor)); console.info("Dex.Themes.CurrentTheme.printValues.checkBoxGradientEndColor : %1".arg(checkBoxGradientEndColor)); @@ -276,6 +280,8 @@ ThemeData console.info("Dex.Themes.CurrentTheme.printValues.textFieldPrefixColor : %1".arg(textFieldPrefixColor)); console.info("Dex.Themes.CurrentTheme.printValues.textFieldSuffixColor : %1".arg(textFieldSuffixColor)); + console.info("Dex.Themes.CurrentTheme.printValues.tickerBadgeBackgroundColor : %1".arg(tickerBadgeBackgroundColor)); + console.info("Dex.Themes.CurrentTheme.printValues.chartTradingLineBackgroundColor : %1".arg(chartTradingLineBackgroundColor)); console.info("Dex.Themes.CurrentTheme.printValues.chartTradingLineColor : %1".arg(chartTradingLineColor)); diff --git a/atomic_defi_design/Dex/Themes/DefaultTheme.js b/atomic_defi_design/Dex/Themes/DefaultTheme.js index b04267315a..d657ade142 100644 --- a/atomic_defi_design/Dex/Themes/DefaultTheme.js +++ b/atomic_defi_design/Dex/Themes/DefaultTheme.js @@ -34,6 +34,7 @@ function getHardcoded() gradientButtonTextHoveredColor: "#FFFFFFFF", gradientButtonTextPressedColor: "#FFFFFFFF", + checkBoxTickColor: "#000000FF", checkBoxGradientStartColor: "#8892EBFF", checkBoxGradientEndColor: "#9DD4F3FF", @@ -71,6 +72,8 @@ function getHardcoded() textFieldPrefixColor: "#45607894", textFieldSuffixColor: "#456078FF", + tickerBadgeBackgroundColor: "#D5DCF8FF", + chartTradingLineBackgroundColor: "#C5F2EFFF", chartTradingLineColor: "#53EBD7FF", diff --git a/atomic_defi_design/Dex/Themes/ThemeData.qml b/atomic_defi_design/Dex/Themes/ThemeData.qml index e6684febbf..b77d786ff7 100644 --- a/atomic_defi_design/Dex/Themes/ThemeData.qml +++ b/atomic_defi_design/Dex/Themes/ThemeData.qml @@ -33,6 +33,7 @@ QtObject property color gradientButtonTextHoveredColor property color gradientButtonTextPressedColor + property color checkBoxTickColor property color checkBoxGradientStartColor property color checkBoxGradientEndColor @@ -70,6 +71,8 @@ QtObject property color textFieldPrefixColor property color textFieldSuffixColor + property color tickerBadgeBackgroundColor + property color chartTradingLineBackgroundColor property color chartTradingLineColor From 571e04ce9e445280835968505aa7b1a2a8b1f84e Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 7 Dec 2022 19:49:59 +0800 Subject: [PATCH 02/80] fix dextypo cyclic dependency --- atomic_defi_design/Dex/Constants/DexTypo.qml | 4 +--- atomic_defi_design/Dex/Constants/General.qml | 5 +++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/atomic_defi_design/Dex/Constants/DexTypo.qml b/atomic_defi_design/Dex/Constants/DexTypo.qml index 55f4e4c55e..6abbef1e44 100644 --- a/atomic_defi_design/Dex/Constants/DexTypo.qml +++ b/atomic_defi_design/Dex/Constants/DexTypo.qml @@ -4,15 +4,13 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 import QtQuick.Controls 2.15 -import App 1.0 as App - QtObject { id: _font property real fontDensity: 1.0 property real languageDensity: { - switch (App.API.app.settings_pg.lang) { + switch (General.getLanguage()) { case "en": return 0.99999 case "fr": diff --git a/atomic_defi_design/Dex/Constants/General.qml b/atomic_defi_design/Dex/Constants/General.qml index 8faf8f4bd9..5ded9d14d5 100644 --- a/atomic_defi_design/Dex/Constants/General.qml +++ b/atomic_defi_design/Dex/Constants/General.qml @@ -58,6 +58,11 @@ QtObject { return API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker).is_wallet_only } + function getLanguage() + { + return API.app.settings_pg.lang + } + function isZhtlc(ticker) { const coin_info = API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker) From 6c4a774ac75091179f4b4bd932f10dc82447de30 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 7 Dec 2022 19:51:57 +0800 Subject: [PATCH 03/80] noColor -> warningColor; greenColor -> okColor --- assets/themes/Binance - Dark/colors.json | 2 +- assets/themes/Default - Dark/colors.json | 2 +- assets/themes/Default - Light/colors.json | 6 +++--- atomic_defi_design/Dex/Addressbook/AddAddressForm.qml | 2 +- .../Dex/Addressbook/AssetFromStandardSelector.qml | 2 +- .../Dex/Components/DefaultProgressBar.qml | 2 +- atomic_defi_design/Dex/Components/DexAppTextArea.qml | 2 +- atomic_defi_design/Dex/Components/DexAppTextField.qml | 2 +- .../Dex/Components/DexDialogManager.qml | 2 +- atomic_defi_design/Dex/Components/DexKeyChecker.qml | 2 +- atomic_defi_design/Dex/Components/LogoutModal.qml | 2 +- atomic_defi_design/Dex/Components/PasswordField.qml | 2 +- atomic_defi_design/Dex/Components/PopupManager.qml | 2 +- atomic_defi_design/Dex/Components/Toast.qml | 2 +- atomic_defi_design/Dex/Constants/DexTheme.qml | 11 +++++------ .../Dex/Exchange/ProView/DexComboBoxLine.qml | 2 +- .../Dex/Exchange/ProView/PlaceOrderForm/Main.qml | 10 +++++----- .../Dex/Exchange/ProView/TradingInfo/OrderLine.qml | 4 ++-- .../Dex/Exchange/ProView/TradingInfo/PriceLine.qml | 4 ++-- .../Dex/Exchange/ProView/TradingInfo/SwapProgress.qml | 4 ++-- .../Dex/Exchange/Trade/BestOrder/ListDelegate.qml | 2 +- .../Dex/Exchange/Trade/ConfirmTradeModal.qml | 2 +- .../Dex/Exchange/Trade/OrderBook/ListDelegate.qml | 6 +++--- .../Dex/Exchange/Trade/PriceLineSimplified.qml | 4 ++-- .../Dex/Exchange/Trade/SimpleView/List.qml | 6 +++--- .../Dex/Exchange/Trade/SimpleView/SubBestOrder.qml | 2 +- atomic_defi_design/Dex/Portfolio/AssetsList.qml | 6 +++--- atomic_defi_design/Dex/Screens/Dashboard.qml | 2 +- .../Dex/Screens/Startup/ImportWallet.qml | 6 +++--- atomic_defi_design/Dex/Screens/Startup/Login.qml | 2 +- atomic_defi_design/Dex/Screens/Startup/NewWallet.qml | 8 ++++---- .../Dex/Screens/Startup/WalletsView.qml | 4 ++-- atomic_defi_design/Dex/Settings/RecoverSeedModal.qml | 2 +- atomic_defi_design/Dex/Settings/SettingModal.qml | 2 +- atomic_defi_design/Dex/Sidebar/Bottom.qml | 2 +- atomic_defi_design/Dex/Themes/CurrentTheme.qml | 4 ++-- atomic_defi_design/Dex/Themes/DefaultTheme.js | 2 +- atomic_defi_design/Dex/Themes/ThemeData.qml | 2 +- atomic_defi_design/Dex/Wallet/Main.qml | 2 +- atomic_defi_design/Dex/Wallet/SendModal.qml | 10 +++++----- atomic_defi_design/Dex/Wallet/SidebarItemDelegate.qml | 2 +- .../Dex/Wallet/TransactionDetailsModal.qml | 4 ++-- atomic_defi_design/Dex/Wallet/Transactions.qml | 2 +- 43 files changed, 75 insertions(+), 76 deletions(-) diff --git a/assets/themes/Binance - Dark/colors.json b/assets/themes/Binance - Dark/colors.json index ba1e99ec58..2343b39fea 100644 --- a/assets/themes/Binance - Dark/colors.json +++ b/assets/themes/Binance - Dark/colors.json @@ -69,7 +69,7 @@ "sidebarLineTextHovered": "#8B6900FF", "okColor": "#74fbeeFF", - "noColor": "#d13990FF", + "warningColor": "#d13990FF", "senderColorStart": "#F85757FF", "receiverColorStart": "#845FEFFF", diff --git a/assets/themes/Default - Dark/colors.json b/assets/themes/Default - Dark/colors.json index 23d3c1e8b3..ec458f54bd 100644 --- a/assets/themes/Default - Dark/colors.json +++ b/assets/themes/Default - Dark/colors.json @@ -102,7 +102,7 @@ "addressBookTagColors": ["#627EEAFF", "#FFD87AFF", "#F7931AFF"], "okColor": "#00C058FF", - "noColor": "#E52167FF", + "warningColor": "#E52167FF", "senderColorStart": "#F85757FF", "receiverColorStart": "#845FEFFF", diff --git a/assets/themes/Default - Light/colors.json b/assets/themes/Default - Light/colors.json index 44392ce5c3..98e46ae970 100644 --- a/assets/themes/Default - Light/colors.json +++ b/assets/themes/Default - Light/colors.json @@ -99,10 +99,10 @@ "addressBookTagColors": ["#627EEAFF", "#FFD87AFF", "#F7931AFF"], "okColor": "#00C058FF", - "noColor": "#E52167FF", + "warningColor": "#E52167FF", - "senderColorStart": "#F85757", - "receiverColorStart": "#845FEF", + "senderColorStart": "#F85757FF", + "receiverColorStart": "#845FEFFF", "arrowUpColor": "#F85757FF", "arrowDownColor": "#845FEFFF", diff --git a/atomic_defi_design/Dex/Addressbook/AddAddressForm.qml b/atomic_defi_design/Dex/Addressbook/AddAddressForm.qml index 7b73c27e05..000a189b2a 100644 --- a/atomic_defi_design/Dex/Addressbook/AddAddressForm.qml +++ b/atomic_defi_design/Dex/Addressbook/AddAddressForm.qml @@ -159,7 +159,7 @@ Dex.Rectangle Layout.preferredWidth: 458 Layout.preferredHeight: 60 visible: text !== "" - color: Dex.CurrentTheme.noColor + color: Dex.CurrentTheme.warningColor wrapMode: Dex.Text.WordWrap elide: Dex.Text.ElideRight horizontalAlignment: Text.AlignHCenter diff --git a/atomic_defi_design/Dex/Addressbook/AssetFromStandardSelector.qml b/atomic_defi_design/Dex/Addressbook/AssetFromStandardSelector.qml index c7416f1727..26a103de95 100644 --- a/atomic_defi_design/Dex/Addressbook/AssetFromStandardSelector.qml +++ b/atomic_defi_design/Dex/Addressbook/AssetFromStandardSelector.qml @@ -90,7 +90,7 @@ Dex.MultipageModal anchors.leftMargin: 6 anchors.verticalCenter: parent.verticalCenter text: qsTr("Disabled") - color: Dex.CurrentTheme.noColor + color: Dex.CurrentTheme.warningColor font: Dex.DexTypo.caption } diff --git a/atomic_defi_design/Dex/Components/DefaultProgressBar.qml b/atomic_defi_design/Dex/Components/DefaultProgressBar.qml index ed56dd814b..ca5e1a7c3a 100644 --- a/atomic_defi_design/Dex/Components/DefaultProgressBar.qml +++ b/atomic_defi_design/Dex/Components/DefaultProgressBar.qml @@ -13,7 +13,7 @@ RowLayout id: root property double label_width: 175 property double bar_width_pct: 0 - property color bar_color: Dex.DexTheme.greenColor + property color bar_color: Dex.DexTheme.okColor property alias label: _label property alias pct_bar: _pct_bar property alias pct_value: _pct_value diff --git a/atomic_defi_design/Dex/Components/DexAppTextArea.qml b/atomic_defi_design/Dex/Components/DexAppTextArea.qml index ff29faec4d..55efcd599f 100644 --- a/atomic_defi_design/Dex/Components/DexAppTextArea.qml +++ b/atomic_defi_design/Dex/Components/DexAppTextArea.qml @@ -51,7 +51,7 @@ Item { height: parent.height radius: 4 color: DexTheme.surfaceColor - border.color: control.error ? DexTheme.redColor : input_field.focus ? DexTheme.accentColor : DexTheme.rectangleBorderColor + border.color: control.error ? DexTheme.warningColor : input_field.focus ? DexTheme.accentColor : DexTheme.rectangleBorderColor border.width: input_field.focus ? 1 : 0 Behavior on x { NumberAnimation { diff --git a/atomic_defi_design/Dex/Components/DexAppTextField.qml b/atomic_defi_design/Dex/Components/DexAppTextField.qml index 9fd086e981..727f2dbb9d 100644 --- a/atomic_defi_design/Dex/Components/DexAppTextField.qml +++ b/atomic_defi_design/Dex/Components/DexAppTextField.qml @@ -76,7 +76,7 @@ Item height: parent.height radius: 4 color: Dex.CurrentTheme.backgroundColor - border.color: control.error ? Dex.CurrentTheme.noColor : input_field.focus ? Dex.CurrentTheme.accentColor : color + border.color: control.error ? Dex.CurrentTheme.warningColor : input_field.focus ? Dex.CurrentTheme.accentColor : color border.width: input_field.focus ? 1 : 0 Behavior on x diff --git a/atomic_defi_design/Dex/Components/DexDialogManager.qml b/atomic_defi_design/Dex/Components/DexDialogManager.qml index 8bf9ab578c..e68193fd92 100644 --- a/atomic_defi_design/Dex/Components/DexDialogManager.qml +++ b/atomic_defi_design/Dex/Components/DexDialogManager.qml @@ -224,7 +224,7 @@ Popup { topInset: 0 opacity: enabled ? 1 : .6 enabled: DialogButtonBox.buttonRole === DialogButtonBox.RejectRole ? true : dialog.enableAcceptButton - backgroundColor: DialogButtonBox.buttonRole === DialogButtonBox.RejectRole ? 'transparent' : dialog.warning ? DexTheme.redColor : DexTheme.accentColor + backgroundColor: DialogButtonBox.buttonRole === DialogButtonBox.RejectRole ? 'transparent' : dialog.warning ? DexTheme.warningColor : DexTheme.accentColor property alias cursorShape: mouseArea.cursorShape Component.onCompleted: { if (text === "Yes" && dialog.yesButtonText !== "") { diff --git a/atomic_defi_design/Dex/Components/DexKeyChecker.qml b/atomic_defi_design/Dex/Components/DexKeyChecker.qml index fe8634f5e2..aa48c9771d 100644 --- a/atomic_defi_design/Dex/Components/DexKeyChecker.qml +++ b/atomic_defi_design/Dex/Components/DexKeyChecker.qml @@ -49,7 +49,7 @@ ColumnLayout { } function hintColor(valid) { - return valid ? DexTheme.greenColor : DexTheme.redColor + return valid ? DexTheme.okColor : DexTheme.warningColor } function hintPrefix(valid) { diff --git a/atomic_defi_design/Dex/Components/LogoutModal.qml b/atomic_defi_design/Dex/Components/LogoutModal.qml index f205e15293..029a275a1f 100644 --- a/atomic_defi_design/Dex/Components/LogoutModal.qml +++ b/atomic_defi_design/Dex/Components/LogoutModal.qml @@ -25,7 +25,7 @@ MultipageModal { Layout.alignment: Qt.AlignHCenter horizontalAlignment: Text.AlignHCenter Layout.fillWidth: true - color: Dex.CurrentTheme.noColor + color: Dex.CurrentTheme.warningColor text_value: { for (let i = 0; i < orders.count; i++) diff --git a/atomic_defi_design/Dex/Components/PasswordField.qml b/atomic_defi_design/Dex/Components/PasswordField.qml index 163d44ac01..6e7301354e 100644 --- a/atomic_defi_design/Dex/Components/PasswordField.qml +++ b/atomic_defi_design/Dex/Components/PasswordField.qml @@ -46,7 +46,7 @@ ColumnLayout { } function hintColor(valid) { - return valid ? DexTheme.greenColor : DexTheme.redColor + return valid ? DexTheme.okColor : DexTheme.warningColor } function hintPrefix(valid) { diff --git a/atomic_defi_design/Dex/Components/PopupManager.qml b/atomic_defi_design/Dex/Components/PopupManager.qml index 8d2a3d7f66..de6db72de1 100644 --- a/atomic_defi_design/Dex/Components/PopupManager.qml +++ b/atomic_defi_design/Dex/Components/PopupManager.qml @@ -348,7 +348,7 @@ Popup topInset: 0 opacity: enabled ? 1 : .6 enabled: DialogButtonBox.buttonRole === DialogButtonBox.RejectRole ? true : dialog.enableAcceptButton - backgroundColor: DialogButtonBox.buttonRole === DialogButtonBox.RejectRole ? 'transparent' : dialog.warning ? DexTheme.redColor : DexTheme.accentColor + backgroundColor: DialogButtonBox.buttonRole === DialogButtonBox.RejectRole ? 'transparent' : dialog.warning ? DexTheme.warningColor : DexTheme.accentColor property alias cursorShape: mouseArea.cursorShape Component.onCompleted: { diff --git a/atomic_defi_design/Dex/Components/Toast.qml b/atomic_defi_design/Dex/Components/Toast.qml index 3351d60831..e67142167d 100644 --- a/atomic_defi_design/Dex/Components/Toast.qml +++ b/atomic_defi_design/Dex/Components/Toast.qml @@ -36,7 +36,7 @@ AnimatedRectangle { radius: margin / 3 opacity: 0 - color: isError ? DexTheme.redColor : Style.colorTheme1 + color: isError ? DexTheme.warningColor : Style.colorTheme1 z: 1000 DexLabel { diff --git a/atomic_defi_design/Dex/Constants/DexTheme.qml b/atomic_defi_design/Dex/Constants/DexTheme.qml index 4104684b0b..2088cacf25 100644 --- a/atomic_defi_design/Dex/Constants/DexTheme.qml +++ b/atomic_defi_design/Dex/Constants/DexTheme.qml @@ -118,8 +118,8 @@ QtObject { property bool portfolioPieGradient: false - property color senderColorStart: redColor - property color receiverColorStart: greenColor + property color senderColorStart: warningColor + property color receiverColorStart: okColor @@ -131,7 +131,6 @@ QtObject { property color dexBoxBackgroundColor: backgroundDarkColor6 property color hightlightColor: accentDarkColor3 - property color hoverColor: buttonColorHovered property color modalStepColor: accentColor property color modelStepBorderColor: hightlightColor @@ -174,8 +173,8 @@ QtObject { property color colorScrollbarGradient1: Style.colorScrollbarGradient1 property color colorScrollbarGradient2: Style.colorScrollbarGradient2 - property color greenColor: Dex.CurrentTheme.okColor - property color redColor: Dex.CurrentTheme.noColor + property color okColor: Dex.CurrentTheme.okColor + property color warningColor: Dex.CurrentTheme.warningColor // Widget settings @@ -359,7 +358,7 @@ QtObject { function getValueColor(v) { v = parseFloat(v) if(v !== 0) - return v > 0 ? greenColor : redColor + return v > 0 ? okColor : warningColor return Style.colorWhite4 } diff --git a/atomic_defi_design/Dex/Exchange/ProView/DexComboBoxLine.qml b/atomic_defi_design/Dex/Exchange/ProView/DexComboBoxLine.qml index 368bce3c3c..6e1cba552f 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/DexComboBoxLine.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/DexComboBoxLine.qml @@ -54,7 +54,7 @@ RowLayout verticalAlignment: Text.AlignVCenter text: activation_progress + "%" font: Dex.DexTypo.body2 - color: Dex.DexTheme.greenColor + color: Dex.DexTheme.okColor } ColumnLayout diff --git a/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/Main.qml b/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/Main.qml index 62e2c1675d..2f5d00b066 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/Main.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/Main.qml @@ -163,7 +163,7 @@ Widget DefaultText { Layout.leftMargin: 15 - color: Dex.CurrentTheme.noColor + color: Dex.CurrentTheme.warningColor text: qsTr("Order Selected") } @@ -174,7 +174,7 @@ Widget Layout.preferredHeight: parent.height Layout.preferredWidth: 30 Layout.rightMargin: 5 - foregroundColor: Dex.CurrentTheme.noColor + foregroundColor: Dex.CurrentTheme.warningColor onClicked: { API.app.trading_pg.reset_order() reset_fees_state() @@ -184,7 +184,7 @@ Widget { anchors.centerIn: parent iconSize: 16 - color: Dex.CurrentTheme.noColor + color: Dex.CurrentTheme.warningColor source: Qaterial.Icons.close } } @@ -196,7 +196,7 @@ Widget anchors.fill: parent radius: 8 color: 'transparent' - border.color: Dex.CurrentTheme.noColor + border.color: Dex.CurrentTheme.warningColor } } @@ -225,7 +225,7 @@ Widget anchors.centerIn: parent horizontalAlignment: Text.AlignHCenter font.pixelSize: Style.textSizeSmall4 - color: Dex.CurrentTheme.noColor + color: Dex.CurrentTheme.warningColor text_value: General.getTradingError( last_trading_error, curr_fee_info, diff --git a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderLine.qml b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderLine.qml index fc880aa0ea..87d5456f62 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderLine.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderLine.qml @@ -273,7 +273,7 @@ FloatingBackground visible: (!is_history ? details.cancellable ?? false : false) === true ? (mouseArea.containsMouse || hovered) ? true : false : false - outlinedColor: Dex.CurrentTheme.noColor + outlinedColor: Dex.CurrentTheme.warningColor hoverEnabled: true onClicked: if (details) cancelOrder(details.order_id) @@ -289,7 +289,7 @@ FloatingBackground { anchors.centerIn: parent iconSize: 16 - color: Dex.CurrentTheme.noColor + color: Dex.CurrentTheme.warningColor source: Qaterial.Icons.close scale: parent.visible ? 1 : 0 } diff --git a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/PriceLine.qml b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/PriceLine.qml index 63cbdaf723..aa54e2761b 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/PriceLine.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/PriceLine.qml @@ -72,7 +72,7 @@ ColumnLayout Layout.topMargin: 10 Layout.bottomMargin: Layout.topMargin Layout.alignment: Qt.AlignHCenter - color: parseFloat(cexPriceDiff) <= 0 ? Dex.CurrentTheme.okColor : Dex.CurrentTheme.noColor + color: parseFloat(cexPriceDiff) <= 0 ? Dex.CurrentTheme.okColor : Dex.CurrentTheme.warningColor text_value: (parseFloat(cexPriceDiff) > 0 ? qsTr("Expensive") : qsTr("Expedient")) + ":    " + qsTr("%1 compared to CEX", "PRICE_DIFF%").arg("" + General.formatPercent(General.limitDigits(cexPriceDiff)) + "") font.pixelSize: fontSize } @@ -92,7 +92,7 @@ ColumnLayout height: 6 start_color: Dex.CurrentTheme.okColor - end_color: Dex.CurrentTheme.noColor + end_color: Dex.CurrentTheme.warningColor AnimatedRectangle { width: 4 diff --git a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/SwapProgress.qml b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/SwapProgress.qml index ad019be3da..3f0963b269 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/SwapProgress.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/SwapProgress.qml @@ -248,10 +248,10 @@ ColumnLayout if (event) { // Red for the Finished if swap failed - if (event.state === "Finished" && details.order_status === "failed") return Dex.CurrentTheme.noColor + if (event.state === "Finished" && details.order_status === "failed") return Dex.CurrentTheme.warningColor // Red for error event, green for the others - return details.error_events.indexOf(event.state) === -1 ? Dex.CurrentTheme.okColor : Dex.CurrentTheme.noColor + return details.error_events.indexOf(event.state) === -1 ? Dex.CurrentTheme.okColor : Dex.CurrentTheme.warningColor } // In progress one is orange diff --git a/atomic_defi_design/Dex/Exchange/Trade/BestOrder/ListDelegate.qml b/atomic_defi_design/Dex/Exchange/Trade/BestOrder/ListDelegate.qml index b3afd35291..9c0daa7477 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/BestOrder/ListDelegate.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/BestOrder/ListDelegate.qml @@ -100,7 +100,7 @@ Item parseFloat(cex_rates).toFixed(2) + "%" color: cex_rates === "0" ? Qt.darker(Dex.CurrentTheme.foregroundColor) : parseFloat(cex_rates) < 0 ? Dex.CurrentTheme.okColor : - Dex.CurrentTheme.noColor + Dex.CurrentTheme.warningColor Behavior on rightPadding { diff --git a/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml b/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml index 8a4f6bf1ea..0793bdbc31 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml @@ -215,7 +215,7 @@ MultipageModal width: parent.width horizontalAlignment: DefaultText.AlignHCenter font: DexTypo.caption - color: Dex.CurrentTheme.noColor + color: Dex.CurrentTheme.warningColor text_value: General.getTradingError( last_trading_error, curr_fee_info, diff --git a/atomic_defi_design/Dex/Exchange/Trade/OrderBook/ListDelegate.qml b/atomic_defi_design/Dex/Exchange/Trade/OrderBook/ListDelegate.qml index 1e405b2477..3aee857e8c 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/OrderBook/ListDelegate.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/OrderBook/ListDelegate.qml @@ -135,7 +135,7 @@ Item height: 6 radius: width / 2 visible: is_mine - color: isAsk ? Dex.CurrentTheme.noColor : Dex.CurrentTheme.okColor + color: isAsk ? Dex.CurrentTheme.warningColor : Dex.CurrentTheme.okColor } // Progress bar @@ -156,7 +156,7 @@ Item Behavior on width { NumberAnimation { duration: 1000 } } radius: 3 opacity: 0.8 - color: isAsk ? Dex.CurrentTheme.noColor : Dex.CurrentTheme.okColor + color: isAsk ? Dex.CurrentTheme.warningColor : Dex.CurrentTheme.okColor Component.onCompleted: width = ((depth * 100) * (mouse_area.width + 40)) / 100 } } @@ -176,7 +176,7 @@ Item text: { new BigNumber(price).toFixed(8) } font.family: DexTypo.fontFamily font.pixelSize: 12 - color: isAsk ? Dex.CurrentTheme.noColor : Dex.CurrentTheme.okColor + color: isAsk ? Dex.CurrentTheme.warningColor : Dex.CurrentTheme.okColor horizontalAlignment: Text.AlignRight wrapMode: Text.NoWrap } diff --git a/atomic_defi_design/Dex/Exchange/Trade/PriceLineSimplified.qml b/atomic_defi_design/Dex/Exchange/Trade/PriceLineSimplified.qml index a9c257204d..1c14921fda 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/PriceLineSimplified.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/PriceLineSimplified.qml @@ -111,7 +111,7 @@ ColumnLayout Layout.preferredHeight: 6 start_color: Dex.CurrentTheme.okColor - end_color: Dex.CurrentTheme.noColor + end_color: Dex.CurrentTheme.warningColor AnimatedRectangle { @@ -146,7 +146,7 @@ ColumnLayout id: price_diff_text Layout.topMargin: 10 Layout.alignment: Qt.AlignHCenter - color: parseFloat(cexPriceDiff) <= 0 ? Dex.CurrentTheme.okColor : Dex.CurrentTheme.noColor + color: parseFloat(cexPriceDiff) <= 0 ? Dex.CurrentTheme.okColor : Dex.CurrentTheme.warningColor text_value: (parseFloat(cexPriceDiff) > 0 ? qsTr("Expensive") : qsTr("Expedient")) + ":    " + qsTr("%1 compared to CEX", "PRICE_DIFF%").arg("" + General.formatPercent(General.limitDigits(cexPriceDiff)) + "") font.pixelSize: fontSize } diff --git a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/List.qml b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/List.qml index 1605adb463..c9ea3a02df 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/List.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/List.qml @@ -302,7 +302,7 @@ DexListView Layout.fillHeight: true bottomInset: 0 topInset: 0 - outlinedColor: DexTheme.redColor + outlinedColor: DexTheme.warningColor visible: !main_order.is_history && details.cancellable onClicked: { if(details) cancelOrder(details.order_id) } Row { @@ -312,12 +312,12 @@ DexListView anchors.verticalCenter: parent.verticalCenter source: Qaterial.Icons.close iconSize: 17 - color: DexTheme.redColor + color: DexTheme.warningColor } DexLabel { anchors.verticalCenter: parent.verticalCenter text: "Cancel " - color: DexTheme.redColor + color: DexTheme.warningColor } } } diff --git a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubBestOrder.qml b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubBestOrder.qml index cad1265732..0c1fcd5e92 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubBestOrder.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubBestOrder.qml @@ -206,7 +206,7 @@ DexListView { Layout.preferredWidth: _cexRateColumnSize horizontalAlignment: Text.AlignRight - color: cex_rates=== "0" ? Qt.darker(DexTheme.foregroundColor) : parseFloat(cex_rates)>0? DexTheme.redColor : DexTheme.greenColor + color: cex_rates=== "0" ? Qt.darker(DexTheme.foregroundColor) : parseFloat(cex_rates)>0? DexTheme.warningColor : DexTheme.okColor text_value: cex_rates=== "0" ? "N/A" : parseFloat(cex_rates)>0? "+"+parseFloat(cex_rates).toFixed(2)+"%" : parseFloat(cex_rates).toFixed(2)+"%" } diff --git a/atomic_defi_design/Dex/Portfolio/AssetsList.qml b/atomic_defi_design/Dex/Portfolio/AssetsList.qml index ded8fd3eda..aa28f0ef62 100644 --- a/atomic_defi_design/Dex/Portfolio/AssetsList.qml +++ b/atomic_defi_design/Dex/Portfolio/AssetsList.qml @@ -142,7 +142,7 @@ Dex.DexListView verticalAlignment: Text.AlignVCenter text: activation_progress + "%" font: Dex.DexTypo.head8 - color: Dex.DexTheme.greenColor + color: Dex.DexTheme.okColor } } @@ -177,7 +177,7 @@ Dex.DexListView text: "IDO" font: Dex.DexTypo.overLine opacity: .7 - color: Dex.DexTheme.redColor + color: Dex.DexTheme.warningColor } } } @@ -203,7 +203,7 @@ Dex.DexListView return parseFloat(balance).toFixed(8) } - color: text_value == parseFloat(balance).toFixed(8) ? Qt.darker(Dex.DexTheme.foregroundColor, 0.8) : Dex.DexTheme.redColor + color: text_value == parseFloat(balance).toFixed(8) ? Qt.darker(Dex.DexTheme.foregroundColor, 0.8) : Dex.DexTheme.warningColor privacy: true } diff --git a/atomic_defi_design/Dex/Screens/Dashboard.qml b/atomic_defi_design/Dex/Screens/Dashboard.qml index 56192a4cdb..e25c8b6170 100644 --- a/atomic_defi_design/Dex/Screens/Dashboard.qml +++ b/atomic_defi_design/Dex/Screens/Dashboard.qml @@ -366,7 +366,7 @@ Item return Dex.CurrentTheme.sidebarLineTextHovered case "failed": default: - return DexTheme.redColor + return DexTheme.warningColor } } diff --git a/atomic_defi_design/Dex/Screens/Startup/ImportWallet.qml b/atomic_defi_design/Dex/Screens/Startup/ImportWallet.qml index acb83d2be4..ba82ad690a 100644 --- a/atomic_defi_design/Dex/Screens/Startup/ImportWallet.qml +++ b/atomic_defi_design/Dex/Screens/Startup/ImportWallet.qml @@ -205,7 +205,7 @@ SetupPage id: _seedError visible: _seedField.error text: qsTr("Your seed is not BIP39 compliant.\nTry again or select 'Allow custom seed' to continue.") - color: Dex.CurrentTheme.noColor + color: Dex.CurrentTheme.warningColor Layout.preferredWidth: parent.width - 40 font: DexTypo.body2 } @@ -267,7 +267,7 @@ SetupPage DefaultText { text_value: text_error - color: Dex.CurrentTheme.noColor + color: Dex.CurrentTheme.warningColor visible: text !== '' } @@ -364,7 +364,7 @@ SetupPage DefaultText { text_value: text_error - color: Dex.CurrentTheme.noColor + color: Dex.CurrentTheme.warningColor visible: text !== '' } } diff --git a/atomic_defi_design/Dex/Screens/Startup/Login.qml b/atomic_defi_design/Dex/Screens/Startup/Login.qml index 299c505ea2..485b0fd5a5 100644 --- a/atomic_defi_design/Dex/Screens/Startup/Login.qml +++ b/atomic_defi_design/Dex/Screens/Startup/Login.qml @@ -98,7 +98,7 @@ SetupPage Layout.alignment: Qt.AlignHCenter height: 14 text: _isPasswordWrong ? qsTr("Incorrect Password") : "" - color: Dex.CurrentTheme.noColor + color: Dex.CurrentTheme.warningColor } GradientButton diff --git a/atomic_defi_design/Dex/Screens/Startup/NewWallet.qml b/atomic_defi_design/Dex/Screens/Startup/NewWallet.qml index 2a2f30e59a..dcc574bb1c 100644 --- a/atomic_defi_design/Dex/Screens/Startup/NewWallet.qml +++ b/atomic_defi_design/Dex/Screens/Startup/NewWallet.qml @@ -335,7 +335,7 @@ SetupPage Layout.topMargin: 10 Layout.bottomMargin: Layout.topMargin Layout.fillWidth: true - color: Dex.CurrentTheme.noColor + color: Dex.CurrentTheme.warningColor height: warning_texts.height + 20 radius: 20 @@ -457,7 +457,7 @@ SetupPage DefaultText { text_value: text_error - color: Dex.CurrentTheme.noColor + color: Dex.CurrentTheme.warningColor visible: text !== '' } @@ -664,7 +664,7 @@ SetupPage DefaultText { text_value: guess_text_error - color: Dex.CurrentTheme.noColor + color: Dex.CurrentTheme.warningColor visible: input_seed_word.error DexVisibleBehavior on visible {} @@ -742,7 +742,7 @@ SetupPage DefaultText { text_value: text_error - color: Dex.CurrentTheme.noColor + color: Dex.CurrentTheme.warningColor visible: text !== '' } } diff --git a/atomic_defi_design/Dex/Screens/Startup/WalletsView.qml b/atomic_defi_design/Dex/Screens/Startup/WalletsView.qml index 6d21be4af2..7db17d6390 100644 --- a/atomic_defi_design/Dex/Screens/Startup/WalletsView.qml +++ b/atomic_defi_design/Dex/Screens/Startup/WalletsView.qml @@ -225,7 +225,7 @@ SetupPage iconSize: 18 anchors.centerIn: parent opacity: .8 - color: _deleteArea.containsMouse ? Dex.CurrentTheme.noColor : Dex.CurrentTheme.foregroundColor + color: _deleteArea.containsMouse ? Dex.CurrentTheme.warningColor : Dex.CurrentTheme.foregroundColor } DexMouseArea @@ -242,7 +242,7 @@ SetupPage text: qsTr("Enter password to confirm deletion of") + " %1 ".arg(wallet_name) + qsTr("wallet"), standardButtons: Dialog.Yes | Dialog.Cancel, warning: true, - iconColor: Dex.CurrentTheme.noColor, + iconColor: Dex.CurrentTheme.warningColor, isPassword: true, placeholderText: qsTr("Type password"), yesButtonText: qsTr("Delete"), diff --git a/atomic_defi_design/Dex/Settings/RecoverSeedModal.qml b/atomic_defi_design/Dex/Settings/RecoverSeedModal.qml index dfa997fa03..5f0c820744 100644 --- a/atomic_defi_design/Dex/Settings/RecoverSeedModal.qml +++ b/atomic_defi_design/Dex/Settings/RecoverSeedModal.qml @@ -80,7 +80,7 @@ MultipageModal Layout.alignment: Qt.AlignHCenter height: 14 text: _isPasswordWrong ? qsTr("Incorrect Password") : "" - color: Dex.CurrentTheme.noColor + color: Dex.CurrentTheme.warningColor } // Footer diff --git a/atomic_defi_design/Dex/Settings/SettingModal.qml b/atomic_defi_design/Dex/Settings/SettingModal.qml index b278a3ff74..40aad6ae50 100644 --- a/atomic_defi_design/Dex/Settings/SettingModal.qml +++ b/atomic_defi_design/Dex/Settings/SettingModal.qml @@ -462,7 +462,7 @@ Qaterial.Dialog standardButtons: Dialog.Yes | Dialog.Cancel, closePolicy: Popup.NoAutoClose, warning: true, - iconColor: Dex.CurrentTheme.noColor, + iconColor: Dex.CurrentTheme.warningColor, isPassword: true, placeholderText: qsTr("Type password"), yesButtonText: qsTr("Confirm"), diff --git a/atomic_defi_design/Dex/Sidebar/Bottom.qml b/atomic_defi_design/Dex/Sidebar/Bottom.qml index 18067aba60..775caf2b55 100644 --- a/atomic_defi_design/Dex/Sidebar/Bottom.qml +++ b/atomic_defi_design/Dex/Sidebar/Bottom.qml @@ -99,7 +99,7 @@ MouseArea standardButtons: Dialog.Yes | Dialog.Cancel, closePolicy: Popup.NoAutoClose, warning: true, - iconColor: Dex.CurrentTheme.noColor, + iconColor: Dex.CurrentTheme.warningColor, isPassword: true, placeholderText: qsTr("Type password"), yesButtonText: qsTr("Confirm"), diff --git a/atomic_defi_design/Dex/Themes/CurrentTheme.qml b/atomic_defi_design/Dex/Themes/CurrentTheme.qml index 32b9290e02..33fb9dbd09 100644 --- a/atomic_defi_design/Dex/Themes/CurrentTheme.qml +++ b/atomic_defi_design/Dex/Themes/CurrentTheme.qml @@ -193,7 +193,7 @@ ThemeData } okColor = Dex.Color.argbStrFromRgbaStr(themeData.okColor || defaultTheme.okColor); - noColor = Dex.Color.argbStrFromRgbaStr(themeData.noColor || defaultTheme.noColor); + warningColor = Dex.Color.argbStrFromRgbaStr(themeData.warningColor || defaultTheme.warningColor); senderColorStart = Dex.Color.argbStrFromRgbaStr(themeData.senderColorStart || defaultTheme.senderColorStart); receiverColorStart = Dex.Color.argbStrFromRgbaStr(themeData.receiverColorStart || defaultTheme.receiverColorStart); @@ -313,7 +313,7 @@ ThemeData console.info("Dex.Themes.CurrentTheme.printValues.addressBookTagColors : %1".arg(addressBookTagColors)); console.info("Dex.Themes.CurrentTheme.printValues.okColor : %1".arg(okColor)); - console.info("Dex.Themes.CurrentTheme.printValues.noColor : %1".arg(noColor)); + console.info("Dex.Themes.CurrentTheme.printValues.warningColor : %1".arg(warningColor)); console.info("Dex.Themes.CurrentTheme.printValues.senderColorStart : %1".arg(senderColorStart)); console.info("Dex.Themes.CurrentTheme.printValues.receiverColorStart : %1".arg(receiverColorStart)); diff --git a/atomic_defi_design/Dex/Themes/DefaultTheme.js b/atomic_defi_design/Dex/Themes/DefaultTheme.js index d657ade142..442e438c1b 100644 --- a/atomic_defi_design/Dex/Themes/DefaultTheme.js +++ b/atomic_defi_design/Dex/Themes/DefaultTheme.js @@ -105,7 +105,7 @@ function getHardcoded() addressBookTagColors: ["#627EEAFF", "#FFD87AFF", "#F7931AFF"], okColor: "#00C058FF", - noColor: "#E52167FF", + warningColor: "#E52167FF", senderColorStart: "#F85757FF", receiverColorStart: "#845FEFFF", diff --git a/atomic_defi_design/Dex/Themes/ThemeData.qml b/atomic_defi_design/Dex/Themes/ThemeData.qml index b77d786ff7..2f3ea0e245 100644 --- a/atomic_defi_design/Dex/Themes/ThemeData.qml +++ b/atomic_defi_design/Dex/Themes/ThemeData.qml @@ -109,7 +109,7 @@ QtObject // Colors used to tell when something is good or wrong. property color okColor - property color noColor + property color warningColor property color senderColorStart property color receiverColorStart diff --git a/atomic_defi_design/Dex/Wallet/Main.qml b/atomic_defi_design/Dex/Wallet/Main.qml index f046780849..a08fffe105 100644 --- a/atomic_defi_design/Dex/Wallet/Main.qml +++ b/atomic_defi_design/Dex/Wallet/Main.qml @@ -112,7 +112,7 @@ Item verticalAlignment: Text.AlignVCenter text: activation_progress + "%" font: DexTypo.head8 - color: DexTheme.greenColor + color: DexTheme.okColor } } diff --git a/atomic_defi_design/Dex/Wallet/SendModal.qml b/atomic_defi_design/Dex/Wallet/SendModal.qml index e48aefb716..c521d97e5e 100644 --- a/atomic_defi_design/Dex/Wallet/SendModal.qml +++ b/atomic_defi_design/Dex/Wallet/SendModal.qml @@ -342,7 +342,7 @@ MultipageModal Layout.preferredWidth: 320 wrapMode: Label.Wrap - color: Dex.CurrentTheme.noColor + color: Dex.CurrentTheme.warningColor text_value: qsTr("The address has to be mixed case.") } @@ -589,7 +589,7 @@ MultipageModal font.pixelSize: 14 Layout.alignment: Qt.AlignHCenter horizontalAlignment: DefaultText.AlignHCenter - color: Dex.CurrentTheme.noColor + color: Dex.CurrentTheme.warningColor } DefaultText @@ -598,7 +598,7 @@ MultipageModal font.pixelSize: 14 Layout.alignment: Qt.AlignHCenter horizontalAlignment: DefaultText.AlignHCenter - color: Dex.CurrentTheme.noColor + color: Dex.CurrentTheme.warningColor text_value: qsTr("Only use custom fees if you know what you are doing! ") } @@ -608,7 +608,7 @@ MultipageModal font.pixelSize: 14 Layout.alignment: Qt.AlignHCenter horizontalAlignment: DefaultText.AlignHCenter - color: Dex.CurrentTheme.noColor + color: Dex.CurrentTheme.warningColor text_value: qsTr("Only use custom fees if you know what you are doing! ") + General.cex_icon DefaultInfoTrigger { triggerModal: gas_info_modal } } @@ -699,7 +699,7 @@ MultipageModal wrapMode: Label.Wrap visible: !fee_error.visible && !hasFunds() - color: Dex.CurrentTheme.noColor + color: Dex.CurrentTheme.warningColor text_value: qsTr("Not enough funds.") + "\n" + qsTr("You have %1", "AMT TICKER").arg(General.formatCrypto("", API.app.get_balance(api_wallet_page.ticker), api_wallet_page.ticker)) diff --git a/atomic_defi_design/Dex/Wallet/SidebarItemDelegate.qml b/atomic_defi_design/Dex/Wallet/SidebarItemDelegate.qml index 8d3a1ad757..f4743e9c69 100644 --- a/atomic_defi_design/Dex/Wallet/SidebarItemDelegate.qml +++ b/atomic_defi_design/Dex/Wallet/SidebarItemDelegate.qml @@ -78,7 +78,7 @@ GradientRectangle verticalAlignment: Text.AlignVCenter text: activation_progress + "%" font: Dex.DexTypo.head8 - color: Dex.DexTheme.greenColor + color: Dex.DexTheme.okColor } } diff --git a/atomic_defi_design/Dex/Wallet/TransactionDetailsModal.qml b/atomic_defi_design/Dex/Wallet/TransactionDetailsModal.qml index 25380f302a..006b51d45a 100644 --- a/atomic_defi_design/Dex/Wallet/TransactionDetailsModal.qml +++ b/atomic_defi_design/Dex/Wallet/TransactionDetailsModal.qml @@ -56,7 +56,7 @@ MultipageModal { title: qsTr("Amount") text: !details ? "" : General.formatCrypto(!details.am_i_sender, details.amount, api_wallet_page.ticker, details.amount_fiat, API.app.settings_pg.current_currency) - value_color: !details ? "white" : details.am_i_sender ? Dex.CurrentTheme.noColor : Dex.CurrentTheme.okColor + value_color: !details ? "white" : details.am_i_sender ? Dex.CurrentTheme.warningColor : Dex.CurrentTheme.okColor privacy: true label.font.pixelSize: 13 } @@ -66,7 +66,7 @@ MultipageModal { title: qsTr("Fees") text: !details ? "" : General.formatCrypto(parseFloat(details.fees) < 0, Math.abs(parseFloat(details.fees)), current_ticker_infos.fee_ticker, details.fees_amount_fiat, API.app.settings_pg.current_currency) - value_color: !details ? "white" : parseFloat(details.fees) > 0 ? Dex.CurrentTheme.noColor : Dex.CurrentTheme.okColor + value_color: !details ? "white" : parseFloat(details.fees) > 0 ? Dex.CurrentTheme.warningColor : Dex.CurrentTheme.okColor privacy: true label.font.pixelSize: 13 } diff --git a/atomic_defi_design/Dex/Wallet/Transactions.qml b/atomic_defi_design/Dex/Wallet/Transactions.qml index 30e94fa2b8..319b61c3c1 100644 --- a/atomic_defi_design/Dex/Wallet/Transactions.qml +++ b/atomic_defi_design/Dex/Wallet/Transactions.qml @@ -93,7 +93,7 @@ Dex.ListView } font.pixelSize: description.font.pixelSize - color: am_i_sender ? Dex.CurrentTheme.noColor : Dex.CurrentTheme.okColor + color: am_i_sender ? Dex.CurrentTheme.warningColor : Dex.CurrentTheme.okColor privacy: true } From 846b707ee3d6acbce1a9484c57f666cf06648b07 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 7 Dec 2022 19:55:46 +0800 Subject: [PATCH 04/80] surfaceColor -> backgroundDarkColor2 --- atomic_defi_design/Dex/Components/DexAmountField.qml | 4 ++-- atomic_defi_design/Dex/Components/DexAppTextArea.qml | 4 ++-- atomic_defi_design/Dex/Components/DexDialogManager.qml | 4 ++-- atomic_defi_design/Dex/Constants/DexTheme.qml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/atomic_defi_design/Dex/Components/DexAmountField.qml b/atomic_defi_design/Dex/Components/DexAmountField.qml index 6699d59e81..c42949bb18 100644 --- a/atomic_defi_design/Dex/Components/DexAmountField.qml +++ b/atomic_defi_design/Dex/Components/DexAmountField.qml @@ -22,7 +22,7 @@ Item { id: _background anchors.fill: parent radius: 4 - color: DexTheme.surfaceColor + color: DexTheme.backgroundDarkColor2 border.color: DexTheme.accentColor border.width: input_field.focus ? 1 : 0 } @@ -56,7 +56,7 @@ Item { anchors.topMargin: 1 anchors.bottomMargin: 1 radius: 0 - color: DexTheme.surfaceColor + color: DexTheme.backgroundDarkColor2 DexTextField { id: input_field validator: RegExpValidator { diff --git a/atomic_defi_design/Dex/Components/DexAppTextArea.qml b/atomic_defi_design/Dex/Components/DexAppTextArea.qml index 55efcd599f..1a1ecda547 100644 --- a/atomic_defi_design/Dex/Components/DexAppTextArea.qml +++ b/atomic_defi_design/Dex/Components/DexAppTextArea.qml @@ -50,7 +50,7 @@ Item { width: parent.width height: parent.height radius: 4 - color: DexTheme.surfaceColor + color: DexTheme.backgroundDarkColor2 border.color: control.error ? DexTheme.warningColor : input_field.focus ? DexTheme.accentColor : DexTheme.rectangleBorderColor border.width: input_field.focus ? 1 : 0 Behavior on x { @@ -72,7 +72,7 @@ Item { anchors.topMargin: 1 anchors.bottomMargin: 1 radius: _background.radius - color: DexTheme.surfaceColor + color: DexTheme.backgroundDarkColor2 DexFlickable { anchors.fill: parent contentHeight: input_field.height diff --git a/atomic_defi_design/Dex/Components/DexDialogManager.qml b/atomic_defi_design/Dex/Components/DexDialogManager.qml index e68193fd92..1d9b1861fb 100644 --- a/atomic_defi_design/Dex/Components/DexDialogManager.qml +++ b/atomic_defi_design/Dex/Components/DexDialogManager.qml @@ -56,7 +56,7 @@ Popup { DexRectangle { anchors.fill: parent radius: 4 - color: DexTheme.surfaceColor + color: DexTheme.backgroundDarkColor2 } } @@ -155,7 +155,7 @@ Popup { anchors.centerIn: parent iconSize: 19 source: Qaterial.Icons.keyVariant - color: DexTheme.surfaceColor + color: DexTheme.backgroundDarkColor2 } } diff --git a/atomic_defi_design/Dex/Constants/DexTheme.qml b/atomic_defi_design/Dex/Constants/DexTheme.qml index 2088cacf25..1ce0de39c8 100644 --- a/atomic_defi_design/Dex/Constants/DexTheme.qml +++ b/atomic_defi_design/Dex/Constants/DexTheme.qml @@ -126,7 +126,7 @@ QtObject { // Old Theme property string chartTheme: Style.dark_theme ? "dark" : "light" - property color surfaceColor: backgroundDarkColor2 + property color backgroundDarkColor2: backgroundDarkColor2 property color backgroundColorDeep: backgroundDarkColor2 property color dexBoxBackgroundColor: backgroundDarkColor6 From 435d50dc31222ce51a94a0af59f8b79924c36118 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 7 Dec 2022 20:07:47 +0800 Subject: [PATCH 05/80] dexBoxBackgroundColor -> backgroundDarkColor6 --- .../Dex/Components/DexDialogManager.qml | 6 +++--- atomic_defi_design/Dex/Components/DexItemBox.qml | 6 +++--- atomic_defi_design/Dex/Components/DexModal.qml | 4 ++-- atomic_defi_design/Dex/Components/PopupManager.qml | 2 +- atomic_defi_design/Dex/Constants/DexTheme.qml | 12 ++---------- atomic_defi_design/Dex/Portfolio/AmountChart.qml | 2 +- 6 files changed, 12 insertions(+), 20 deletions(-) diff --git a/atomic_defi_design/Dex/Components/DexDialogManager.qml b/atomic_defi_design/Dex/Components/DexDialogManager.qml index 1d9b1861fb..fc3726ec11 100644 --- a/atomic_defi_design/Dex/Components/DexDialogManager.qml +++ b/atomic_defi_design/Dex/Components/DexDialogManager.qml @@ -18,7 +18,7 @@ Popup { Overlay.modal: Item { DexRectangle { anchors.fill: parent - color: Qt.darker(DexTheme.dexBoxBackgroundColor) + color: Qt.darker(DexTheme.backgroundDarkColor6) opacity: .8 } } @@ -128,7 +128,7 @@ Popup { height: 45 error: false visible: dialog.getText - defaultBorderColor: DexTheme.dexBoxBackgroundColor + defaultBorderColor: DexTheme.backgroundDarkColor6 background.border.width: 1 field.font: DexTypo.body2 placeholderText: dialog.placeholderText @@ -215,7 +215,7 @@ Popup { onReset: dialog.reset() topPadding: 25 background: Rectangle { - color: DexTheme.dexBoxBackgroundColor + color: DexTheme.backgroundDarkColor6 } delegate: Qaterial.Button { id: _dialogManagerButton diff --git a/atomic_defi_design/Dex/Components/DexItemBox.qml b/atomic_defi_design/Dex/Components/DexItemBox.qml index 67cdd130d2..eaec5d467e 100644 --- a/atomic_defi_design/Dex/Components/DexItemBox.qml +++ b/atomic_defi_design/Dex/Components/DexItemBox.qml @@ -64,7 +64,7 @@ InnerBackground { } //shadowOff: true - color: DexTheme.portfolioPieGradient ? 'transparent' : DexTheme.dexBoxBackgroundColor + color: DexTheme.portfolioPieGradient ? 'transparent' : DexTheme.backgroundDarkColor6 property alias titleLabel: _texto onExpandedVertChanged: { @@ -139,7 +139,7 @@ InnerBackground { width: parent.width height: 40 radius: parent.parent.height < 41 ? parent.parent.radius : 0 - color: DexTheme.portfolioPieGradient ? 'transparent' : DexTheme.dexBoxBackgroundColor + color: DexTheme.portfolioPieGradient ? 'transparent' : DexTheme.backgroundDarkColor6 visible: visibility && !_control.hideHeader RowLayout { anchors.fill: parent @@ -237,7 +237,7 @@ InnerBackground { height: parent.height anchors.right: parent.right radius: parent.parent.height < 41 ? parent.parent.radius : 0 - color: DexTheme.dexBoxBackgroundColor + color: DexTheme.backgroundDarkColor6 visible: !isVertical && hidden DefaultText { id: _texto2 diff --git a/atomic_defi_design/Dex/Components/DexModal.qml b/atomic_defi_design/Dex/Components/DexModal.qml index 7b476bca3a..5ee466fbcb 100644 --- a/atomic_defi_design/Dex/Components/DexModal.qml +++ b/atomic_defi_design/Dex/Components/DexModal.qml @@ -16,7 +16,7 @@ Popup { modal: true padding: 0 Overlay.modeless: DefaultRectangle { - color: Dex.CurrentTheme.dexBoxBackgroundColor + color: Dex.CurrentTheme.backgroundDarkColor6 opacity: .3 } @@ -27,7 +27,7 @@ Popup { anchors.fill: parent border.width: 2 radius: parent.radius - color: Dex.CurrentTheme.dexBoxBackgroundColor + color: Dex.CurrentTheme.backgroundDarkColor6 Container { id: _header width: parent.width diff --git a/atomic_defi_design/Dex/Components/PopupManager.qml b/atomic_defi_design/Dex/Components/PopupManager.qml index de6db72de1..a35025bea7 100644 --- a/atomic_defi_design/Dex/Components/PopupManager.qml +++ b/atomic_defi_design/Dex/Components/PopupManager.qml @@ -338,7 +338,7 @@ Popup topPadding: 25 background: Rectangle { - color: DexTheme.dexBoxBackgroundColor + color: DexTheme.backgroundDarkColor6 } delegate: Qaterial.Button { diff --git a/atomic_defi_design/Dex/Constants/DexTheme.qml b/atomic_defi_design/Dex/Constants/DexTheme.qml index 1ce0de39c8..18adf00bf1 100644 --- a/atomic_defi_design/Dex/Constants/DexTheme.qml +++ b/atomic_defi_design/Dex/Constants/DexTheme.qml @@ -90,18 +90,14 @@ QtObject { property color headTextColor: accentColor - property color proviewItemBoxBackgroundColor: dexBoxBackgroundColor + property color proviewItemBoxBackgroundColor: backgroundDarkColor6 property color proviewItemBoxBorderColor: 'transparent' property color proviewItemBoxTitleColor: headTextColor property color proviewItemBoxIconColor: accentColor property int proviewItemBoxBorderWidth: 0 property color comboBoxBorderColor: rectangleBorderColor - property color comboBoxBackgroundColor: dexBoxBackgroundColor - - - property bool walletSidebarShadowVisibility: true - property color walletSidebarLeftBorderColor: backgroundColorDeep + property color comboBoxBackgroundColor: backgroundDarkColor6 property color leftSidebarBorderColor: rectangleBorderColor @@ -126,10 +122,6 @@ QtObject { // Old Theme property string chartTheme: Style.dark_theme ? "dark" : "light" - property color backgroundDarkColor2: backgroundDarkColor2 - property color backgroundColorDeep: backgroundDarkColor2 - property color dexBoxBackgroundColor: backgroundDarkColor6 - property color hightlightColor: accentDarkColor3 property color modalStepColor: accentColor property color modelStepBorderColor: hightlightColor diff --git a/atomic_defi_design/Dex/Portfolio/AmountChart.qml b/atomic_defi_design/Dex/Portfolio/AmountChart.qml index ec3bef155b..1f7bca35d2 100644 --- a/atomic_defi_design/Dex/Portfolio/AmountChart.qml +++ b/atomic_defi_design/Dex/Portfolio/AmountChart.qml @@ -217,7 +217,7 @@ InnerBackground { Rectangle { anchors.fill: parent opacity: .6 - color: DexTheme.dexBoxBackgroundColor + color: DexTheme.backgroundDarkColor6 visible: portfolio_asset_chart.isProgress radius: parent.radius DefaultBusyIndicator { From fbf964d6808b1546f93727b7005c16e981afdca9 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 7 Dec 2022 20:26:32 +0800 Subject: [PATCH 06/80] rm old theme code --- atomic_defi_design/Dex/Constants/DexTheme.qml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/atomic_defi_design/Dex/Constants/DexTheme.qml b/atomic_defi_design/Dex/Constants/DexTheme.qml index 18adf00bf1..876b2ec7b1 100644 --- a/atomic_defi_design/Dex/Constants/DexTheme.qml +++ b/atomic_defi_design/Dex/Constants/DexTheme.qml @@ -117,25 +117,8 @@ QtObject { property color senderColorStart: warningColor property color receiverColorStart: okColor - - - // Old Theme - property string chartTheme: Style.dark_theme ? "dark" : "light" - - property color hightlightColor: accentDarkColor3 - property color modalStepColor: accentColor - property color modelStepBorderColor: hightlightColor - - property int sidebarShadowRadius: 32 - property real sideBarAnimationDuration: Style.animationDuration - - property color chartTradingLineColor: Dex.CurrentTheme.chartTradingLineColor - property color chartTradingLineBackgroundColor: Dex.CurrentTheme.chartTradingLineBackgroundColor - property color lineChartColor: accentColor property color chartGridLineColor: Qt.rgba(255,255,255,0.4) - property color busyIndicatorColor: Dex.CurrentTheme.busyIndicatorColor - // Button property color buttonColorDisabled: Dex.CurrentTheme.buttonColorDisabled property color buttonColorHovered: Dex.CurrentTheme.buttonColorHovered From bc6d107304c2b3fa277fabe5804cf228540e54a5 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 7 Dec 2022 20:32:47 +0800 Subject: [PATCH 07/80] rename unused chart file --- .../Dex/Portfolio/{SmartChartView.qml => TradingViewChart.qml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename atomic_defi_design/Dex/Portfolio/{SmartChartView.qml => TradingViewChart.qml} (100%) diff --git a/atomic_defi_design/Dex/Portfolio/SmartChartView.qml b/atomic_defi_design/Dex/Portfolio/TradingViewChart.qml similarity index 100% rename from atomic_defi_design/Dex/Portfolio/SmartChartView.qml rename to atomic_defi_design/Dex/Portfolio/TradingViewChart.qml From 1101e1956d4b2c96f93f9cf640b9a8bf25e22908 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 7 Dec 2022 20:56:22 +0800 Subject: [PATCH 08/80] match buy/sell buttons to orderbook coloring --- assets/themes/Default - Dark/colors.json | 8 ++++---- assets/themes/Default - Light/colors.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/assets/themes/Default - Dark/colors.json b/assets/themes/Default - Dark/colors.json index ec458f54bd..3a62740cbd 100644 --- a/assets/themes/Default - Dark/colors.json +++ b/assets/themes/Default - Dark/colors.json @@ -93,10 +93,10 @@ "sidebarLineTextHovered": "#2C87B9FF", "sidebarLineTextSelected": "#FFFFFFFF", - "tradeBuyModeSelectorBackgroundColorStart": "#6A4DE3FF", - "tradeBuyModeSelectorBackgroundColorEnd": "#2279F1FF", - "tradeSellModeSelectorBackgroundColorStart": "#E52167FF", - "tradeSellModeSelectorBackgroundColorEnd": "#E216A9FF", + "tradeBuyModeSelectorBackgroundColorStart": "#E52167FF", + "tradeBuyModeSelectorBackgroundColorEnd": "#CD0F53FF", + "tradeSellModeSelectorBackgroundColorStart": "#0F713CFF", + "tradeSellModeSelectorBackgroundColorEnd": "#037B3AFF", "tradeMarketModeSelectorNotSelectedBackgroundColor": "#89B6FF21", "addressBookTagColors": ["#627EEAFF", "#FFD87AFF", "#F7931AFF"], diff --git a/assets/themes/Default - Light/colors.json b/assets/themes/Default - Light/colors.json index 98e46ae970..0579c513f2 100644 --- a/assets/themes/Default - Light/colors.json +++ b/assets/themes/Default - Light/colors.json @@ -90,10 +90,10 @@ "sidebarLineTextHovered": "#2C87B9FF", "sidebarLineTextSelected": "#FFFFFFFF", - "tradeBuyModeSelectorBackgroundColorStart": "#6A4DE3FF", - "tradeBuyModeSelectorBackgroundColorEnd": "#2279F1FF", - "tradeSellModeSelectorBackgroundColorStart": "#E52167FF", - "tradeSellModeSelectorBackgroundColorEnd": "#E216A9FF", + "tradeBuyModeSelectorBackgroundColorStart": "#E52167FF", + "tradeBuyModeSelectorBackgroundColorEnd": "#CD0F53FF", + "tradeSellModeSelectorBackgroundColorStart": "#0F713CFF", + "tradeSellModeSelectorBackgroundColorEnd": "#037B3AFF", "tradeMarketModeSelectorNotSelectedBackgroundColor": "#89B6FF21", "addressBookTagColors": ["#627EEAFF", "#FFD87AFF", "#F7931AFF"], From f5a8e918149323d8693abdd506a6df183e0f9ebb Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 7 Dec 2022 21:07:22 +0800 Subject: [PATCH 09/80] use opacity when disabled to avoid ugly border pixels --- .../PlaceOrderForm/MarketModeSelector.qml | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/MarketModeSelector.qml b/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/MarketModeSelector.qml index 6eb535000b..b4ffbdbf17 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/MarketModeSelector.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/MarketModeSelector.qml @@ -11,6 +11,7 @@ Rectangle property string ticker: "" radius: 18 + opacity: marketMode != API.app.trading_pg.market_mode ? 0.1 : 1 gradient: Gradient { @@ -32,28 +33,6 @@ Rectangle } } - // Background on topover of gradient to hide it when the market mode is different - DefaultRectangle - { - anchors.centerIn: parent - width: parent.width - 2 - height: parent.height - 2 - radius: parent.radius - 1 - color: Dex.CurrentTheme.backgroundColor - visible: marketMode != API.app.trading_pg.market_mode - } - - // Background when market mode is different - DefaultRectangle - { - anchors.centerIn: parent - width: parent.width - 2 - height: parent.height - 2 - radius: parent.radius - 1 - color: Dex.CurrentTheme.tradeMarketModeSelectorNotSelectedBackgroundColor - visible: marketMode != API.app.trading_pg.market_mode - } - DefaultText { anchors.centerIn: parent From 1ab70e0bb6d0754865d4ea0d32dcd3974fcf348e Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 7 Dec 2022 22:20:07 +0800 Subject: [PATCH 10/80] styling login password input --- assets/themes/Default - Dark/colors.json | 4 +++- assets/themes/Default - Light/colors.json | 4 +++- .../Dex/Components/DexAppPasswordField.qml | 2 +- .../ProView/PlaceOrderForm/OrderFormSubfield.qml | 9 +++------ atomic_defi_design/Dex/Themes/CurrentTheme.qml | 6 ++++-- atomic_defi_design/Dex/Themes/DefaultTheme.js | 3 ++- atomic_defi_design/Dex/Themes/ThemeData.qml | 5 ++++- 7 files changed, 20 insertions(+), 13 deletions(-) diff --git a/assets/themes/Default - Dark/colors.json b/assets/themes/Default - Dark/colors.json index 3a62740cbd..4762eed1b5 100644 --- a/assets/themes/Default - Dark/colors.json +++ b/assets/themes/Default - Dark/colors.json @@ -97,7 +97,9 @@ "tradeBuyModeSelectorBackgroundColorEnd": "#CD0F53FF", "tradeSellModeSelectorBackgroundColorStart": "#0F713CFF", "tradeSellModeSelectorBackgroundColorEnd": "#037B3AFF", - "tradeMarketModeSelectorNotSelectedBackgroundColor": "#89B6FF21", + + "inputModifierBackgroundColor": "#89B6FF21", + "inputPasswordBackgroundColor": "#24273DFF", "addressBookTagColors": ["#627EEAFF", "#FFD87AFF", "#F7931AFF"], diff --git a/assets/themes/Default - Light/colors.json b/assets/themes/Default - Light/colors.json index 0579c513f2..4be82b0837 100644 --- a/assets/themes/Default - Light/colors.json +++ b/assets/themes/Default - Light/colors.json @@ -94,7 +94,9 @@ "tradeBuyModeSelectorBackgroundColorEnd": "#CD0F53FF", "tradeSellModeSelectorBackgroundColorStart": "#0F713CFF", "tradeSellModeSelectorBackgroundColorEnd": "#037B3AFF", - "tradeMarketModeSelectorNotSelectedBackgroundColor": "#89B6FF21", + + "inputModifierBackgroundColor": "#89B6FF21", + "inputPasswordBackgroundColor": "#A9BDDCFF", "addressBookTagColors": ["#627EEAFF", "#FFD87AFF", "#F7931AFF"], diff --git a/atomic_defi_design/Dex/Components/DexAppPasswordField.qml b/atomic_defi_design/Dex/Components/DexAppPasswordField.qml index a071c90e17..ccbc900359 100644 --- a/atomic_defi_design/Dex/Components/DexAppPasswordField.qml +++ b/atomic_defi_design/Dex/Components/DexAppPasswordField.qml @@ -14,7 +14,7 @@ DexAppTextField property bool forceFocus: false property string leftIcon: Qaterial.Icons.keyVariant - property color leftIconColor: Dex.CurrentTheme.foregroundColor + property color leftIconColor: Dex.CurrentTheme.inputPasswordBackgroundColor property alias hideFieldButton: _hideFieldButton height: 50 diff --git a/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/OrderFormSubfield.qml b/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/OrderFormSubfield.qml index 1370518b6a..c39c0619c4 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/OrderFormSubfield.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/OrderFormSubfield.qml @@ -33,13 +33,12 @@ RowLayout width: btn_width height: parent.height - // Background when market mode is different DefaultRectangle { anchors.centerIn: parent width: parent.width height: parent.height - color: Dex.CurrentTheme.tradeMarketModeSelectorNotSelectedBackgroundColor + color: Dex.CurrentTheme.inputModifierBackgroundColor } DefaultText @@ -94,13 +93,12 @@ RowLayout width: btn_width height: parent.height - // Background when market mode is different DefaultRectangle { anchors.centerIn: parent width: parent.width height: parent.height - color: Dex.CurrentTheme.tradeMarketModeSelectorNotSelectedBackgroundColor + color: Dex.CurrentTheme.inputModifierBackgroundColor DefaultMouseArea { @@ -155,14 +153,13 @@ RowLayout width: btn_width height: parent.height - // Background when market mode is different DefaultRectangle { id: right_rect anchors.centerIn: parent width: parent.width height: parent.height - color: Dex.CurrentTheme.tradeMarketModeSelectorNotSelectedBackgroundColor + color: Dex.CurrentTheme.inputModifierBackgroundColor } DefaultText diff --git a/atomic_defi_design/Dex/Themes/CurrentTheme.qml b/atomic_defi_design/Dex/Themes/CurrentTheme.qml index 33fb9dbd09..47a1d30907 100644 --- a/atomic_defi_design/Dex/Themes/CurrentTheme.qml +++ b/atomic_defi_design/Dex/Themes/CurrentTheme.qml @@ -184,7 +184,9 @@ ThemeData tradeBuyModeSelectorBackgroundColorEnd = Dex.Color.argbStrFromRgbaStr(themeData.tradeBuyModeSelectorBackgroundColorEnd || defaultTheme.tradeBuyModeSelectorBackgroundColorEnd); tradeSellModeSelectorBackgroundColorStart = Dex.Color.argbStrFromRgbaStr(themeData.tradeSellModeSelectorBackgroundColorStart || defaultTheme.tradeSellModeSelectorBackgroundColorStart); tradeSellModeSelectorBackgroundColorEnd = Dex.Color.argbStrFromRgbaStr(themeData.tradeSellModeSelectorBackgroundColorEnd || defaultTheme.tradeSellModeSelectorBackgroundColorEnd); - tradeMarketModeSelectorNotSelectedBackgroundColor = Dex.Color.argbStrFromRgbaStr(themeData.tradeMarketModeSelectorNotSelectedBackgroundColor || defaultTheme.tradeMarketModeSelectorNotSelectedBackgroundColor); + + inputModifierBackgroundColor = Dex.Color.argbStrFromRgbaStr(themeData.inputModifierBackgroundColor || defaultTheme.inputModifierBackgroundColor); + inputPasswordBackgroundColor = Dex.Color.argbStrFromRgbaStr(themeData.inputPasswordBackgroundColor || defaultTheme.inputPasswordBackgroundColor); addressBookTagColors = themeData.addressBookTagColors || defaultTheme.addressBookTagColors for (var i = 0; i < addressBookTagColors.length; i++) @@ -308,7 +310,7 @@ ThemeData console.info("Dex.Themes.CurrentTheme.printValues.tradeBuyModeSelectorBackgroundColorEnd : %1".arg(tradeBuyModeSelectorBackgroundColorEnd)); console.info("Dex.Themes.CurrentTheme.printValues.tradeSellModeSelectorBackgroundColorStart : %1".arg(tradeSellModeSelectorBackgroundColorStart)); console.info("Dex.Themes.CurrentTheme.printValues.tradeSellModeSelectorBackgroundColorEnd : %1".arg(tradeSellModeSelectorBackgroundColorEnd)); - console.info("Dex.Themes.CurrentTheme.printValues.tradeMarketModeSelectorNotSelectedBackgroundColor : %1".arg(tradeMarketModeSelectorNotSelectedBackgroundColor)); + console.info("Dex.Themes.CurrentTheme.printValues.inputModifierBackgroundColor : %1".arg(inputModifierBackgroundColor)); console.info("Dex.Themes.CurrentTheme.printValues.addressBookTagColors : %1".arg(addressBookTagColors)); diff --git a/atomic_defi_design/Dex/Themes/DefaultTheme.js b/atomic_defi_design/Dex/Themes/DefaultTheme.js index 442e438c1b..5b101b2425 100644 --- a/atomic_defi_design/Dex/Themes/DefaultTheme.js +++ b/atomic_defi_design/Dex/Themes/DefaultTheme.js @@ -100,7 +100,8 @@ function getHardcoded() tradeBuyModeSelectorBackgroundColorEnd: "#2279F1FF", tradeSellModeSelectorBackgroundColorStart: "#E52167FF", tradeSellModeSelectorBackgroundColorEnd: "#E216A9FF", - tradeMarketModeSelectorNotSelectedBackgroundColor: "#89B6FF21", + inputModifierBackgroundColor: "#89B6FF21", + inputPasswordBackgroundColor: "#A9BDDCFF", addressBookTagColors: ["#627EEAFF", "#FFD87AFF", "#F7931AFF"], diff --git a/atomic_defi_design/Dex/Themes/ThemeData.qml b/atomic_defi_design/Dex/Themes/ThemeData.qml index 2f3ea0e245..7935814cb4 100644 --- a/atomic_defi_design/Dex/Themes/ThemeData.qml +++ b/atomic_defi_design/Dex/Themes/ThemeData.qml @@ -102,7 +102,10 @@ QtObject property color tradeBuyModeSelectorBackgroundColorEnd property color tradeSellModeSelectorBackgroundColorStart property color tradeSellModeSelectorBackgroundColorEnd - property color tradeMarketModeSelectorNotSelectedBackgroundColor + + // Inputs styling + property color inputModifierBackgroundColor + property color inputPasswordBackgroundColor // Address book page related property var addressBookTagColors From c85ab20ee2eed2b4de1bc7ae035811dfd13e4335 Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 8 Dec 2022 14:13:34 +0800 Subject: [PATCH 11/80] red/green sell/buy trade mode button colors --- assets/themes/Default - Dark/colors.json | 8 ++++---- assets/themes/Default - Light/colors.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/assets/themes/Default - Dark/colors.json b/assets/themes/Default - Dark/colors.json index 4762eed1b5..f1e7c878ec 100644 --- a/assets/themes/Default - Dark/colors.json +++ b/assets/themes/Default - Dark/colors.json @@ -93,10 +93,10 @@ "sidebarLineTextHovered": "#2C87B9FF", "sidebarLineTextSelected": "#FFFFFFFF", - "tradeBuyModeSelectorBackgroundColorStart": "#E52167FF", - "tradeBuyModeSelectorBackgroundColorEnd": "#CD0F53FF", - "tradeSellModeSelectorBackgroundColorStart": "#0F713CFF", - "tradeSellModeSelectorBackgroundColorEnd": "#037B3AFF", + "tradeSellModeSelectorBackgroundColorStart": "#E52167FF", + "tradeSellModeSelectorBackgroundColorEnd": "#CD0F53FF", + "tradeBuyModeSelectorBackgroundColorStart": "#0F713CFF", + "tradeBuyModeSelectorBackgroundColorEnd": "#037B3AFF", "inputModifierBackgroundColor": "#89B6FF21", "inputPasswordBackgroundColor": "#24273DFF", diff --git a/assets/themes/Default - Light/colors.json b/assets/themes/Default - Light/colors.json index 4be82b0837..dde66c9703 100644 --- a/assets/themes/Default - Light/colors.json +++ b/assets/themes/Default - Light/colors.json @@ -90,10 +90,10 @@ "sidebarLineTextHovered": "#2C87B9FF", "sidebarLineTextSelected": "#FFFFFFFF", - "tradeBuyModeSelectorBackgroundColorStart": "#E52167FF", - "tradeBuyModeSelectorBackgroundColorEnd": "#CD0F53FF", - "tradeSellModeSelectorBackgroundColorStart": "#0F713CFF", - "tradeSellModeSelectorBackgroundColorEnd": "#037B3AFF", + "tradeSellModeSelectorBackgroundColorStart": "#E52167FF", + "tradeSellModeSelectorBackgroundColorEnd": "#CD0F53FF", + "tradeBuyModeSelectorBackgroundColorStart": "#0F713CFF", + "tradeBuyModeSelectorBackgroundColorEnd": "#037B3AFF", "inputModifierBackgroundColor": "#89B6FF21", "inputPasswordBackgroundColor": "#A9BDDCFF", From 682ddb1cc4d4170fae824a921e75a5085b138be6 Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 8 Dec 2022 19:55:09 +0800 Subject: [PATCH 12/80] theme updates for password/text input fields --- assets/themes/Default - Dark/colors.json | 22 ++++++++++++------- assets/themes/Default - Light/colors.json | 14 ++++++++---- .../Dex/Components/DexAppPasswordField.qml | 19 +++++++--------- .../Dex/Components/DexAppTextField.qml | 13 +++++------ atomic_defi_design/Dex/Constants/DexTheme.qml | 18 --------------- atomic_defi_design/Dex/Constants/DexTypo.qml | 13 +++++++++++ .../Dex/Screens/Startup/ImportWallet.qml | 5 +---- .../Dex/Screens/Startup/Login.qml | 4 ---- .../Dex/Screens/Startup/NewWallet.qml | 3 +-- .../Dex/Settings/RecoverSeedModal.qml | 3 --- .../Dex/Themes/CurrentTheme.qml | 8 ++++++- atomic_defi_design/Dex/Themes/DefaultTheme.js | 14 ++++++++---- atomic_defi_design/Dex/Themes/ThemeData.qml | 7 +++++- atomic_defi_design/Dex/main.qml | 11 ++++++---- 14 files changed, 83 insertions(+), 71 deletions(-) diff --git a/assets/themes/Default - Dark/colors.json b/assets/themes/Default - Dark/colors.json index f1e7c878ec..4a2002f990 100644 --- a/assets/themes/Default - Dark/colors.json +++ b/assets/themes/Default - Dark/colors.json @@ -1,6 +1,6 @@ { "accentColor": "#2C3D66FF", - "foregroundColor": "#ffffffFF", + "foregroundColor": "#FFFFFFFF", "foregroundColor2": "#7A8EA1FF", "foregroundColor3": "#ABC0D3FF", "backgroundColor": "#202337FF", @@ -14,9 +14,9 @@ "buttonColorHovered": "#4068B929", "buttonColorPressed": "#2932546C", "buttonTextDisabledColor": "#444444FF", - "buttonTextEnabledColor": "#ffffffFF", - "buttonTextHoveredColor": "#ffffffFF", - "buttonTextPressedColor": "#ffffffFF", + "buttonTextEnabledColor": "#FFFFFFFF", + "buttonTextHoveredColor": "#FFFFFFFF", + "buttonTextPressedColor": "#FFFFFFFF", "gradientButtonStartColor": "#4986EAAD", "gradientButtonEndColor": "#5A68E6FF", @@ -94,12 +94,18 @@ "sidebarLineTextSelected": "#FFFFFFFF", "tradeSellModeSelectorBackgroundColorStart": "#E52167FF", - "tradeSellModeSelectorBackgroundColorEnd": "#CD0F53FF", - "tradeBuyModeSelectorBackgroundColorStart": "#0F713CFF", - "tradeBuyModeSelectorBackgroundColorEnd": "#037B3AFF", + "tradeSellModeSelectorBackgroundColorEnd": "#CD0F53FF", + "tradeBuyModeSelectorBackgroundColorStart": "#0F713CFF", + "tradeBuyModeSelectorBackgroundColorEnd": "#037B3AFF", "inputModifierBackgroundColor": "#89B6FF21", - "inputPasswordBackgroundColor": "#24273DFF", + "inputFieldBackgroundColor": "#313555FF", + + "inputFieldBorderColor": "#24273DFF", + "inputPlaceholderTextColor": "#FFFFFFFF", + "inputRightIconColor": "#FFFFFFFF", + "inputLeftIconColor": "#FFFFFFFF", + "inputLeftIconBackgroundColor": "#2C3D66FF", "addressBookTagColors": ["#627EEAFF", "#FFD87AFF", "#F7931AFF"], diff --git a/assets/themes/Default - Light/colors.json b/assets/themes/Default - Light/colors.json index dde66c9703..8c7e328953 100644 --- a/assets/themes/Default - Light/colors.json +++ b/assets/themes/Default - Light/colors.json @@ -91,12 +91,18 @@ "sidebarLineTextSelected": "#FFFFFFFF", "tradeSellModeSelectorBackgroundColorStart": "#E52167FF", - "tradeSellModeSelectorBackgroundColorEnd": "#CD0F53FF", - "tradeBuyModeSelectorBackgroundColorStart": "#0F713CFF", - "tradeBuyModeSelectorBackgroundColorEnd": "#037B3AFF", + "tradeSellModeSelectorBackgroundColorEnd": "#CD0F53FF", + "tradeBuyModeSelectorBackgroundColorStart": "#0F713CFF", + "tradeBuyModeSelectorBackgroundColorEnd": "#037B3AFF", "inputModifierBackgroundColor": "#89B6FF21", - "inputPasswordBackgroundColor": "#A9BDDCFF", + "inputFieldBackgroundColor": "#F3F5F6FF", + + "inputFieldBorderColor": "#A9BDDCFF", + "inputPlaceholderTextColor": "#456078FF", + "inputRightIconColor": "#456078FF", + "inputLeftIconColor": "#456078FF", + "inputLeftIconBackgroundColor": "#F0F2FFFF", "addressBookTagColors": ["#627EEAFF", "#FFD87AFF", "#F7931AFF"], diff --git a/atomic_defi_design/Dex/Components/DexAppPasswordField.qml b/atomic_defi_design/Dex/Components/DexAppPasswordField.qml index ccbc900359..a0024ca302 100644 --- a/atomic_defi_design/Dex/Components/DexAppPasswordField.qml +++ b/atomic_defi_design/Dex/Components/DexAppPasswordField.qml @@ -14,25 +14,22 @@ DexAppTextField property bool forceFocus: false property string leftIcon: Qaterial.Icons.keyVariant - property color leftIconColor: Dex.CurrentTheme.inputPasswordBackgroundColor + property color leftIconColor: Dex.CurrentTheme.inputLeftIconColor + property color rightIconColor: Dex.CurrentTheme.inputRightIconColor property alias hideFieldButton: _hideFieldButton height: 50 width: 300 background.radius: 25 max_length: General.max_std_pw_length + field.echoMode: TextField.Password - field.font: Qt.font( - { - pixelSize: (16 * DexTypo.fontDensity) * (Screen.pixelDensity / 160), - letterSpacing: 0.5, - family: DexTypo.fontFamily, - weight: Font.Normal - }) + field.font: DexTypo.inputFieldFont field.horizontalAlignment: Qt.AlignLeft field.leftPadding: 75 field.rightPadding: 60 field.placeholderText: qsTr("Type password") + Component.onCompleted: { if (forceFocus) field.forceActiveFocus() @@ -44,8 +41,8 @@ DexAppTextField height: 40 width: 60 radius: 20 - color: Dex.CurrentTheme.accentColor - border.color: Dex.CurrentTheme.accentColor + color: Dex.CurrentTheme.inputLeftIconBackgroundColor + border.color: Dex.CurrentTheme.inputFieldBorderColor border.width: _inputPassword.focus ? 2 : 0 anchors.verticalCenter: parent.verticalCenter @@ -66,7 +63,7 @@ DexAppTextField icon { source: _inputPassword.field.echoMode === TextField.Password ? Qaterial.Icons.eyeOffOutline : Qaterial.Icons.eyeOutline - color: Dex.CurrentTheme.foregroundColor + color: rightIconColor } anchors { diff --git a/atomic_defi_design/Dex/Components/DexAppTextField.qml b/atomic_defi_design/Dex/Components/DexAppTextField.qml index 727f2dbb9d..3c3035f75c 100644 --- a/atomic_defi_design/Dex/Components/DexAppTextField.qml +++ b/atomic_defi_design/Dex/Components/DexAppTextField.qml @@ -5,6 +5,7 @@ import QtQuick.Layouts 1.5 import App 1.0 import Dex.Themes 1.0 as Dex +import "../Constants" Item { @@ -75,7 +76,7 @@ Item width: parent.width height: parent.height radius: 4 - color: Dex.CurrentTheme.backgroundColor + color: Dex.CurrentTheme.inputFieldBackgroundColor border.color: control.error ? Dex.CurrentTheme.warningColor : input_field.focus ? Dex.CurrentTheme.accentColor : color border.width: input_field.focus ? 1 : 0 @@ -126,7 +127,7 @@ Item anchors.topMargin: 1 anchors.bottomMargin: 1 radius: _background.radius - color: background.color + color: Dex.CurrentTheme.inputFieldBackgroundColor DexTextField { @@ -157,13 +158,12 @@ Item text: control.placeholderText anchors.verticalCenter: parent.verticalCenter leftPadding: input_field.leftPadding - color: Dex.CurrentTheme.foregroundColor - font: DexTypo.body1 + color: Dex.CurrentTheme.inputPlaceholderTextColor + font: DexTypo.inputFieldFont elide: DexLabel.ElideRight width: parent.width - 10 wrapMode: DexLabel.NoWrap visible: input_field.text === "" - opacity: .2 } } } @@ -182,8 +182,7 @@ Item text: rightText color: Dex.CurrentTheme.foregroundColor opacity: .4 - font.pixelSize: 14 - font.weight: Font.Medium + font: DexTypo.inputFieldSuffixFont } } } diff --git a/atomic_defi_design/Dex/Constants/DexTheme.qml b/atomic_defi_design/Dex/Constants/DexTheme.qml index 876b2ec7b1..19cde78f3f 100644 --- a/atomic_defi_design/Dex/Constants/DexTheme.qml +++ b/atomic_defi_design/Dex/Constants/DexTheme.qml @@ -154,24 +154,6 @@ QtObject { // Widget settings property int rectangleRadius: Style.rectangleCornerRadius - - - - - - - - - - - - - - - - - - diff --git a/atomic_defi_design/Dex/Constants/DexTypo.qml b/atomic_defi_design/Dex/Constants/DexTypo.qml index 6abbef1e44..93db4733f9 100644 --- a/atomic_defi_design/Dex/Constants/DexTypo.qml +++ b/atomic_defi_design/Dex/Constants/DexTypo.qml @@ -3,6 +3,7 @@ pragma Singleton import QtQuick 2.15 import QtQuick.Layouts 1.15 import QtQuick.Controls 2.15 +import QtQuick.Window 2.15 QtObject { id: _font @@ -153,4 +154,16 @@ QtObject { family: "Courier", weight: Font.Normal }) + property font inputFieldFont: Qt.font({ + pixelSize: (16 * DexTypo.fontDensity) * (Screen.pixelDensity / 160), + letterSpacing: 0.5, + family: DexTypo.fontFamily, + weight: Font.Normal + }) + property font inputFieldSuffixFont: Qt.font({ + pixelSize: (14 * DexTypo.fontDensity) * (Screen.pixelDensity / 160), + letterSpacing: 0.1, + family: fontFamily, + weight: Font.Medium + }) } diff --git a/atomic_defi_design/Dex/Screens/Startup/ImportWallet.qml b/atomic_defi_design/Dex/Screens/Startup/ImportWallet.qml index ba82ad690a..889173856a 100644 --- a/atomic_defi_design/Dex/Screens/Startup/ImportWallet.qml +++ b/atomic_defi_design/Dex/Screens/Startup/ImportWallet.qml @@ -166,14 +166,12 @@ SetupPage height: 40 width: 60 radius: 20 - color: Dex.CurrentTheme.accentColor anchors.verticalCenter: parent.verticalCenter Qaterial.ColorIcon { anchors.centerIn: parent iconSize: 19 source: Qaterial.Icons.wallet - color: Dex.CurrentTheme.foregroundColor } } } @@ -306,7 +304,7 @@ SetupPage DexAppPasswordField { id: _inputPassword - field.font: DexTypo.body2 + field.placeholderText: qsTr("Enter password") Layout.fillWidth: true Layout.preferredHeight: 50 field.onAccepted: trySubmit() @@ -324,7 +322,6 @@ SetupPage DexAppPasswordField { id: _inputPasswordConfirm - field.font: DexTypo.body2 field.placeholderText: qsTr("Enter the same password to confirm") Layout.fillWidth: true Layout.preferredHeight: 50 diff --git a/atomic_defi_design/Dex/Screens/Startup/Login.qml b/atomic_defi_design/Dex/Screens/Startup/Login.qml index 485b0fd5a5..115fcf981b 100644 --- a/atomic_defi_design/Dex/Screens/Startup/Login.qml +++ b/atomic_defi_design/Dex/Screens/Startup/Login.qml @@ -67,7 +67,6 @@ SetupPage max_length: General.max_pw_length height: 50 width: 300 - background.color: Dex.CurrentTheme.floatingBackgroundColor forceFocus: true field.onTextChanged: { _isPasswordWrong = false } field.onAccepted: @@ -88,9 +87,6 @@ SetupPage return false; } } - - leftIconColor: Dex.CurrentTheme.foregroundColor - hideFieldButton.icon.color: Dex.CurrentTheme.foregroundColor } DexLabel diff --git a/atomic_defi_design/Dex/Screens/Startup/NewWallet.qml b/atomic_defi_design/Dex/Screens/Startup/NewWallet.qml index dcc574bb1c..cedcc1be87 100644 --- a/atomic_defi_design/Dex/Screens/Startup/NewWallet.qml +++ b/atomic_defi_design/Dex/Screens/Startup/NewWallet.qml @@ -318,14 +318,12 @@ SetupPage height: 40 width: 60 radius: 20 - color: Dex.CurrentTheme.accentColor anchors.verticalCenter: parent.verticalCenter Qaterial.ColorIcon { anchors.centerIn: parent iconSize: 19 source: Qaterial.Icons.wallet - color: Dex.CurrentTheme.foregroundColor } } } @@ -685,6 +683,7 @@ SetupPage id: _inputPassword Layout.fillWidth: true Layout.preferredHeight: 50 + field.placeholderText: qsTr("Enter password") field.onAccepted: _keyChecker.isValid() ? eula_modal.open() : undefined } diff --git a/atomic_defi_design/Dex/Settings/RecoverSeedModal.qml b/atomic_defi_design/Dex/Settings/RecoverSeedModal.qml index 5f0c820744..c76588a941 100644 --- a/atomic_defi_design/Dex/Settings/RecoverSeedModal.qml +++ b/atomic_defi_design/Dex/Settings/RecoverSeedModal.qml @@ -69,10 +69,7 @@ MultipageModal Layout.margins: 20 Layout.alignment: Qt.AlignHCenter field.onAccepted: tryViewKeysAndSeed() - leftIconColor: Dex.CurrentTheme.foregroundColor field.onTextChanged: { _isPasswordWrong = false } - background.color: Dex.CurrentTheme.accentColor - hideFieldButton.icon.color: Dex.CurrentTheme.foregroundColor } DexLabel diff --git a/atomic_defi_design/Dex/Themes/CurrentTheme.qml b/atomic_defi_design/Dex/Themes/CurrentTheme.qml index 47a1d30907..805b3192fe 100644 --- a/atomic_defi_design/Dex/Themes/CurrentTheme.qml +++ b/atomic_defi_design/Dex/Themes/CurrentTheme.qml @@ -186,7 +186,13 @@ ThemeData tradeSellModeSelectorBackgroundColorEnd = Dex.Color.argbStrFromRgbaStr(themeData.tradeSellModeSelectorBackgroundColorEnd || defaultTheme.tradeSellModeSelectorBackgroundColorEnd); inputModifierBackgroundColor = Dex.Color.argbStrFromRgbaStr(themeData.inputModifierBackgroundColor || defaultTheme.inputModifierBackgroundColor); - inputPasswordBackgroundColor = Dex.Color.argbStrFromRgbaStr(themeData.inputPasswordBackgroundColor || defaultTheme.inputPasswordBackgroundColor); + inputFieldBackgroundColor = Dex.Color.argbStrFromRgbaStr(themeData.inputFieldBackgroundColor || defaultTheme.inputFieldBackgroundColor); + + inputFieldBorderColor = Dex.Color.argbStrFromRgbaStr(themeData.inputFieldBorderColor || defaultTheme.inputFieldBorderColor); + inputPlaceholderTextColor = Dex.Color.argbStrFromRgbaStr(themeData.inputPlaceholderTextColor || defaultTheme.inputPlaceholderTextColor); + inputRightIconColor = Dex.Color.argbStrFromRgbaStr(themeData.inputRightIconColor || defaultTheme.inputRightIconColor); + inputLeftIconColor = Dex.Color.argbStrFromRgbaStr(themeData.inputLeftIconColor || defaultTheme.inputLeftIconColor); + inputLeftIconBackgroundColor = Dex.Color.argbStrFromRgbaStr(themeData.inputLeftIconBackgroundColor || defaultTheme.inputLeftIconBackgroundColor); addressBookTagColors = themeData.addressBookTagColors || defaultTheme.addressBookTagColors for (var i = 0; i < addressBookTagColors.length; i++) diff --git a/atomic_defi_design/Dex/Themes/DefaultTheme.js b/atomic_defi_design/Dex/Themes/DefaultTheme.js index 5b101b2425..f22050ea8b 100644 --- a/atomic_defi_design/Dex/Themes/DefaultTheme.js +++ b/atomic_defi_design/Dex/Themes/DefaultTheme.js @@ -96,12 +96,18 @@ function getHardcoded() sidebarLineTextHovered: "#2C87B9FF", sidebarLineTextSelected: "#FFFFFFFF", - tradeBuyModeSelectorBackgroundColorStart: "#6A4DE3FF", - tradeBuyModeSelectorBackgroundColorEnd: "#2279F1FF", + tradeBuyModeSelectorBackgroundColorStart: "#6A4DE3FF", + tradeBuyModeSelectorBackgroundColorEnd: "#2279F1FF", tradeSellModeSelectorBackgroundColorStart: "#E52167FF", - tradeSellModeSelectorBackgroundColorEnd: "#E216A9FF", + tradeSellModeSelectorBackgroundColorEnd: "#E216A9FF", + inputModifierBackgroundColor: "#89B6FF21", - inputPasswordBackgroundColor: "#A9BDDCFF", + inputFieldBackgroundColor: "#A9BDDCFF", + inputFieldBorderColor: "#28272EFF", + inputPlaceholderTextColor: "#A9A9A9FF", + inputRightIconColor: "#A9A9A9FF", + inputLeftIconColor: "#FFFFFFFF", + inputLeftIconBackgroundColor: "#1C1B24FF", addressBookTagColors: ["#627EEAFF", "#FFD87AFF", "#F7931AFF"], diff --git a/atomic_defi_design/Dex/Themes/ThemeData.qml b/atomic_defi_design/Dex/Themes/ThemeData.qml index 7935814cb4..fb32c63b56 100644 --- a/atomic_defi_design/Dex/Themes/ThemeData.qml +++ b/atomic_defi_design/Dex/Themes/ThemeData.qml @@ -105,7 +105,12 @@ QtObject // Inputs styling property color inputModifierBackgroundColor - property color inputPasswordBackgroundColor + property color inputFieldBackgroundColor + property color inputFieldBorderColor + property color inputPlaceholderTextColor + property color inputRightIconColor + property color inputLeftIconColor + property color inputLeftIconBackgroundColor // Address book page related property var addressBookTagColors diff --git a/atomic_defi_design/Dex/main.qml b/atomic_defi_design/Dex/main.qml index 546f406a79..7d4acf7e11 100644 --- a/atomic_defi_design/Dex/main.qml +++ b/atomic_defi_design/Dex/main.qml @@ -354,10 +354,13 @@ DexWindow iconSize: 24 icon: { - if (Dex.CurrentTheme.getColorMode() === Dex.CurrentTheme.ColorMode.Light) - return Qaterial.Icons.moonWaningCrescent; - else if (Dex.CurrentTheme.getColorMode() === Dex.CurrentTheme.ColorMode.Dark) - return Qaterial.Icons.whiteBalanceSunny; + if (Dex.CurrentTheme.getColorMode() !== Dex.CurrentTheme.ColorMode.None) + { + if (Dex.CurrentTheme.getColorMode() === Dex.CurrentTheme.ColorMode.Light) + return Qaterial.Icons.moonWaningCrescent; + else if (Dex.CurrentTheme.getColorMode() === Dex.CurrentTheme.ColorMode.Dark) + return Qaterial.Icons.whiteBalanceSunny; + } } onClicked: { From f2de8c580d9b6f59c772bdb7d1cb9ec5eb4ed0bc Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 8 Dec 2022 20:31:41 +0800 Subject: [PATCH 13/80] input border and icon on light mode fix --- assets/themes/Default - Dark/colors.json | 4 ++-- assets/themes/Default - Light/colors.json | 4 ++-- atomic_defi_design/Dex/Components/DexAppPasswordField.qml | 1 - atomic_defi_design/Dex/Components/DexAppTextField.qml | 2 +- atomic_defi_design/Dex/Screens/Startup/ImportWallet.qml | 1 + atomic_defi_design/Dex/Screens/Startup/NewWallet.qml | 3 +++ 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/assets/themes/Default - Dark/colors.json b/assets/themes/Default - Dark/colors.json index 4a2002f990..34bd571e16 100644 --- a/assets/themes/Default - Dark/colors.json +++ b/assets/themes/Default - Dark/colors.json @@ -101,11 +101,11 @@ "inputModifierBackgroundColor": "#89B6FF21", "inputFieldBackgroundColor": "#313555FF", - "inputFieldBorderColor": "#24273DFF", + "inputFieldBorderColor": "#20233788", "inputPlaceholderTextColor": "#FFFFFFFF", "inputRightIconColor": "#FFFFFFFF", "inputLeftIconColor": "#FFFFFFFF", - "inputLeftIconBackgroundColor": "#2C3D66FF", + "inputLeftIconBackgroundColor": "#202337FF", "addressBookTagColors": ["#627EEAFF", "#FFD87AFF", "#F7931AFF"], diff --git a/assets/themes/Default - Light/colors.json b/assets/themes/Default - Light/colors.json index 8c7e328953..bbaf927cce 100644 --- a/assets/themes/Default - Light/colors.json +++ b/assets/themes/Default - Light/colors.json @@ -98,11 +98,11 @@ "inputModifierBackgroundColor": "#89B6FF21", "inputFieldBackgroundColor": "#F3F5F6FF", - "inputFieldBorderColor": "#A9BDDCFF", + "inputFieldBorderColor": "#DCE8FD88", "inputPlaceholderTextColor": "#456078FF", "inputRightIconColor": "#456078FF", "inputLeftIconColor": "#456078FF", - "inputLeftIconBackgroundColor": "#F0F2FFFF", + "inputLeftIconBackgroundColor": "#DCE8FDFF", "addressBookTagColors": ["#627EEAFF", "#FFD87AFF", "#F7931AFF"], diff --git a/atomic_defi_design/Dex/Components/DexAppPasswordField.qml b/atomic_defi_design/Dex/Components/DexAppPasswordField.qml index a0024ca302..6fde726c1a 100644 --- a/atomic_defi_design/Dex/Components/DexAppPasswordField.qml +++ b/atomic_defi_design/Dex/Components/DexAppPasswordField.qml @@ -42,7 +42,6 @@ DexAppTextField width: 60 radius: 20 color: Dex.CurrentTheme.inputLeftIconBackgroundColor - border.color: Dex.CurrentTheme.inputFieldBorderColor border.width: _inputPassword.focus ? 2 : 0 anchors.verticalCenter: parent.verticalCenter diff --git a/atomic_defi_design/Dex/Components/DexAppTextField.qml b/atomic_defi_design/Dex/Components/DexAppTextField.qml index 3c3035f75c..81773020b4 100644 --- a/atomic_defi_design/Dex/Components/DexAppTextField.qml +++ b/atomic_defi_design/Dex/Components/DexAppTextField.qml @@ -77,7 +77,7 @@ Item height: parent.height radius: 4 color: Dex.CurrentTheme.inputFieldBackgroundColor - border.color: control.error ? Dex.CurrentTheme.warningColor : input_field.focus ? Dex.CurrentTheme.accentColor : color + border.color: control.error ? Dex.CurrentTheme.warningColor : input_field.focus ? Dex.CurrentTheme.inputFieldBorderColor : color border.width: input_field.focus ? 1 : 0 Behavior on x diff --git a/atomic_defi_design/Dex/Screens/Startup/ImportWallet.qml b/atomic_defi_design/Dex/Screens/Startup/ImportWallet.qml index 889173856a..2abfd27ab4 100644 --- a/atomic_defi_design/Dex/Screens/Startup/ImportWallet.qml +++ b/atomic_defi_design/Dex/Screens/Startup/ImportWallet.qml @@ -172,6 +172,7 @@ SetupPage anchors.centerIn: parent iconSize: 19 source: Qaterial.Icons.wallet + color: Dex.CurrentTheme.inputLeftIconColor } } } diff --git a/atomic_defi_design/Dex/Screens/Startup/NewWallet.qml b/atomic_defi_design/Dex/Screens/Startup/NewWallet.qml index cedcc1be87..c6d4ab60ad 100644 --- a/atomic_defi_design/Dex/Screens/Startup/NewWallet.qml +++ b/atomic_defi_design/Dex/Screens/Startup/NewWallet.qml @@ -319,11 +319,14 @@ SetupPage width: 60 radius: 20 anchors.verticalCenter: parent.verticalCenter + color: Dex.CurrentTheme.inputLeftIconBackgroundColor + Qaterial.ColorIcon { anchors.centerIn: parent iconSize: 19 source: Qaterial.Icons.wallet + color: Dex.CurrentTheme.inputLeftIconColor } } } From 290bbe74fc66f1f73095ba0c94678fee613eec9e Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 8 Dec 2022 23:22:02 +0800 Subject: [PATCH 14/80] tweak list hovering styles --- assets/themes/Default - Dark/colors.json | 5 +++++ assets/themes/Default - Light/colors.json | 4 ++++ .../Dex/Exchange/Trade/SimpleView/SubBestOrder.qml | 5 +++-- .../Exchange/Trade/SimpleView/SubCoinSelector.qml | 2 +- atomic_defi_design/Dex/Portfolio/AssetsList.qml | 4 ++-- atomic_defi_design/Dex/Screens/Dashboard.qml | 1 + atomic_defi_design/Dex/Themes/CurrentTheme.qml | 9 ++++++--- atomic_defi_design/Dex/Themes/DefaultTheme.js | 14 +++++++++----- atomic_defi_design/Dex/Themes/ThemeData.qml | 4 ++++ atomic_defi_design/Dex/Wallet/Transactions.qml | 2 +- atomic_defi_design/Dex/main.qml | 1 + 11 files changed, 37 insertions(+), 14 deletions(-) diff --git a/assets/themes/Default - Dark/colors.json b/assets/themes/Default - Dark/colors.json index 34bd571e16..63b31c7787 100644 --- a/assets/themes/Default - Dark/colors.json +++ b/assets/themes/Default - Dark/colors.json @@ -107,6 +107,11 @@ "inputLeftIconColor": "#FFFFFFFF", "inputLeftIconBackgroundColor": "#202337FF", + "listItemOddBackground": "#202337FF", + "listItemEvenBackground": "#24273DFF", + "listItemHoveredBackground": "#4068B9FF", + + "addressBookTagColors": ["#627EEAFF", "#FFD87AFF", "#F7931AFF"], "okColor": "#00C058FF", diff --git a/assets/themes/Default - Light/colors.json b/assets/themes/Default - Light/colors.json index bbaf927cce..546b78e686 100644 --- a/assets/themes/Default - Light/colors.json +++ b/assets/themes/Default - Light/colors.json @@ -104,6 +104,10 @@ "inputLeftIconColor": "#456078FF", "inputLeftIconBackgroundColor": "#DCE8FDFF", + "listItemOddBackground": "#FCFCFCFF", + "listItemEvenBackground": "#EDF4FFFF", + "listItemHoveredBackground": "#D7E7FFFF", + "addressBookTagColors": ["#627EEAFF", "#FFD87AFF", "#F7931AFF"], "okColor": "#00C058FF", diff --git a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubBestOrder.qml b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubBestOrder.qml index 0c1fcd5e92..73afee60fd 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubBestOrder.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubBestOrder.qml @@ -128,10 +128,10 @@ DexListView width: _rowWidth height: _rowHeight - radius: 0 + radius: mouse_area.containsMouse ? 3 : 0 border.width: 0 colorAnimation: false - color: mouse_area.containsMouse ? Dex.CurrentTheme.buttonColorHovered : 'transparent' + color: mouse_area.containsMouse ? Dex.CurrentTheme.listItemHoveredBackground : 'transparent' DexMouseArea { @@ -162,6 +162,7 @@ DexListView { property int _iconWidth: 24 Layout.preferredWidth: _tokenColumnSize + Layout.leftMargin: 3 DexImage // Order Token Icon { diff --git a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubCoinSelector.qml b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubCoinSelector.qml index 5a89dd366d..bf1938c322 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubCoinSelector.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubCoinSelector.qml @@ -130,7 +130,7 @@ DexListView radius: 0 border.width: 0 colorAnimation: false - color: mouse_area.containsMouse ? Dex.CurrentTheme.buttonColorHovered : 'transparent' + color: mouse_area.containsMouse ? Dex.CurrentTheme.listItemHoveredBackground : 'transparent' DexMouseArea { diff --git a/atomic_defi_design/Dex/Portfolio/AssetsList.qml b/atomic_defi_design/Dex/Portfolio/AssetsList.qml index aa28f0ef62..480865d617 100644 --- a/atomic_defi_design/Dex/Portfolio/AssetsList.qml +++ b/atomic_defi_design/Dex/Portfolio/AssetsList.qml @@ -96,13 +96,13 @@ Dex.DexListView delegate: Rectangle { - property color _idleColor: index % 2 === 1 ? Dex.CurrentTheme.backgroundColor : Dex.CurrentTheme.innerBackgroundColor + property color _idleColor: index % 2 === 1 ? Dex.CurrentTheme.listItemOddBackground : Dex.CurrentTheme.listItemEvenBackground property int activation_progress: Dex.General.zhtlcActivationProgress(activation_status, ticker) width: list.width height: _assetRowHeight - color: mouseArea.containsMouse ? Dex.CurrentTheme.buttonColorHovered : _idleColor + color: mouseArea.containsMouse ? Dex.CurrentTheme.listItemHoveredBackground : _idleColor RowLayout { diff --git a/atomic_defi_design/Dex/Screens/Dashboard.qml b/atomic_defi_design/Dex/Screens/Dashboard.qml index e25c8b6170..319292f2e5 100644 --- a/atomic_defi_design/Dex/Screens/Dashboard.qml +++ b/atomic_defi_design/Dex/Screens/Dashboard.qml @@ -20,6 +20,7 @@ import "../Support" as SupportPage import "../Screens" import "../Addressbook" as Addressbook import Dex.Themes 1.0 as Dex +import AtomicDEX.TradingMode 1.0 Item { diff --git a/atomic_defi_design/Dex/Themes/CurrentTheme.qml b/atomic_defi_design/Dex/Themes/CurrentTheme.qml index 805b3192fe..1b1e1d0f96 100644 --- a/atomic_defi_design/Dex/Themes/CurrentTheme.qml +++ b/atomic_defi_design/Dex/Themes/CurrentTheme.qml @@ -186,14 +186,17 @@ ThemeData tradeSellModeSelectorBackgroundColorEnd = Dex.Color.argbStrFromRgbaStr(themeData.tradeSellModeSelectorBackgroundColorEnd || defaultTheme.tradeSellModeSelectorBackgroundColorEnd); inputModifierBackgroundColor = Dex.Color.argbStrFromRgbaStr(themeData.inputModifierBackgroundColor || defaultTheme.inputModifierBackgroundColor); - inputFieldBackgroundColor = Dex.Color.argbStrFromRgbaStr(themeData.inputFieldBackgroundColor || defaultTheme.inputFieldBackgroundColor); - - inputFieldBorderColor = Dex.Color.argbStrFromRgbaStr(themeData.inputFieldBorderColor || defaultTheme.inputFieldBorderColor); + inputFieldBackgroundColor = Dex.Color.argbStrFromRgbaStr(themeData.inputFieldBackgroundColor || defaultTheme.inputFieldBackgroundColor); + inputFieldBorderColor = Dex.Color.argbStrFromRgbaStr(themeData.inputFieldBorderColor || defaultTheme.inputFieldBorderColor); inputPlaceholderTextColor = Dex.Color.argbStrFromRgbaStr(themeData.inputPlaceholderTextColor || defaultTheme.inputPlaceholderTextColor); inputRightIconColor = Dex.Color.argbStrFromRgbaStr(themeData.inputRightIconColor || defaultTheme.inputRightIconColor); inputLeftIconColor = Dex.Color.argbStrFromRgbaStr(themeData.inputLeftIconColor || defaultTheme.inputLeftIconColor); inputLeftIconBackgroundColor = Dex.Color.argbStrFromRgbaStr(themeData.inputLeftIconBackgroundColor || defaultTheme.inputLeftIconBackgroundColor); + listItemOddBackground = Dex.Color.argbStrFromRgbaStr(themeData.listItemOddBackground || defaultTheme.listItemOddBackground); + listItemEvenBackground = Dex.Color.argbStrFromRgbaStr(themeData.listItemEvenBackground || defaultTheme.listItemEvenBackground); + listItemHoveredBackground = Dex.Color.argbStrFromRgbaStr(themeData.listItemHoveredBackground || defaultTheme.listItemHoveredBackground); + addressBookTagColors = themeData.addressBookTagColors || defaultTheme.addressBookTagColors for (var i = 0; i < addressBookTagColors.length; i++) { diff --git a/atomic_defi_design/Dex/Themes/DefaultTheme.js b/atomic_defi_design/Dex/Themes/DefaultTheme.js index f22050ea8b..7bb44b2ca1 100644 --- a/atomic_defi_design/Dex/Themes/DefaultTheme.js +++ b/atomic_defi_design/Dex/Themes/DefaultTheme.js @@ -102,12 +102,16 @@ function getHardcoded() tradeSellModeSelectorBackgroundColorEnd: "#E216A9FF", inputModifierBackgroundColor: "#89B6FF21", - inputFieldBackgroundColor: "#A9BDDCFF", - inputFieldBorderColor: "#28272EFF", - inputPlaceholderTextColor: "#A9A9A9FF", - inputRightIconColor: "#A9A9A9FF", + inputFieldBackgroundColor: "#313555FF", + inputFieldBorderColor: "#20233788", + inputPlaceholderTextColor: "#FFFFFFFF", + inputRightIconColor: "#FFFFFFFF", inputLeftIconColor: "#FFFFFFFF", - inputLeftIconBackgroundColor: "#1C1B24FF", + inputLeftIconBackgroundColor: "#202337FF", + + listItemOddBackground: "#202337FF", + listItemEvenBackground: "#24273DFF", + listItemHoveredBackground: "#4068B9FF", addressBookTagColors: ["#627EEAFF", "#FFD87AFF", "#F7931AFF"], diff --git a/atomic_defi_design/Dex/Themes/ThemeData.qml b/atomic_defi_design/Dex/Themes/ThemeData.qml index fb32c63b56..c261fe832a 100644 --- a/atomic_defi_design/Dex/Themes/ThemeData.qml +++ b/atomic_defi_design/Dex/Themes/ThemeData.qml @@ -112,6 +112,10 @@ QtObject property color inputLeftIconColor property color inputLeftIconBackgroundColor + property color listItemOddBackground + property color listItemEvenBackground + property color listItemHoveredBackground + // Address book page related property var addressBookTagColors diff --git a/atomic_defi_design/Dex/Wallet/Transactions.qml b/atomic_defi_design/Dex/Wallet/Transactions.qml index 319b61c3c1..9e3edf4663 100644 --- a/atomic_defi_design/Dex/Wallet/Transactions.qml +++ b/atomic_defi_design/Dex/Wallet/Transactions.qml @@ -30,7 +30,7 @@ Dex.ListView radius: 0 border.width: 0 colorAnimation: false - color: mouse_area.containsMouse ? Dex.CurrentTheme.buttonColorHovered : 'transparent' + color: mouse_area.containsMouse ? Dex.CurrentTheme.listItemHoveredBackground : 'transparent' Dex.MouseArea { diff --git a/atomic_defi_design/Dex/main.qml b/atomic_defi_design/Dex/main.qml index 7d4acf7e11..0a18ae3c4e 100644 --- a/atomic_defi_design/Dex/main.qml +++ b/atomic_defi_design/Dex/main.qml @@ -361,6 +361,7 @@ DexWindow else if (Dex.CurrentTheme.getColorMode() === Dex.CurrentTheme.ColorMode.Dark) return Qaterial.Icons.whiteBalanceSunny; } + return Qaterial.Icons.moonWaningCrescent; } onClicked: { From 2cf1abe2d77e17b7baab99dcdfdfebbdb3f6d0ca Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 9 Dec 2022 00:10:05 +0800 Subject: [PATCH 15/80] secondary button style --- assets/themes/Default - Dark/colors.json | 5 +++++ assets/themes/Default - Light/colors.json | 5 +++++ .../Dex/Components/DexAppButton.qml | 10 ++++++---- atomic_defi_design/Dex/Constants/DexTheme.qml | 5 +++++ atomic_defi_design/Dex/Constants/DexTypo.qml | 2 +- atomic_defi_design/Dex/Portfolio/Portfolio.qml | 2 +- atomic_defi_design/Dex/Themes/CurrentTheme.qml | 5 +++++ atomic_defi_design/Dex/Themes/DefaultTheme.js | 5 +++++ atomic_defi_design/Dex/Themes/ThemeData.qml | 5 +++++ atomic_defi_design/Dex/Wallet/Sidebar.qml | 16 +++++++--------- 10 files changed, 45 insertions(+), 15 deletions(-) diff --git a/assets/themes/Default - Dark/colors.json b/assets/themes/Default - Dark/colors.json index 63b31c7787..198fd2b516 100644 --- a/assets/themes/Default - Dark/colors.json +++ b/assets/themes/Default - Dark/colors.json @@ -18,6 +18,11 @@ "buttonTextHoveredColor": "#FFFFFFFF", "buttonTextPressedColor": "#FFFFFFFF", + "buttonSecondaryColorDisabled": "#28375AFF", + "buttonSecondaryColorEnabled": "#293254FF", + "buttonSecondaryColorHovered": "#4068B929", + "buttonSecondaryColorPressed": "#2932546C", + "gradientButtonStartColor": "#4986EAAD", "gradientButtonEndColor": "#5A68E6FF", "gradientButtonDisabledStartColor": "#5A68E64D", diff --git a/assets/themes/Default - Light/colors.json b/assets/themes/Default - Light/colors.json index 546b78e686..a66df4fe02 100644 --- a/assets/themes/Default - Light/colors.json +++ b/assets/themes/Default - Light/colors.json @@ -15,6 +15,11 @@ "buttonTextHoveredColor": "#2F5678FF", "buttonTextPressedColor": "#3A5B78FF", + "buttonSecondaryColorDisabled": "#D8E3F8FF", + "buttonSecondaryColorEnabled": "#F0F6FFFF", + "buttonSecondaryColorHovered": "#D7E7FFFF", + "buttonSecondaryColorPressed": "#B8D2F9FF", + "gradientButtonStartColor": "#5A68E6FF", "gradientButtonEndColor": "#4986EAAB", "gradientButtonDisabledStartColor": "#CDD0F6FF", diff --git a/atomic_defi_design/Dex/Components/DexAppButton.qml b/atomic_defi_design/Dex/Components/DexAppButton.qml index 4414add9d2..9976ae9200 100644 --- a/atomic_defi_design/Dex/Components/DexAppButton.qml +++ b/atomic_defi_design/Dex/Components/DexAppButton.qml @@ -23,6 +23,11 @@ DexRectangle property int horizontalPadding: 2 property int iconSize: _label.font.pixelSize + 2 + property color btnPressedColor: Dex.CurrentTheme.buttonColorPressed + property color btnHoveredColor: Dex.CurrentTheme.buttonColorHovered + property color btnEnabledColor: Dex.CurrentTheme.buttonColorEnabled + property color btnDisabledColor: Dex.CurrentTheme.buttonColorDisabled + property alias label: _label property alias font: _label.font property alias content: _contentRow @@ -41,10 +46,7 @@ DexRectangle colorAnimation: false color: enabled ? _controlMouseArea.containsMouse ? _controlMouseArea.containsPress ? - Dex.CurrentTheme.buttonColorPressed : - Dex.CurrentTheme.buttonColorHovered : - Dex.CurrentTheme.buttonColorEnabled : - Dex.CurrentTheme.buttonColorDisabled + btnPressedColor : btnHoveredColor : btnEnabledColor : btnDisabledColor opacity: _controlMouseArea.containsMouse ? 1 : .8 Row diff --git a/atomic_defi_design/Dex/Constants/DexTheme.qml b/atomic_defi_design/Dex/Constants/DexTheme.qml index 19cde78f3f..38a1e0f48c 100644 --- a/atomic_defi_design/Dex/Constants/DexTheme.qml +++ b/atomic_defi_design/Dex/Constants/DexTheme.qml @@ -129,6 +129,11 @@ QtObject { property color buttonColorTextEnabled: Dex.CurrentTheme.buttonTextEnabledColor property color buttonColorTextPressed: Dex.CurrentTheme.buttonTextPressedColor + property color buttonSecondaryColorDisabled: Dex.CurrentTheme.buttonSecondaryColorDisabled + property color buttonSecondaryColorEnabled: Dex.CurrentTheme.buttonSecondaryColorEnabled + property color buttonSecondaryColorHovered: Dex.CurrentTheme.buttonSecondaryColorHovered + property color buttonSecondaryColorPressed: Dex.CurrentTheme.buttonSecondaryColorPressed + property color buttonGradientEnabled1: DexTheme.buttonColorEnabled property color buttonGradientEnabled2: DexTheme.buttonColorEnabled property color buttonGradientTextEnabled: DexTheme.foregroundColor diff --git a/atomic_defi_design/Dex/Constants/DexTypo.qml b/atomic_defi_design/Dex/Constants/DexTypo.qml index 93db4733f9..8df64967c7 100644 --- a/atomic_defi_design/Dex/Constants/DexTypo.qml +++ b/atomic_defi_design/Dex/Constants/DexTypo.qml @@ -161,7 +161,7 @@ QtObject { weight: Font.Normal }) property font inputFieldSuffixFont: Qt.font({ - pixelSize: (14 * DexTypo.fontDensity) * (Screen.pixelDensity / 160), + pixelSize: (14 * DexTypo.fontDensity) * (Screen.pixelDensity / 140), letterSpacing: 0.1, family: fontFamily, weight: Font.Medium diff --git a/atomic_defi_design/Dex/Portfolio/Portfolio.qml b/atomic_defi_design/Dex/Portfolio/Portfolio.qml index de0ea3394b..a8925ed9c2 100644 --- a/atomic_defi_design/Dex/Portfolio/Portfolio.qml +++ b/atomic_defi_design/Dex/Portfolio/Portfolio.qml @@ -148,7 +148,7 @@ Item { radius: 15 padding: 25 font: DexTypo.body2 - text: qsTr("ADD ASSET") + text: qsTr("ADD CRYPTO") onClicked: enable_coin_modal.open() } } diff --git a/atomic_defi_design/Dex/Themes/CurrentTheme.qml b/atomic_defi_design/Dex/Themes/CurrentTheme.qml index 1b1e1d0f96..a7940baaf5 100644 --- a/atomic_defi_design/Dex/Themes/CurrentTheme.qml +++ b/atomic_defi_design/Dex/Themes/CurrentTheme.qml @@ -105,6 +105,11 @@ ThemeData buttonTextHoveredColor = Dex.Color.argbStrFromRgbaStr(themeData.buttonTextHoveredColor || defaultTheme.buttonTextHoveredColor); buttonTextPressedColor = Dex.Color.argbStrFromRgbaStr(themeData.buttonTextPressedColor || defaultTheme.buttonTextPressedColor); + buttonSecondaryColorDisabled = Dex.Color.argbStrFromRgbaStr(themeData.buttonSecondaryColorDisabled || defaultTheme.buttonSecondaryColorDisabled); + buttonSecondaryColorEnabled = Dex.Color.argbStrFromRgbaStr(themeData.buttonSecondaryColorEnabled || defaultTheme.buttonSecondaryColorEnabled); + buttonSecondaryColorHovered = Dex.Color.argbStrFromRgbaStr(themeData.buttonSecondaryColorHovered || defaultTheme.buttonSecondaryColorHovered); + buttonSecondaryColorPressed = Dex.Color.argbStrFromRgbaStr(themeData.buttonSecondaryColorPressed || defaultTheme.buttonSecondaryColorPressed); + gradientButtonStartColor = Dex.Color.argbStrFromRgbaStr(themeData.gradientButtonStartColor || defaultTheme.gradientButtonStartColor); gradientButtonEndColor = Dex.Color.argbStrFromRgbaStr(themeData.gradientButtonEndColor || defaultTheme.gradientButtonEndColor); gradientButtonDisabledStartColor = Dex.Color.argbStrFromRgbaStr(themeData.gradientButtonDisabledStartColor || defaultTheme.gradientButtonDisabledStartColor); diff --git a/atomic_defi_design/Dex/Themes/DefaultTheme.js b/atomic_defi_design/Dex/Themes/DefaultTheme.js index 7bb44b2ca1..f8475eda3e 100644 --- a/atomic_defi_design/Dex/Themes/DefaultTheme.js +++ b/atomic_defi_design/Dex/Themes/DefaultTheme.js @@ -21,6 +21,11 @@ function getHardcoded() buttonTextHoveredColor: "#000000FF", buttonTextPressedColor: "#000000FF", + buttonSecondaryColorDisabled: "#D8E3F8FF", + buttonSecondaryColorEnabled: "#F0F6FFFF", + buttonSecondaryColorHovered: "#D7E7FFFF", + buttonSecondaryColorPressed: "#B8D2F9FF", + gradientButtonStartColor: "#5A68E6FF", gradientButtonEndColor: "#4986EAAB", gradientButtonDisabledStartColor: "#CDD0F6FF", diff --git a/atomic_defi_design/Dex/Themes/ThemeData.qml b/atomic_defi_design/Dex/Themes/ThemeData.qml index c261fe832a..8117fdcc62 100644 --- a/atomic_defi_design/Dex/Themes/ThemeData.qml +++ b/atomic_defi_design/Dex/Themes/ThemeData.qml @@ -20,6 +20,11 @@ QtObject property color buttonTextHoveredColor property color buttonTextPressedColor + property color buttonSecondaryColorDisabled + property color buttonSecondaryColorEnabled + property color buttonSecondaryColorHovered + property color buttonSecondaryColorPressed + property color gradientButtonStartColor property color gradientButtonEndColor property color gradientButtonDisabledStartColor diff --git a/atomic_defi_design/Dex/Wallet/Sidebar.qml b/atomic_defi_design/Dex/Wallet/Sidebar.qml index aca26235ad..84e6de8a12 100644 --- a/atomic_defi_design/Dex/Wallet/Sidebar.qml +++ b/atomic_defi_design/Dex/Wallet/Sidebar.qml @@ -6,7 +6,7 @@ import QtGraphicalEffects 1.0 import Qaterial 1.0 as Qaterial import "../Components" -import "../Constants" as Constants +import "../Constants" import App 1.0 import Dex.Themes 1.0 as Dex import Dex.Components 1.0 as Dex @@ -127,17 +127,15 @@ Item Layout.preferredWidth: 140 radius: 18 spacing: 2 - font: Qt.font({ - pixelSize: 9 * DexTypo.fontDensity, - letterSpacing: 1.25, - capitalization: Font.AllUppercase, - family: DexTypo.fontFamily, - weight: Font.Normal - }) - text: qsTr("Add asset") + label.font: DexTypo.overLine + text: qsTr("ADD CRYPTO") iconSource: Qaterial.Icons.plus leftPadding: 3 rightPadding: 3 + btnPressedColor: Dex.CurrentTheme.buttonSecondaryColorPressed + btnHoveredColor: Dex.CurrentTheme.buttonSecondaryColorHovered + btnEnabledColor: Dex.CurrentTheme.buttonSecondaryColorEnabled + btnDisabledColor: Dex.CurrentTheme.buttonSecondaryColorDisabled } } From 207f76fea215ec6c9ecaee199c7f143952a46f15 Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 9 Dec 2022 01:56:30 +0800 Subject: [PATCH 16/80] update arrow styles --- assets/themes/Default - Dark/colors.json | 1 + assets/themes/Default - Light/colors.json | 3 +- .../Dex/Components/DexAppButton.qml | 1 + atomic_defi_design/Dex/Constants/DexTheme.qml | 3 +- .../Dex/Themes/CurrentTheme.qml | 11 ++-- atomic_defi_design/Dex/Themes/ThemeData.qml | 1 + atomic_defi_design/Dex/Wallet/Main.qml | 56 +++++++++---------- .../Dex/Wallet/Transactions.qml | 8 ++- 8 files changed, 47 insertions(+), 37 deletions(-) diff --git a/assets/themes/Default - Dark/colors.json b/assets/themes/Default - Dark/colors.json index 198fd2b516..06160e0db3 100644 --- a/assets/themes/Default - Dark/colors.json +++ b/assets/themes/Default - Dark/colors.json @@ -121,6 +121,7 @@ "okColor": "#00C058FF", "warningColor": "#E52167FF", + "swapIconColor": "#005FBEFF", "senderColorStart": "#F85757FF", "receiverColorStart": "#845FEFFF", diff --git a/assets/themes/Default - Light/colors.json b/assets/themes/Default - Light/colors.json index a66df4fe02..86a872165e 100644 --- a/assets/themes/Default - Light/colors.json +++ b/assets/themes/Default - Light/colors.json @@ -19,7 +19,7 @@ "buttonSecondaryColorEnabled": "#F0F6FFFF", "buttonSecondaryColorHovered": "#D7E7FFFF", "buttonSecondaryColorPressed": "#B8D2F9FF", - + "gradientButtonStartColor": "#5A68E6FF", "gradientButtonEndColor": "#4986EAAB", "gradientButtonDisabledStartColor": "#CDD0F6FF", @@ -117,6 +117,7 @@ "okColor": "#00C058FF", "warningColor": "#E52167FF", + "swapIconColor": "#005FBEFF", "senderColorStart": "#F85757FF", "receiverColorStart": "#845FEFFF", diff --git a/atomic_defi_design/Dex/Components/DexAppButton.qml b/atomic_defi_design/Dex/Components/DexAppButton.qml index 9976ae9200..db494f9cac 100644 --- a/atomic_defi_design/Dex/Components/DexAppButton.qml +++ b/atomic_defi_design/Dex/Components/DexAppButton.qml @@ -22,6 +22,7 @@ DexRectangle property int verticalPadding: 2 property int horizontalPadding: 2 property int iconSize: _label.font.pixelSize + 2 + property color iconColor: _label.color property color btnPressedColor: Dex.CurrentTheme.buttonColorPressed property color btnHoveredColor: Dex.CurrentTheme.buttonColorHovered diff --git a/atomic_defi_design/Dex/Constants/DexTheme.qml b/atomic_defi_design/Dex/Constants/DexTheme.qml index 38a1e0f48c..99f7fa2ba6 100644 --- a/atomic_defi_design/Dex/Constants/DexTheme.qml +++ b/atomic_defi_design/Dex/Constants/DexTheme.qml @@ -133,7 +133,7 @@ QtObject { property color buttonSecondaryColorEnabled: Dex.CurrentTheme.buttonSecondaryColorEnabled property color buttonSecondaryColorHovered: Dex.CurrentTheme.buttonSecondaryColorHovered property color buttonSecondaryColorPressed: Dex.CurrentTheme.buttonSecondaryColorPressed - + property color buttonGradientEnabled1: DexTheme.buttonColorEnabled property color buttonGradientEnabled2: DexTheme.buttonColorEnabled property color buttonGradientTextEnabled: DexTheme.foregroundColor @@ -155,6 +155,7 @@ QtObject { property color okColor: Dex.CurrentTheme.okColor property color warningColor: Dex.CurrentTheme.warningColor + property color swapIconColor: Dex.CurrentTheme.swapIconColor // Widget settings diff --git a/atomic_defi_design/Dex/Themes/CurrentTheme.qml b/atomic_defi_design/Dex/Themes/CurrentTheme.qml index a7940baaf5..146d3a90bd 100644 --- a/atomic_defi_design/Dex/Themes/CurrentTheme.qml +++ b/atomic_defi_design/Dex/Themes/CurrentTheme.qml @@ -208,13 +208,14 @@ ThemeData addressBookTagColors[i] = Dex.Color.argbStrFromRgbaStr(addressBookTagColors[i]) } - okColor = Dex.Color.argbStrFromRgbaStr(themeData.okColor || defaultTheme.okColor); - warningColor = Dex.Color.argbStrFromRgbaStr(themeData.warningColor || defaultTheme.warningColor); + okColor = Dex.Color.argbStrFromRgbaStr(themeData.okColor || defaultTheme.okColor); + warningColor = Dex.Color.argbStrFromRgbaStr(themeData.warningColor || defaultTheme.warningColor); + swapIconColor = Dex.Color.argbStrFromRgbaStr(themeData.swapIconColor || defaultTheme.swapIconColor); - senderColorStart = Dex.Color.argbStrFromRgbaStr(themeData.senderColorStart || defaultTheme.senderColorStart); - receiverColorStart = Dex.Color.argbStrFromRgbaStr(themeData.receiverColorStart || defaultTheme.receiverColorStart); + senderColorStart = Dex.Color.argbStrFromRgbaStr(themeData.senderColorStart || defaultTheme.senderColorStart); + receiverColorStart = Dex.Color.argbStrFromRgbaStr(themeData.receiverColorStart || defaultTheme.receiverColorStart); - lineSeparatorColor = Dex.Color.argbStrFromRgbaStr(themeData.lineSeparatorColor || defaultTheme.lineSeparatorColor); + lineSeparatorColor = Dex.Color.argbStrFromRgbaStr(themeData.lineSeparatorColor || defaultTheme.lineSeparatorColor); } function loadLogo(themeName) diff --git a/atomic_defi_design/Dex/Themes/ThemeData.qml b/atomic_defi_design/Dex/Themes/ThemeData.qml index 8117fdcc62..28c02819a2 100644 --- a/atomic_defi_design/Dex/Themes/ThemeData.qml +++ b/atomic_defi_design/Dex/Themes/ThemeData.qml @@ -127,6 +127,7 @@ QtObject // Colors used to tell when something is good or wrong. property color okColor property color warningColor + property color swapIconColor property color senderColorStart property color receiverColorStart diff --git a/atomic_defi_design/Dex/Wallet/Main.qml b/atomic_defi_design/Dex/Wallet/Main.qml index a08fffe105..e74ef4fb7a 100644 --- a/atomic_defi_design/Dex/Wallet/Main.qml +++ b/atomic_defi_design/Dex/Wallet/Main.qml @@ -432,11 +432,11 @@ Item enabled: General.canSend(api_wallet_page.ticker, activation_progress) anchors.fill: parent radius: 18 - label.text: qsTr("Send") label.font.pixelSize: 16 content.anchors.left: content.parent.left content.anchors.leftMargin: enabled ? 23 : 48 + content.anchors.rightMargin: 23 onClicked: { @@ -444,13 +444,19 @@ Item else enable_fees_coin_modal.open() } - TransactionArrow + Row { - id: arrow_send - amISender: true anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right - anchors.rightMargin: 19 + anchors.rightMargin: 23 + + Qaterial.Icon + { + icon: Qaterial.Icons.arrowTopRight + size: 24 + anchors.verticalCenter: parent.verticalCenter + color: Dex.CurrentTheme.warningColor + } } } @@ -544,12 +550,19 @@ Item onClicked: receive_modal.open() - TransactionArrow + Row { anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right - anchors.rightMargin: 19 - amISender: false + anchors.rightMargin: 23 + + Qaterial.Icon + { + icon: Qaterial.Icons.arrowBottomRight + size: 24 + anchors.verticalCenter: parent.verticalCenter + color: Dex.CurrentTheme.okColor + } } } @@ -592,21 +605,17 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right - anchors.rightMargin: arrow_send.anchors.rightMargin - spacing: 2 + anchors.rightMargin: 23 - TransactionArrow - { - amISender: true - anchors.verticalCenter: parent.verticalCenter - } - - TransactionArrow + Qaterial.Icon { - amISender: false + icon: Qaterial.Icons.swapHorizontal + size: 28 anchors.verticalCenter: parent.verticalCenter + color: Dex.CurrentTheme.swapIconColor } } + } // Swap button error icon @@ -675,23 +684,14 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right - anchors.rightMargin: arrow_send.anchors.rightMargin + anchors.rightMargin: 23 Qaterial.Icon { icon: Qaterial.Icons.water size: 24 - anchors.right: parent.right - anchors.leftMargin: iconSize / 2 - anchors.rightMargin: iconSize / 2 anchors.verticalCenter: parent.verticalCenter color: "cyan" - - DefaultTooltip - { - visible: alertArea.containsMouse && tooltipText != "" - text: "" - } } } } diff --git a/atomic_defi_design/Dex/Wallet/Transactions.qml b/atomic_defi_design/Dex/Wallet/Transactions.qml index 9e3edf4663..67608f5bdb 100644 --- a/atomic_defi_design/Dex/Wallet/Transactions.qml +++ b/atomic_defi_design/Dex/Wallet/Transactions.qml @@ -1,6 +1,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 import QtQuick.Controls 2.15 +import Qaterial 1.0 as Qaterial import "../Components" import "../Constants" @@ -63,10 +64,13 @@ Dex.ListView visible: transaction_note !== "" } - TransactionArrow + + Qaterial.Icon { id: received_icon - amISender: am_i_sender ? true : false + size: 16 + icon: am_i_sender ? Qaterial.Icons.arrowTopRight : Qaterial.Icons.arrowBottomRight + color: am_i_sender ? Dex.CurrentTheme.warningColor : Dex.CurrentTheme.okColor } // Description From a293233088dc051538ca8a71ce19490a4c4de48e Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 9 Dec 2022 03:37:54 +0800 Subject: [PATCH 17/80] tweak border line separators --- assets/themes/Default - Light/colors.json | 2 +- atomic_defi_design/Dex/Screens/Dashboard.qml | 13 + atomic_defi_design/Dex/Sidebar/Main.qml | 14 +- atomic_defi_design/Dex/Wallet/Sidebar.qml | 10 +- atomic_defi_design/Dex/main.qml | 1 + .../assets/images/arrow-bottom-right.svg | 1 + .../assets/images/arrow-top-right.svg | 1 + .../assets/images/swap-horizontal.svg | 1 + .../assets/languages/atomic_defi_de.ts | 553 +++++++++--------- .../assets/languages/atomic_defi_en.ts | 547 ++++++++--------- .../assets/languages/atomic_defi_es.ts | 553 +++++++++--------- .../assets/languages/atomic_defi_fr.ts | 551 ++++++++--------- .../assets/languages/atomic_defi_ru.ts | 551 ++++++++--------- .../assets/languages/atomic_defi_tr.ts | 551 ++++++++--------- 14 files changed, 1695 insertions(+), 1654 deletions(-) create mode 100644 atomic_defi_design/assets/images/arrow-bottom-right.svg create mode 100644 atomic_defi_design/assets/images/arrow-top-right.svg create mode 100644 atomic_defi_design/assets/images/swap-horizontal.svg diff --git a/assets/themes/Default - Light/colors.json b/assets/themes/Default - Light/colors.json index 86a872165e..83c87d43f7 100644 --- a/assets/themes/Default - Light/colors.json +++ b/assets/themes/Default - Light/colors.json @@ -125,5 +125,5 @@ "arrowUpColor": "#F85757FF", "arrowDownColor": "#845FEFFF", - "lineSeparatorColor": "#CDD3DCFF" + "lineSeparatorColor": "#CDD3DC88" } diff --git a/atomic_defi_design/Dex/Screens/Dashboard.qml b/atomic_defi_design/Dex/Screens/Dashboard.qml index 319292f2e5..6a8ece6f81 100644 --- a/atomic_defi_design/Dex/Screens/Dashboard.qml +++ b/atomic_defi_design/Dex/Screens/Dashboard.qml @@ -116,6 +116,7 @@ Item } } + // Right side AnimatedRectangle { @@ -124,6 +125,18 @@ Item x: sidebar.width border.color: 'transparent' + Rectangle + { + radius: 0 + anchors.fill: parent + anchors.rightMargin : - border.width + anchors.bottomMargin: - border.width + anchors.leftMargin: - border.width + border.width: 1 + border.color: Dex.CurrentTheme.lineSeparatorColor + color: 'transparent' + } + // Modals ModalLoader { diff --git a/atomic_defi_design/Dex/Sidebar/Main.qml b/atomic_defi_design/Dex/Sidebar/Main.qml index d4a47b7d38..3a09d8fda5 100644 --- a/atomic_defi_design/Dex/Sidebar/Main.qml +++ b/atomic_defi_design/Dex/Sidebar/Main.qml @@ -34,9 +34,15 @@ Item height: parent.height // Background Rectangle - Rectangle + DefaultRectangle { + radius: 0 anchors.fill: parent + anchors.rightMargin : - border.width + anchors.bottomMargin: - border.width + anchors.leftMargin: - border.width + border.width: 1 + border.color: Dex.CurrentTheme.lineSeparatorColor color: Dex.CurrentTheme.sidebarBgColor } @@ -118,11 +124,5 @@ Item onSettingsClicked: root.settingsClicked() onSupportClicked: root.supportClicked() } - - VerticalLine - { - height: parent.height - anchors.right: parent.right - } } } diff --git a/atomic_defi_design/Dex/Wallet/Sidebar.qml b/atomic_defi_design/Dex/Wallet/Sidebar.qml index 84e6de8a12..db3fe15a97 100644 --- a/atomic_defi_design/Dex/Wallet/Sidebar.qml +++ b/atomic_defi_design/Dex/Wallet/Sidebar.qml @@ -28,10 +28,16 @@ Item DefaultRectangle { id: background - anchors.right: parent.right + radius: 0 width: parent.width - height: parent.height + anchors.right: parent.right + anchors.rightMargin : - border.width + anchors.topMargin : - border.width + anchors.bottomMargin: - border.width + anchors.leftMargin: - border.width + border.width: 0 + color: 'transparent' // Panel contents Item diff --git a/atomic_defi_design/Dex/main.qml b/atomic_defi_design/Dex/main.qml index 0a18ae3c4e..81bea29475 100644 --- a/atomic_defi_design/Dex/main.qml +++ b/atomic_defi_design/Dex/main.qml @@ -158,6 +158,7 @@ DexWindow { width: _row.width height: 30 + clip: true Behavior on x { NumberAnimation diff --git a/atomic_defi_design/assets/images/arrow-bottom-right.svg b/atomic_defi_design/assets/images/arrow-bottom-right.svg new file mode 100644 index 0000000000..c667cc0ea1 --- /dev/null +++ b/atomic_defi_design/assets/images/arrow-bottom-right.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/atomic_defi_design/assets/images/arrow-top-right.svg b/atomic_defi_design/assets/images/arrow-top-right.svg new file mode 100644 index 0000000000..2a4d5229e1 --- /dev/null +++ b/atomic_defi_design/assets/images/arrow-top-right.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/atomic_defi_design/assets/images/swap-horizontal.svg b/atomic_defi_design/assets/images/swap-horizontal.svg new file mode 100644 index 0000000000..6b4d56ecb7 --- /dev/null +++ b/atomic_defi_design/assets/images/swap-horizontal.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/atomic_defi_design/assets/languages/atomic_defi_de.ts b/atomic_defi_design/assets/languages/atomic_defi_de.ts index 06dad49822..47450a6cc9 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_de.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_de.ts @@ -733,83 +733,83 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 ConfirmTradeModal - + Confirm Exchange Details Bestätigen Sie die Austausch-Details - + Trade price is more than 50% different to CEX! Confirm? Der Handelspreis unterscheidet sich um mehr als 50% vom CEX-Preis. Bestätigen? - + This swap request can not be undone and is a final event! Diese Tauschanfrage kann nicht rückgängig gemacht werden und ist ein endgültiges Ereignis! - + This transaction can take up to 60 mins - DO NOT close this application! Diese Transaktion kann bis zu 60 Minuten dauern - schließen Sie diese Anwendung NICHT! - + Loading fees... Lade Gebühren... - + <b>Total %1 fees:</b> <b>Gesamt %1 Gebühren:</b> - + Security configuration Sicherheitskonfiguration - + %1 confirmations for incoming %2 transactions %1 Bestätigungen für eingehende %2 Transaktionen - + Read more about dPoW Lesen Sie mehr über dPoW - + Use custom protection settings for incoming %1 transactions TICKER Benutzerdefinierte Schutzeinstellungen für eingehende %1 Transaktionen verwenden - + Enable Komodo dPoW security Komodo dPoW-Sicherheit aktivieren - + dPoW protected dPoW-gesichert - + Required Confirmations Erforderliche Bestätigungen - + Warning, this atomic swap is not dPoW protected! Achtung, dieser Atomic Swap ist nicht dPoW-geschützt! - + Cancel Abbrechen - + Confirm Bestätigen @@ -825,182 +825,182 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 Dashboard - + The current number of enabled coins does not match your configuration specification. Your assets configuration will be reset. Die aktuelle Anzahl aktivierter Coins stimmt nicht mit Ihrer Konfigurationsvorgabe überein. Die Konfiguration der Assets wird zurückgesetzt. - + Matching Zusammenführung - + Order Matching Order wird zusammengeführt - + Matched Zusammengeführt - + Order Matched Order wurde zusammengeführt - + Ongoing Laufend - + Swap Ongoing Austausch läuft - + Successful Erfolgreich - + Swap Successful Tausch erfolgreich - + Refunding Rückzahlung - + Failed Fehlgeschlagen - + Swap Failed Tausch fehlgeschlagen - + Unknown Unbekannt - + Unknown State Unbekannter Status - + Started Gestartet - + Negotiated Ausgehandelt - + Taker fee sent Taker-Gebühr gesendet - + Maker payment received Maker-Zahlung erhalten - + Maker payment wait confirm started Warten auf die Zahlungsbestätigung des Makers gestartet - + Maker payment validated and confirmed Maker-Zahlung validiert und bestätigt - + Taker payment sent Taker-Zahlung gesendet - + Taker payment spent Taker-Zahlung ausgegeben - + Maker payment spent Maker-Zahlung ausgegeben - + Finished Fertig - + Start failed Start fehlgeschlagen - + Negotiate failed Verhandeln fehlgeschlagen - + Taker fee validate failed Validierung der Abnehmergebühr fehlgeschlagen - + Maker payment transaction failed Maker-Zahlungstransaktion fehlgeschlagen - + Maker payment Data send failed Fehler beim Senden der Maker-Zahlungsdaten - + Maker payment wait confirm failed Warten auf die Zahlungsbestätigung des Makers fehlgeschlagen - + Taker payment validate failed Validierung der Taker-Zahlung fehlgeschlagen - + Taker payment wait confirm failed Warten auf die Zahlungsbestätigung des Takers fehlgeschlagen - + Taker payment spend failed Zahlungsausgabe des Takers fehlgeschlagen - + Maker payment wait refund started Countdown für die Rückerstattung der Maker-Zahlung hat begonnen - + Maker payment refunded Maker-Zahlung zurückerstattet - + Maker payment refund failed Rückerstattung der Maker-Zahlung fehlgeschlagen @@ -1084,7 +1084,7 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 DexAppPasswordField - + Type password Kennwort eingeben @@ -1385,7 +1385,7 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 General - + %n day(s) %n Tag @@ -1393,7 +1393,7 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 - + %nd day @@ -1402,7 +1402,7 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 - + %nh hours @@ -1411,7 +1411,7 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 - + %nm minutes @@ -1420,7 +1420,7 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 - + %ns seconds @@ -1429,7 +1429,7 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 - + %nms milliseconds @@ -1438,92 +1438,117 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 - + - - - + <b>Taker tx fee:</b> <b>Taker tx Gebühren:</b> - + <b>Dex tx fee:</b> <b>Dex tx Gebühren:</b> - + <b>Dex fee:</b> <b>Dex Gebühren:</b> - + <b>Maker tx fee:</b> <b>Maker tx Gebühren:</b> - + + %1 balance is zero + + + + + Activating %1 (%2%) + + + + + Loading wallet... + + + + + Min: %1 + Minimum: %1 + + + + Enter an amount + Betrag eingeben + + + Trading Fee Handelsgebühr - + Minimum Trading Amount Mindesthandelsbetrag - + Wallet %1 already exists WALLETNAME Brieftasche %1 existiert bereits - + %1 balance is lower than the fees amount: %2 %3 Das %1 Guthaben ist niedriger als der Gebührenbetrag: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount Handelbares %1 Guthaben (nach Gebühren) ist niedriger als der Mindesthandelsbetrag - + Please fill the price field Bitte füllen Sie das Preisfeld aus - + Please fill the volume field - - + + Please wait for %1 to fully activate - - + + %1 volume is lower than minimum trade amount %1 Volumen ist niedriger als der minimale Handelsbetrag - - + + %1 needs to be enabled in order to use %2 %1 muss aktiviert werden, um %2 verwenden zu können - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions Das %1 Guthaben muss finanziert werden, ein Guthaben größer Null ist erforderlich, um das Benzin von %2 Transaktionen zu bezahlen - + Unknown Error Unbekannter Fehler @@ -1589,89 +1614,94 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456Name der Brieftasche - + Enter seed Geben Sie den Seed ein - + Your seed is not BIP39 compliant. Try again or select 'Allow custom seed' to continue. Ihr Seed ist nicht BIP39-konform. Versuchen Sie es erneut oder wählen Sie "benutzerdefinierten Seed erlauben" um fortzufahren - - + + i understand Ich verstehe - - + + я согласен - - + + je comprends - - + + entiendo - - + + anladım - - + + ich verstehe - + Ok Ok - + Allow custom seed Benutzerdefinierten Seed zulassen - + <strong>Allow custom seed</strong> <strong>Benutzerdefinierten Seed zulassen</strong> - + Custom seed phrases might be less secure and easier to crack than a generated BIP39 compliant seed phrase or private key (WIF).<br><br>To confirm you understand the risk and know what you are doing, type <strong>'I understand'</strong> in the box below. Benutzerdefinierte Seed-Phrasen sind möglicherweise weniger sicher und leichter zu knacken als eine generierte BIP39-konforme Seed-Phrase oder ein privater Schlüssel (WIF).<br><br>Um zu bestätigen, dass Sie das Risiko verstehen und wissen, was Sie tun, geben Sie bitte <strong>'Ich verstehe'</strong> in das Feld unten ein. - + I understand Ich verstehe - + Next Weiter - + + Enter password + + + + Enter the same password to confirm Geben Sie zur Bestätigung dasselbe Kennwort ein - + Continue Fortsetzen @@ -1759,17 +1789,17 @@ Try again or select 'Allow custom seed' to continue. Login - + Incorrect Password Falsches Kennwort - + Log In Anmelden - + Cancel Abbrechen @@ -1857,47 +1887,47 @@ They will be removed from the orderbook until you log in again. Vertragsadresse - + Send Senden - + Enable %1 ? %1 aktivieren? - + Yes Ja - + No Nein - + Receive Empfangen - + Swap Tausch - + is wallet only nur Brieftasche (kein DEX möglich) - + Rewards Belohnungen - + Faucet Faucet @@ -1976,17 +2006,17 @@ They will be removed from the orderbook until you log in again. Historie - + Place Order Order platzieren - + Order Selected Order ausgewählt - + START SWAP TAUSCH STARTEN @@ -2040,13 +2070,13 @@ They will be removed from the orderbook until you log in again. MarketModeSelector - + Sell %1 TICKER %1 Verkaufen - + Buy %1 TICKER %1 Kaufen @@ -2226,67 +2256,72 @@ They will be removed from the orderbook until you log in again. Wählen sie ein Kennwort - + Important: Back up your seed phrase before proceeding! Wichtig: Sichern Sie Ihre Seed-Phrase, bevor Sie fortfahren! - + We recommend storing it offline. Wir empfehlen, sie offline zu speichern. - + Generated Seed Generierter Seed - + Seed phrase Seed Phrase - + copied to clipboard In die Zwischenablage kopiert - + Next Weiter - + Let's double check your seed phrase Lassen Sie uns Ihre Seed-Phrase noch einmal überprüfen - + Your seed phrase is important - that's why we like to make sure it's correct. We'll ask you three different questions about your seed phrase to make sure you'll be able to easily restore your wallet whenever you want. Ihre Seed-Phrase ist wichtig – deshalb stellen wir gerne sicher, dass sie korrekt ist. Wir stellen Ihnen drei verschiedene Fragen zu Ihrer Seed-Phrase, um sicherzustellen, dass Sie Ihre Wallet jederzeit problemlos wiederherstellen können. - + Enter the Geben Sie das - + word Wort ein - + Check Prüfen - + + Enter password + + + + Enter the same password to confirm Geben Sie zur Bestätigung dasselbe Kennwort ein - + Continue Fortsetzen @@ -2470,97 +2505,97 @@ They will be removed from the orderbook until you log in again. OrderForm - + Price Preis - + Reduce 1% relative to CEX market price. - + Use CEX market price. - + Increase 1% relative to CEX market price. - + Volume Volumen - + Amount to sell Zu verkaufender Betrag - + Amount to receive Zu erhaltender Betrag - + Max Max - + Swap 25% of your tradable balance. - + Swap 50% of your tradable balance. - + Swap 100% of your tradable balance. - + Min Volume - + Min amount to sell - + Min amount to receive - + Minimum accepted trade equals 10% of order volume. - + Minimum accepted trade equals 25% of order volume. - + Minimum accepted trade equals 50% of order volume. - + Min volume: Mindestvolumen: - + Use custom minimum trade amount Benutzerdefinierten Mindesthandelsbetrag verwenden @@ -2594,104 +2629,104 @@ They will be removed from the orderbook until you log in again. Orderdetails - + Order Type Orderart - + Maker Order Maker-Order - + Taker Order Taker-Order - + Refund State Rückerstattungsstatus - + Your swap failed but the auto-refund process for your payment started already. Please wait and keep application opened until you receive your payment back Ihr Umtausch ist fehlgeschlagen, aber der automatische Rückerstattungsprozess für Ihre Zahlung hat bereits begonnen. Bitte warten Sie und lassen Sie die Anwendung geöffnet, bis Sie Ihre Zahlung zurückerhalten - + Date Datum - + Error ID Fehler-ID - - + + Error Log Fehlerprotokoll - + Close Schließen - + Cancel Order Order Abbrechen - - + + Swap ID Swap ID - + Maker Payment Sent Transaction ID Maker-Zahlung gesendet: Transaktions-ID - + Maker Payment Spent Transaction ID Maker-Zahlung ausgegeben: Transaktions-ID - + Maker Payment TXID Maker-Zahlung: TXID - + Taker Payment Spent Transaction ID Taker-Zahlung ausgegeben: Transaktions-ID - + Taker Payment Sent Transaction ID Taker-Zahlung gesendet: Transaktions-ID - + Taker Payment TXID Taker-Zahlung: TXID - + Recover Funds Rückerstattung der Geldmittel - + Refunding... Rückzahlung… - + View on Explorer Ansicht im Explorer @@ -2828,8 +2863,8 @@ Bitte wählen Sie eine neue Order aus. Portfolio - ADD ASSET - ASSET HINZUFÜGEN + ADD CRYPTO + @@ -2928,12 +2963,12 @@ Bitte wählen Sie eine neue Order aus. ProView - + Failed to place the order Die Order konnte nicht platziert werden - + Placed the order Order platziert @@ -2981,7 +3016,7 @@ Bitte wählen Sie eine neue Order aus. RecoverSeedModal - + View seed and private keys Seed- und privaten Schlüsseln anzeigen @@ -2991,64 +3026,64 @@ Bitte wählen Sie eine neue Order aus. Bitte geben Sie Ihr Kennwort ein, um den Seed anzuzeigen. - + Seed Seed - + Backup Seed Seed Sicherung - + Public Address copied to clipboard Öffentliche Adresse in die Zwischenablage kopiert - + Cancel Abbrechen - + Incorrect Password Falsches Kennwort - + View Ansehen - - + + copied to clipboard In die Zwischenablage kopiert - - + + RPC Password RPC Kennwort - + Search a coin. Coin suchen. - + Public Address Öffentliche Adresse - + Private Key copied to clipboard Privater Schlüssel in die Zwischenablage kopiert - + Private Key Privater Schlüssel @@ -3619,22 +3654,9 @@ Bitte wählen Sie eine neue Order aus. Suchen - - Add asset - Asset hinzufügen - - - - SmartChartView - - - Loading market data - Laden von Marktdaten - - - - There is no chart data for this ticker yet - Für diesen Ticker liegen noch keine Chartdaten vor + + ADD CRYPTO + @@ -3665,7 +3687,7 @@ Bitte wählen Sie eine neue Order aus. CEX-Kurs - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> %1 ist nicht aktiviert - Möchten Sie es aktivieren, um die günstigsten Order von %2 auswählen zu können? <br><a href='#'>Ja</a> - <a href='#no'>Nein</a> @@ -4038,154 +4060,122 @@ Die Netzwerkgebühren können je nach ausgewähltem Handelspaar stark variieren. Trade - + Swap Tauschen - + Instant trading with best orders Sofortiger Handel mit den besten Order - + Reset form Formular zurücksetzen - + You have no tradable assets Keine handelbaren Assets vorhanden - + From Von - - Enter an amount - Betrag eingeben + + Entered amount must be higher than 0. + + + + + Select an order. + - + MAX MAX - + To Nach - + Pick an order Order auswählen - + Price Preis - + Better price found: %1. Updating forms. Besseren Preis gefunden: %1. Formulare aktualisieren. - + Better price (%1) found but received quantity (%2) is lower than your current one (%3). Click here to update the selected order. Besseren Preis (%1) gefunden, aber erhaltene Menge (%2) ist niedriger als Ihre aktuelle (%3). Klicken Sie hier, um den ausgewählte Order zu aktualisieren. - + %1 %1 - + Tradable: Handelbar: - - Min: %1 - Minimum: %1 - - - + Pick a coin Wählen Sie einen Coin - + SWAP NOW JETZT TAUSCHEN - + Failed to place the order Die Order konnte nicht platziert werden - + Placed the order Order platziert - - Entered amount must be superior than 0. - Der eingegebene Betrag muss größer als 0 sein. - - - - You must select an order. - Sie müssen eine Order auswählen. - - - - Entered amount is below the minimum required by this order: %1 - Der eingegebene Betrag liegt unter dem für diese Order erforderlichen Mindestbetrag: %1 - - - - - %1 needs to be enabled in order to use %2 - %1 muss aktiviert werden, um %2 verwenden zu können - - - - - %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions - Das %1 Guthaben muss finanziert werden, ein Guthaben größer Null ist erforderlich, um das Benzin von %2 Transaktionen zu bezahlen - - - - %1 balance does not have enough funds to pay the gas of %2 transactions - Das Guthaben von %1 reicht nicht aus, um das Gas von %2 Transaktionen zu bezahlen - - - + No buy orders found for %1. Keine Kauforder für %1 gefunden. - + You can check later or try to sell a different coin. Sie können später nachsehen oder versuchen, einen anderen Coin zu verkaufen. - + Calculating fee estimate... Geschätzten Gebühren werden berechnet... - + Total %1 fees: %1 Gesamtgebühren: - + %2 (%3) %2 (%3) @@ -4228,6 +4218,19 @@ Die Netzwerkgebühren können je nach ausgewähltem Handelspaar stark variieren. Order platzieren + + TradingViewChart + + + Loading market data + Laden von Marktdaten + + + + There is no chart data for this ticker yet + Für diesen Ticker liegen noch keine Chartdaten vor + + TransactionDetailsModal @@ -4320,22 +4323,22 @@ Die Netzwerkgebühren können je nach ausgewähltem Handelspaar stark variieren. Transactions - + Sent Gesendet - + Received Erhalten - + fees Gebühren - + Unconfirmed Unbestätigt diff --git a/atomic_defi_design/assets/languages/atomic_defi_en.ts b/atomic_defi_design/assets/languages/atomic_defi_en.ts index 574da37ff9..1c7bae05ce 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_en.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_en.ts @@ -732,83 +732,83 @@ ConfirmTradeModal - + Confirm Exchange Details - + Trade price is more than 50% different to CEX! Confirm? - + This swap request can not be undone and is a final event! - + This transaction can take up to 60 mins - DO NOT close this application! - + Loading fees... - + <b>Total %1 fees:</b> - + Security configuration - + %1 confirmations for incoming %2 transactions - + Read more about dPoW - + Use custom protection settings for incoming %1 transactions TICKER - + Enable Komodo dPoW security - + dPoW protected - + Required Confirmations - + Warning, this atomic swap is not dPoW protected! - + Cancel Cancel - + Confirm @@ -824,182 +824,182 @@ Dashboard - + The current number of enabled coins does not match your configuration specification. Your assets configuration will be reset. - + Matching - + Order Matching - + Matched - + Order Matched - + Ongoing - + Swap Ongoing - + Successful - + Swap Successful - + Refunding - + Failed - + Swap Failed - + Unknown - + Unknown State - + Started - + Negotiated - + Taker fee sent - + Maker payment received - + Maker payment wait confirm started - + Maker payment validated and confirmed - + Taker payment sent - + Taker payment spent - + Maker payment spent - + Finished - + Start failed - + Negotiate failed - + Taker fee validate failed - + Maker payment transaction failed - + Maker payment Data send failed - + Maker payment wait confirm failed - + Taker payment validate failed - + Taker payment wait confirm failed - + Taker payment spend failed - + Maker payment wait refund started - + Maker payment refunded - + Maker payment refund failed @@ -1083,7 +1083,7 @@ DexAppPasswordField - + Type password @@ -1384,7 +1384,7 @@ General - + %n day(s) @@ -1392,7 +1392,7 @@ - + %nd day @@ -1401,7 +1401,7 @@ - + %nh hours @@ -1410,7 +1410,7 @@ - + %nm minutes @@ -1419,7 +1419,7 @@ - + %ns seconds @@ -1428,7 +1428,7 @@ - + %nms milliseconds @@ -1437,92 +1437,117 @@ - + - - + <b>Taker tx fee:</b> - + <b>Dex tx fee:</b> - + <b>Dex fee:</b> - + <b>Maker tx fee:</b> - + + %1 balance is zero + + + + + Activating %1 (%2%) + + + + + Loading wallet... + + + + + Min: %1 + + + + + Enter an amount + + + + Trading Fee - + Minimum Trading Amount - + Wallet %1 already exists WALLETNAME - + %1 balance is lower than the fees amount: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount - + Please fill the price field - + Please fill the volume field - - + + Please wait for %1 to fully activate - - + + %1 volume is lower than minimum trade amount - - + + %1 needs to be enabled in order to use %2 - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions - + Unknown Error @@ -1588,89 +1613,94 @@ - + Enter seed - + Your seed is not BIP39 compliant. Try again or select 'Allow custom seed' to continue. - - + + i understand - - + + я согласен - - + + je comprends - - + + entiendo - - + + anladım - - + + ich verstehe - + Ok - + Allow custom seed - + <strong>Allow custom seed</strong> - + Custom seed phrases might be less secure and easier to crack than a generated BIP39 compliant seed phrase or private key (WIF).<br><br>To confirm you understand the risk and know what you are doing, type <strong>'I understand'</strong> in the box below. - + I understand - + Next - + + Enter password + + + + Enter the same password to confirm - + Continue @@ -1758,17 +1788,17 @@ Try again or select 'Allow custom seed' to continue. Login - + Incorrect Password - + Log In - + Cancel Cancel @@ -1856,47 +1886,47 @@ They will be removed from the orderbook until you log in again. - + Send - + Enable %1 ? - + Yes Yes - + No - + Receive - + Swap - + is wallet only - + Rewards - + Faucet @@ -1975,17 +2005,17 @@ They will be removed from the orderbook until you log in again. - + Place Order - + Order Selected - + START SWAP @@ -2039,13 +2069,13 @@ They will be removed from the orderbook until you log in again. MarketModeSelector - + Sell %1 TICKER - + Buy %1 TICKER @@ -2225,67 +2255,72 @@ They will be removed from the orderbook until you log in again. - + Important: Back up your seed phrase before proceeding! - + We recommend storing it offline. - + Generated Seed - + Seed phrase - + copied to clipboard - + Next - + Let's double check your seed phrase - + Your seed phrase is important - that's why we like to make sure it's correct. We'll ask you three different questions about your seed phrase to make sure you'll be able to easily restore your wallet whenever you want. - + Enter the - + word - + Check - + + Enter password + + + + Enter the same password to confirm - + Continue @@ -2469,97 +2504,97 @@ They will be removed from the orderbook until you log in again. OrderForm - + Price - + Reduce 1% relative to CEX market price. - + Use CEX market price. - + Increase 1% relative to CEX market price. - + Volume - + Amount to sell - + Amount to receive - + Max - + Swap 25% of your tradable balance. - + Swap 50% of your tradable balance. - + Swap 100% of your tradable balance. - + Min Volume - + Min amount to sell - + Min amount to receive - + Minimum accepted trade equals 10% of order volume. - + Minimum accepted trade equals 25% of order volume. - + Minimum accepted trade equals 50% of order volume. - + Min volume: - + Use custom minimum trade amount @@ -2593,104 +2628,104 @@ They will be removed from the orderbook until you log in again. - + Order Type - + Maker Order - + Taker Order - + Refund State - + Your swap failed but the auto-refund process for your payment started already. Please wait and keep application opened until you receive your payment back - + Date - + Error ID - - + + Error Log - + Close - + Cancel Order - - + + Swap ID - + Maker Payment Sent Transaction ID - + Maker Payment Spent Transaction ID - + Maker Payment TXID - + Taker Payment Spent Transaction ID - + Taker Payment Sent Transaction ID - + Taker Payment TXID - + Recover Funds - + Refunding... - + View on Explorer @@ -2826,7 +2861,7 @@ Please select a new order. Portfolio - ADD ASSET + ADD CRYPTO @@ -2926,12 +2961,12 @@ Please select a new order. ProView - + Failed to place the order - + Placed the order @@ -2979,7 +3014,7 @@ Please select a new order. RecoverSeedModal - + View seed and private keys @@ -2989,64 +3024,64 @@ Please select a new order. - + Seed - + Backup Seed - + Public Address copied to clipboard - + Cancel Cancel - + Incorrect Password - + View - - + + copied to clipboard - - + + RPC Password - + Search a coin. - + Public Address - + Private Key copied to clipboard - + Private Key @@ -3617,21 +3652,8 @@ Please select a new order. - - Add asset - - - - - SmartChartView - - - Loading market data - - - - - There is no chart data for this ticker yet + + ADD CRYPTO @@ -3663,7 +3685,7 @@ Please select a new order. - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> @@ -4020,154 +4042,122 @@ Network fees can vary greatly depending on your selected trading pair. Trade - + Swap - + Instant trading with best orders - + Reset form - + You have no tradable assets - + From - - Enter an amount + + Entered amount must be higher than 0. - + + Select an order. + + + + MAX - + To - + Pick an order - + Price - + Better price found: %1. Updating forms. - + Better price (%1) found but received quantity (%2) is lower than your current one (%3). Click here to update the selected order. - + %1 - + Tradable: - - Min: %1 - - - - + Pick a coin - + SWAP NOW - + Failed to place the order - + Placed the order - - Entered amount must be superior than 0. - - - - - You must select an order. - - - - - Entered amount is below the minimum required by this order: %1 - - - - - - %1 needs to be enabled in order to use %2 - - - - - - %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions - - - - - %1 balance does not have enough funds to pay the gas of %2 transactions - - - - + No buy orders found for %1. - + You can check later or try to sell a different coin. - + Calculating fee estimate... - + Total %1 fees: - + %2 (%3) @@ -4210,6 +4200,19 @@ Network fees can vary greatly depending on your selected trading pair. + + TradingViewChart + + + Loading market data + + + + + There is no chart data for this ticker yet + + + TransactionDetailsModal @@ -4302,22 +4305,22 @@ Network fees can vary greatly depending on your selected trading pair. Transactions - + Sent - + Received - + fees - + Unconfirmed diff --git a/atomic_defi_design/assets/languages/atomic_defi_es.ts b/atomic_defi_design/assets/languages/atomic_defi_es.ts index c2b1055f75..fe0b09d3c6 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_es.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_es.ts @@ -732,83 +732,83 @@ ConfirmTradeModal - + Confirm Exchange Details Confirmar Detalles de Intercambio - + Trade price is more than 50% different to CEX! Confirm? ¡El precio comercial es más del 50% diferente al de CEX! ¿Confirmar? - + This swap request can not be undone and is a final event! ¡Esta solicitud de intercambio no se puede deshacer y es un evento final! - + This transaction can take up to 60 mins - DO NOT close this application! Esta transacción puede demorar hasta 60 minutos. ¡NO cierre esta aplicación! - + Loading fees... Cargando tarifas... - + <b>Total %1 fees:</b> <b>Cuota total de %1:</b> - + Security configuration Configuración de seguridad - + %1 confirmations for incoming %2 transactions %1 confirmaciones para %2 transacciones entrantes - + Read more about dPoW Obtenga más información sobre dPoW - + Use custom protection settings for incoming %1 transactions TICKER Utilice configuraciones de protección personalizadas para %1 transacciones entrantes - + Enable Komodo dPoW security Habilite la seguridad dPoW de Komodo - + dPoW protected Protegido por dPoW - + Required Confirmations Confirmaciones Requeridas - + Warning, this atomic swap is not dPoW protected! Advertencia, este intercambio atómico no está protegido por dPoW! - + Cancel Cancelar - + Confirm Confirmar @@ -824,182 +824,182 @@ Dashboard - + The current number of enabled coins does not match your configuration specification. Your assets configuration will be reset. El número actual de monedas habilitadas no coincide con su especificación de configuración. Se restablecerá la configuración de sus activos. - + Matching Emparejando - + Order Matching Emparejando Orden - + Matched Emparejado - + Order Matched Orden Emparejada - + Ongoing En Curso - + Swap Ongoing Intercambio En Curso - + Successful Exitoso - + Swap Successful Intercambio exitoso - + Refunding Reembolso - + Failed Fallo - + Swap Failed Intercambio fallido - + Unknown Desconocido - + Unknown State Estado Desconocido - + Started Iniciado - + Negotiated Negociado - + Taker fee sent Tarifa taker enviada - + Maker payment received Pago de maker recibido - + Maker payment wait confirm started Inicio de espera de confirmacion de pago de maker - + Maker payment validated and confirmed Validacion y confirmacion de pago de maker - + Taker payment sent Pago de taker enviado - + Taker payment spent Pago del taker gastado - + Maker payment spent Pago del maker gastado - + Finished Terminado - + Start failed Inicio fallido - + Negotiate failed Negociacion fallida - + Taker fee validate failed Validación de tarifa del taker fallida - + Maker payment transaction failed Transacción de pago de maker fallo - + Maker payment Data send failed Envio de data de pago de maker fallo - + Maker payment wait confirm failed Espera de confirmacion de pago de maker fallo - + Taker payment validate failed Validacion de pago de taker fallo - + Taker payment wait confirm failed Espera de confirmacion de pago de taker fallo - + Taker payment spend failed Gasto de pago de taker fallo - + Maker payment wait refund started Reembolso de espera de pago de maker iniciado - + Maker payment refunded Pago de maker reembolsado - + Maker payment refund failed Reembolso del pago de maker fallo @@ -1083,7 +1083,7 @@ DexAppPasswordField - + Type password Escriba la contraseña @@ -1384,7 +1384,7 @@ General - + %n day(s) %n día @@ -1392,7 +1392,7 @@ - + %nd day @@ -1401,7 +1401,7 @@ - + %nh hours @@ -1410,7 +1410,7 @@ - + %nm minutes @@ -1419,7 +1419,7 @@ - + %ns seconds @@ -1428,7 +1428,7 @@ - + %nms milliseconds @@ -1437,92 +1437,117 @@ - + - - - + <b>Taker tx fee:</b> <b>Cuota de tx del taker:</b> - + <b>Dex tx fee:</b> <b>Cuota de tx del Dex:</b> - + <b>Dex fee:</b> <b>Cuota Dex:</b> - + <b>Maker tx fee:</b> <b>Cuota tx del maker:</b> - + + %1 balance is zero + + + + + Activating %1 (%2%) + + + + + Loading wallet... + + + + + Min: %1 + Mín.: %1 + + + + Enter an amount + Ingrese una cantidad + + + Trading Fee Tarifa de Intercambio - + Minimum Trading Amount Cantidad Mínima de Intercambio - + Wallet %1 already exists WALLETNAME Monedero %1 ya existe - + %1 balance is lower than the fees amount: %2 %3 El saldo de %1 es inferior al monto de las tarifas: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount El saldo de %1 (después de las tarifas) es inferior al monto mínimo de intercambio - + Please fill the price field Por favor complete el campo de precio - + Please fill the volume field Complete el campo de volumen - - + + Please wait for %1 to fully activate Espere a que %1 se active por completo - - + + %1 volume is lower than minimum trade amount El volumen de %1 es inferior al monto mínimo de intercambio - - + + %1 needs to be enabled in order to use %2 %1 debe habilitarse para usar %2 - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions se debe rellenar el saldo de %1, se requiere un saldo distinto de cero para pagar el gas de %2 transacciones - + Unknown Error Error Desconocido @@ -1588,90 +1613,95 @@ Nombre de billetera - + Enter seed Ingresar semilla - + Your seed is not BIP39 compliant. Try again or select 'Allow custom seed' to continue. Su semilla no cumple con BIP39. Vuelva a intentarlo o seleccione 'Permitir semilla personalizada' personalizada continúe. - - + + i understand entiendo - - + + я согласен - - + + je comprends - - + + entiendo - - + + anladım - - + + ich verstehe - + Ok Ok - + Allow custom seed Permitir semilla personalizada - + <strong>Allow custom seed</strong> <strong>Permitir semilla personalizada</strong> - + Custom seed phrases might be less secure and easier to crack than a generated BIP39 compliant seed phrase or private key (WIF).<br><br>To confirm you understand the risk and know what you are doing, type <strong>'I understand'</strong> in the box below. Las frases semilla personalizadas pueden ser menos seguras y más fáciles de descifrar que una frase semilla o clave privada (WIF) compatible con BIP39.<br><br>Para confirmar que comprende el riesgo y sabe lo que está haciendo, escriba <strong> 'Entiendo'</strong> en el cuadro de abajo. - + I understand Entiendo - + Next Siguiente - + + Enter password + + + + Enter the same password to confirm Ingrese la misma contraseña para confirmar - + Continue Continuar @@ -1759,17 +1789,17 @@ Vuelva a intentarlo o seleccione 'Permitir semilla personalizada' pers Login - + Incorrect Password Contraseña incorrecta - + Log In Iniciar sesión - + Cancel Cancelar @@ -1859,47 +1889,47 @@ Se eliminarán del libro de pedidos hasta que vuelva a iniciar sesión. Dirección del Contrato - + Send Enviar - + Enable %1 ? ¿Habilitar %1? - + Yes Sí - + No No - + Receive Recibir - + Swap Intercambiar - + is wallet only es solo billetera - + Rewards Recompensas - + Faucet Grifo @@ -1978,17 +2008,17 @@ Se eliminarán del libro de pedidos hasta que vuelva a iniciar sesión.Historial - + Place Order Realizar pedido - + Order Selected Pedido seleccionado - + START SWAP INICIO INTERCAMBIAR @@ -2042,13 +2072,13 @@ Se eliminarán del libro de pedidos hasta que vuelva a iniciar sesión. MarketModeSelector - + Sell %1 TICKER Vender %1 - + Buy %1 TICKER Comprar %1 @@ -2228,67 +2258,72 @@ Se eliminarán del libro de pedidos hasta que vuelva a iniciar sesión.Elegir contraseña - + Important: Back up your seed phrase before proceeding! Importante: ¡Haga una copia de seguridad de su frase semilla antes de continuar! - + We recommend storing it offline. Recomendamos almacenarlo fuera de línea. - + Generated Seed Semilla Generada - + Seed phrase Frase semilla - + copied to clipboard copiado al portapapeles - + Next Siguiente - + Let's double check your seed phrase Verifiquemos dos veces su frase semilla - + Your seed phrase is important - that's why we like to make sure it's correct. We'll ask you three different questions about your seed phrase to make sure you'll be able to easily restore your wallet whenever you want. Su frase semilla es importante, por eso nos gusta asegurarnos de que sea correcta. Le haremos tres preguntas diferentes sobre su frase semilla para asegurarnos de que podrá restaurar fácilmente su billetera cuando lo desee. - + Enter the Ingresa la - + word palabra - + Check Verificar - + + Enter password + + + + Enter the same password to confirm Ingrese la misma contraseña para confirmar - + Continue Continuar @@ -2472,97 +2507,97 @@ Se eliminarán del libro de pedidos hasta que vuelva a iniciar sesión. OrderForm - + Price Precio - + Reduce 1% relative to CEX market price. Reducción del 1% en relación con el precio de mercado CEX. - + Use CEX market price. Utilice el precio de mercado CEX. - + Increase 1% relative to CEX market price. Aumento del 1% en relación con el precio de mercado de CEX. - + Volume Volumen - + Amount to sell Importe para vender - + Amount to receive Importe para recibir - + Max Max - + Swap 25% of your tradable balance. Usar el 25% de su saldo comercial. - + Swap 50% of your tradable balance. Usar el 50% de su saldo comercial. - + Swap 100% of your tradable balance. Usar el 100% de su saldo comercial. - + Min Volume Volumen Mínimo - + Min amount to sell Cantidad mínima para vender - + Min amount to receive Cantidad mínimo para recibir - + Minimum accepted trade equals 10% of order volume. El comercio mínimo aceptado es igual al 10% del volumen del pedido. - + Minimum accepted trade equals 25% of order volume. El comercio mínimo aceptado es igual al 25% del volumen del pedido. - + Minimum accepted trade equals 50% of order volume. El comercio mínimo aceptado es igual al 50% del volumen del pedido. - + Min volume: Volumen mínimo: - + Use custom minimum trade amount Utilizar una cantidad personalizada de intercambio mínima @@ -2596,104 +2631,104 @@ Se eliminarán del libro de pedidos hasta que vuelva a iniciar sesión.Detalles de Orden - + Order Type Tipo de Orden - + Maker Order Orden de Maker - + Taker Order Orden de Taker - + Refund State Estado del Reembolso - + Your swap failed but the auto-refund process for your payment started already. Please wait and keep application opened until you receive your payment back Su intercambio falló, pero el proceso de reembolso automático para su pago ya comenzó. Espere y mantenga la aplicación abierta hasta que reciba su pago - + Date Fecha - + Error ID ID de Error - - + + Error Log Registro de Error - + Close Cerrar - + Cancel Order Cancelar Pedido - - + + Swap ID ID de Intercambio - + Maker Payment Sent Transaction ID ID de la transacción pago enviada de Maker - + Maker Payment Spent Transaction ID ID de la transacción pago gastado de Maker - + Maker Payment TXID TXID del pago de Maker - + Taker Payment Spent Transaction ID ID de la transacción pago gastado de Taker - + Taker Payment Sent Transaction ID ID de la transacción pago enviada de Taker - + Taker Payment TXID TXID del pago de Taker - + Recover Funds Recuperar fondos - + Refunding... Reembolso... - + View on Explorer Ver en Explorer @@ -2830,8 +2865,8 @@ Seleccione un nuevo pedido. Portfolio - ADD ASSET - AGREGAR ACTIVO + ADD CRYPTO + @@ -2930,12 +2965,12 @@ Seleccione un nuevo pedido. ProView - + Failed to place the order Error al realizar el pedido - + Placed the order Realizó el pedido El @@ -2983,7 +3018,7 @@ Seleccione un nuevo pedido. RecoverSeedModal - + View seed and private keys Ver semilla y claves privadas @@ -2993,64 +3028,64 @@ Seleccione un nuevo pedido. Por favor ingrese su contraseña para ver la semilla. - + Seed Semilla - + Backup Seed Copia de seguridad de semilla - + Public Address copied to clipboard Direccion publica copiada en el portapapeles - + Cancel Cancelar - + Incorrect Password Contraseña incorrecta - + View Ver - - + + copied to clipboard copiado al portapapeles - - + + RPC Password Contraseña RPC - + Search a coin. Buscar una moneda. - + Public Address Dirección Pública - + Private Key copied to clipboard Clave Privada copiada en el portapapeles - + Private Key Clave Privada @@ -3621,22 +3656,9 @@ Seleccione un nuevo pedido. Buscar - - Add asset - Agregar activo - - - - SmartChartView - - - Loading market data - Cargando datos de mercado - - - - There is no chart data for this ticker yet - No hay datos de gráficos para este ticker aún + + ADD CRYPTO + @@ -3667,7 +3689,7 @@ Seleccione un nuevo pedido. Tasa CEX - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> %1 no está habilitado. ¿Desea habilitarlo para poder seleccionar %2 mejores ordenes?<br><a href='#'>Sí</a> - <a href='#no'>No</a> @@ -4040,154 +4062,122 @@ Las tarifas de la red pueden variar mucho según el par comercial seleccionado.< Trade - + Swap Intercambiar - + Instant trading with best orders Comercio instantáneo con las mejores órdenes - + Reset form Restablecer formulario - + You have no tradable assets No tiene activos intercambiables - + From Desde - - Enter an amount - Ingrese una cantidad + + Entered amount must be higher than 0. + + + + + Select an order. + - + MAX MAX - + To A - + Pick an order Elegir una orden - + Price Precio - + Better price found: %1. Updating forms. Mejor precio encontrado: %1. Actualización de formularios. - + Better price (%1) found but received quantity (%2) is lower than your current one (%3). Click here to update the selected order. Mejor precio (%1) encontrado pero la cantidad recibida (%2) es más baja que la actual (%3). Haga clic aquí para actualizar el pedido seleccionado. - + %1 %1 - + Tradable: Negociable: - - Min: %1 - Mín.: %1 - - - + Pick a coin Elija una moneda - + SWAP NOW CAMBIE AHORA - + Failed to place the order Error al realizar el pedido - + Placed the order Realizó el pedido El - - Entered amount must be superior than 0. - monto ingresado debe ser superior a 0. - - - - You must select an order. - Debe seleccionar un pedido. - - - - Entered amount is below the minimum required by this order: %1 - El monto ingresado está por debajo del mínimo requerido por esta orden: %1 - - - - - %1 needs to be enabled in order to use %2 - %1 debe habilitarse para usar %2 - - - - - %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions - se debe rellenar el saldo de %1, se requiere un saldo distinto de cero para pagar el gas de %2 transacciones - - - - %1 balance does not have enough funds to pay the gas of %2 transactions - %1 el saldo no tiene fondos suficientes para pagar el gas de %2 transacciones - - - + No buy orders found for %1. No se encontraron órdenes de compra para %1. - + You can check later or try to sell a different coin. Puede verificar más tarde o intentar vender una moneda diferente. - + Calculating fee estimate... Calculando tarifa estimada... - + Total %1 fees: Total de %1 tarifas: - + %2 (%3) %2 (%3) @@ -4230,6 +4220,19 @@ Las tarifas de la red pueden variar mucho según el par comercial seleccionado.< Realizar pedido + + TradingViewChart + + + Loading market data + Cargando datos de mercado + + + + There is no chart data for this ticker yet + No hay datos de gráficos para este ticker aún + + TransactionDetailsModal @@ -4322,22 +4325,22 @@ Las tarifas de la red pueden variar mucho según el par comercial seleccionado.< Transactions - + Sent Enviado - + Received Recibido - + fees tarifas - + Unconfirmed Sin confirmar diff --git a/atomic_defi_design/assets/languages/atomic_defi_fr.ts b/atomic_defi_design/assets/languages/atomic_defi_fr.ts index ca2981786a..80242b19bf 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_fr.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_fr.ts @@ -732,83 +732,83 @@ ConfirmTradeModal - + Confirm Exchange Details Détails de la confirmation de l'échange - + This swap request can not be undone and is a final event! La requête de ce swap ne peut pas être annulé, c'est irréversible ! - + Security configuration Configuration de la sécurité - + Read more about dPoW En savoir plus sur dPoW - + Use custom protection settings for incoming %1 transactions TICKER Utiliser les paramètres de protection personnalisés pour les transactions %1 entrantes - + Enable Komodo dPoW security Activer la sécurité de Komodo dPoW - + %1 confirmations for incoming %2 transactions Il y a %1 confirmations pour les transactions entrantes du ticker %2 - + This transaction can take up to 60 mins - DO NOT close this application! Cette transaction peut prendre jusqu'à 60 minutes - NE fermez PAS cette application ! - + Trade price is more than 50% different to CEX! Confirm? Le prix est supérieur à 50% du prix sur les CEX ! Êtes-vous sûr ? - + Loading fees... - + <b>Total %1 fees:</b> Frais totaux %1: - + dPoW protected Protégé par dPoW - + Required Confirmations Confirmations requises - + Warning, this atomic swap is not dPoW protected! Attention, ce swap atomique n'est pas protégé par dPoW ! - + Cancel Annuler - + Confirm Confirmer @@ -824,182 +824,182 @@ Dashboard - + The current number of enabled coins does not match your configuration specification. Your assets configuration will be reset. Le nombre actuel d'actifs activées ne correspond pas à vos spécifications de configuration. La configuration de vos actifs sera réinitialisée. - + Matching Recherche en cours - + Order Matching Recherche d'un ordre - + Matched Trouvé - + Order Matched Ordre trouvé - + Ongoing En cours - + Swap Ongoing Échange en cours - + Successful Réussi - + Swap Successful Échange terminé - + Refunding En cours de remboursement - + Failed Échoué - + Swap Failed Erreur lors de l'échange - + Unknown Inconnue - + Unknown State État inconnu - + Started Commencé - + Negotiated Négocié - + Taker fee sent Frais de preneur envoyés - + Maker payment received Paiement de l'envoyeur reçu - + Maker payment wait confirm started La confirmation d'attente de paiement de l'envoyeur a commencé - + Maker payment validated and confirmed Paiement de l'envoyeur validé et confirmé - + Taker payment sent Paiement du preneur envoyé - + Taker payment spent Paiement du preneur dépensé - + Maker payment spent Paiement de l'envoyeur dépensé - + Finished Fini - + Start failed Le démarrage a échoué - + Negotiate failed La négociation a échoué - + Taker fee validate failed Échec de la validation des frais du preneur - + Maker payment transaction failed La transaction de paiement du créateur a échoué - + Maker payment Data send failed Échec de l'envoi des données de paiement du créateur - + Maker payment wait confirm failed La confirmation de l'attente de paiement du créateur a échoué - + Taker payment validate failed La validation du paiement du preneur a échoué - + Taker payment wait confirm failed La confirmation de l'attente de paiement du preneur a échoué - + Taker payment spend failed Échec des dépenses de paiement du preneur - + Maker payment wait refund started attente de paiement du créateur, remboursement commencé - + Maker payment refunded Paiement du créateur remboursé - + Maker payment refund failed échec du remboursement du paiement du créateur @@ -1083,7 +1083,7 @@ DexAppPasswordField - + Type password Tapez votre mot de passe @@ -1384,7 +1384,7 @@ General - + %n day(s) %n jour(s) @@ -1392,7 +1392,7 @@ - + %nd day @@ -1401,7 +1401,7 @@ - + %nh hours @@ -1410,7 +1410,7 @@ - + %nm minutes @@ -1419,7 +1419,7 @@ - + %ns seconds @@ -1428,7 +1428,7 @@ - + %nms milliseconds @@ -1437,92 +1437,117 @@ - + - - - + <b>Taker tx fee:</b> Taxes de transaction du preneur: - + <b>Dex tx fee:</b> Taxes de transaction de DEX: - + <b>Dex fee:</b> Taxes de DEX: - + <b>Maker tx fee:</b> Taxes de transaction du créateur - + + %1 balance is zero + + + + + Activating %1 (%2%) + + + + + Loading wallet... + + + + + Min: %1 + + + + + Enter an amount + Entrez un montant + + + Trading Fee Frais d'échanges - + Minimum Trading Amount Frais d'échange minimum - + Wallet %1 already exists WALLETNAME Le portefeuille %1 existe déjà - + %1 balance is lower than the fees amount: %2 %3 La %1 balance est inférieur aux frais: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount Le solde négociable (après frais) %1 est inférieur au montant minimum de la transaction - + Please fill the price field Veuillez remplir le champ de prix - + Please fill the volume field - - + + Please wait for %1 to fully activate - - + + %1 volume is lower than minimum trade amount Le volume de %1 est inférieur au montant minimum de la transaction - - + + %1 needs to be enabled in order to use %2 %1 doit être activé pour utiliser %2 - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions Le solde %1 doit être financé, un solde différent de zéro est requis pour payer les frais de transactions de %2 - + Unknown Error Erreur inconnue @@ -1588,89 +1613,94 @@ Nom du portefeuille - + Enter seed Entrez la phrase de récupération - + Your seed is not BIP39 compliant. Try again or select 'Allow custom seed' to continue. - - + + i understand je comprends - - + + я согласен - - + + je comprends - - + + entiendo - - + + anladım - - + + ich verstehe - + Ok Ok - + Allow custom seed Autoriser les phrases de récupération personnalisées - + <strong>Allow custom seed</strong> <strong>Autoriser les phrases personnalisées</strong> - + Custom seed phrases might be less secure and easier to crack than a generated BIP39 compliant seed phrase or private key (WIF).<br><br>To confirm you understand the risk and know what you are doing, type <strong>'I understand'</strong> in the box below. Les phrases de départ personnalisées peuvent être moins sécurisées et plus faciles à déchiffrer qu'une phrase de départ ou une clé privée (WIF) conforme à BIP39 générée.<br><br>Pour confirmer que vous comprenez le risque et savez ce que vous faites, tapez <strong>'Je comprends'</strong> dans la case ci-dessous. - + I understand Je comprends - + Next Suivant - + + Enter password + + + + Enter the same password to confirm Entrez le même mot de passe pour confirmer - + Continue Continuer @@ -1758,17 +1788,17 @@ Try again or select 'Allow custom seed' to continue. Login - + Incorrect Password Mot de passe incorrect - + Log In - + Cancel Annuler @@ -1856,47 +1886,47 @@ They will be removed from the orderbook until you log in again. - + Send Envoyez - + Enable %1 ? Activer %1 ? - + Yes Oui - + No Non - + Receive Recevoir - + Swap Échange - + is wallet only - + Rewards Récompenses - + Faucet Robinet @@ -1975,17 +2005,17 @@ They will be removed from the orderbook until you log in again. Historique - + Place Order Placer l'ordre - + Order Selected Ordre séléctionné - + START SWAP COMMENCER L'ÉCHANGE @@ -2039,13 +2069,13 @@ They will be removed from the orderbook until you log in again. MarketModeSelector - + Sell %1 TICKER - + Buy %1 TICKER @@ -2225,67 +2255,72 @@ They will be removed from the orderbook until you log in again. Choisissez un mot de passe - + Important: Back up your seed phrase before proceeding! Important: sauvegardez votre phrase de recupération avant de continuer ! - + We recommend storing it offline. Nous vous recommandons de le stocker hors ligne. - + Generated Seed Générer un Seed - + Seed phrase Phrase de récupération - + copied to clipboard copié dans le presse-papier - + Next Suivant - + Let's double check your seed phrase Vérifions à nouveau votre phrase de récupération - + Your seed phrase is important - that's why we like to make sure it's correct. We'll ask you three different questions about your seed phrase to make sure you'll be able to easily restore your wallet whenever you want. Votre phrase de récupération est importante - c'est pourquoi nous aimons nous assurer qu'elle est correcte. Nous vous poserons trois questions différentes au sujet de votre phrase source pour vous assurer que vous pourrez facilement restaurer votre portefeuille à tout moment. - + Enter the - + word - + Check Vérifier - + + Enter password + + + + Enter the same password to confirm Entrez le même mot de passe pour confirmer - + Continue Continuer @@ -2469,97 +2504,97 @@ They will be removed from the orderbook until you log in again. OrderForm - + Amount to sell Montant à vendre - + Amount to receive Montant à recevoir - + Max Max - + Swap 25% of your tradable balance. - + Swap 50% of your tradable balance. - + Swap 100% of your tradable balance. - + Min Volume - + Min amount to sell - + Min amount to receive - + Minimum accepted trade equals 10% of order volume. - + Minimum accepted trade equals 25% of order volume. - + Minimum accepted trade equals 50% of order volume. - + Min volume: Min volume : - + Use custom minimum trade amount Utiliser le montant d'échange minimum personnalisé - + Price Prix - + Reduce 1% relative to CEX market price. - + Use CEX market price. - + Increase 1% relative to CEX market price. - + Volume Volume @@ -2593,104 +2628,104 @@ They will be removed from the orderbook until you log in again. Détails de l'ordre - + Order Type - + Maker Order Ordre de vente - + Taker Order Ordre d'achat - + Refund State État de remboursement - + Your swap failed but the auto-refund process for your payment started already. Please wait and keep application opened until you receive your payment back Votre échange a échoué, mais le processus de remboursement automatique de votre paiement a déjà commencé. Veuillez patienter et garder l'application ouverte jusqu'à ce que vous receviez votre remboursement - + Date Date - + Recover Funds Récupérer des fonds - + Refunding... Remboursement... - + View on Explorer Voir dans l'explorateur - + Cancel Order Annuler l'ordre - + Error ID ID de l'erreur - - + + Swap ID ID du Swap - + Maker Payment Sent Transaction ID - + Maker Payment Spent Transaction ID - + Maker Payment TXID - + Taker Payment Spent Transaction ID - + Taker Payment Sent Transaction ID - + Taker Payment TXID - - + + Error Log Journal des erreurs - + Close Fermer @@ -2826,7 +2861,7 @@ Please select a new order. Portfolio - ADD ASSET + ADD CRYPTO @@ -2926,12 +2961,12 @@ Please select a new order. ProView - + Failed to place the order Échec lors du placement de l'ordre - + Placed the order L'ordre a été placé avec succès @@ -2979,7 +3014,7 @@ Please select a new order. RecoverSeedModal - + View seed and private keys Afficher le seed et les clefs privées @@ -2989,64 +3024,64 @@ Please select a new order. Veuillez entrer votre mot de passe pour voir la phrase de récupération. - + Seed - + Backup Seed - + Public Address copied to clipboard - + Cancel Annuler - + Incorrect Password Mot de passe incorrect - - + + copied to clipboard copié dans le presse-papier - - + + RPC Password Mot de passe RPC - + Search a coin. Rechercher une asset. - + Public Address Adresse publique - + Private Key copied to clipboard - + Private Key Clé privée - + View Voir @@ -3617,22 +3652,9 @@ Please select a new order. Rechercher - - Add asset - Ajouter un actif - - - - SmartChartView - - - Loading market data - Chargement des données de marché - - - - There is no chart data for this ticker yet - Il n'y a pas encore de données graphiques pour cet actif + + ADD CRYPTO + @@ -3663,7 +3685,7 @@ Please select a new order. Taux CEX - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> %1 n'est pas activé - Souhaitez vous l'activer pour pouvoir selectionnez les meilleurs offres %2 ?<br><a href='#'>Oui</a> - <a href='#no'>Non</a> @@ -4022,154 +4044,122 @@ Network fees can vary greatly depending on your selected trading pair. Trade - + Swap Échange - + Instant trading with best orders Trading instantané avec les meilleurs ordres - + Reset form - + You have no tradable assets - + From De - - Enter an amount - Entrez un montant + + Entered amount must be higher than 0. + - + + Select an order. + + + + MAX MAX - + To Vers - + Pick an order Choisir une commande - + Price Prix - + Better price found: %1. Updating forms. Meilleur prix trouvé : %1. Mise à jour du formulaire. - + Better price (%1) found but received quantity (%2) is lower than your current one (%3). Click here to update the selected order. Meilleur prix (%1) trouvé mais la quantité reçue (%2) est inférieure à votre montant de réception (%3). Cliquez ici pour mettre à jour la commande sélectionnée. - + %1 - + Tradable: Disponible: - - Min: %1 - - - - + Pick a coin Choisissez un actif - + SWAP NOW ÉCHANGER MAINTENANT - + Failed to place the order Échec lors du placement de l'ordre - + Placed the order L'ordre a été placé - - Entered amount must be superior than 0. - Le montant saisi doit être supérieur à 0. - - - - You must select an order. - Vous devez sélectionner une commande. - - - - Entered amount is below the minimum required by this order: %1 - Le montant saisi est inférieur au minimum requis par cette commande : %1 - - - - - %1 needs to be enabled in order to use %2 - %1 doit être activé pour utiliser %2 - - - - - %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions - Le solde %1 doit être financé, un solde différent de zéro est requis pour payer les frais de transactions de %2 - - - - %1 balance does not have enough funds to pay the gas of %2 transactions - - - - + No buy orders found for %1. Aucun ordre d'achat trouvé pour %1. - + You can check later or try to sell a different coin. Vous pouvez vérifier plus tard ou essayer de vendre un actif différent. - + Calculating fee estimate... - + Total %1 fees: Frais totaux %1 : - + %2 (%3) @@ -4212,6 +4202,19 @@ Network fees can vary greatly depending on your selected trading pair. Placer l'ordre + + TradingViewChart + + + Loading market data + Chargement des données de marché + + + + There is no chart data for this ticker yet + + + TransactionDetailsModal @@ -4304,22 +4307,22 @@ Network fees can vary greatly depending on your selected trading pair. Transactions - + Received Reçue - + Sent Envoyé - + fees frais - + Unconfirmed Non confirmé diff --git a/atomic_defi_design/assets/languages/atomic_defi_ru.ts b/atomic_defi_design/assets/languages/atomic_defi_ru.ts index 31ae9a0ed6..4de7d0f1bc 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_ru.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_ru.ts @@ -732,83 +732,83 @@ ConfirmTradeModal - + Confirm Exchange Details Подтвердить данные обмена - + Trade price is more than 50% different to CEX! Confirm? Стоимость обмена в сравнении с CEX дороже более чем на 50%, вы подтверждаете сделку? - + This swap request can not be undone and is a final event! Этот запрос на своп не может быть отменен и является окончательным! - + This transaction can take up to 60 mins - DO NOT close this application! Эта транзакция может занять до 60 минут - НЕ закрывайте приложение! - + Loading fees... - + <b>Total %1 fees:</b> - + Security configuration Настройки безопасности - + %1 confirmations for incoming %2 transactions %1 подтверждений для входящих %2 транзакций - + Read more about dPoW Узнать больше о dPoW - + Use custom protection settings for incoming %1 transactions TICKER Использовать пользовательские настройки защиты для входящих транзакций %1 - + Enable Komodo dPoW security Включить Komodo dPoW - + dPoW protected dPoW защита - + Required Confirmations Необходимое количество подтверждений - + Warning, this atomic swap is not dPoW protected! Предупреждение, этот атомарный своп не защищен dPoW! - + Cancel Отменить - + Confirm Подтверждение @@ -824,182 +824,182 @@ Dashboard - + The current number of enabled coins does not match your configuration specification. Your assets configuration will be reset. Текущее количество включенных монет не совпадает с конфигурацией. Ваша конфигурация активов будет сброшена. - + Matching Матчинг - + Order Matching Матчинг ордеров - + Matched Сматчен - + Order Matched Ордер сматчен - + Ongoing В процессе - + Swap Ongoing Своп продолжается - + Successful Успешно - + Swap Successful Своп успешно завершен - + Refunding Проводится возврат - + Failed Не завершено - + Swap Failed Своп не был завершен - + Unknown Неизвестно - + Unknown State Статус неизвестен - + Started Начат - + Negotiated Согласован - + Taker fee sent Комиссия тейкера отправлена - + Maker payment received Платеж мейкера получен - + Maker payment wait confirm started Ожидание платежа мейкера - + Maker payment validated and confirmed Платеж мейкера валидирован и подтвержден - + Taker payment sent Платеж тейкера отправлен - + Taker payment spent Платеж тейкера потрачен - + Maker payment spent Платеж мейкера потрачен - + Finished Завершено - + Start failed Не удалось начать - + Negotiate failed Согласование не прошло - + Taker fee validate failed Валидация комиссии тейкера не прошла - + Maker payment transaction failed Платежная транзакция мейкера не прошла - + Maker payment Data send failed Отправка платежных данных мейкера не прошла - + Maker payment wait confirm failed Платежная транзакция мейкера не была подтверждена - + Taker payment validate failed Не прошла валидация платежа тейкера - + Taker payment wait confirm failed Платежная транзакция тейкера не была подтверждена - + Taker payment spend failed Spend платежа тейкера не прошел - + Maker payment wait refund started Ожидание возврата платежа мейкера - + Maker payment refunded Платеж мейкера возвращен - + Maker payment refund failed Возврат платежа мейкера не выполнен @@ -1083,7 +1083,7 @@ DexAppPasswordField - + Type password Введите пароль @@ -1384,7 +1384,7 @@ General - + %n day(s) %n день @@ -1393,7 +1393,7 @@ - + %nd day @@ -1403,7 +1403,7 @@ - + %nh hours @@ -1413,7 +1413,7 @@ - + %nm minutes @@ -1423,7 +1423,7 @@ - + %ns seconds @@ -1433,7 +1433,7 @@ - + %nms milliseconds @@ -1443,92 +1443,117 @@ - + - - - + <b>Taker tx fee:</b> - + <b>Dex tx fee:</b> - + <b>Dex fee:</b> - + <b>Maker tx fee:</b> - + + %1 balance is zero + + + + + Activating %1 (%2%) + + + + + Loading wallet... + + + + + Min: %1 + Мин: %1 + + + + Enter an amount + Введите количество + + + Trading Fee Торговая комиссия - + Minimum Trading Amount Минимальный объем сделки - + Wallet %1 already exists WALLETNAME Кошелек %1 уже существует - + %1 balance is lower than the fees amount: %2 %3 %1 баланс менее чем размер комиссий: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount Торгуемый (после комиссий) баланс %1 - меньше минимальной суммы сделки - + Please fill the price field Пожалуйста, укажите цену - + Please fill the volume field - - + + Please wait for %1 to fully activate - - + + %1 volume is lower than minimum trade amount Сумма %1 меньше минимальной суммы сделки - - + + %1 needs to be enabled in order to use %2 %1 должен быть активным для использования %2 - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions нужно пополнить баланс %1 для оплаты газа %2 транзакций - + Unknown Error Неизвестная ошибка @@ -1594,89 +1619,94 @@ Название кошелька - + Enter seed Введите сид-фразу - + Your seed is not BIP39 compliant. Try again or select 'Allow custom seed' to continue. - - + + i understand Я согласен - - + + я согласен - - + + je comprends - - + + entiendo - - + + anladım - - + + ich verstehe - + Ok Ок - + Allow custom seed Разрешить пользовательский формат сид-фразы - + <strong>Allow custom seed</strong> <strong>Разрешить произвольный seed</strong> - + Custom seed phrases might be less secure and easier to crack than a generated BIP39 compliant seed phrase or private key (WIF).<br><br>To confirm you understand the risk and know what you are doing, type <strong>'I understand'</strong> in the box below. Пользовательские исходные фразы могут быть менее безопасными и их легче взломать, чем сгенерированные исходные фразы или закрытый ключ (WIF), совместимые с BIP39.<br><br>Чтобы подтвердить, что вы понимаете риск и знаете, что делаете, введите <strong>'Я согласен'</strong> в поле ниже. - + I understand Я согласен - + Next Далее - + + Enter password + + + + Enter the same password to confirm Введите тот же пароль для подтверждения - + Continue Продолжить @@ -1764,17 +1794,17 @@ Try again or select 'Allow custom seed' to continue. Login - + Incorrect Password Неправильный пароль - + Log In - + Cancel Отменить @@ -1862,47 +1892,47 @@ They will be removed from the orderbook until you log in again. - + Send Отправить - + Enable %1 ? Активировать %1 ? - + Yes Да - + No Нет - + Receive Получить - + Swap Обменять - + is wallet only - + Rewards Награды - + Faucet Фаусет @@ -1981,17 +2011,17 @@ They will be removed from the orderbook until you log in again. История - + Place Order Разместить ордер - + Order Selected Ордер выбран - + START SWAP НАЧАТЬ ОБМЕН @@ -2045,13 +2075,13 @@ They will be removed from the orderbook until you log in again. MarketModeSelector - + Sell %1 TICKER - + Buy %1 TICKER @@ -2231,67 +2261,72 @@ They will be removed from the orderbook until you log in again. Задайте пароль - + Important: Back up your seed phrase before proceeding! Важно: убедитесь, что вы сохранили ваш seed ключ, прежде чем продолжить! - + We recommend storing it offline. Мы рекумендуем хранить его офлайн. - + Generated Seed Сгенерированный seed ключ - + Seed phrase Seed фраза - + copied to clipboard скопировано в буфер - + Next Далее - + Let's double check your seed phrase Давайте перепроверим ваш seed ключ - + Your seed phrase is important - that's why we like to make sure it's correct. We'll ask you three different questions about your seed phrase to make sure you'll be able to easily restore your wallet whenever you want. Ваш seed ключ важен, и поэтому мы хотим убедиться, что вы его сохранили. Мы зададим вам три разных вопроса о вашем seed ключе, чтобы убедиться, что вы сможете легко восстановить свой кошелек, когда захотите. - + Enter the - + word - + Check Проверить - + + Enter password + + + + Enter the same password to confirm Введите тот же пароль для подтверждения - + Continue Продолжить @@ -2475,97 +2510,97 @@ They will be removed from the orderbook until you log in again. OrderForm - + Price Цена - + Reduce 1% relative to CEX market price. - + Use CEX market price. - + Increase 1% relative to CEX market price. - + Volume Объем - + Amount to sell Сумма для продажи - + Amount to receive Получаемая сумма - + Max Макс - + Swap 25% of your tradable balance. - + Swap 50% of your tradable balance. - + Swap 100% of your tradable balance. - + Min Volume - + Min amount to sell - + Min amount to receive - + Minimum accepted trade equals 10% of order volume. - + Minimum accepted trade equals 25% of order volume. - + Minimum accepted trade equals 50% of order volume. - + Min volume: Мин. объем: - + Use custom minimum trade amount Задать минимальный объем сделки @@ -2599,104 +2634,104 @@ They will be removed from the orderbook until you log in again. Детали ордера - + Order Type - + Maker Order Мейкер ордер - + Taker Order Тейкер ордер - + Refund State Статус рефанда - + Your swap failed but the auto-refund process for your payment started already. Please wait and keep application opened until you receive your payment back Обмен не был завершен, но процесс автоматического рефанда уже начался. Пожалуйста, подождите, оставляя приложение открытым, пока вы не получите свои средства - + Date Дата - + Error ID ID ошибки - - + + Error Log Лог ошибки - + Close Закрыть - + Cancel Order Отменить ордер - - + + Swap ID ID обмена - + Maker Payment Sent Transaction ID - + Maker Payment Spent Transaction ID - + Maker Payment TXID - + Taker Payment Spent Transaction ID - + Taker Payment Sent Transaction ID - + Taker Payment TXID - + Recover Funds Восстановить средства - + Refunding... Возмещается... - + View on Explorer Показать в эксплорере @@ -2832,7 +2867,7 @@ Please select a new order. Portfolio - ADD ASSET + ADD CRYPTO @@ -2932,12 +2967,12 @@ Please select a new order. ProView - + Failed to place the order Не удалось разместить ордер - + Placed the order Ордер размещен @@ -2985,7 +3020,7 @@ Please select a new order. RecoverSeedModal - + View seed and private keys Показать seed-фразу и приватные ключи @@ -2995,64 +3030,64 @@ Please select a new order. Введите пароль для отображения seed ключа. - + Seed - + Backup Seed - + Public Address copied to clipboard - + Cancel Отменить - + Incorrect Password Неправильный пароль - - + + copied to clipboard скопировано в буфер - - + + RPC Password RPC Пароль - + Search a coin. Поиск актива. - + Public Address Публичный адрес - + Private Key copied to clipboard - + Private Key Приватный ключ - + View Показать @@ -3623,22 +3658,9 @@ Please select a new order. Поиск - - Add asset - Добавить крипто актив - - - - SmartChartView - - - Loading market data - Загрузка рыночных данных - - - - There is no chart data for this ticker yet - Для этого графика пока еще нет данных + + ADD CRYPTO + @@ -3669,7 +3691,7 @@ Please select a new order. CEX цена - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> %1 не активирован -Вы хотите активировать этот %2 актив чтобы видеть лучшие ордеры для него ?<br><a href='#'>Да</a> - <a href='#no'>Нет</a> @@ -4026,154 +4048,122 @@ Network fees can vary greatly depending on your selected trading pair. Trade - + Swap Обменять - + Instant trading with best orders Быстрая торговля с лучшими ордерами - + Reset form - + You have no tradable assets - + From От - - Enter an amount - Введите количество + + Entered amount must be higher than 0. + - + + Select an order. + + + + MAX МАКС - + To Получатель - + Pick an order Выберите ордер - + Price Цена - + Better price found: %1. Updating forms. Найдена цена лучше: %1.Обновляю форму. - + Better price (%1) found but received quantity (%2) is lower than your current one (%3). Click here to update the selected order. Лучшая цена (%1) была обнаружена но количество (%2) меньше чем в вашем текущем ордере (%3).Нажмите чтобы обновить выбранный ордер. - + %1 %1 - + Tradable: Доступно: - - Min: %1 - Мин: %1 - - - + Pick a coin Выберите монету - + SWAP NOW - + Failed to place the order Не удалось разместить ордер - + Placed the order Ордер размещен - - Entered amount must be superior than 0. - Введенная сумма должна быть больше 0. - - - - You must select an order. - Вы должны выбрать ордер. - - - - Entered amount is below the minimum required by this order: %1 - Введнная сумма меньше минимальной для этого ордера: %1 - - - - - %1 needs to be enabled in order to use %2 - %1 должен быть активным для использования %2 - - - - - %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions - нужно пополнить баланс %1 для оплаты газа %2 транзакций - - - - %1 balance does not have enough funds to pay the gas of %2 transactions - - - - + No buy orders found for %1. Не найдено ордеров на покупку дл] %1. - + You can check later or try to sell a different coin. Вы можете попробовать позже или попробовать продать другой актив. - + Calculating fee estimate... - + Total %1 fees: Всего %1 комиссий: - + %2 (%3) %2 (%3) @@ -4216,6 +4206,19 @@ Network fees can vary greatly depending on your selected trading pair. Разместить ордер + + TradingViewChart + + + Loading market data + Загрузка рыночных данных + + + + There is no chart data for this ticker yet + + + TransactionDetailsModal @@ -4308,22 +4311,22 @@ Network fees can vary greatly depending on your selected trading pair. Transactions - + Received Получено - + Sent Отправлено - + fees комиссии - + Unconfirmed Не подтверждена diff --git a/atomic_defi_design/assets/languages/atomic_defi_tr.ts b/atomic_defi_design/assets/languages/atomic_defi_tr.ts index d4fe94d9c5..34e9b6e6db 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_tr.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_tr.ts @@ -732,83 +732,83 @@ ConfirmTradeModal - + Confirm Exchange Details Al-Sat Detaylarını Onayla - + This swap request can not be undone and is a final event! Bu takas isteği geri döndürülemez! - + Security configuration Güvenlik yapılandırması - + Read more about dPoW dPoW hakkında daha fazla bilgi - + Use custom protection settings for incoming %1 transactions TICKER %1 işlemleri için özel güvenlik ayarları kullan - + Enable Komodo dPoW security Komodo dPoW güvenliğini etkinleştir - + %1 confirmations for incoming %2 transactions Gelen %2 işlemleri için %1 onay - + This transaction can take up to 60 mins - DO NOT close this application! Bu işlem 60 dakikayı bulabilir - Programı KAPATMAYINIZ! - + Trade price is more than 50% different to CEX! Confirm? Takas ücreti CEX ile karşılaştırıldığında %50'den daha fazla farka sahip. Onaylıyor musunuz? - + Loading fees... - + <b>Total %1 fees:</b> <b>Toplam %1 işlem giderleri: </b> - + dPoW protected dPoW korumalı - + Required Confirmations Gereken Onaylar - + Warning, this atomic swap is not dPoW protected! Uyarı, bu atomik takas dPoW korumalı değil! - + Cancel İptal - + Confirm Onayla @@ -824,182 +824,182 @@ Dashboard - + The current number of enabled coins does not match your configuration specification. Your assets configuration will be reset. Etkinleştirilmiş koinlerin mevcut sayısı yapılandırma ayarlarınızla eşleşmiyor. Varlık yapılandırmanız sıfırlanacak. - + Matching Eşleşiyor - + Order Matching Emir Eşleşiyor - + Matched Eşleşti - + Order Matched Emir Eşleşti - + Ongoing Devam ediyor - + Swap Ongoing Takas Devam Ediyor - + Successful Başarılı - + Swap Successful Takas Başarılı - + Refunding Geri ödeniyor - + Failed Başarısız - + Swap Failed Takas Başarısız - + Unknown Bilinmiyor - + Unknown State Bilinmeyen durum - + Started Başlatıldı - + Negotiated Pazarlık yapıldı - + Taker fee sent Alıcı ücreti gönderildi - + Maker payment received Yapıcı ödemesi alındı - + Maker payment wait confirm started Yapıcı ödemesi bekleme onayı başladı - + Maker payment validated and confirmed Yapıcı ödemesi doğrulandı ve onaylandı - + Taker payment sent Alıcı ödemesi gönderildi - + Taker payment spent Alıcı ödemesi harcandı - + Maker payment spent Yapıcı ödemesi harcandı - + Finished Tamamlandı - + Start failed Başlatılamadı - + Negotiate failed Pazarlık başarısız - + Taker fee validate failed Alıcı ücreti doğrulanamadı - + Maker payment transaction failed Yapıcı ödeme işlemi başarısız - + Maker payment Data send failed Yapıcı ödeme verileri gönderilemedi - + Maker payment wait confirm failed Yapıcı ödemesi bekleme onayı başarısız - + Taker payment validate failed Alıcı ödemesi doğrulanamadı - + Taker payment wait confirm failed Alıcı ödemesi bekleme onayı başarısız oldu - + Taker payment spend failed Alıcı ödeme harcaması başarısız oldu - + Maker payment wait refund started Yapıcı ödemesi bekleme iadesi başladı - + Maker payment refunded Yapıcı ödemesi iade edildi - + Maker payment refund failed Yapıcı ödeme iadesi başarısız @@ -1083,7 +1083,7 @@ DexAppPasswordField - + Type password @@ -1384,14 +1384,14 @@ General - + %n day(s) %n gün - + %nd day @@ -1399,7 +1399,7 @@ - + %nh hours @@ -1407,7 +1407,7 @@ - + %nm minutes @@ -1415,7 +1415,7 @@ - + %ns seconds @@ -1423,7 +1423,7 @@ - + %nms milliseconds @@ -1431,92 +1431,117 @@ - + - - - + <b>Taker tx fee:</b> - + <b>Dex tx fee:</b> - + <b>Dex fee:</b> - + <b>Maker tx fee:</b> - + + %1 balance is zero + + + + + Activating %1 (%2%) + + + + + Loading wallet... + + + + + Min: %1 + + + + + Enter an amount + Bir miktar gir + + + Trading Fee Takas Ücreti - + Minimum Trading Amount Minimum Takas Hacmi - + Wallet %1 already exists WALLETNAME %1 cüzdanı zaten mevcut - + %1 balance is lower than the fees amount: %2 %3 %1 bakiye ücret tutarının altında: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount Takas edilebilir (ücretlerden sonra)%1 bakiyesi minimum işlem ücretinden düşük - + Please fill the price field Lütfen fiyat alanını doldurun - + Please fill the volume field - - + + Please wait for %1 to fully activate - - + + %1 volume is lower than minimum trade amount %1 hacmi, minimum işlem ücretinden düşük - - + + %1 needs to be enabled in order to use %2 - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions - + Unknown Error Bilinmeyen Hata @@ -1582,89 +1607,94 @@ Cüzdan Adı - + Enter seed - + Your seed is not BIP39 compliant. Try again or select 'Allow custom seed' to continue. - - + + i understand Anladım - - + + я согласен - - + + je comprends - - + + entiendo - - + + anladım - - + + ich verstehe - + Ok Tamam - + Allow custom seed Özel Seed'e izin ver - + <strong>Allow custom seed</strong> - + Custom seed phrases might be less secure and easier to crack than a generated BIP39 compliant seed phrase or private key (WIF).<br><br>To confirm you understand the risk and know what you are doing, type <strong>'I understand'</strong> in the box below. Özel çekirdek tümceler, oluşturulmuş bir BIP39 uyumlu çekirdek sözcük grubu veya özel anahtara (WIF).<br><br> Riski anladığınızı ve ne yaptığınızı bildiğinizi doğrulamak için lütfen aşağıdaki kutuya <strong>'Anladım'</strong> yazın. - + I understand Anladım - + Next İleri - + + Enter password + + + + Enter the same password to confirm Doğrulamak için aynı parolayı giriniz - + Continue Devam @@ -1752,17 +1782,17 @@ Try again or select 'Allow custom seed' to continue. Login - + Incorrect Password Yanlış Parola - + Log In - + Cancel İptal @@ -1850,47 +1880,47 @@ They will be removed from the orderbook until you log in again. - + Send Gönder - + Enable %1 ? %1 Etkinleştirilsin mi ? - + Yes Evet - + No Hayır - + Receive Al - + Swap Takasla - + is wallet only - + Rewards - + Faucet Musluk @@ -1969,17 +1999,17 @@ They will be removed from the orderbook until you log in again. Tarihçe - + Place Order Emir Ver - + Order Selected Emir Seçildi - + START SWAP Takası başlat @@ -2033,13 +2063,13 @@ They will be removed from the orderbook until you log in again. MarketModeSelector - + Sell %1 TICKER - + Buy %1 TICKER @@ -2219,67 +2249,72 @@ They will be removed from the orderbook until you log in again. - + Important: Back up your seed phrase before proceeding! Önemli: Devam etmeden önce seed kelimelerinizi yedekleyin! - + We recommend storing it offline. Çevrimdışı saklamanızı öneririz. - + Generated Seed Seed Oluştur - + Seed phrase - + copied to clipboard - + Next İleri - + Let's double check your seed phrase Seed kelimelerinizi tekrar kontrol edelim - + Your seed phrase is important - that's why we like to make sure it's correct. We'll ask you three different questions about your seed phrase to make sure you'll be able to easily restore your wallet whenever you want. Seed kelimeleriniz önemlidir - bu yüzden doğru olduğundan emin olmak istiyoruz. Cüzdanınızı istediğiniz zaman kolayca kurtarabileceğinizden emin olmak için seed kelimeleriniz hakkında üç farklı soru soracağız. - + Enter the - + word - + Check - + + Enter password + + + + Enter the same password to confirm Doğrulamak için aynı parolayı giriniz - + Continue Devam @@ -2463,97 +2498,97 @@ They will be removed from the orderbook until you log in again. OrderForm - + Amount to sell Satılacak miktar - + Amount to receive Alınacak miktar - + Max Maks - + Swap 25% of your tradable balance. - + Swap 50% of your tradable balance. - + Swap 100% of your tradable balance. - + Min Volume - + Min amount to sell - + Min amount to receive - + Minimum accepted trade equals 10% of order volume. - + Minimum accepted trade equals 25% of order volume. - + Minimum accepted trade equals 50% of order volume. - + Min volume: - + Use custom minimum trade amount - + Price Fiyat - + Reduce 1% relative to CEX market price. - + Use CEX market price. - + Increase 1% relative to CEX market price. - + Volume Hacim @@ -2587,104 +2622,104 @@ They will be removed from the orderbook until you log in again. Emir Detayları - + Order Type - + Maker Order Yapıcı Emri - + Taker Order Alıcı Emri - + Refund State Geri Ödeme Durumu - + Your swap failed but the auto-refund process for your payment started already. Please wait and keep application opened until you receive your payment back Takas işlemi başarısız oldu, ancak otomatik geri ödeme süreci başladı. Lütfen bekleyin ve ödemenizi geri alana kadar uygulamayı açık tutun - + Date Tarih - + Recover Funds Fon Kurtar - + Refunding... - + View on Explorer Explorer'da Göster - + Cancel Order Emri İptal Et - + Error ID Hata ID - - + + Swap ID - + Maker Payment Sent Transaction ID - + Maker Payment Spent Transaction ID - + Maker Payment TXID - + Taker Payment Spent Transaction ID - + Taker Payment Sent Transaction ID - + Taker Payment TXID - - + + Error Log Hata Kaydı - + Close Kapat @@ -2820,7 +2855,7 @@ Please select a new order. Portfolio - ADD ASSET + ADD CRYPTO @@ -2920,12 +2955,12 @@ Please select a new order. ProView - + Failed to place the order Emir başarısız oldu - + Placed the order Emir başarılı @@ -2973,7 +3008,7 @@ Please select a new order. RecoverSeedModal - + View seed and private keys Seed ve özel anahtarları görüntüle @@ -2983,64 +3018,64 @@ Please select a new order. Seed'i görmek için lütfen parolanızı giriniz. - + Seed - + Backup Seed - + Public Address copied to clipboard - + Cancel İptal - + Incorrect Password Yanlış Parola - - + + copied to clipboard - - + + RPC Password RPC Parolası - + Search a coin. Koin ara. - + Public Address Public Adres - + Private Key copied to clipboard - + Private Key Private Key - + View Görüntüle @@ -3611,22 +3646,9 @@ Please select a new order. Ara - - Add asset - Varlık ekle - - - - SmartChartView - - - Loading market data - Piyasa bilgisi yükleniyor - - - - There is no chart data for this ticker yet - Henüz bu kontrat için grafik verisi yok + + ADD CRYPTO + @@ -3657,7 +3679,7 @@ Please select a new order. CEX Oranı - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> %1 etkin değil - En iyi %2 siparişini seçebilmesi için etkinleştirmek istiyor musunuz ? <br><a href='#'>Evet</a> - <a href='#no'>Hayır</a> @@ -4014,154 +4036,122 @@ Network fees can vary greatly depending on your selected trading pair. Trade - + Swap Takasla - + Instant trading with best orders En iyi emirlerle anında alım satım - + Reset form - + You have no tradable assets - + From Gönderen - - Enter an amount - Bir miktar gir + + Entered amount must be higher than 0. + - + + Select an order. + + + + MAX MAKS - + To Alan - + Pick an order Emri seç - + Price Fiyat - + Better price found: %1. Updating forms. Daha iyi fiyat bulundu: %1. Formları güncelliyor. - + Better price (%1) found but received quantity (%2) is lower than your current one (%3). Click here to update the selected order. Daha iyi fiyat (%1) bulundu, ancak alınan miktar (%2) mevcut fiyattan (%3) daha düşük. Seçilen emri güncellemek için buraya tıklayın. - + %1 %1 - + Tradable: Al sat yapılabilir: - - Min: %1 - - - - + Pick a coin - + SWAP NOW - + Failed to place the order Emir başarısız oldu - + Placed the order Emir başarılı - - Entered amount must be superior than 0. - Girilen tutar 0'dan büyük olmalıdır. - - - - You must select an order. - Bir emir seçmelisiniz. - - - - Entered amount is below the minimum required by this order: %1 - Girilen miktar, bu emrin gerektirdiği minimum %1 tutarının altında - - - - - %1 needs to be enabled in order to use %2 - - - - - - %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions - - - - - %1 balance does not have enough funds to pay the gas of %2 transactions - - - - + No buy orders found for %1. - + You can check later or try to sell a different coin. - + Calculating fee estimate... - + Total %1 fees: Toplam %1 işlem giderleri: - + %2 (%3) %2 (%3) @@ -4204,6 +4194,19 @@ Network fees can vary greatly depending on your selected trading pair. Emir Ver + + TradingViewChart + + + Loading market data + Piyasa bilgisi yükleniyor + + + + There is no chart data for this ticker yet + + + TransactionDetailsModal @@ -4296,22 +4299,22 @@ Network fees can vary greatly depending on your selected trading pair. Transactions - + Received Alınan - + Sent Gönderilen - + fees işlem ücretleri - + Unconfirmed Onaylanmamış From 5a8440eb360430a65cfb73b581a04e857ff47db5 Mon Sep 17 00:00:00 2001 From: smk762 Date: Sat, 10 Dec 2022 00:41:41 +0800 Subject: [PATCH 18/80] update cancel and close button styles --- assets/themes/Default - Dark/colors.json | 5 +++++ assets/themes/Default - Light/colors.json | 5 +++++ .../Dex/Addressbook/AddAddressForm.qml | 4 ++-- .../Dex/Addressbook/EditContactModal.qml | 2 +- .../Dex/Addressbook/EnableAssetModal.qml | 2 +- .../Dex/Components/CannotEnableCoinModal.qml | 2 +- .../Dex/Components/DexCancelButton.qml | 12 ++++++++++++ atomic_defi_design/Dex/Components/EulaModal.qml | 2 +- atomic_defi_design/Dex/Components/LogModal.qml | 2 +- atomic_defi_design/Dex/Components/PopupManager.qml | 2 +- .../Dex/Components/ZcashParamsModal.qml | 2 +- atomic_defi_design/Dex/Components/qmldir | 1 + atomic_defi_design/Dex/Constants/DexTheme.qml | 5 +++++ atomic_defi_design/Dex/Dashboard/FatalErrorModal.qml | 2 +- .../Dex/Exchange/ProView/TradingInfo/OrderModal.qml | 2 +- .../Exchange/Trade/ConfirmMultiOrderTradeModal.qml | 2 +- .../Dex/Exchange/Trade/ConfirmTradeModal.qml | 2 +- .../Dex/Exchange/Trade/SimpleView/SubHistory.qml | 2 +- .../Dex/Exchange/Trade/SimpleView/SubOrders.qml | 3 ++- atomic_defi_design/Dex/NewUpdateModal.qml | 6 +++--- atomic_defi_design/Dex/Screens/Startup/Login.qml | 4 +--- .../Dex/Settings/AddCustomCoinModal.qml | 2 +- .../Dex/Settings/CamouflagePasswordModal.qml | 2 +- .../Dex/Settings/DeleteWalletModal.qml | 2 +- atomic_defi_design/Dex/Settings/RecoverSeedModal.qml | 2 +- atomic_defi_design/Dex/Themes/CurrentTheme.qml | 5 +++++ atomic_defi_design/Dex/Themes/DefaultTheme.js | 5 +++++ atomic_defi_design/Dex/Themes/ThemeData.qml | 5 +++++ atomic_defi_design/Dex/Wallet/ClaimRewardsModal.qml | 2 +- atomic_defi_design/Dex/Wallet/EnableCoinModal.qml | 2 +- atomic_defi_design/Dex/Wallet/ReceiveModal.qml | 2 +- atomic_defi_design/Dex/Wallet/SendModal.qml | 2 +- atomic_defi_design/Dex/Wallet/SendResult.qml | 2 +- .../Dex/Wallet/TransactionDetailsModal.qml | 2 +- 34 files changed, 73 insertions(+), 31 deletions(-) create mode 100644 atomic_defi_design/Dex/Components/DexCancelButton.qml diff --git a/assets/themes/Default - Dark/colors.json b/assets/themes/Default - Dark/colors.json index 06160e0db3..5b6d4391bb 100644 --- a/assets/themes/Default - Dark/colors.json +++ b/assets/themes/Default - Dark/colors.json @@ -23,6 +23,11 @@ "buttonSecondaryColorHovered": "#4068B929", "buttonSecondaryColorPressed": "#2932546C", + "buttonCancelColorDisabled": "#28375AFF", + "buttonCancelColorEnabled": "#293254FF", + "buttonCancelColorHovered": "#4068B929", + "buttonCancelColorPressed": "#2932546C", + "gradientButtonStartColor": "#4986EAAD", "gradientButtonEndColor": "#5A68E6FF", "gradientButtonDisabledStartColor": "#5A68E64D", diff --git a/assets/themes/Default - Light/colors.json b/assets/themes/Default - Light/colors.json index 83c87d43f7..fcf1f7f9a9 100644 --- a/assets/themes/Default - Light/colors.json +++ b/assets/themes/Default - Light/colors.json @@ -20,6 +20,11 @@ "buttonSecondaryColorHovered": "#D7E7FFFF", "buttonSecondaryColorPressed": "#B8D2F9FF", + "buttonCancelColorDisabled": "#D8E3F8FF", + "buttonCancelColorEnabled": "#F0F6FFFF", + "buttonCancelColorHovered": "#D7E7FFFF", + "buttonCancelColorPressed": "#B8D2F9FF", + "gradientButtonStartColor": "#5A68E6FF", "gradientButtonEndColor": "#4986EAAB", "gradientButtonDisabledStartColor": "#CDD0F6FF", diff --git a/atomic_defi_design/Dex/Addressbook/AddAddressForm.qml b/atomic_defi_design/Dex/Addressbook/AddAddressForm.qml index 1560a694b0..cc0502700a 100644 --- a/atomic_defi_design/Dex/Addressbook/AddAddressForm.qml +++ b/atomic_defi_design/Dex/Addressbook/AddAddressForm.qml @@ -176,7 +176,7 @@ Dex.Rectangle Layout.topMargin: 10 Layout.fillWidth: true - Dex.Button + Dex.CancelButton { Layout.preferredWidth: 116 Layout.preferredHeight: 38 @@ -301,7 +301,7 @@ Dex.Rectangle }, // Cancel button - Dex.Button + Dex.CancelButton { Layout.rightMargin: 5 text: qsTr("Cancel") diff --git a/atomic_defi_design/Dex/Addressbook/EditContactModal.qml b/atomic_defi_design/Dex/Addressbook/EditContactModal.qml index 673c52936a..4a4668a15c 100644 --- a/atomic_defi_design/Dex/Addressbook/EditContactModal.qml +++ b/atomic_defi_design/Dex/Addressbook/EditContactModal.qml @@ -283,7 +283,7 @@ Dex.MultipageModal footer: [ - Dex.Button + Dex.CancelButton { Layout.preferredWidth: 199 Layout.preferredHeight: 48 diff --git a/atomic_defi_design/Dex/Addressbook/EnableAssetModal.qml b/atomic_defi_design/Dex/Addressbook/EnableAssetModal.qml index 63317676f5..d8776239ac 100644 --- a/atomic_defi_design/Dex/Addressbook/EnableAssetModal.qml +++ b/atomic_defi_design/Dex/Addressbook/EnableAssetModal.qml @@ -34,7 +34,7 @@ Dex.MultipageModal }, // Cancel button - Dex.Button + Dex.CancelButton { Layout.rightMargin: 5 text: qsTr("Cancel") diff --git a/atomic_defi_design/Dex/Components/CannotEnableCoinModal.qml b/atomic_defi_design/Dex/Components/CannotEnableCoinModal.qml index 19c44755c6..42b54688ff 100644 --- a/atomic_defi_design/Dex/Components/CannotEnableCoinModal.qml +++ b/atomic_defi_design/Dex/Components/CannotEnableCoinModal.qml @@ -32,7 +32,7 @@ MultipageModal close() } } - DefaultButton + DexCancelButton { Layout.fillWidth: true text: qsTr("Cancel") diff --git a/atomic_defi_design/Dex/Components/DexCancelButton.qml b/atomic_defi_design/Dex/Components/DexCancelButton.qml new file mode 100644 index 0000000000..2409171be9 --- /dev/null +++ b/atomic_defi_design/Dex/Components/DexCancelButton.qml @@ -0,0 +1,12 @@ +import QtQuick 2.15 +import App 1.0 +import Dex.Themes 1.0 as Dex +import "../Constants" + +// Add button +DexAppButton { + btnPressedColor: Dex.CurrentTheme.buttonCancelColorPressed + btnHoveredColor: Dex.CurrentTheme.buttonCancelColorHovered + btnEnabledColor: Dex.CurrentTheme.buttonCancelColorEnabled + btnDisabledColor: Dex.CurrentTheme.buttonCancelColorDisabled +} diff --git a/atomic_defi_design/Dex/Components/EulaModal.qml b/atomic_defi_design/Dex/Components/EulaModal.qml index 4191801010..756682741d 100644 --- a/atomic_defi_design/Dex/Components/EulaModal.qml +++ b/atomic_defi_design/Dex/Components/EulaModal.qml @@ -82,7 +82,7 @@ MultipageModal Layout.alignment: Qt.AlignRight - DefaultButton + DexCancelButton { text: close_only ? qsTr("Close") : qsTr("Cancel") radius: 18 diff --git a/atomic_defi_design/Dex/Components/LogModal.qml b/atomic_defi_design/Dex/Components/LogModal.qml index 570f96bf63..c6c8312450 100644 --- a/atomic_defi_design/Dex/Components/LogModal.qml +++ b/atomic_defi_design/Dex/Components/LogModal.qml @@ -21,7 +21,7 @@ MultipageModal { // Buttons footer: [ - DefaultButton { + DexCancelButton { text: qsTr("Close") Layout.fillWidth: true onClicked: root.close() diff --git a/atomic_defi_design/Dex/Components/PopupManager.qml b/atomic_defi_design/Dex/Components/PopupManager.qml index a35025bea7..6fe64bb317 100644 --- a/atomic_defi_design/Dex/Components/PopupManager.qml +++ b/atomic_defi_design/Dex/Components/PopupManager.qml @@ -254,7 +254,7 @@ Popup anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter width: parent.width - 80 - DexAppButton + DexCancelButton { id: cancelBtn visible: showCancelBtn diff --git a/atomic_defi_design/Dex/Components/ZcashParamsModal.qml b/atomic_defi_design/Dex/Components/ZcashParamsModal.qml index c32d414c4c..30c642674a 100644 --- a/atomic_defi_design/Dex/Components/ZcashParamsModal.qml +++ b/atomic_defi_design/Dex/Components/ZcashParamsModal.qml @@ -78,7 +78,7 @@ Dex.MultipageModal onClicked: Qt.openUrlExternally("https://www.coinbureau.com/education/zcash-ceremony/") }, Item { Layout.fillWidth: true }, - Dex.DefaultButton + Dex.CancelButton { text: qsTr("Close") onClicked: close() diff --git a/atomic_defi_design/Dex/Components/qmldir b/atomic_defi_design/Dex/Components/qmldir index bc894bd813..06f384a7d2 100644 --- a/atomic_defi_design/Dex/Components/qmldir +++ b/atomic_defi_design/Dex/Components/qmldir @@ -20,3 +20,4 @@ TextField 1.0 DefaultTextField.qml TextFieldWithTitle 1.0 TextFieldWithTitle.qml ToolTip 1.0 DefaultTooltip.qml UserIcon 1.0 UserIcon.qml +CancelButton 1.0 DexCancelButton.qml \ No newline at end of file diff --git a/atomic_defi_design/Dex/Constants/DexTheme.qml b/atomic_defi_design/Dex/Constants/DexTheme.qml index 99f7fa2ba6..6aedf64898 100644 --- a/atomic_defi_design/Dex/Constants/DexTheme.qml +++ b/atomic_defi_design/Dex/Constants/DexTheme.qml @@ -134,6 +134,11 @@ QtObject { property color buttonSecondaryColorHovered: Dex.CurrentTheme.buttonSecondaryColorHovered property color buttonSecondaryColorPressed: Dex.CurrentTheme.buttonSecondaryColorPressed + property color buttonCancelColorDisabled: Dex.CurrentTheme.buttonCancelColorDisabled + property color buttonCancelColorEnabled: Dex.CurrentTheme.buttonCancelColorEnabled + property color buttonCancelColorHovered: Dex.CurrentTheme.buttonCancelColorHovered + property color buttonCancelColorPressed: Dex.CurrentTheme.buttonCancelColorPressed + property color buttonGradientEnabled1: DexTheme.buttonColorEnabled property color buttonGradientEnabled2: DexTheme.buttonColorEnabled property color buttonGradientTextEnabled: DexTheme.foregroundColor diff --git a/atomic_defi_design/Dex/Dashboard/FatalErrorModal.qml b/atomic_defi_design/Dex/Dashboard/FatalErrorModal.qml index e4bc2646d4..81e9eacc98 100644 --- a/atomic_defi_design/Dex/Dashboard/FatalErrorModal.qml +++ b/atomic_defi_design/Dex/Dashboard/FatalErrorModal.qml @@ -32,7 +32,7 @@ MultipageModal { } footer: [ - DefaultButton { + DexCancelButton { Layout.fillWidth: true text: qsTr("Close") onClicked: root.close() diff --git a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderModal.qml b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderModal.qml index 381a7d7bc0..6768ce4f8d 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderModal.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderModal.qml @@ -289,7 +289,7 @@ MultipageModal Layout.fillWidth: true }, - DefaultButton + DexCancelButton { id: close_order_button text: qsTr("Close") diff --git a/atomic_defi_design/Dex/Exchange/Trade/ConfirmMultiOrderTradeModal.qml b/atomic_defi_design/Dex/Exchange/Trade/ConfirmMultiOrderTradeModal.qml index be005b5314..778dff84be 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/ConfirmMultiOrderTradeModal.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/ConfirmMultiOrderTradeModal.qml @@ -101,7 +101,7 @@ MultipageModal { // Buttons footer: [ - DefaultButton { + DexCancelButton { text: qsTr("Cancel") Layout.fillWidth: true onClicked: root.close() diff --git a/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml b/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml index 0793bdbc31..6f9e61be86 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml @@ -396,7 +396,7 @@ MultipageModal [ Item { Layout.fillWidth: true }, - DefaultButton + DexCancelButton { text: qsTr("Cancel") padding: 10 diff --git a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubHistory.qml b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubHistory.qml index b6171ada9c..74ed4284af 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubHistory.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubHistory.qml @@ -252,7 +252,7 @@ Item anchors.fill: parent spacing: 15 - DefaultButton + DexCancelButton { Layout.fillWidth: true Layout.alignment: Qt.AlignVCenter diff --git a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubOrders.qml b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubOrders.qml index 680331ad66..021da04f71 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubOrders.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubOrders.qml @@ -245,7 +245,7 @@ Item { anchors.fill: parent spacing: 15 - DefaultButton + DexCancelButton { Layout.fillWidth: true Layout.alignment: Qt.AlignVCenter @@ -253,6 +253,7 @@ Item text: qsTr("Cancel") onClicked: _subOrdersRoot.displayFilter = false } + DefaultButton { Layout.fillWidth: true diff --git a/atomic_defi_design/Dex/NewUpdateModal.qml b/atomic_defi_design/Dex/NewUpdateModal.qml index 4f9d7e3907..eccb4867c4 100644 --- a/atomic_defi_design/Dex/NewUpdateModal.qml +++ b/atomic_defi_design/Dex/NewUpdateModal.qml @@ -53,7 +53,7 @@ Dex.MultipageModal footer: [ Item { Layout.fillWidth: true }, - Dex.DefaultButton + Dex.CancelButton { text: qsTr("Close") onClicked: close() @@ -75,7 +75,7 @@ Dex.MultipageModal footer: [ Item { Layout.fillWidth: true }, - Dex.DefaultButton + Dex.CancelButton { text: qsTr("Close") onClicked: close() @@ -134,7 +134,7 @@ Dex.MultipageModal footer: [ Item { Layout.fillWidth: true }, - Dex.DefaultButton + Dex.CancelButton { text: qsTr("Close") onClicked: close() diff --git a/atomic_defi_design/Dex/Screens/Startup/Login.qml b/atomic_defi_design/Dex/Screens/Startup/Login.qml index 115fcf981b..239b1781e1 100644 --- a/atomic_defi_design/Dex/Screens/Startup/Login.qml +++ b/atomic_defi_design/Dex/Screens/Startup/Login.qml @@ -115,14 +115,12 @@ SetupPage visible: false } - DexAppButton + DexCancelButton { text: qsTr("Cancel") - color: containsMouse ? Dex.CurrentTheme.buttonColorHovered : 'transparent' height: 25 radius: 20 width: 100 - border.color: 'transparent' Layout.alignment: Qt.AlignHCenter font: Qt.font( { diff --git a/atomic_defi_design/Dex/Settings/AddCustomCoinModal.qml b/atomic_defi_design/Dex/Settings/AddCustomCoinModal.qml index da91a1695a..e8c63e0151 100644 --- a/atomic_defi_design/Dex/Settings/AddCustomCoinModal.qml +++ b/atomic_defi_design/Dex/Settings/AddCustomCoinModal.qml @@ -146,7 +146,7 @@ MultipageModal // Buttons footer: [ - DefaultButton + DexCancelButton { text: qsTr("Cancel") Layout.preferredWidth: 220 diff --git a/atomic_defi_design/Dex/Settings/CamouflagePasswordModal.qml b/atomic_defi_design/Dex/Settings/CamouflagePasswordModal.qml index e0f83cd7a3..e1fe28e331 100644 --- a/atomic_defi_design/Dex/Settings/CamouflagePasswordModal.qml +++ b/atomic_defi_design/Dex/Settings/CamouflagePasswordModal.qml @@ -78,7 +78,7 @@ MultipageModal // Buttons footer: [ - DexAppButton + DexCancelButton { text: qsTr("Cancel") leftPadding: 40 diff --git a/atomic_defi_design/Dex/Settings/DeleteWalletModal.qml b/atomic_defi_design/Dex/Settings/DeleteWalletModal.qml index b126dab5e5..96f8ea01a6 100644 --- a/atomic_defi_design/Dex/Settings/DeleteWalletModal.qml +++ b/atomic_defi_design/Dex/Settings/DeleteWalletModal.qml @@ -70,7 +70,7 @@ MultipageModal { // Buttons footer: [ - DefaultButton { + DexCancelButton { text: qsTr("Cancel") Layout.fillWidth: true onClicked: root.close() diff --git a/atomic_defi_design/Dex/Settings/RecoverSeedModal.qml b/atomic_defi_design/Dex/Settings/RecoverSeedModal.qml index 0b73423286..d45cf1b618 100644 --- a/atomic_defi_design/Dex/Settings/RecoverSeedModal.qml +++ b/atomic_defi_design/Dex/Settings/RecoverSeedModal.qml @@ -85,7 +85,7 @@ MultipageModal { Layout.preferredWidth: parent.width Layout.topMargin: 30 - DefaultButton + DexCancelButton { text: qsTr("Cancel") Layout.preferredWidth: parent.width / 100 * 48 diff --git a/atomic_defi_design/Dex/Themes/CurrentTheme.qml b/atomic_defi_design/Dex/Themes/CurrentTheme.qml index 146d3a90bd..94ef9960d9 100644 --- a/atomic_defi_design/Dex/Themes/CurrentTheme.qml +++ b/atomic_defi_design/Dex/Themes/CurrentTheme.qml @@ -110,6 +110,11 @@ ThemeData buttonSecondaryColorHovered = Dex.Color.argbStrFromRgbaStr(themeData.buttonSecondaryColorHovered || defaultTheme.buttonSecondaryColorHovered); buttonSecondaryColorPressed = Dex.Color.argbStrFromRgbaStr(themeData.buttonSecondaryColorPressed || defaultTheme.buttonSecondaryColorPressed); + buttonCancelColorDisabled = Dex.Color.argbStrFromRgbaStr(themeData.buttonCancelColorDisabled || defaultTheme.buttonCancelColorDisabled); + buttonCancelColorEnabled = Dex.Color.argbStrFromRgbaStr(themeData.buttonCancelColorEnabled || defaultTheme.buttonCancelColorEnabled); + buttonCancelColorHovered = Dex.Color.argbStrFromRgbaStr(themeData.buttonCancelColorHovered || defaultTheme.buttonCancelColorHovered); + buttonCancelColorPressed = Dex.Color.argbStrFromRgbaStr(themeData.buttonCancelColorPressed || defaultTheme.buttonCancelColorPressed); + gradientButtonStartColor = Dex.Color.argbStrFromRgbaStr(themeData.gradientButtonStartColor || defaultTheme.gradientButtonStartColor); gradientButtonEndColor = Dex.Color.argbStrFromRgbaStr(themeData.gradientButtonEndColor || defaultTheme.gradientButtonEndColor); gradientButtonDisabledStartColor = Dex.Color.argbStrFromRgbaStr(themeData.gradientButtonDisabledStartColor || defaultTheme.gradientButtonDisabledStartColor); diff --git a/atomic_defi_design/Dex/Themes/DefaultTheme.js b/atomic_defi_design/Dex/Themes/DefaultTheme.js index f8475eda3e..b26ae4cc50 100644 --- a/atomic_defi_design/Dex/Themes/DefaultTheme.js +++ b/atomic_defi_design/Dex/Themes/DefaultTheme.js @@ -26,6 +26,11 @@ function getHardcoded() buttonSecondaryColorHovered: "#D7E7FFFF", buttonSecondaryColorPressed: "#B8D2F9FF", + buttonCancelColorDisabled: "#D8E3F8FF", + buttonCancelColorEnabled: "#F0F6FFFF", + buttonCancelColorHovered: "#D7E7FFFF", + buttonCancelColorPressed: "#B8D2F9FF", + gradientButtonStartColor: "#5A68E6FF", gradientButtonEndColor: "#4986EAAB", gradientButtonDisabledStartColor: "#CDD0F6FF", diff --git a/atomic_defi_design/Dex/Themes/ThemeData.qml b/atomic_defi_design/Dex/Themes/ThemeData.qml index 28c02819a2..a138eb816c 100644 --- a/atomic_defi_design/Dex/Themes/ThemeData.qml +++ b/atomic_defi_design/Dex/Themes/ThemeData.qml @@ -25,6 +25,11 @@ QtObject property color buttonSecondaryColorHovered property color buttonSecondaryColorPressed + property color buttonCancelColorDisabled + property color buttonCancelColorEnabled + property color buttonCancelColorHovered + property color buttonCancelColorPressed + property color gradientButtonStartColor property color gradientButtonEndColor property color gradientButtonDisabledStartColor diff --git a/atomic_defi_design/Dex/Wallet/ClaimRewardsModal.qml b/atomic_defi_design/Dex/Wallet/ClaimRewardsModal.qml index 4222e0189f..829fae9e59 100644 --- a/atomic_defi_design/Dex/Wallet/ClaimRewardsModal.qml +++ b/atomic_defi_design/Dex/Wallet/ClaimRewardsModal.qml @@ -414,7 +414,7 @@ MultipageModal // Buttons footer: [ - DexAppButton + DexCancelButton { text: qsTr("Cancel") leftPadding: 40 diff --git a/atomic_defi_design/Dex/Wallet/EnableCoinModal.qml b/atomic_defi_design/Dex/Wallet/EnableCoinModal.qml index 332f7049b0..9f8310a361 100644 --- a/atomic_defi_design/Dex/Wallet/EnableCoinModal.qml +++ b/atomic_defi_design/Dex/Wallet/EnableCoinModal.qml @@ -263,7 +263,7 @@ MultipageModal footer: [ - DefaultButton + DexCancelButton { Layout.preferredWidth: 199 text: qsTr("Cancel") diff --git a/atomic_defi_design/Dex/Wallet/ReceiveModal.qml b/atomic_defi_design/Dex/Wallet/ReceiveModal.qml index cb91aded2d..62c273f652 100644 --- a/atomic_defi_design/Dex/Wallet/ReceiveModal.qml +++ b/atomic_defi_design/Dex/Wallet/ReceiveModal.qml @@ -55,7 +55,7 @@ MultipageModal footer: [ Item { Layout.fillWidth: true }, - DefaultButton + DexCancelButton { text: qsTr("Close") Layout.fillWidth: true diff --git a/atomic_defi_design/Dex/Wallet/SendModal.qml b/atomic_defi_design/Dex/Wallet/SendModal.qml index c521d97e5e..6ab98888e3 100644 --- a/atomic_defi_design/Dex/Wallet/SendModal.qml +++ b/atomic_defi_design/Dex/Wallet/SendModal.qml @@ -733,7 +733,7 @@ MultipageModal Layout.alignment: Qt.AlignHCenter Layout.topMargin: 20 - DefaultButton + DexCancelButton { text: qsTr("Cancel") diff --git a/atomic_defi_design/Dex/Wallet/SendResult.qml b/atomic_defi_design/Dex/Wallet/SendResult.qml index 41b06be0cb..25f0a1884f 100644 --- a/atomic_defi_design/Dex/Wallet/SendResult.qml +++ b/atomic_defi_design/Dex/Wallet/SendResult.qml @@ -105,7 +105,7 @@ MultipageModalContent // Buttons footer: [ - DexButton + DexCancelButton { Layout.fillWidth: true text: qsTr("Close") diff --git a/atomic_defi_design/Dex/Wallet/TransactionDetailsModal.qml b/atomic_defi_design/Dex/Wallet/TransactionDetailsModal.qml index 006b51d45a..248992405b 100644 --- a/atomic_defi_design/Dex/Wallet/TransactionDetailsModal.qml +++ b/atomic_defi_design/Dex/Wallet/TransactionDetailsModal.qml @@ -147,7 +147,7 @@ MultipageModal // Buttons footer: [ - DefaultButton + DexCancelButton { Layout.fillWidth: true text: qsTr("Close") From c5d24518e079a466f723219f6293a3bd31591b75 Mon Sep 17 00:00:00 2001 From: smk762 Date: Sat, 10 Dec 2022 01:49:58 +0800 Subject: [PATCH 19/80] update warning icon & button gradient --- .../Dex/Components/DefaultAlertIcon.qml | 12 ++++++------ atomic_defi_design/Dex/Components/DexCheckBox.qml | 1 + .../Dex/Exchange/Trade/ConfirmTradeModal.qml | 5 +++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/atomic_defi_design/Dex/Components/DefaultAlertIcon.qml b/atomic_defi_design/Dex/Components/DefaultAlertIcon.qml index 696a7f50b3..b980ab0c94 100644 --- a/atomic_defi_design/Dex/Components/DefaultAlertIcon.qml +++ b/atomic_defi_design/Dex/Components/DefaultAlertIcon.qml @@ -4,20 +4,20 @@ import Qaterial 1.0 as Qaterial import "../Constants" as Constants import App 1.0 -Qaterial.Icon + +DefaultImage { property int iconSize: 24 property string tooltipText: "" - property var iconColor: "gold" - property var iconColorHover: "yellow" - icon: Qaterial.Icons.alert - size: iconSize + source: General.image_path + "warning.svg" + height: iconSize + width: iconSize + opacity: alertArea.containsMouse ? 0.9 : 1 anchors.left: parent.left anchors.leftMargin: iconSize / 2 anchors.rightMargin: iconSize / 2 anchors.verticalCenter: parent.verticalCenter - color: alertArea.containsMouse ? iconColorHover : iconColor DexMouseArea { diff --git a/atomic_defi_design/Dex/Components/DexCheckBox.qml b/atomic_defi_design/Dex/Components/DexCheckBox.qml index b471d0d922..344df181ad 100644 --- a/atomic_defi_design/Dex/Components/DexCheckBox.qml +++ b/atomic_defi_design/Dex/Components/DexCheckBox.qml @@ -15,6 +15,7 @@ CheckBox property alias label: _label property alias boxWidth: _indicator.implicitWidth property alias boxHeight: _indicator.implicitHeight + property alias boxRadius: _indicator.radius property alias mouseArea: mouseArea property color textColor: Dex.CurrentTheme.foregroundColor property int labelWidth: 0 diff --git a/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml b/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml index 6f9e61be86..5be326653b 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml @@ -17,8 +17,8 @@ MultipageModal id: root readonly property var fees: API.app.trading_pg.fees width: 720 - horizontalPadding: 30 - verticalPadding: 30 + horizontalPadding: 20 + verticalPadding: 20 closePolicy: Popup.NoAutoClose MultipageModalContent @@ -95,6 +95,7 @@ MultipageModal spacing: 2 boxWidth: 16 boxHeight: 16 + boxRadius: 8 label.wrapMode: Label.NoWrap text: qsTr("Trade price is more than 50% different to CEX! Confirm?") font: DexTypo.caption From b43538936b1b4eab11439add8028965138a3439b Mon Sep 17 00:00:00 2001 From: smk762 Date: Sat, 10 Dec 2022 02:11:30 +0800 Subject: [PATCH 20/80] add warning.svg --- atomic_defi_design/assets/images/warning.svg | 27 ++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 atomic_defi_design/assets/images/warning.svg diff --git a/atomic_defi_design/assets/images/warning.svg b/atomic_defi_design/assets/images/warning.svg new file mode 100644 index 0000000000..2bfc1aa8b6 --- /dev/null +++ b/atomic_defi_design/assets/images/warning.svg @@ -0,0 +1,27 @@ + + + + + + + + + + From 762887df3b8e53cc0bfc36acd23cd0ef33a08ece Mon Sep 17 00:00:00 2001 From: smk762 Date: Sun, 11 Dec 2022 00:24:36 +0800 Subject: [PATCH 21/80] fix portfolio assets price text color --- atomic_defi_design/Dex/Portfolio/AssetsList.qml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/atomic_defi_design/Dex/Portfolio/AssetsList.qml b/atomic_defi_design/Dex/Portfolio/AssetsList.qml index 480865d617..9bf89b1623 100644 --- a/atomic_defi_design/Dex/Portfolio/AssetsList.qml +++ b/atomic_defi_design/Dex/Portfolio/AssetsList.qml @@ -203,7 +203,6 @@ Dex.DexListView return parseFloat(balance).toFixed(8) } - color: text_value == parseFloat(balance).toFixed(8) ? Qt.darker(Dex.DexTheme.foregroundColor, 0.8) : Dex.DexTheme.warningColor privacy: true } @@ -217,8 +216,6 @@ Dex.DexListView font: Dex.DexTypo.body2 text_value: Dex.General.formatFiat("", main_currency_balance, Dex.API.app.settings_pg.current_currency) - - color: Qt.darker(Dex.DexTheme.foregroundColor, 0.8) privacy: true } @@ -252,7 +249,6 @@ Dex.DexListView text_value: Dex.General.formatFiat('', main_currency_price_for_one_unit, Dex.API.app.settings_pg.current_currency, 6) - color: Dex.DexTheme.colorThemeDarkLight } Item // Price Provider From 44e1f918941fdc285450cb8e0769fab7c57e49b2 Mon Sep 17 00:00:00 2001 From: smk762 Date: Sun, 11 Dec 2022 02:03:57 +0800 Subject: [PATCH 22/80] dex page styles and seed word selection buttons --- .../ProView/TradingInfo/OrdersPage.qml | 24 ++-- .../Dex/Exchange/Trade/SimpleView/Main.qml | 125 ++++++++++-------- .../Dex/Screens/Startup/NewWallet.qml | 7 +- 3 files changed, 84 insertions(+), 72 deletions(-) diff --git a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrdersPage.qml b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrdersPage.qml index 5ff799eda8..abe3c7e0df 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrdersPage.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrdersPage.qml @@ -115,6 +115,18 @@ Item { } } + DefaultButton + { + visible: !root.is_history + enabled: list_model.length > 0 + Layout.preferredHeight: 29 + radius: 7 + label.font: DexTypo.body2 + text: qsTr("Cancel All") + iconSource: Qaterial.Icons.close + onClicked: API.app.trading_pg.orders.cancel_order(list_model_proxy.get_filtered_ids()) + } + DefaultText { color: Dex.CurrentTheme.foregroundColor2 @@ -143,18 +155,6 @@ Item { text: qsTr("Apply Filter") onClicked: list_model_proxy.apply_all_filtering() } - - DefaultButton - { - visible: !root.is_history - enabled: API.app.orders_mdl.length > 0 - Layout.preferredHeight: 29 - radius: 7 - label.font: DexTypo.body2 - text: qsTr("Cancel All") - iconSource: Qaterial.Icons.close - onClicked: API.app.trading_pg.orders.cancel_order(list_model_proxy.get_filtered_ids()) - } } RowLayout diff --git a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/Main.qml b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/Main.qml index ee73c2f269..649d133c0b 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/Main.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/Main.qml @@ -40,76 +40,87 @@ Item spacing: 30 anchors.horizontalCenter: parent.horizontalCenter - Item // Sub-pages Tabs Selector + Rectangle // Tabs Border { anchors.horizontalCenter: parent.horizontalCenter - width: _selectedTabMarker.width * 3 - height: 30 - - Rectangle // Selected Tab Rectangle + width: _selectedTabMarker.width * 3 + 8 + height: 38 + border.color: Dex.CurrentTheme.gradientButtonStartColor + border.width: 1 + color: Dex.CurrentTheme.floatingBackgroundColor + radius: 19 + + Item // Sub-pages Tabs Selector { - id: _selectedTabMarker + anchors.centerIn: parent + width: _selectedTabMarker.width * 3 + height: 30 - function update() // Updates transform according to selected sub-page. + Rectangle // Selected Tab Rectangle { - switch (currentSubPage) + id: _selectedTabMarker + + function update() // Updates transform according to selected sub-page. { - case subPages.Trade: - x = 0 - break; - case subPages.Orders: - x = (parent.width / 3) - orders_view.update() - break; - case subPages.History: - x = (parent.width / 3) *2 - history_view.update() - break; + switch (currentSubPage) + { + case subPages.Trade: + x = 0 + break; + case subPages.Orders: + x = (parent.width / 3) + orders_view.update() + break; + case subPages.History: + x = (parent.width / 3) * 2 + history_view.update() + break; + } } - } - anchors.verticalCenter: parent.verticalCenter - height: parent.height - width: 108 - radius: 15 - color: Dex.CurrentTheme.tabSelectedColor - - Behavior on x { NumberAnimation { duration: 150 } } - } + anchors.verticalCenter: parent.verticalCenter + height: parent.height + width: 108 + radius: 15 + color: Dex.CurrentTheme.tabSelectedColor - RowLayout - { - anchors.fill: parent - spacing: 0 - - ClickableText - { - id: _tradeText - Layout.preferredWidth: parent.width / 3 - Layout.fillHeight: true - text: qsTr("Trade") - font.pixelSize: Constants.Style.textSize - onClicked: if (currentSubPage !== subPages.Trade) currentSubPage = subPages.Trade + Behavior on x { NumberAnimation { duration: 150 } } } - ClickableText + RowLayout { - id: _ordersText - Layout.preferredWidth: parent.width / 3 - Layout.fillHeight: true - text: qsTr("Orders") - font.pixelSize: Constants.Style.textSize - onClicked: if (currentSubPage !== subPages.Orders) currentSubPage = subPages.Orders - } + anchors.fill: parent + spacing: 0 - ClickableText - { - id: _historyText - Layout.preferredWidth: parent.width / 3 - Layout.fillHeight: true - text: qsTr("History") - font.pixelSize: Constants.Style.textSize - onClicked: if (currentSubPage !== subPages.History) currentSubPage = subPages.History + ClickableText + { + id: _tradeText + Layout.preferredWidth: parent.width / 3 + Layout.fillHeight: true + text: qsTr("Swap") + font.pixelSize: Constants.Style.textSize + onClicked: if (currentSubPage !== subPages.Trade) currentSubPage = subPages.Trade + } + + ClickableText + { + id: _ordersText + Layout.preferredWidth: parent.width / 3 + Layout.fillHeight: true + text: qsTr("Orders") + font.pixelSize: Constants.Style.textSize + onClicked: if (currentSubPage !== subPages.Orders) currentSubPage = subPages.Orders + } + + ClickableText + { + id: _historyText + Layout.preferredWidth: parent.width / 3 + Layout.fillHeight: true + text: qsTr("History") + font.pixelSize: Constants.Style.textSize + onClicked: if (currentSubPage !== subPages.History) currentSubPage = subPages.History + } } } } diff --git a/atomic_defi_design/Dex/Screens/Startup/NewWallet.qml b/atomic_defi_design/Dex/Screens/Startup/NewWallet.qml index c6d4ab60ad..ef22a5bbd6 100644 --- a/atomic_defi_design/Dex/Screens/Startup/NewWallet.qml +++ b/atomic_defi_design/Dex/Screens/Startup/NewWallet.qml @@ -569,7 +569,8 @@ SetupPage width: (_insideFlow2.width - 30) / 4 text: modelData ?? "" radius: 20 - color: Dex.CurrentTheme.accentColor + btnEnabledColor: Dex.CurrentTheme.buttonColorEnabled + btnHoveredColor: Dex.CurrentTheme.accentColor font: DexTypo.body2 onClicked: @@ -610,9 +611,9 @@ SetupPage { x: 5 height: 40 - width: 60 + width: 50 radius: 20 - color: Dex.CurrentTheme.accentColor + color: Dex.CurrentTheme.inputLeftIconBackgroundColor anchors.verticalCenter: parent.verticalCenter DefaultText From f4605fd52bdadefe8f072f348c67dd42d27baedb Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 12 Dec 2022 19:23:45 +0800 Subject: [PATCH 23/80] DexCancelButton -> CancelButton --- .../Dex/Components/{DexCancelButton.qml => CancelButton.qml} | 0 atomic_defi_design/Dex/Components/CannotEnableCoinModal.qml | 2 +- atomic_defi_design/Dex/Components/EulaModal.qml | 2 +- atomic_defi_design/Dex/Components/LogModal.qml | 2 +- atomic_defi_design/Dex/Components/PopupManager.qml | 2 +- atomic_defi_design/Dex/Components/qmldir | 2 +- atomic_defi_design/Dex/Dashboard/FatalErrorModal.qml | 2 +- .../Dex/Exchange/ProView/TradingInfo/OrderModal.qml | 2 +- .../Dex/Exchange/Trade/ConfirmMultiOrderTradeModal.qml | 2 +- atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml | 2 +- atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubHistory.qml | 2 +- atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubOrders.qml | 2 +- atomic_defi_design/Dex/Screens/Startup/Login.qml | 2 +- atomic_defi_design/Dex/Settings/AddCustomCoinModal.qml | 2 +- atomic_defi_design/Dex/Settings/CamouflagePasswordModal.qml | 2 +- atomic_defi_design/Dex/Settings/DeleteWalletModal.qml | 2 +- atomic_defi_design/Dex/Settings/RecoverSeedModal.qml | 2 +- atomic_defi_design/Dex/Wallet/ClaimRewardsModal.qml | 2 +- atomic_defi_design/Dex/Wallet/EnableCoinModal.qml | 2 +- atomic_defi_design/Dex/Wallet/ReceiveModal.qml | 2 +- atomic_defi_design/Dex/Wallet/SendModal.qml | 2 +- atomic_defi_design/Dex/Wallet/SendResult.qml | 2 +- atomic_defi_design/Dex/Wallet/TransactionDetailsModal.qml | 2 +- 23 files changed, 22 insertions(+), 22 deletions(-) rename atomic_defi_design/Dex/Components/{DexCancelButton.qml => CancelButton.qml} (100%) diff --git a/atomic_defi_design/Dex/Components/DexCancelButton.qml b/atomic_defi_design/Dex/Components/CancelButton.qml similarity index 100% rename from atomic_defi_design/Dex/Components/DexCancelButton.qml rename to atomic_defi_design/Dex/Components/CancelButton.qml diff --git a/atomic_defi_design/Dex/Components/CannotEnableCoinModal.qml b/atomic_defi_design/Dex/Components/CannotEnableCoinModal.qml index 42b54688ff..dad42aa5ac 100644 --- a/atomic_defi_design/Dex/Components/CannotEnableCoinModal.qml +++ b/atomic_defi_design/Dex/Components/CannotEnableCoinModal.qml @@ -32,7 +32,7 @@ MultipageModal close() } } - DexCancelButton + CancelButton { Layout.fillWidth: true text: qsTr("Cancel") diff --git a/atomic_defi_design/Dex/Components/EulaModal.qml b/atomic_defi_design/Dex/Components/EulaModal.qml index 756682741d..ad71f04fab 100644 --- a/atomic_defi_design/Dex/Components/EulaModal.qml +++ b/atomic_defi_design/Dex/Components/EulaModal.qml @@ -82,7 +82,7 @@ MultipageModal Layout.alignment: Qt.AlignRight - DexCancelButton + CancelButton { text: close_only ? qsTr("Close") : qsTr("Cancel") radius: 18 diff --git a/atomic_defi_design/Dex/Components/LogModal.qml b/atomic_defi_design/Dex/Components/LogModal.qml index c6c8312450..492856d7ef 100644 --- a/atomic_defi_design/Dex/Components/LogModal.qml +++ b/atomic_defi_design/Dex/Components/LogModal.qml @@ -21,7 +21,7 @@ MultipageModal { // Buttons footer: [ - DexCancelButton { + CancelButton { text: qsTr("Close") Layout.fillWidth: true onClicked: root.close() diff --git a/atomic_defi_design/Dex/Components/PopupManager.qml b/atomic_defi_design/Dex/Components/PopupManager.qml index 6fe64bb317..0d24426e75 100644 --- a/atomic_defi_design/Dex/Components/PopupManager.qml +++ b/atomic_defi_design/Dex/Components/PopupManager.qml @@ -254,7 +254,7 @@ Popup anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter width: parent.width - 80 - DexCancelButton + CancelButton { id: cancelBtn visible: showCancelBtn diff --git a/atomic_defi_design/Dex/Components/qmldir b/atomic_defi_design/Dex/Components/qmldir index 06f384a7d2..dab8794241 100644 --- a/atomic_defi_design/Dex/Components/qmldir +++ b/atomic_defi_design/Dex/Components/qmldir @@ -20,4 +20,4 @@ TextField 1.0 DefaultTextField.qml TextFieldWithTitle 1.0 TextFieldWithTitle.qml ToolTip 1.0 DefaultTooltip.qml UserIcon 1.0 UserIcon.qml -CancelButton 1.0 DexCancelButton.qml \ No newline at end of file +CancelButton 1.0 CancelButton.qml \ No newline at end of file diff --git a/atomic_defi_design/Dex/Dashboard/FatalErrorModal.qml b/atomic_defi_design/Dex/Dashboard/FatalErrorModal.qml index 81e9eacc98..2213fb772f 100644 --- a/atomic_defi_design/Dex/Dashboard/FatalErrorModal.qml +++ b/atomic_defi_design/Dex/Dashboard/FatalErrorModal.qml @@ -32,7 +32,7 @@ MultipageModal { } footer: [ - DexCancelButton { + CancelButton { Layout.fillWidth: true text: qsTr("Close") onClicked: root.close() diff --git a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderModal.qml b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderModal.qml index 6768ce4f8d..25fa8d93cb 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderModal.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderModal.qml @@ -289,7 +289,7 @@ MultipageModal Layout.fillWidth: true }, - DexCancelButton + CancelButton { id: close_order_button text: qsTr("Close") diff --git a/atomic_defi_design/Dex/Exchange/Trade/ConfirmMultiOrderTradeModal.qml b/atomic_defi_design/Dex/Exchange/Trade/ConfirmMultiOrderTradeModal.qml index 778dff84be..fece784f8e 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/ConfirmMultiOrderTradeModal.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/ConfirmMultiOrderTradeModal.qml @@ -101,7 +101,7 @@ MultipageModal { // Buttons footer: [ - DexCancelButton { + CancelButton { text: qsTr("Cancel") Layout.fillWidth: true onClicked: root.close() diff --git a/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml b/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml index 5be326653b..c0aae025d4 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml @@ -397,7 +397,7 @@ MultipageModal [ Item { Layout.fillWidth: true }, - DexCancelButton + CancelButton { text: qsTr("Cancel") padding: 10 diff --git a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubHistory.qml b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubHistory.qml index 74ed4284af..917e515db6 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubHistory.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubHistory.qml @@ -252,7 +252,7 @@ Item anchors.fill: parent spacing: 15 - DexCancelButton + CancelButton { Layout.fillWidth: true Layout.alignment: Qt.AlignVCenter diff --git a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubOrders.qml b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubOrders.qml index 021da04f71..7b26d92157 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubOrders.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubOrders.qml @@ -245,7 +245,7 @@ Item { anchors.fill: parent spacing: 15 - DexCancelButton + CancelButton { Layout.fillWidth: true Layout.alignment: Qt.AlignVCenter diff --git a/atomic_defi_design/Dex/Screens/Startup/Login.qml b/atomic_defi_design/Dex/Screens/Startup/Login.qml index 239b1781e1..74401c45e2 100644 --- a/atomic_defi_design/Dex/Screens/Startup/Login.qml +++ b/atomic_defi_design/Dex/Screens/Startup/Login.qml @@ -115,7 +115,7 @@ SetupPage visible: false } - DexCancelButton + CancelButton { text: qsTr("Cancel") height: 25 diff --git a/atomic_defi_design/Dex/Settings/AddCustomCoinModal.qml b/atomic_defi_design/Dex/Settings/AddCustomCoinModal.qml index e8c63e0151..d3dd686fed 100644 --- a/atomic_defi_design/Dex/Settings/AddCustomCoinModal.qml +++ b/atomic_defi_design/Dex/Settings/AddCustomCoinModal.qml @@ -146,7 +146,7 @@ MultipageModal // Buttons footer: [ - DexCancelButton + CancelButton { text: qsTr("Cancel") Layout.preferredWidth: 220 diff --git a/atomic_defi_design/Dex/Settings/CamouflagePasswordModal.qml b/atomic_defi_design/Dex/Settings/CamouflagePasswordModal.qml index e1fe28e331..a798ff68dc 100644 --- a/atomic_defi_design/Dex/Settings/CamouflagePasswordModal.qml +++ b/atomic_defi_design/Dex/Settings/CamouflagePasswordModal.qml @@ -78,7 +78,7 @@ MultipageModal // Buttons footer: [ - DexCancelButton + CancelButton { text: qsTr("Cancel") leftPadding: 40 diff --git a/atomic_defi_design/Dex/Settings/DeleteWalletModal.qml b/atomic_defi_design/Dex/Settings/DeleteWalletModal.qml index 96f8ea01a6..c19c6854f9 100644 --- a/atomic_defi_design/Dex/Settings/DeleteWalletModal.qml +++ b/atomic_defi_design/Dex/Settings/DeleteWalletModal.qml @@ -70,7 +70,7 @@ MultipageModal { // Buttons footer: [ - DexCancelButton { + CancelButton { text: qsTr("Cancel") Layout.fillWidth: true onClicked: root.close() diff --git a/atomic_defi_design/Dex/Settings/RecoverSeedModal.qml b/atomic_defi_design/Dex/Settings/RecoverSeedModal.qml index d45cf1b618..39253a7786 100644 --- a/atomic_defi_design/Dex/Settings/RecoverSeedModal.qml +++ b/atomic_defi_design/Dex/Settings/RecoverSeedModal.qml @@ -85,7 +85,7 @@ MultipageModal { Layout.preferredWidth: parent.width Layout.topMargin: 30 - DexCancelButton + CancelButton { text: qsTr("Cancel") Layout.preferredWidth: parent.width / 100 * 48 diff --git a/atomic_defi_design/Dex/Wallet/ClaimRewardsModal.qml b/atomic_defi_design/Dex/Wallet/ClaimRewardsModal.qml index 829fae9e59..f067a7886f 100644 --- a/atomic_defi_design/Dex/Wallet/ClaimRewardsModal.qml +++ b/atomic_defi_design/Dex/Wallet/ClaimRewardsModal.qml @@ -414,7 +414,7 @@ MultipageModal // Buttons footer: [ - DexCancelButton + CancelButton { text: qsTr("Cancel") leftPadding: 40 diff --git a/atomic_defi_design/Dex/Wallet/EnableCoinModal.qml b/atomic_defi_design/Dex/Wallet/EnableCoinModal.qml index 9f8310a361..4ab058acca 100644 --- a/atomic_defi_design/Dex/Wallet/EnableCoinModal.qml +++ b/atomic_defi_design/Dex/Wallet/EnableCoinModal.qml @@ -263,7 +263,7 @@ MultipageModal footer: [ - DexCancelButton + CancelButton { Layout.preferredWidth: 199 text: qsTr("Cancel") diff --git a/atomic_defi_design/Dex/Wallet/ReceiveModal.qml b/atomic_defi_design/Dex/Wallet/ReceiveModal.qml index 62c273f652..bf28c7b6c6 100644 --- a/atomic_defi_design/Dex/Wallet/ReceiveModal.qml +++ b/atomic_defi_design/Dex/Wallet/ReceiveModal.qml @@ -55,7 +55,7 @@ MultipageModal footer: [ Item { Layout.fillWidth: true }, - DexCancelButton + CancelButton { text: qsTr("Close") Layout.fillWidth: true diff --git a/atomic_defi_design/Dex/Wallet/SendModal.qml b/atomic_defi_design/Dex/Wallet/SendModal.qml index 6ab98888e3..3ae2949107 100644 --- a/atomic_defi_design/Dex/Wallet/SendModal.qml +++ b/atomic_defi_design/Dex/Wallet/SendModal.qml @@ -733,7 +733,7 @@ MultipageModal Layout.alignment: Qt.AlignHCenter Layout.topMargin: 20 - DexCancelButton + CancelButton { text: qsTr("Cancel") diff --git a/atomic_defi_design/Dex/Wallet/SendResult.qml b/atomic_defi_design/Dex/Wallet/SendResult.qml index 25f0a1884f..deb97babdc 100644 --- a/atomic_defi_design/Dex/Wallet/SendResult.qml +++ b/atomic_defi_design/Dex/Wallet/SendResult.qml @@ -105,7 +105,7 @@ MultipageModalContent // Buttons footer: [ - DexCancelButton + CancelButton { Layout.fillWidth: true text: qsTr("Close") diff --git a/atomic_defi_design/Dex/Wallet/TransactionDetailsModal.qml b/atomic_defi_design/Dex/Wallet/TransactionDetailsModal.qml index 248992405b..c05e7463ef 100644 --- a/atomic_defi_design/Dex/Wallet/TransactionDetailsModal.qml +++ b/atomic_defi_design/Dex/Wallet/TransactionDetailsModal.qml @@ -147,7 +147,7 @@ MultipageModal // Buttons footer: [ - DexCancelButton + CancelButton { Layout.fillWidth: true text: qsTr("Close") From f477d2f2d49713772f3b09ea43ccc09fb623abdf Mon Sep 17 00:00:00 2001 From: smk762 Date: Sun, 19 Feb 2023 22:56:25 +0800 Subject: [PATCH 24/80] fix dex pro filter layout --- .../ProView/TradingInfo/OrdersPage.qml | 50 ++++++++++--------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrdersPage.qml b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrdersPage.qml index abe3c7e0df..8be325adbb 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrdersPage.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrdersPage.qml @@ -101,6 +101,30 @@ Item { onClicked: settings.visible = !settings.visible } + DefaultButton + { + visible: settings.visible && root.is_history + Layout.preferredHeight: 29 + enabled: list_model_proxy.can_i_apply_filtering + radius: 7 + label.font: DexTypo.body2 + text: qsTr("Apply Filter") + onClicked: list_model_proxy.apply_all_filtering() + } + + DefaultText + { + color: Dex.CurrentTheme.foregroundColor2 + font: DexTypo.caption + visible: !settings.visible + text: qsTr("Filter") + ": %1 / %2
%3: %4 - %5".arg(combo_base.currentTicker).arg(combo_rel.currentTicker).arg(qsTr("Date")).arg(min_date.selectedDate.toLocaleDateString(Locale.ShortFormat, "yyyy-MM-dd")).arg(max_date.selectedDate.toLocaleDateString(Locale.ShortFormat, "yyyy-MM-dd")) + } + + Item + { + Layout.fillWidth: true + } + DefaultButton { visible: root.is_history @@ -117,7 +141,7 @@ Item { DefaultButton { - visible: !root.is_history + visible: !root.is_history && list_model.length > 0 enabled: list_model.length > 0 Layout.preferredHeight: 29 radius: 7 @@ -126,14 +150,6 @@ Item { iconSource: Qaterial.Icons.close onClicked: API.app.trading_pg.orders.cancel_order(list_model_proxy.get_filtered_ids()) } - - DefaultText - { - color: Dex.CurrentTheme.foregroundColor2 - font: DexTypo.caption - visible: !settings.visible - text: qsTr("Filter") + ": %1 / %2
%3: %4 - %5".arg(combo_base.currentTicker).arg(combo_rel.currentTicker).arg(qsTr("Date")).arg(min_date.selectedDate.toLocaleDateString(Locale.ShortFormat, "yyyy-MM-dd")).arg(max_date.selectedDate.toLocaleDateString(Locale.ShortFormat, "yyyy-MM-dd")) - } } ColumnLayout @@ -142,21 +158,7 @@ Item { visible: false spacing: 8 - RowLayout - { - spacing: 10 - DefaultButton - { - visible: root.is_history - enabled: list_model_proxy.can_i_apply_filtering - Layout.preferredHeight: 29 - radius: 7 - label.font: DexTypo.body2 - text: qsTr("Apply Filter") - onClicked: list_model_proxy.apply_all_filtering() - } - } - + // Coin Selection comboboxes RowLayout { Layout.alignment: Qt.AlignHCenter From 2d5c7ce8705eddb8ab49e082d429b5e3ab923bd5 Mon Sep 17 00:00:00 2001 From: smk762 Date: Sat, 4 Mar 2023 23:19:30 +0800 Subject: [PATCH 25/80] add build type variable --- .github/workflows/atomicdex-desktop-ci.yml | 1 + ci_tools_atomic_dex/ci_scripts/windows_script.ps1 | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index f1dc595d33..a16f9f3a76 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -256,6 +256,7 @@ jobs: shell: powershell run: | $Env:QT_VERSION = "${{ matrix.qt }}" + $Env:CMAKE_BUILD_TYPE = "${{ matrix.type }}" .\ci_tools_atomic_dex\ci_scripts\windows_script.ps1 - name: Upload env variable for artifacts (Linux) diff --git a/ci_tools_atomic_dex/ci_scripts/windows_script.ps1 b/ci_tools_atomic_dex/ci_scripts/windows_script.ps1 index 191d0007b2..fbb2258a90 100644 --- a/ci_tools_atomic_dex/ci_scripts/windows_script.ps1 +++ b/ci_tools_atomic_dex/ci_scripts/windows_script.ps1 @@ -14,10 +14,12 @@ scoop cache rm git scoop cache rm cmake scoop cache rm ninja scoop cache rm llvm + $Env:QT_INSTALL_CMAKE_PATH = "C:\Qt\$Env:QT_VERSION\msvc2019_64" $Env:QT_ROOT = "C:\Qt" + mkdir b cd b -cmake --version +Invoke-Expression "cmake -DCMAKE_BUILD_TYPE=$Env:CMAKE_BUILD_TYPE -GNinja ../" cmake -DCMAKE_BUILD_TYPE=Release -GNinja ../ ninja install From 3374c30b8e0f8cf08608af80b16722429d664c67 Mon Sep 17 00:00:00 2001 From: smk762 Date: Sat, 4 Mar 2023 23:24:26 +0800 Subject: [PATCH 26/80] rm old make cmd --- ci_tools_atomic_dex/ci_scripts/windows_script.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/ci_tools_atomic_dex/ci_scripts/windows_script.ps1 b/ci_tools_atomic_dex/ci_scripts/windows_script.ps1 index fbb2258a90..311ee71461 100644 --- a/ci_tools_atomic_dex/ci_scripts/windows_script.ps1 +++ b/ci_tools_atomic_dex/ci_scripts/windows_script.ps1 @@ -21,5 +21,4 @@ $Env:QT_ROOT = "C:\Qt" mkdir b cd b Invoke-Expression "cmake -DCMAKE_BUILD_TYPE=$Env:CMAKE_BUILD_TYPE -GNinja ../" -cmake -DCMAKE_BUILD_TYPE=Release -GNinja ../ ninja install From 2277196f25bac057492abacf5808d1d0db8a631b Mon Sep 17 00:00:00 2001 From: Canialon Date: Wed, 15 Mar 2023 19:58:55 +0000 Subject: [PATCH 27/80] fix Binance colors.json --- assets/themes/Binance - Dark/colors.json | 202 +++++++++++++++-------- 1 file changed, 130 insertions(+), 72 deletions(-) diff --git a/assets/themes/Binance - Dark/colors.json b/assets/themes/Binance - Dark/colors.json index 05bed4fd30..2600fb338d 100644 --- a/assets/themes/Binance - Dark/colors.json +++ b/assets/themes/Binance - Dark/colors.json @@ -1,81 +1,139 @@ { - "accentColor": "#0A0A0AFF", - "foregroundColor": "#ffffffFF", - "backgroundColor": "#161515FF", - "backgroundColorDeep": "#0A0A0AFF", - - "busyIndicatorColor": "#cb9800FF", - - "buttonColorDisabled": "#8B6900FF", - "buttonColorEnabled": "#cb9800FF", - "buttonColorHovered": "#EBB514FF", - "buttonColorPressed": "#EBB514FF", - "buttonTextDisabledColor": "#3B3B3BFF", - "buttonTextEnabledColor": "#fafffaFF", + "accentColor": "#F0B90BFF", + "foregroundColor": "#FFFFFFFF", + "foregroundColor2": "#8790B2FF", + "foregroundColor3": "#ABC0D3FF", + "backgroundColor": "#000000FF", + "secondBackgroundColor": "#0E111AFF", + "backgroundColorDeep": "#060A10FF", + + "busyIndicatorColor": "#F0B90BFF", + + "buttonColorDisabled": "#745804FF", + "buttonColorEnabled": "#F0B90BFF", + "buttonColorHovered": "#FFC200FF", + "buttonColorPressed": "#F0B90B6C", + + "buttonTextDisabledColor": "#444444FF", + "buttonTextEnabledColor": "#FFFFFF", "buttonTextHoveredColor": "#000000FF", "buttonTextPressedColor": "#000000FF", - - "gradientButtonStartColor": "#cb9800FF", - "gradientButtonEndColor": "#cb9800FF", - "gradientButtonDisabledStartColor": "#8B6900FF", - "gradientButtonDisabledEndColor": "#8B6900FF", - "gradientButtonHoveredStartColor": "#EBB514FF", - "gradientButtonHoveredEndColor": "#EBB514FF", - "gradientButtonPressedStartColor": "#EBB514FF", - "gradientButtonPressedEndColor": "#EBB514FF", - "gradientButtonTextEnabledColor": "#080707FF", - "gradientButtonTextDisabledColor": "#3B3B3BFF", + + "buttonSecondaryColorDisabled": "#745804", + "buttonSecondaryColorEnabled": "#CFA00B", + "buttonSecondaryColorHovered": "#FFC200FF", + "buttonSecondaryColorPressed": "#F0B90B6C", + + "buttonCancelColorDisabled": "#2C3D66FF", + "buttonCancelColorEnabled": "#5B4606FF", + "buttonCancelColorHovered": "#FFC200FF", + "buttonCancelColorPressed": "#F0B90B6C", + + "gradientButtonStartColor": "#F0B90BAD", + "gradientButtonEndColor": "#F0B90BFF", + "gradientButtonDisabledStartColor": "#F0B90B4D", + "gradientButtonDisabledEndColor": "#F0B90B34", + "gradientButtonHoveredStartColor": "#FFC200FF", + "gradientButtonHoveredEndColor": "#FFD346FF", + "gradientButtonPressedStartColor": "#F0B90BFF", + "gradientButtonPressedEndColor": "#F0B90BFF", + "gradientButtonTextEnabledColor": "#000000FF", + "gradientButtonTextDisabledColor": "#000000FF", "gradientButtonTextHoveredColor": "#000000FF", "gradientButtonTextPressedColor": "#000000FF", - "checkBoxTickColor": "#FFFFFFFF", - "checkBoxGradientStartColor": "#cb9800FF", - "checkBoxGradientEndColor": "#EBB514FF", - - "switchGradientStartColor": "#cb9800FF", - "switchGradientEndColor": "#EBB514FF", - "switchGradientStartColor2": "#FFFFFFFF", - "switchGradientEndColor2": "#FFFFFFFF", - - "modalPageCounterGradientStartColor": "#cb9800FF", - "modalPageCounterGradientEndColor": "#EBB514FF", - - "tabSelectedColor": "#EBB514FF", - - "textDisabledColor": "#444444FF", - "textSelectionColor": "#4986EAFF", - "textPlaceholderColor": "#8B6900FF", - "textSelectedColor": "#0e1021FF", - - "textFieldBackgroundColor": "#0e0e0eFF", - "textFieldActiveBackgroundColor": "#0c0c0cFF", - "textFieldPrefixColor": "#8790B2FF", - "textFieldSuffixColor": "#456078FF", + "checkBoxTickColor": "#000000", + "checkBoxGradientStartColor": "#F0B90BFF", + "checkBoxGradientEndColor": "#F0B90BFF", - "comboBoxBackgroundColor": "#0A0A0AFF", + "switchGradientStartColor": "#F0B90BFF", + "switchGradientEndColor": "#F0B90BFF", + "switchGradientStartColor2": "#000000", + "switchGradientEndColor2": "#000000", + + "comboBoxBackgroundColor": "#1D232FFF", "comboBoxArrowsColor": "#FFFFFFFF", - "comboBoxDropdownItemHighlightedColor": "#111111FF", - - "chartTradingLineBackgroundColor": "#24283dFF", - "chartTradingLineColor": "#74fbeeFF", - - "innerBackgroundColor": "#111111FF", - - "floatingBackgroundColor": "#222222FF", - - "sidebarBgColor": "#161515FF", - "sidebarVersionTextColor": "#BBBBBBFF", - "sidebarCursorStartColor": "#cb9800FF", - "sidebarCursorEndColor": "#EBB51400", - "sidebarLineTextHovered": "#8B6900FF", - - "okColor": "#74fbeeFF", - "warningColor": "#d13990FF", - - "senderColorStart": "#F85757FF", - "receiverColorStart": "#845FEFFF", - "arrowUpColor": "#F85757FF", - "arrowDownColor": "#845FEFFF", - - "lineSeparatorColor": "#222222FF" + "comboBoxDropdownItemHighlightedColor": "#F0B90BFF", + + "modalPageCounterGradientStartColor": "#F0B90BFF", + "modalPageCounterGradientEndColor": "#F0B90BFF", + + "notifPopupBackgroundColor": "#0E111AFF", + "notifPopupTextColor": "#FFFFFFFF", + "notifPopupTimerColor": "#8790B2FF", + "notifPopupTimerBackgroundColor": "#94A3B11F", + "notifPopupIconStartColor": "#FFFFFFFF", + "notifPopupIconEndColor": "#FFFFFFFF", + + "scrollBarIndicatorColor": "#8790B2", + "scrollBarBackgroundColor": "#94A3B1", + + "tabSelectedColor": "#F0B90B", + + "textDisabledColor": "#707070", + "textSelectionColor": "#F0B90B", + "textPlaceholderColor": "#5A4400", + "textSelectedColor": "#211D0E", + + "textFieldBackgroundColor": "#262424", + "textFieldActiveBackgroundColor": "#262424", + "textFieldPrefixColor": "#F0B90B", + "textFieldSuffixColor": "#F0B90B", + + "tickerBadgeBackgroundColor": "#161515", + + "chartTradingLineBackgroundColor": "#161515", + "chartTradingLineColor": "#F0B90B", + + "innerBackgroundColor": "#161515", + + "floatingBackgroundColor": "#161515", + + "rangeSliderBackgroundColor": "#F0B90B", + "rangeSliderDistanceColor": "#F0B90B33", + "rangeSliderIndicatorBackgroundStartColor": "#F0B90B", + "rangeSliderIndicatorBackgroundEndColor": "#F0B90B", + + "userIconColorStart": "#F0B90B", + "userIconColorEnd": "#F0B90B33", + + "sidebarBgColor": "#000000", + "sidebarVersionTextColor": "#F0B90B", + "sidebarCursorStartColor": "#F0B90B", + "sidebarCursorEndColor": "#16151500", + "sidebarLineTextHovered": "#F0B90B", + "sidebarLineTextSelected": "#FFFFFF", + + "tradeSellModeSelectorBackgroundColorStart": "#E52167", + "tradeSellModeSelectorBackgroundColorEnd": "#CD0F53", + "tradeBuyModeSelectorBackgroundColorStart": "#0BC05F", + "tradeBuyModeSelectorBackgroundColorEnd": "#037B3A", + + "inputModifierBackgroundColor": "#F0B90B21", + "inputFieldBackgroundColor": "#161515", + + "inputFieldBorderColor": "#F0B90B", + "inputPlaceholderTextColor": "#FF00FF", + "inputRightIconColor": "#FFFFFF", + "inputLeftIconColor": "#FFFFFF", + "inputLeftIconBackgroundColor": "#161515", + + "listItemOddBackground": "#000000", + "listItemEvenBackground": "#161515", + "listItemHoveredBackground": "#5B4704", + + "addressBookTagColors": ["#627EEA", "#FFD87A", "#F7931A"], + + "okColor": "#00C058", + "warningColor": "#E52167", + "swapIconColor": "#005FBE", + + "senderColorStart": "#F85757", + "receiverColorStart": "#845FEF", + + "arrowUpColor": "#F85757", + "arrowDownColor": "#845FEF", + + "lineSeparatorColor": "#161515" + } \ No newline at end of file From 6e83d01eebf7a882196f2b68a6d798c498bc934f Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 27 Mar 2023 18:46:55 +0800 Subject: [PATCH 28/80] use local dll files --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4dbf66bc0d..2b6d7125b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,10 +95,11 @@ else () configure_file(${jl777-coins_SOURCE_DIR}/utils/coins_config.json ${CMAKE_BINARY_DIR}/bin/assets/config/${PROJECT_VERSION}-coins.json COPYONLY) configure_file(${jl777-coins_SOURCE_DIR}/coins ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/coins COPYONLY) configure_file(${mm2_SOURCE_DIR}/mm2.exe ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/${DEX_API}.exe COPYONLY) - configure_file(${mm2_SOURCE_DIR}/msvcp140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/msvcp140.dll COPYONLY) - configure_file(${mm2_SOURCE_DIR}/vcruntime140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/vcruntime140.dll COPYONLY) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ci_tools_atomic_dex/windows_misc/msvcp140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/msvcp140.dll COPYONLY) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ci_tools_atomic_dex/windows_misc/vcruntime140.dll ${CMAKE_BINARY_DIR}/bin/assets/tools/mm2/vcruntime140.dll COPYONLY) endif () + add_subdirectory(vendor/antara-gaming_sdk/modules) ##! Osx bundle icon From da7fa26320a374625f98f729a8eaf8dd2c971dd0 Mon Sep 17 00:00:00 2001 From: smk762 Date: Tue, 28 Mar 2023 21:32:16 +0800 Subject: [PATCH 29/80] update version --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- CMakeLists.txt | 2 +- ci_tools_atomic_dex/installer/osx/config/config.xml.in | 2 +- .../com.komodoplatform.atomicdex/meta/package.xml.in | 4 ++-- ci_tools_atomic_dex/installer/windows/config/config.xml.in | 2 +- .../com.komodoplatform.atomicdex/meta/package.xml.in | 4 ++-- cmake/install/macos/dex_install.cmake | 4 ++-- src/core/atomicdex/constants/dex.constants.hpp | 2 ++ src/core/atomicdex/version/version.hpp | 6 +++--- vcpkg.json | 2 +- 10 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index a31d2a73f0..51cdf57ac8 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -26,7 +26,7 @@ Please describe what you expected to happen. **Operating Environment(s):** - OS: [e.g. Windows/OSX/Linux. If Linux, include distro. ] - OS version: [e.g. 7/10/11, 10.13/10.15, 18.04/20.04 ] - - AtomicDEX Version: [e.g. 0.5.7.1] + - AtomicDEX Version: [e.g. 0.5.7.2] - Build branch: [e.g. master/dev] diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cd4d9f093..60cba2e1fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ include(vcpkg_prerequisites) include(qt_prerequisites) include(cfg_hash) -project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.7.1) +project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.7.2) message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}") include(cmake_default_options) diff --git a/ci_tools_atomic_dex/installer/osx/config/config.xml.in b/ci_tools_atomic_dex/installer/osx/config/config.xml.in index c3d57543ce..838e6f170d 100644 --- a/ci_tools_atomic_dex/installer/osx/config/config.xml.in +++ b/ci_tools_atomic_dex/installer/osx/config/config.xml.in @@ -1,7 +1,7 @@ ${DEX_DISPLAY_NAME} - 0.5.7.1 + 0.5.7.2 ${DEX_DISPLAY_NAME} Installer ${DEX_WEBSITE} ${DEX_COMPANY} diff --git a/ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/meta/package.xml.in b/ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/meta/package.xml.in index 3c71c1edf4..57bb3278f8 100644 --- a/ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/meta/package.xml.in +++ b/ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/meta/package.xml.in @@ -2,8 +2,8 @@ ${DEX_DISPLAY_NAME} Install ${DEX_DISPLAY_NAME}. - 0.5.7.1 - 2023-06-03 + 0.5.7.2 + 2023-03-04 diff --git a/ci_tools_atomic_dex/installer/windows/config/config.xml.in b/ci_tools_atomic_dex/installer/windows/config/config.xml.in index 6e498e3100..886bb6f594 100644 --- a/ci_tools_atomic_dex/installer/windows/config/config.xml.in +++ b/ci_tools_atomic_dex/installer/windows/config/config.xml.in @@ -1,7 +1,7 @@ @DEX_DISPLAY_NAME@ - 0.5.7.1 + 0.5.7.2 @DEX_DISPLAY_NAME@ Installer @DEX_WEBSITE@ @DEX_COMPANY@ diff --git a/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/package.xml.in b/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/package.xml.in index 128fdd7f46..57bb3278f8 100644 --- a/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/package.xml.in +++ b/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/package.xml.in @@ -2,8 +2,8 @@ ${DEX_DISPLAY_NAME} Install ${DEX_DISPLAY_NAME}. - 0.5.7.1 - 2023-03-06 + 0.5.7.2 + 2023-03-04 diff --git a/cmake/install/macos/dex_install.cmake b/cmake/install/macos/dex_install.cmake index 916e682cfa..7eb09e6edd 100644 --- a/cmake/install/macos/dex_install.cmake +++ b/cmake/install/macos/dex_install.cmake @@ -4,8 +4,8 @@ if (APPLE) MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}" RESOURCE ${ICON} MACOSX_BUNDLE_ICON_FILE dex-logo - MACOSX_BUNDLE_SHORT_VERSION_STRING 0.5.7.1 - MACOSX_BUNDLE_LONG_VERSION_STRING 0.5.7.1 + MACOSX_BUNDLE_SHORT_VERSION_STRING 0.5.7.2 + MACOSX_BUNDLE_LONG_VERSION_STRING 0.5.7.2 MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/cmake/MacOSXBundleInfo.plist.in") add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND diff --git a/src/core/atomicdex/constants/dex.constants.hpp b/src/core/atomicdex/constants/dex.constants.hpp index 8ff26bd2e2..2a9581bfcb 100644 --- a/src/core/atomicdex/constants/dex.constants.hpp +++ b/src/core/atomicdex/constants/dex.constants.hpp @@ -10,6 +10,7 @@ namespace atomic_dex inline const std::vector g_default_coins{ g_primary_dex_coin, g_second_primary_dex_coin, + "VOTE2023", "KIP0001", "BTC" }; @@ -32,6 +33,7 @@ namespace atomic_dex "SUPERNET", "XPM", "KIP0001", + "VOTE2023", "ATOM" }; } diff --git a/src/core/atomicdex/version/version.hpp b/src/core/atomicdex/version/version.hpp index de74639360..8fce7de2ff 100644 --- a/src/core/atomicdex/version/version.hpp +++ b/src/core/atomicdex/version/version.hpp @@ -21,7 +21,7 @@ namespace atomic_dex constexpr const char* get_version() { - return "0.5.7.1-beta"; + return "0.5.7.2-beta"; } constexpr int @@ -33,12 +33,12 @@ namespace atomic_dex constexpr const char* get_raw_version() { - return "0.5.7.1"; + return "0.5.7.2"; } constexpr const char* get_precedent_raw_version() { - return "0.5.7"; + return "0.5.7.1"; } } // namespace atomic_dex diff --git a/vcpkg.json b/vcpkg.json index 5c085f92ef..933bbee3d5 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,6 @@ { "name": "atomicdex-desktop", - "version-string": "0.5.7.1", + "version-string": "0.5.7.2", "dependencies": [ "entt", "boost-multiprecision", From 4abc627cc268f9b8a76763b859f5f564906f416d Mon Sep 17 00:00:00 2001 From: cipig Date: Sun, 2 Apr 2023 13:06:05 +0000 Subject: [PATCH 30/80] fix pair --- atomic_defi_design/Dex/Screens/Dashboard.qml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/atomic_defi_design/Dex/Screens/Dashboard.qml b/atomic_defi_design/Dex/Screens/Dashboard.qml index 22e9440a04..a93bcf813c 100644 --- a/atomic_defi_design/Dex/Screens/Dashboard.qml +++ b/atomic_defi_design/Dex/Screens/Dashboard.qml @@ -87,14 +87,7 @@ Item sidebar.currentLineType = currentPage if (currentPage == Dashboard.PageType.DEX) { - if (API.app.trading_pg.current_trading_mode == TradingMode.Pro) - { - API.app.trading_pg.set_pair(false, api_wallet_page.ticker) - } - else - { - API.app.trading_pg.set_pair(true, api_wallet_page.ticker) - } + API.app.trading_pg.set_pair(true, api_wallet_page.ticker) } } From 86b0620d968076f682f7392bc081eb552e5f261f Mon Sep 17 00:00:00 2001 From: cipig Date: Sun, 2 Apr 2023 15:56:42 +0000 Subject: [PATCH 31/80] don't update max_taker_vol on every orderbook update --- src/core/atomicdex/pages/qt.trading.page.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/atomicdex/pages/qt.trading.page.cpp b/src/core/atomicdex/pages/qt.trading.page.cpp index 1a4ecf6415..cafb7f030b 100644 --- a/src/core/atomicdex/pages/qt.trading.page.cpp +++ b/src/core/atomicdex/pages/qt.trading.page.cpp @@ -56,7 +56,7 @@ namespace atomic_dex { m_actions_queue.push(trading_actions::post_process_orderbook_finished); m_models_actions[orderbook_need_a_reset] = evt.is_a_reset; - determine_max_volume(); + //determine_max_volume(); } } } // namespace atomic_dex From 010fc1c67d8aa185ee06f2f54dc16d920b58ff1b Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 3 Apr 2023 17:31:25 +0800 Subject: [PATCH 32/80] segwit bug tweak --- src/core/atomicdex/models/qt.orderbook.model.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/core/atomicdex/models/qt.orderbook.model.cpp b/src/core/atomicdex/models/qt.orderbook.model.cpp index daf5353b75..d2e4321978 100644 --- a/src/core/atomicdex/models/qt.orderbook.model.cpp +++ b/src/core/atomicdex/models/qt.orderbook.model.cpp @@ -374,6 +374,10 @@ namespace atomic_dex m_orders_id_registry.clear(); for (auto&& order: m_model_data) { + if (order.coin.find("-segwit") != std::string::npos) + { + order.uuid = order.uuid + "-segwit"; + } if (this->m_orders_id_registry.find(order.uuid) == m_orders_id_registry.end()) { this->m_orders_id_registry.emplace(order.uuid); From 737dadb0ba3aaf98f1a2b1b08f1d74c2b470c558 Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 3 Apr 2023 17:43:07 +0800 Subject: [PATCH 33/80] update vcpkg action version --- .github/workflows/atomicdex-desktop-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index fdc802a91f..6dc87adf4a 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -181,7 +181,7 @@ jobs: echo "CC=clang-12" >> $GITHUB_ENV - name: vcpkg deps (All) - uses: lukka/run-vcpkg@v10 + uses: lukka/run-vcpkg@v11 with: vcpkgDirectory: '${{ github.workspace }}/ci_tools_atomic_dex/vcpkg-repo' appendedCacheKey: ${{ hashFiles('vcpkg.json') }} From 3449e2765d72cd2e54d6686ecb05aacec1d50158 Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 3 Apr 2023 17:48:08 +0800 Subject: [PATCH 34/80] update vcpkg to latest --- ci_tools_atomic_dex/vcpkg-repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci_tools_atomic_dex/vcpkg-repo b/ci_tools_atomic_dex/vcpkg-repo index 086ef2a484..1712ed5174 160000 --- a/ci_tools_atomic_dex/vcpkg-repo +++ b/ci_tools_atomic_dex/vcpkg-repo @@ -1 +1 @@ -Subproject commit 086ef2a4845fd12e5164df1876737afa67942208 +Subproject commit 1712ed51743a2e739c2f2c3855cd1d16fbbb6873 From 2cf43f11610fabbf1cd3be421c6b69b2bfd773ba Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 3 Apr 2023 18:30:14 +0800 Subject: [PATCH 35/80] rm vcpkg cache key --- .github/workflows/atomicdex-desktop-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index 6dc87adf4a..329ce6d0ff 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -184,7 +184,6 @@ jobs: uses: lukka/run-vcpkg@v11 with: vcpkgDirectory: '${{ github.workspace }}/ci_tools_atomic_dex/vcpkg-repo' - appendedCacheKey: ${{ hashFiles('vcpkg.json') }} vcpkgJsonGlob: 'vcpkg.json' From 1fb006a87dd2e49c95489bb380576d09a3d23e32 Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 3 Apr 2023 20:22:55 +0800 Subject: [PATCH 36/80] add some vcpkg env vars --- .github/workflows/atomicdex-desktop-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index 329ce6d0ff..06de2e1dba 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -17,6 +17,10 @@ env: DEX_DISPLAY_NAME: "AtomicDex Desktop" DEX_COMPANY: "KomodoPlatform" DEX_WEBSITE: "https://atomicdex.io/" + VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/b/vcpkg_cache + VCPKG_BINARY_SOURCES: clear;x-gha,readwrite + RUNVCPKG_VCPKG_ROOT: ${{ github.workspace }}\atomicDEX-Desktop\ci_tools_atomic_dex\vcpkg-repo + VCPKG_ROOT: ${{ github.workspace }}\atomicDEX-Desktop\ci_tools_atomic_dex\vcpkg-repo jobs: @@ -184,8 +188,6 @@ jobs: uses: lukka/run-vcpkg@v11 with: vcpkgDirectory: '${{ github.workspace }}/ci_tools_atomic_dex/vcpkg-repo' - vcpkgJsonGlob: 'vcpkg.json' - - name: import code signing certificates (macos) if: runner.os == 'macOS' && 'KomodoPlatform/atomicDEX-Desktop' == github.repository From 1573be33644c0dd00e21559bcc0c5364d551b9a5 Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 3 Apr 2023 20:31:35 +0800 Subject: [PATCH 37/80] restore cachekey / glob --- .github/workflows/atomicdex-desktop-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index 06de2e1dba..c7855e7570 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -22,6 +22,7 @@ env: RUNVCPKG_VCPKG_ROOT: ${{ github.workspace }}\atomicDEX-Desktop\ci_tools_atomic_dex\vcpkg-repo VCPKG_ROOT: ${{ github.workspace }}\atomicDEX-Desktop\ci_tools_atomic_dex\vcpkg-repo + jobs: ci-flow: @@ -188,6 +189,9 @@ jobs: uses: lukka/run-vcpkg@v11 with: vcpkgDirectory: '${{ github.workspace }}/ci_tools_atomic_dex/vcpkg-repo' + vcpkgJsonGlob: 'vcpkg.json' + appendedCacheKey: vcpkginstall + - name: import code signing certificates (macos) if: runner.os == 'macOS' && 'KomodoPlatform/atomicDEX-Desktop' == github.repository From e1c4ee5ebf79027501be8438d6825dbc2fbafcc8 Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 3 Apr 2023 20:54:48 +0800 Subject: [PATCH 38/80] restore cachekey / glob --- .github/workflows/atomicdex-desktop-ci.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index c7855e7570..f9e5064f0d 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -22,7 +22,6 @@ env: RUNVCPKG_VCPKG_ROOT: ${{ github.workspace }}\atomicDEX-Desktop\ci_tools_atomic_dex\vcpkg-repo VCPKG_ROOT: ${{ github.workspace }}\atomicDEX-Desktop\ci_tools_atomic_dex\vcpkg-repo - jobs: ci-flow: @@ -84,6 +83,14 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} submodules: 'true' + - name: Expose GitHub Runtime + uses: crazy-max/ghaction-github-runtime@v2 + + - name: Env + run: | + # ACTIONS_RUNTIME_TOKEN, ACTIONS_RUNTIME_URL should be exposed + env|sort + - name: Setup Python uses: actions/setup-python@v4 with: From 239142e157b1194037d0491c07fd8646261e3709 Mon Sep 17 00:00:00 2001 From: smk762 Date: Tue, 4 Apr 2023 16:17:50 +0800 Subject: [PATCH 39/80] removed unneeded items --- .github/workflows/atomicdex-desktop-ci.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index f9e5064f0d..d6df9925c2 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -83,14 +83,9 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} submodules: 'true' - - name: Expose GitHub Runtime + - name: Expose GitHub Runtime Env uses: crazy-max/ghaction-github-runtime@v2 - - name: Env - run: | - # ACTIONS_RUNTIME_TOKEN, ACTIONS_RUNTIME_URL should be exposed - env|sort - - name: Setup Python uses: actions/setup-python@v4 with: @@ -197,8 +192,6 @@ jobs: with: vcpkgDirectory: '${{ github.workspace }}/ci_tools_atomic_dex/vcpkg-repo' vcpkgJsonGlob: 'vcpkg.json' - appendedCacheKey: vcpkginstall - - name: import code signing certificates (macos) if: runner.os == 'macOS' && 'KomodoPlatform/atomicDEX-Desktop' == github.repository From b75b9ebf6458c6bacef9b48eb2374c6aeb0da0e6 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 5 Apr 2023 01:45:57 +0800 Subject: [PATCH 40/80] remove nomics and replace chart --- atomic_defi_design/Dex/Constants/General.qml | 10 ---- .../Dex/Exchange/ProView/Chart.qml | 55 ++++++++++++------- .../Dex/Exchange/ProView/TradingInfo/Main.qml | 13 +++-- .../api/komodo_prices/komodo.prices.cpp | 4 -- .../api/komodo_prices/komodo.prices.hpp | 1 - src/core/atomicdex/config/coins.cfg.cpp | 1 - src/core/atomicdex/config/coins.cfg.hpp | 1 - .../models/qt.global.coins.cfg.model.cpp | 1 - .../komodo_prices/komodo.prices.provider.cpp | 2 - 9 files changed, 43 insertions(+), 45 deletions(-) diff --git a/atomic_defi_design/Dex/Constants/General.qml b/atomic_defi_design/Dex/Constants/General.qml index a27e733f48..789d7dcb67 100644 --- a/atomic_defi_design/Dex/Constants/General.qml +++ b/atomic_defi_design/Dex/Constants/General.qml @@ -115,16 +115,6 @@ QtObject { return progress } - function getNomicsId(ticker) { - if(ticker === "" || ticker === "All" || ticker===undefined) { - return "" - } else { - const nomics_id = API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker).nomics_id - if (nomics_id == 'test-coin') return "" - return nomics_id - } - } - function coinContractAddress(ticker) { var cfg = API.app.trading_pg.get_raw_mm2_coin_cfg(ticker) if (cfg.hasOwnProperty('protocol')) { diff --git a/atomic_defi_design/Dex/Exchange/ProView/Chart.qml b/atomic_defi_design/Dex/Exchange/ProView/Chart.qml index 4dbc9dc49d..068a864612 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/Chart.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/Chart.qml @@ -17,20 +17,28 @@ Item property bool pair_supported: false onPair_supportedChanged: if (!pair_supported) webEngineViewPlaceHolder.visible = false - function loadChart(right_ticker, left_ticker, force = false, source="nomics") + function loadChart(right_ticker, left_ticker, force = false, source="livecoinwatch") { + + //
+ let chart_html = "" let symbol = "" - - if (source == "nomics") + let widget_x = 390 + let widget_y = 150 + let scale_x = root.width / widget_x + let scale_y = root.height / widget_y + console.log("chart_x", widget_x) + console.log("chart_y", widget_y) + console.log("root.width", root.width) + console.log("root.height", root.height) + + + if (source == "livecoinwatch") { - let right_ticker_full = General.coinName(right_ticker) - let right_ticker_id = General.getNomicsId(right_ticker) - let left_ticker_id = General.getNomicsId(left_ticker) - - if (right_ticker_id != "" && left_ticker_id != "") + if (right_ticker != "" && left_ticker != "") { - symbol = right_ticker_id+"-"+left_ticker_id + symbol = right_ticker+"-"+left_ticker pair_supported = true if (symbol === loaded_symbol && !force) @@ -38,20 +46,20 @@ Item webEngineViewPlaceHolder.visible = true return } - - loaded_symbol = symbol - chart_html = ` - - -
- - ` + +
+ ` } } + console.log(chart_html) if (chart_html == "") { @@ -78,7 +86,7 @@ Item loaded_symbol = symbol - let chart_html = ` + chart_html = ` @@ -118,6 +126,15 @@ Item catch (e) { console.error(e) } } + onWidthChanged: { + try + { + loadChart(left_ticker?? atomic_app_primary_coin, + right_ticker?? atomic_app_secondary_coin) + } + catch (e) { console.error(e) } + } + RowLayout { anchors.fill: parent diff --git a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/Main.qml b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/Main.qml index b08a691dcf..c16c36175f 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/Main.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/Main.qml @@ -79,25 +79,26 @@ Widget ColumnLayout { Layout.fillHeight: true + Layout.fillWidth: true spacing: 10 // Chart Chart { id: chart Layout.topMargin: 20 - Layout.leftMargin: 28 - Layout.rightMargin: 28 + Layout.leftMargin: 15 + Layout.rightMargin: 15 Layout.fillWidth: true - Layout.preferredHeight: 310 - + Layout.fillHeight: true + Layout.minimumWidth : 465 } PriceLineSimplified { id: price_line Layout.bottomMargin: 20 - Layout.leftMargin: 28 - Layout.rightMargin: 28 + Layout.leftMargin: 20 + Layout.rightMargin: 20 Layout.fillWidth: true Layout.fillHeight: true } diff --git a/src/core/atomicdex/api/komodo_prices/komodo.prices.cpp b/src/core/atomicdex/api/komodo_prices/komodo.prices.cpp index 65ca7505bb..e596de60c7 100644 --- a/src/core/atomicdex/api/komodo_prices/komodo.prices.cpp +++ b/src/core/atomicdex/api/komodo_prices/komodo.prices.cpp @@ -61,10 +61,6 @@ namespace atomic_dex::komodo_prices::api { x = provider::forex; } - else if (j == "nomics") - { - x = provider::nomics; - } else { x = provider::unknown; diff --git a/src/core/atomicdex/api/komodo_prices/komodo.prices.hpp b/src/core/atomicdex/api/komodo_prices/komodo.prices.hpp index de183477af..36ec80e245 100644 --- a/src/core/atomicdex/api/komodo_prices/komodo.prices.hpp +++ b/src/core/atomicdex/api/komodo_prices/komodo.prices.hpp @@ -13,7 +13,6 @@ namespace atomic_dex::komodo_prices::api coingecko, coinpaprika, forex, - nomics, unknown }; diff --git a/src/core/atomicdex/config/coins.cfg.cpp b/src/core/atomicdex/config/coins.cfg.cpp index b74b08a035..58671f9c54 100644 --- a/src/core/atomicdex/config/coins.cfg.cpp +++ b/src/core/atomicdex/config/coins.cfg.cpp @@ -140,7 +140,6 @@ namespace atomic_dex cfg.minimal_claim_amount = cfg.is_claimable ? j.at("minimal_claim_amount").get() : "0"; cfg.coinpaprika_id = j.contains("coinpaprika_id") ? j.at("coinpaprika_id").get() : "test-coin"; cfg.coingecko_id = j.contains("coingecko_id") ? j.at("coingecko_id").get() : "test-coin"; - cfg.nomics_id = j.contains("nomics_id") ? j.at("nomics_id").get() : "test-coin"; cfg.is_claimable = j.count("is_claimable") > 0; cfg.is_custom_coin = j.contains("is_custom_coin") ? j.at("is_custom_coin").get() : false; cfg.is_testnet = j.contains("is_testnet") ? j.at("is_testnet").get() : false; diff --git a/src/core/atomicdex/config/coins.cfg.hpp b/src/core/atomicdex/config/coins.cfg.hpp index b612e2684e..ecdc9de92b 100644 --- a/src/core/atomicdex/config/coins.cfg.hpp +++ b/src/core/atomicdex/config/coins.cfg.hpp @@ -56,7 +56,6 @@ namespace atomic_dex bool active{false}; std::string coinpaprika_id{"test-coin"}; std::string coingecko_id{"test-coin"}; - std::string nomics_id{"test-coin"}; bool is_custom_coin{false}; std::string type; std::optional> other_types; diff --git a/src/core/atomicdex/models/qt.global.coins.cfg.model.cpp b/src/core/atomicdex/models/qt.global.coins.cfg.model.cpp index 6acc6c482d..eb8abd9391 100644 --- a/src/core/atomicdex/models/qt.global.coins.cfg.model.cpp +++ b/src/core/atomicdex/models/qt.global.coins.cfg.model.cpp @@ -36,7 +36,6 @@ namespace {"ticker", QString::fromStdString(coin.ticker)}, {"name", QString::fromStdString(coin.name)}, {"type", QString::fromStdString(coin.type)}, - {"nomics_id", QString::fromStdString(coin.nomics_id)}, {"explorer_url", QString::fromStdString(coin.explorer_url)}, {"tx_uri", QString::fromStdString(coin.tx_uri)}, {"address_uri", QString::fromStdString(coin.address_url)}, diff --git a/src/core/atomicdex/services/price/komodo_prices/komodo.prices.provider.cpp b/src/core/atomicdex/services/price/komodo_prices/komodo.prices.provider.cpp index 140f2cd53b..e427c62635 100644 --- a/src/core/atomicdex/services/price/komodo_prices/komodo.prices.provider.cpp +++ b/src/core/atomicdex/services/price/komodo_prices/komodo.prices.provider.cpp @@ -141,8 +141,6 @@ namespace atomic_dex return "coinpaprika"; case komodo_prices::api::provider::forex: return "forex"; - case komodo_prices::api::provider::nomics: - return "nomics"; default: return "unknown"; } From 3fbd3b2246bbefa43750a4ac0f0bcb4788256c8c Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 5 Apr 2023 18:03:21 +0800 Subject: [PATCH 41/80] Use weekly charts from livecoinwatch --- atomic_defi_design/Dex/Exchange/ProView/Chart.qml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/atomic_defi_design/Dex/Exchange/ProView/Chart.qml b/atomic_defi_design/Dex/Exchange/ProView/Chart.qml index 068a864612..c100b96f5e 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/Chart.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/Chart.qml @@ -20,7 +20,7 @@ Item function loadChart(right_ticker, left_ticker, force = false, source="livecoinwatch") { - //
+ //
let chart_html = "" let symbol = "" @@ -28,10 +28,6 @@ Item let widget_y = 150 let scale_x = root.width / widget_x let scale_y = root.height / widget_y - console.log("chart_x", widget_x) - console.log("chart_y", widget_y) - console.log("root.width", root.width) - console.log("root.height", root.height) if (source == "livecoinwatch") @@ -55,12 +51,10 @@ Item } -
+
` } } - console.log(chart_html) - if (chart_html == "") { const pair = atomic_qt_utilities.retrieve_main_ticker(left_ticker) + "/" + atomic_qt_utilities.retrieve_main_ticker(right_ticker) From 554219bf9330f2c98afa2069446aac480166d158 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 5 Apr 2023 19:44:32 +0800 Subject: [PATCH 42/80] handle ticker protocol suffix for charts --- atomic_defi_design/Dex/Constants/General.qml | 13 +++++++++++++ atomic_defi_design/Dex/Exchange/ProView/Chart.qml | 2 ++ 2 files changed, 15 insertions(+) diff --git a/atomic_defi_design/Dex/Constants/General.qml b/atomic_defi_design/Dex/Constants/General.qml index 789d7dcb67..9bb7d31f83 100644 --- a/atomic_defi_design/Dex/Constants/General.qml +++ b/atomic_defi_design/Dex/Constants/General.qml @@ -37,6 +37,19 @@ QtObject { } } + function coinWithoutSuffix(ticker) + { + console.log("coinWithoutSuffix: " + ticker) + if (ticker.search("-") > -1) + { + return ticker.split("-")[0] + } + else + { + return ticker + } + } + function coinName(ticker) { if(ticker === "" || ticker === "All" || ticker===undefined) { return "" diff --git a/atomic_defi_design/Dex/Exchange/ProView/Chart.qml b/atomic_defi_design/Dex/Exchange/ProView/Chart.qml index c100b96f5e..baa996cadc 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/Chart.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/Chart.qml @@ -42,6 +42,8 @@ Item webEngineViewPlaceHolder.visible = true return } + right_ticker = General.coinWithoutSuffix(right_ticker) + left_ticker = General.coinWithoutSuffix(left_ticker) chart_html = ` -
+
` } } From 93f42a65faac1990ce8a01104f0e1b5aaccf04db Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 7 Apr 2023 16:16:51 +0800 Subject: [PATCH 51/80] tweak theme for highlighting active input field --- assets/themes/Default - Dark/colors.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/themes/Default - Dark/colors.json b/assets/themes/Default - Dark/colors.json index 5b6d4391bb..9ab278f8f2 100644 --- a/assets/themes/Default - Dark/colors.json +++ b/assets/themes/Default - Dark/colors.json @@ -75,9 +75,9 @@ "textSelectedColor": "#0e1021FF", "textFieldBackgroundColor": "#313555FF", - "textFieldActiveBackgroundColor": "#313555CC", + "textFieldActiveBackgroundColor": "#3b3f62FF", "textFieldPrefixColor": "#8790B2FF", - "textFieldSuffixColor": "#456078FF", + "textFieldSuffixColor": "#8790B2FF", "tickerBadgeBackgroundColor": "#202337FF", From e98ef98be9ad322fad7d0e1387918184b3f070f8 Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 7 Apr 2023 16:17:25 +0800 Subject: [PATCH 52/80] increase digits shown in chart --- atomic_defi_design/Dex/Exchange/ProView/Chart.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/atomic_defi_design/Dex/Exchange/ProView/Chart.qml b/atomic_defi_design/Dex/Exchange/ProView/Chart.qml index 0c5189e1a3..4eead3d0ca 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/Chart.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/Chart.qml @@ -21,7 +21,7 @@ Item function loadChart(right_ticker, left_ticker, force = false, source="livecoinwatch") { - //
+ //
let chart_html = "" let symbol = "" @@ -66,7 +66,7 @@ Item } -
+
` } } From 55773b062ff2f9983902f2f5b15cb1c1e3372fde Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 7 Apr 2023 16:18:46 +0800 Subject: [PATCH 53/80] Use more intuative wording in pro order form --- .../Dex/Exchange/ProView/PlaceOrderForm/OrderForm.qml | 4 ++-- .../Dex/Exchange/ProView/PlaceOrderForm/TotalView.qml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/OrderForm.qml b/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/OrderForm.qml index 99f66e762d..9c5fe529d2 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/OrderForm.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/OrderForm.qml @@ -120,9 +120,9 @@ ColumnLayout width: parent.width height: 41 radius: 18 - left_text: qsTr("Volume") + left_text: sell_mode ? qsTr("Send") : qsTr("Receive") right_text: left_ticker - placeholderText: sell_mode ? qsTr("Amount to sell") : qsTr("Amount to receive") + placeholderText: "0" text: API.app.trading_pg.volume onTextChanged: setVolume(text) } diff --git a/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/TotalView.qml b/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/TotalView.qml index 588c1a054b..83d6e8a380 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/TotalView.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/TotalView.qml @@ -24,7 +24,7 @@ ColumnLayout Layout.fillWidth: true Layout.alignment: Qt.AlignLeft color: Dex.CurrentTheme.foregroundColor3 - text: "Total " + API.app.settings_pg.current_fiat + " " + General.cex_icon + text: "Trade Value " + API.app.settings_pg.current_fiat + " " + General.cex_icon font.pixelSize: 14 font.weight: Font.Normal opacity: .6 @@ -60,7 +60,7 @@ ColumnLayout Layout.fillWidth: true color: Dex.CurrentTheme.foregroundColor3 Layout.preferredWidth: parent.width * 0.3 - text: "Total " + right_ticker + text: sell_mode ? qsTr("Receive %1").arg(right_ticker) : qsTr("Send %1").arg(right_ticker) font.pixelSize: 14 opacity: .6 font.weight: Font.Normal From ac5a983e644f11d85d53c8967ba1d08654e53930 Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 7 Apr 2023 16:20:55 +0800 Subject: [PATCH 54/80] Fix overflow in pro view comboboxes --- .../Dex/Components/ComboBoxWithSearchBar.qml | 2 +- .../Dex/Exchange/ProView/DexComboBoxLine.qml | 35 ++++++++++++++----- .../ProView/SearchableTickerSelector.qml | 4 +-- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/atomic_defi_design/Dex/Components/ComboBoxWithSearchBar.qml b/atomic_defi_design/Dex/Components/ComboBoxWithSearchBar.qml index 908c6a407f..0009bc9d0a 100644 --- a/atomic_defi_design/Dex/Components/ComboBoxWithSearchBar.qml +++ b/atomic_defi_design/Dex/Components/ComboBoxWithSearchBar.qml @@ -11,7 +11,7 @@ ComboBox { id: control - property int radius: 20 + property int radius: 10 property int popupWidth: width property int popupMaxHeight: 450 property bool popupForceMaxHeight: false diff --git a/atomic_defi_design/Dex/Exchange/ProView/DexComboBoxLine.qml b/atomic_defi_design/Dex/Exchange/ProView/DexComboBoxLine.qml index 6e1cba552f..6b28afb85a 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/DexComboBoxLine.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/DexComboBoxLine.qml @@ -10,6 +10,7 @@ import App 1.0 import Dex.Themes 1.0 as Dex import Dex.Components 1.0 as Dex + RowLayout { id: root @@ -17,6 +18,7 @@ RowLayout property int padding: 0 property var details property color color: !details ? "white" : Style.getCoinColor(details.ticker) + property alias middle_text: middle_line.text_value property alias bottom_text: bottom_line.text_value property int activation_progress: Dex.General.zhtlcActivationProgress(details.activation_status, details.ticker) @@ -26,8 +28,8 @@ RowLayout { id: icon source: General.coinIcon(details.ticker) - Layout.preferredWidth: 32 - Layout.preferredHeight: 45 + Layout.preferredWidth: 52 + Layout.preferredHeight: 52 Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft Layout.leftMargin: padding Layout.topMargin: Layout.leftMargin @@ -37,7 +39,7 @@ RowLayout { anchors.centerIn: parent anchors.fill: parent - radius: 15 + radius: 10 enabled: Dex.General.isZhtlc(details.ticker) ? activation_progress != 100 : false visible: enabled opacity: .9 @@ -62,7 +64,8 @@ RowLayout anchors.left: parent.right anchors.leftMargin: 12 anchors.verticalCenter: parent.verticalCenter - width: root.width - 40 + width: root.width - 60 + spacing: 3 Dex.Text { @@ -77,18 +80,32 @@ RowLayout Dex.Text { - id: bottom_line + id: middle_line - property string real_value: !details ? "" : - details.balance + " (" + General.formatFiat("", details.main_currency_balance, API.app.settings_pg.current_fiat_sign) + ")" + property string coin_value: !details ? "" : details.balance + text: coin_value + Layout.fillWidth: true + elide: Text.ElideRight + color: Dex.CurrentTheme.foregroundColor + font: DexTypo.body2 + wrapMode: Label.NoWrap + ToolTip.text: coin_value + Component.onCompleted: font.pixelSize = 11.5 + } + + Dex.Text + { + id: bottom_line - text: real_value + property string fiat_value: !details ? "" : + General.formatFiat("", details.main_currency_balance, API.app.settings_pg.current_fiat_sign) + text: fiat_value Layout.fillWidth: true elide: Text.ElideRight color: Dex.CurrentTheme.foregroundColor font: DexTypo.body2 wrapMode: Label.NoWrap - ToolTip.text: real_value + ToolTip.text: fiat_value Component.onCompleted: font.pixelSize = 11.5 } } diff --git a/atomic_defi_design/Dex/Exchange/ProView/SearchableTickerSelector.qml b/atomic_defi_design/Dex/Exchange/ProView/SearchableTickerSelector.qml index de90ed3f2d..6bda8f68fe 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/SearchableTickerSelector.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/SearchableTickerSelector.qml @@ -18,7 +18,7 @@ Dex.ComboBoxWithSearchBar property string ticker property bool index_changed: false - height: 60 + height: 70 enabled: !block_everything textRole: "ticker" @@ -34,7 +34,7 @@ Dex.ComboBoxWithSearchBar { id: _delegate width: control.width - height: visible ? 60 : 0 + height: visible ? 70 : 0 highlighted: control.highlightedIndex === index contentItem: DexComboBoxLine { details: model } From c00ffdbec3594d52f128ef26c300961c9c670afb Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 7 Apr 2023 18:35:58 +0800 Subject: [PATCH 55/80] Improve combobox data display --- .../Dex/Exchange/Trade/ConfirmTradeModal.qml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml b/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml index c0aae025d4..4054ef6606 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml @@ -34,29 +34,41 @@ MultipageModal RowLayout { id: dex_pair_badges + Layout.fillWidth: true + Layout.preferredHeight: 70 + Layout.preferredWidth: 480 + + Item { Layout.fillWidth: true } PairItemBadge { ticker: base_ticker fullname: General.coinName(base_ticker) amount: base_amount + Layout.fillHeight: true } + Item { Layout.fillWidth: true } + Qaterial.Icon { - Layout.fillWidth: true Layout.alignment: Qt.AlignVCenter - color: Dex.CurrentTheme.foregroundColor icon: Qaterial.Icons.swapHorizontal + Layout.fillHeight: true } + Item { Layout.fillWidth: true } + PairItemBadge { ticker: rel_ticker fullname: General.coinName(rel_ticker) amount: rel_amount + Layout.fillHeight: true } + + Item { Layout.fillWidth: true } }, PriceLineSimplified From ac768b5c1a90dd35817c80420c42466f6b71a1ed Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 7 Apr 2023 18:36:50 +0800 Subject: [PATCH 56/80] improve coin /and values display in swap/order modals --- .../Dex/Components/PairItemBadge.qml | 133 ++++++++---------- .../ProView/TradingInfo/OrderModal.qml | 42 +++--- 2 files changed, 83 insertions(+), 92 deletions(-) diff --git a/atomic_defi_design/Dex/Components/PairItemBadge.qml b/atomic_defi_design/Dex/Components/PairItemBadge.qml index 3c5dd89a93..0660a8b49c 100644 --- a/atomic_defi_design/Dex/Components/PairItemBadge.qml +++ b/atomic_defi_design/Dex/Components/PairItemBadge.qml @@ -1,105 +1,96 @@ +import bignumberjs 1.0 + import QtQuick 2.15 import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 +import QtGraphicalEffects 1.0 +import QtQuick.Controls.Universal 2.15 -import bignumberjs 1.0 - -import "../Constants" +import "../Constants" as Dex +import App 1.0 import Dex.Themes 1.0 as Dex +import Dex.Components 1.0 as Dex -DefaultRectangle +DexRectangle { id: root - property alias source: icon.source - property alias ticker: ticker.text - property alias fullname: fullname.text - property string amount - - width: 260 - height: 66 radius: 10 - color: Dex.CurrentTheme.tickerBadgeBackgroundColor + visible: enabled + opacity: .9 + color: Dex.CurrentTheme.innerBackgroundColor + property string ticker + property string fullname + property string amount + property int padding: 0 + property alias middle_text: middle_line.text_value + property alias bottom_text: bottom_line.text_value + Layout.fillHeight: true + Layout.fillWidth: true + Layout.leftMargin: 20 + Layout.rightMargin: 20 RowLayout { - Layout.fillWidth: true - Layout.fillHeight: true anchors.fill: parent - anchors.margins: 15 - spacing: 8 + anchors.centerIn: parent + Layout.leftMargin: 20 + Layout.rightMargin: 20 - Item { Layout.fillWidth: true } - - DefaultImage + Dex.Image { id: icon - Layout.preferredWidth: 35 - Layout.preferredHeight: 35 - Layout.alignment: Qt.AlignVCenter - source: General.coinIcon(root.ticker) + source: General.coinIcon(ticker) + Layout.preferredWidth: 52 + Layout.preferredHeight: 52 + Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft + Layout.leftMargin: 20 + Layout.rightMargin: 10 + Layout.topMargin: 9 + Layout.bottomMargin: 9 } - - Item { Layout.fillWidth: true } - ColumnLayout { - Layout.fillWidth: true - Layout.fillHeight: true - Layout.alignment: Qt.AlignVCenter - spacing: 5 + spacing: 2 - DefaultText + Dex.Text { - id: ticker - Layout.fillWidth: true - font.pixelSize: 11 - horizontalAlignment: Text.AlignLeft - wrapMode: Text.NoWrap - } + Layout.preferredWidth: parent.width - 15 - DefaultText - { - Layout.fillWidth: true - font.pixelSize: 11 - horizontalAlignment: Text.AlignLeft + text_value: `${ticker}   ${fullname}` + font.pixelSize: Style.textSizeSmall3 + elide: Text.ElideRight wrapMode: Text.NoWrap - text: - { - BigNumber.config({ DECIMAL_PLACES: 6 }) - return new BigNumber(root.amount).toString(10) - } } - } - - Item { Layout.fillWidth: true } - - ColumnLayout - { - Layout.fillWidth: true - Layout.fillHeight: true - Layout.alignment: Qt.AlignVCenter - spacing: 5 - DefaultText + Dex.Text { - id: fullname + id: middle_line + + property string coin_value: amount + text: coin_value Layout.fillWidth: true - wrapMode: Text.WordWrap - horizontalAlignment: Text.AlignLeft - font.pixelSize: 11 + elide: Text.ElideRight + color: Dex.CurrentTheme.foregroundColor + font: DexTypo.body2 + wrapMode: Label.NoWrap + ToolTip.text: coin_value + Component.onCompleted: font.pixelSize = 11.5 } - DefaultText + Dex.Text { - id: amount_fiat - visible: text != '' + id: bottom_line + + property string fiat_value: General.getFiatText(amount, ticker) + text: fiat_value Layout.fillWidth: true - font.pixelSize: 11 - wrapMode: Text.NoWrap - horizontalAlignment: Text.AlignLeft elide: Text.ElideRight + color: Dex.CurrentTheme.foregroundColor + font: DexTypo.body2 + wrapMode: Label.NoWrap + ToolTip.text: fiat_value + Component.onCompleted: font.pixelSize = 11.5 } } - - Item { Layout.fillWidth: true } } -} +} \ No newline at end of file diff --git a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderModal.qml b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderModal.qml index 25fa8d93cb..b64f2a479a 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderModal.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderModal.qml @@ -27,11 +27,11 @@ MultipageModal MultipageModalContent { - titleText: !details ? "" : details.is_swap ? qsTr("Swap Details") : qsTr("Order Details") + titleText: !details ? "" : visible ? getStatusText(details.order_status) : '' title.font.pixelSize: Style.textSize2 titleAlignment: Qt.AlignHCenter - titleTopMargin: 10 - topMarginAfterTitle: 10 + titleTopMargin: 0 + topMarginAfterTitle: 8 flickMax: window.height - 450 header: [ @@ -41,7 +41,8 @@ MultipageModal visible: !details ? false : details.is_swap && details.order_status === "successful" Layout.alignment: Qt.AlignHCenter source: General.image_path + "exchange-trade-complete.png" - height: 100 + Layout.preferredHeight: 60 + Layout.preferredWidth: 60 }, // Loading symbol @@ -51,49 +52,48 @@ MultipageModal details.is_swap && !["successful", "failed"].includes(details.order_status) running: visible && Qt.platform.os != "osx" Layout.alignment: Qt.AlignHCenter - height: 100 + Layout.preferredHeight: 60 + Layout.preferredWidth: 60 }, RowLayout { - Layout.topMargin: 10 - height: 70 + id: dex_pair_badges + Layout.fillWidth: true + Layout.preferredHeight: 70 + Layout.preferredWidth: 480 + + Item { Layout.fillWidth: true } PairItemBadge { ticker: details ? details.base_coin : "" fullname: details ? General.coinName(details.base_coin) : "" amount: details ? details.base_amount : "" + Layout.preferredHeight: 70 } + Item { Layout.fillWidth: true } + Qaterial.Icon { - Layout.fillWidth: true + Layout.preferredHeight: 70 Layout.alignment: Qt.AlignVCenter - color: Dex.CurrentTheme.foregroundColor icon: Qaterial.Icons.swapHorizontal } + Item { Layout.fillWidth: true } + PairItemBadge { ticker: details ? details.rel_coin : "" fullname: details ? General.coinName(details.rel_coin) : "" amount: details ? details.rel_amount : "" + Layout.preferredHeight: 70 } - }, - // Status Text - DefaultText - { - id: statusText - Layout.alignment: Qt.AlignHCenter - Layout.topMargin: 5 - font.pixelSize: Style.textSizeMid1 - font.bold: true - visible: !details ? false : details.is_swap || !details.is_maker - text_value: !details ? "" : visible ? getStatusText(details.order_status) : '' - height: 25 + Item { Layout.fillWidth: true } }, DefaultText From 3dbefba404540f4373997cd4de4298124fa0bd7a Mon Sep 17 00:00:00 2001 From: smk762 Date: Sun, 9 Apr 2023 01:29:58 +0800 Subject: [PATCH 57/80] fix some coin text colors for contrast --- atomic_defi_design/Dex/Constants/Style.qml | 66 ++++++++++++---------- 1 file changed, 37 insertions(+), 29 deletions(-) diff --git a/atomic_defi_design/Dex/Constants/Style.qml b/atomic_defi_design/Dex/Constants/Style.qml index ff2dbd105c..9c90be421c 100644 --- a/atomic_defi_design/Dex/Constants/Style.qml +++ b/atomic_defi_design/Dex/Constants/Style.qml @@ -184,30 +184,30 @@ QtObject { { switch (type) { - case 'ERC-20': return getCoinColor("ETH") - case 'ZHTLC': return getCoinColor("ARRR") - case 'QRC-20': return getCoinColor("QTUM") - case 'Smart Chain': return getCoinColor("KMD") + case 'ERC-20': return colorCoin["ETH"] + case 'ZHTLC': return colorCoin["ARRR"] + case 'QRC-20': return colorCoin["QTUM"] + case 'Smart Chain': return colorCoin["KMD"] case 'WALLET ONLY': return "#4D4D4D" - case 'UTXO': return getCoinColor("BTC") - case 'BEP-20': return getCoinColor("BNB") - case 'SLP': return getCoinColor("BCH") - case 'IDO': return getCoinColor("TKL") - case 'Matic': return getCoinColor("MATIC") + case 'UTXO': return colorCoin["BTC"] + case 'BEP-20': return colorCoin["BNB"] + case 'SLP': return colorCoin["BCH"] + case 'IDO': return colorCoin["TKL"] + case 'Matic': return colorCoin["MATIC"] case 'Optimism': return "#BB2100" - case 'Arbitrum': return getCoinColor("ETH") - case 'AVX-20': return getCoinColor("AVAX") - case 'FTM-20': return getCoinColor("FTM") - case 'HRC-20': return getCoinColor("ONE") - case 'Ubiq': return getCoinColor("UBQ") - case 'KRC-20': return getCoinColor("KCS") - case 'Moonriver': return getCoinColor("MOVR") - case 'Moonbeam': return getCoinColor("GLMR") - case 'HecoChain': return getCoinColor("HECO") - case 'SmartBCH': return getCoinColor("SBCH") - case 'Ethereum Classic': return getCoinColor("ETC") - case 'RSK Smart Bitcoin': return getCoinColor("BTC") - default: return getCoinColor("BTC") + case 'Arbitrum': return colorCoin["ETH"] + case 'AVX-20': return colorCoin["AVAX"] + case 'FTM-20': return colorCoin["FTM"] + case 'HRC-20': return colorCoin["ONE"] + case 'Ubiq': return colorCoin["UBQ"] + case 'KRC-20': return colorCoin["KCS"] + case 'Moonriver': return colorCoin["MOVR"] + case 'Moonbeam': return colorCoin["GLMR"] + case 'HecoChain': return colorCoin["HECO"] + case 'SmartBCH': return colorCoin["SBCH"] + case 'Ethereum Classic': return colorCoin["ETC"] + case 'RSK Smart Bitcoin': return colorCoin["BTC"] + default: return colorCoin["BTC"] } } @@ -221,8 +221,17 @@ QtObject { } function getCoinColor(ticker) { - const c = colorCoin[atomic_qt_utilities.retrieve_main_ticker(ticker)] - return c || Style.colorTheme2 + let info = API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker) + let color = getCoinTypeTextColor(info.type) + if (colorCoin.hasOwnProperty(info.type)) + { + color = colorCoin[info.type] + } + else if (colorCoin.hasOwnProperty(atomic_qt_utilities.retrieve_main_ticker(ticker))) + { + color = colorCoin[atomic_qt_utilities.retrieve_main_ticker(ticker)] + } + return color } readonly property var colorCoin: ({ @@ -297,7 +306,7 @@ QtObject { "RVN": "#384182", "SAND": "#05C1F4", "CADC": "#FF6666", - "DGB": "#006AD2", + "DGB": "#0b77e1", "DIA": "#B94897", "DOT": "#E80082", "FLUX": "#2B61D1", @@ -334,7 +343,7 @@ QtObject { "MONA": "#DEC799", "MOVR": "#52CCC9", "GLMR": "#F6007C", - "NMC": "#186C9D", + "NMC": "#2286c0", "NZDS": "#1B3044", "RFOX": "#D83331", "BOTS": "#F69B57", @@ -372,7 +381,7 @@ QtObject { "REN": "#595959", "SMTF": "#F75836", "SUSHI": "#E25DA8", - "TRYB": "#0929AA", + "TRYB": "#5c74d6", "TUSD": "#2E3181", "AWC": "#31A5F6", "VRA": "#D70A41", @@ -392,7 +401,7 @@ QtObject { "CENNZ": "#2E87F1", "CHTA": "#C3A634", "COMP": "#00DBA3", - "CRO": "#243565", + "CRO": "#445790", "CVC": "#3AB03E", "CVT": "#4B0082", "PIC": "#04D9FF", @@ -487,7 +496,6 @@ QtObject { "ZOMBIE": "#72B001", "ZRX": "#302C2C", "UNI": "#FF007A", - "VOTE2022": "#7490AA", "USBL": "#279553", "RUNES": "#336699", "SIX": "#ed0909", From 05d90088a176d4b6e54abd89b4b874bce5b45f1c Mon Sep 17 00:00:00 2001 From: smk762 Date: Sun, 9 Apr 2023 01:31:16 +0800 Subject: [PATCH 58/80] widen pair info badges in swap modals --- .../Dex/Components/DexSweetComboBox.qml | 2 +- atomic_defi_design/Dex/Components/PairItemBadge.qml | 10 +++++----- .../Dex/Exchange/ProView/TradingInfo/OrderModal.qml | 12 +++++------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/atomic_defi_design/Dex/Components/DexSweetComboBox.qml b/atomic_defi_design/Dex/Components/DexSweetComboBox.qml index e8a7086ab6..cc47e64e63 100644 --- a/atomic_defi_design/Dex/Components/DexSweetComboBox.qml +++ b/atomic_defi_design/Dex/Components/DexSweetComboBox.qml @@ -174,7 +174,7 @@ ComboBox highlighted: control.highlightedIndex === index contentItem: DefaultText { - text_value: "" + ticker + "" + " %1".arg(General.coinName(ticker)) + text_value: "" + ticker + "" + " %1".arg(General.coinName(ticker)) } background: DefaultRectangle diff --git a/atomic_defi_design/Dex/Components/PairItemBadge.qml b/atomic_defi_design/Dex/Components/PairItemBadge.qml index 0660a8b49c..51b90aef69 100644 --- a/atomic_defi_design/Dex/Components/PairItemBadge.qml +++ b/atomic_defi_design/Dex/Components/PairItemBadge.qml @@ -26,7 +26,7 @@ DexRectangle property alias bottom_text: bottom_line.text_value Layout.fillHeight: true Layout.fillWidth: true - Layout.leftMargin: 20 + Layout.leftMargin: 10 Layout.rightMargin: 20 RowLayout @@ -40,13 +40,13 @@ DexRectangle { id: icon source: General.coinIcon(ticker) - Layout.preferredWidth: 52 - Layout.preferredHeight: 52 + Layout.preferredWidth: 40 + Layout.preferredHeight: 40 Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft Layout.leftMargin: 20 Layout.rightMargin: 10 - Layout.topMargin: 9 - Layout.bottomMargin: 9 + Layout.topMargin: 0 + Layout.bottomMargin: 0 } ColumnLayout { diff --git a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderModal.qml b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderModal.qml index b64f2a479a..2c0f7854c1 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderModal.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderModal.qml @@ -14,8 +14,9 @@ MultipageModal id: root property var details - horizontalPadding: 60 - verticalPadding: 40 + width: 720 + horizontalPadding: 40 + verticalPadding: 30 onDetailsChanged: { if (!details) root.close() } onOpened: @@ -55,15 +56,13 @@ MultipageModal Layout.preferredHeight: 60 Layout.preferredWidth: 60 }, - + RowLayout { id: dex_pair_badges - Layout.fillWidth: true Layout.preferredHeight: 70 - Layout.preferredWidth: 480 + Layout.fillWidth: true - Item { Layout.fillWidth: true } PairItemBadge { @@ -93,7 +92,6 @@ MultipageModal Layout.preferredHeight: 70 } - Item { Layout.fillWidth: true } }, DefaultText From 17c371f77913df8fbf190132e1a929dddcc3837a Mon Sep 17 00:00:00 2001 From: smk762 Date: Sun, 9 Apr 2023 01:53:34 +0800 Subject: [PATCH 59/80] reset icon size for comboboxes --- atomic_defi_design/Dex/Components/PairItemBadge.qml | 1 + atomic_defi_design/Dex/Exchange/ProView/DexComboBoxLine.qml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/atomic_defi_design/Dex/Components/PairItemBadge.qml b/atomic_defi_design/Dex/Components/PairItemBadge.qml index 51b90aef69..42bed3d89d 100644 --- a/atomic_defi_design/Dex/Components/PairItemBadge.qml +++ b/atomic_defi_design/Dex/Components/PairItemBadge.qml @@ -51,6 +51,7 @@ DexRectangle ColumnLayout { spacing: 2 + anchors.verticalCenter: parent.verticalCenter Dex.Text { diff --git a/atomic_defi_design/Dex/Exchange/ProView/DexComboBoxLine.qml b/atomic_defi_design/Dex/Exchange/ProView/DexComboBoxLine.qml index 6b28afb85a..89d6265293 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/DexComboBoxLine.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/DexComboBoxLine.qml @@ -28,8 +28,8 @@ RowLayout { id: icon source: General.coinIcon(details.ticker) - Layout.preferredWidth: 52 - Layout.preferredHeight: 52 + Layout.preferredWidth: 40 + Layout.preferredHeight: 40 Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft Layout.leftMargin: padding Layout.topMargin: Layout.leftMargin @@ -64,7 +64,7 @@ RowLayout anchors.left: parent.right anchors.leftMargin: 12 anchors.verticalCenter: parent.verticalCenter - width: root.width - 60 + width: root.width - 48 spacing: 3 Dex.Text From daa708e9bb0e39139065a333a8e14787791fc1f7 Mon Sep 17 00:00:00 2001 From: cipig Date: Sun, 9 Apr 2023 16:20:03 +0000 Subject: [PATCH 60/80] Revert "don't update max_taker_vol on every orderbook update" This reverts commit 86b0620d968076f682f7392bc081eb552e5f261f. --- src/core/atomicdex/pages/qt.trading.page.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/atomicdex/pages/qt.trading.page.cpp b/src/core/atomicdex/pages/qt.trading.page.cpp index 1ece670438..b273ba7e52 100644 --- a/src/core/atomicdex/pages/qt.trading.page.cpp +++ b/src/core/atomicdex/pages/qt.trading.page.cpp @@ -56,7 +56,7 @@ namespace atomic_dex { m_actions_queue.push(trading_actions::post_process_orderbook_finished); m_models_actions[orderbook_need_a_reset] = evt.is_a_reset; - //determine_max_volume(); + determine_max_volume(); } } } // namespace atomic_dex From feeded98ed39603ffd786b81a9a854b223b1dcaf Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 10 Apr 2023 03:22:34 +0800 Subject: [PATCH 61/80] fix anchor layout error --- atomic_defi_design/Dex/Components/PairItemBadge.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atomic_defi_design/Dex/Components/PairItemBadge.qml b/atomic_defi_design/Dex/Components/PairItemBadge.qml index 42bed3d89d..4fec7de383 100644 --- a/atomic_defi_design/Dex/Components/PairItemBadge.qml +++ b/atomic_defi_design/Dex/Components/PairItemBadge.qml @@ -51,7 +51,7 @@ DexRectangle ColumnLayout { spacing: 2 - anchors.verticalCenter: parent.verticalCenter + Layout.alignment: Qt.AlignVCenter Dex.Text { From 7c0255fcdfe90c615123e3b2e98808df2b7cf623 Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 10 Apr 2023 16:36:23 +0800 Subject: [PATCH 62/80] set ticer status log to debug --- src/core/atomicdex/services/mm2/mm2.service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/atomicdex/services/mm2/mm2.service.cpp b/src/core/atomicdex/services/mm2/mm2.service.cpp index 40c891fd23..3faf992992 100644 --- a/src/core/atomicdex/services/mm2/mm2.service.cpp +++ b/src/core/atomicdex/services/mm2/mm2.service.cpp @@ -161,7 +161,7 @@ namespace } if (field_name == "active") { - SPDLOG_INFO("ticker: {} status active: {}", ticker, status); + SPDLOG_DEBUG("ticker: {} status active: {}", ticker, status); registry[ticker].active = status; } else if (field_name == "is_segwit_on") From 78bc7c9111ec2e17aec4b582e4f7dc79cfdecb42 Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 10 Apr 2023 16:37:02 +0800 Subject: [PATCH 63/80] fix getTitle error in notifications --- atomic_defi_design/Dex/Dashboard/NotificationsModal.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atomic_defi_design/Dex/Dashboard/NotificationsModal.qml b/atomic_defi_design/Dex/Dashboard/NotificationsModal.qml index c6d8fa9e79..4b494de500 100644 --- a/atomic_defi_design/Dex/Dashboard/NotificationsModal.qml +++ b/atomic_defi_design/Dex/Dashboard/NotificationsModal.qml @@ -80,7 +80,7 @@ DexPopup app.pageLoader.item.switchPage(Dashboard.PageType.DEX) break case "open_log_modal": - showError(notification.getTitle(), notification.long_message) + showError(getNotificationTitle(notification), notification.long_message) break default: console.warn("Unknown notification click action", notification.click_action) From 815c67604f6be004497b1e486806e3234de813b2 Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 10 Apr 2023 16:46:05 +0800 Subject: [PATCH 64/80] Fix spelling mistake --- atomic_defi_design/Dex/Wallet/Main.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atomic_defi_design/Dex/Wallet/Main.qml b/atomic_defi_design/Dex/Wallet/Main.qml index e74ef4fb7a..101c341420 100644 --- a/atomic_defi_design/Dex/Wallet/Main.qml +++ b/atomic_defi_design/Dex/Wallet/Main.qml @@ -309,7 +309,7 @@ Item DefaultText { id: portfolio_title - text_value: qsTr("Porfolio") + text_value: qsTr("Portfolio") Layout.alignment: Qt.AlignHCenter color: headerTitleColor font.pixelSize: headerTitleFont From 00b91466aac2dd5f8c61003b6f7768e6c2c97831 Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 10 Apr 2023 17:00:58 +0800 Subject: [PATCH 65/80] update combobox background for lite theme --- assets/themes/Default - Light/colors.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/themes/Default - Light/colors.json b/assets/themes/Default - Light/colors.json index fcf1f7f9a9..ce09819f1a 100644 --- a/assets/themes/Default - Light/colors.json +++ b/assets/themes/Default - Light/colors.json @@ -47,7 +47,7 @@ "switchGradientStartColor2": "#FFFFFFFF", "switchGradientEndColor2": "#FFFFFFFF", - "comboBoxBackgroundColor": "#FFFFFFFF", + "comboBoxBackgroundColor": "#DDE6F2FF", "comboBoxArrowsColor": "#456078FF", "comboBoxDropdownItemHighlightedColor": "#CDE1FFFF", From 104552a446324ba00fc83a240498de75e1fa49e1 Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 10 Apr 2023 17:09:30 +0800 Subject: [PATCH 66/80] update chart theme colors --- atomic_defi_design/Dex/Exchange/ProView/Chart.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atomic_defi_design/Dex/Exchange/ProView/Chart.qml b/atomic_defi_design/Dex/Exchange/ProView/Chart.qml index 4eead3d0ca..1e1f9ebd64 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/Chart.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/Chart.qml @@ -66,7 +66,7 @@ Item } -
+
` } } From d92c4cfb1d0ff4fde967c38ea6207976b7757aa4 Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 10 Apr 2023 20:40:11 +0800 Subject: [PATCH 67/80] update lite theme colors --- assets/themes/Default - Light/colors.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/assets/themes/Default - Light/colors.json b/assets/themes/Default - Light/colors.json index fcf1f7f9a9..dd52d7d358 100644 --- a/assets/themes/Default - Light/colors.json +++ b/assets/themes/Default - Light/colors.json @@ -2,13 +2,14 @@ "accentColor": "#F0F2FFFF", "foregroundColor": "#456078FF", "backgroundColor": "#FCFCFCFF", - "backgroundColorDeep": "#FCFCFCFF", + "secondBackgroundColor": "#ECECECFF", + "backgroundColorDeep": "#ECECECFF", "busyIndicatorColor": "#5A68E6FF", "buttonColorDisabled": "#D8E3F8FF", - "buttonColorEnabled": "#F0F6FFFF", - "buttonColorHovered": "#D7E7FFFF", + "buttonColorEnabled": "#DDE6F2FF", + "buttonColorHovered": "#CDE1FFFF", "buttonColorPressed": "#B8D2F9FF", "buttonTextDisabledColor": "#D1D4DCFF", "buttonTextEnabledColor": "#456078FF", @@ -21,8 +22,8 @@ "buttonSecondaryColorPressed": "#B8D2F9FF", "buttonCancelColorDisabled": "#D8E3F8FF", - "buttonCancelColorEnabled": "#F0F6FFFF", - "buttonCancelColorHovered": "#D7E7FFFF", + "buttonCancelColorEnabled": "#DDE6F2FF", + "buttonCancelColorHovered": "#CDE1FFFF", "buttonCancelColorPressed": "#B8D2F9FF", "gradientButtonStartColor": "#5A68E6FF", From 5be6b9cbd3454ff71c0ae5d25bc48c8b6b45e845 Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 10 Apr 2023 20:41:03 +0800 Subject: [PATCH 68/80] remove duplicate component --- atomic_defi_design/Dex/Components/DefaultButton.qml | 5 ++--- atomic_defi_design/Dex/Components/DexButton.qml | 6 ------ atomic_defi_design/Dex/Components/PaginationButton.qml | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) delete mode 100644 atomic_defi_design/Dex/Components/DexButton.qml diff --git a/atomic_defi_design/Dex/Components/DefaultButton.qml b/atomic_defi_design/Dex/Components/DefaultButton.qml index 12f0a4655d..458a254905 100644 --- a/atomic_defi_design/Dex/Components/DefaultButton.qml +++ b/atomic_defi_design/Dex/Components/DefaultButton.qml @@ -3,6 +3,5 @@ import "../Constants" import App 1.0 // Add button -DexButton { - -} +DexAppButton {} + \ No newline at end of file diff --git a/atomic_defi_design/Dex/Components/DexButton.qml b/atomic_defi_design/Dex/Components/DexButton.qml deleted file mode 100644 index f886729bf8..0000000000 --- a/atomic_defi_design/Dex/Components/DexButton.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.15 -import "../Constants" -import App 1.0 - -// Add button -DexAppButton {} diff --git a/atomic_defi_design/Dex/Components/PaginationButton.qml b/atomic_defi_design/Dex/Components/PaginationButton.qml index 5d850f8b2e..501fca07a0 100644 --- a/atomic_defi_design/Dex/Components/PaginationButton.qml +++ b/atomic_defi_design/Dex/Components/PaginationButton.qml @@ -1,6 +1,6 @@ import "../Components" -DexButton +DexAppButton { font.pixelSize: 12 } From 63d314802ba0d637b3dddb1726252e8651c77089 Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 10 Apr 2023 20:41:42 +0800 Subject: [PATCH 69/80] fix contrast for contact name pop up --- atomic_defi_design/Dex/Addressbook/NewContactPopup.qml | 2 ++ atomic_defi_design/Dex/Components/DefaultPopup.qml | 4 +++- atomic_defi_design/Dex/Components/DexTextField.qml | 5 +++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/atomic_defi_design/Dex/Addressbook/NewContactPopup.qml b/atomic_defi_design/Dex/Addressbook/NewContactPopup.qml index 4c61b27c64..535337dcaa 100644 --- a/atomic_defi_design/Dex/Addressbook/NewContactPopup.qml +++ b/atomic_defi_design/Dex/Addressbook/NewContactPopup.qml @@ -6,6 +6,7 @@ import QtQuick.Layouts 1.15 import "../Components" import "../Constants" import Dex.Components 1.0 as Dex +import Dex.Themes 1.0 as Dex Dex.Popup { @@ -14,6 +15,7 @@ Dex.Popup height: 88 onOpened: nameField.forceActiveFocus() onClosed: nameField.text = "" + bgColor: Dex.CurrentTheme.innerBackgroundColor contentItem: Column { diff --git a/atomic_defi_design/Dex/Components/DefaultPopup.qml b/atomic_defi_design/Dex/Components/DefaultPopup.qml index e893062d08..353a8557b1 100644 --- a/atomic_defi_design/Dex/Components/DefaultPopup.qml +++ b/atomic_defi_design/Dex/Components/DefaultPopup.qml @@ -2,14 +2,16 @@ import QtQuick 2.12 import QtQuick.Controls 2.15 //> Popup +import Dex.Themes 1.0 as Dex Popup { id: popup + property color bgColor: Dex.CurrentTheme.floatingBackgroundColor y: parent.height x: (parent.width / 2) - (width / 2) closePolicy: Popup.CloseOnPressOutsideParent | Popup.CloseOnEscape - background: FloatingBackground { } + background: FloatingBackground { color: bgColor } } diff --git a/atomic_defi_design/Dex/Components/DexTextField.qml b/atomic_defi_design/Dex/Components/DexTextField.qml index 485f4b449a..1764675b85 100644 --- a/atomic_defi_design/Dex/Components/DexTextField.qml +++ b/atomic_defi_design/Dex/Components/DexTextField.qml @@ -11,7 +11,8 @@ TextField property alias left_text: left_text.text_value property alias right_text: right_text.text_value property alias radius: background.radius - property alias backgroundColor: background.color + property color backgroundColor: Dex.CurrentTheme.textFieldBackgroundColor + property color backgroundColorActive: Dex.CurrentTheme.textFieldActiveBackgroundColor property bool forceFocus: false font: DexTypo.body2 @@ -30,7 +31,7 @@ TextField background: DefaultRectangle { id: background - color: text_field.focus ? Dex.CurrentTheme.textFieldActiveBackgroundColor : Dex.CurrentTheme.textFieldBackgroundColor + color: text_field.focus ? backgroundColorActive : backgroundColor radius: 18 anchors.fill: parent } From 15571dc3b832682cd6b52d73a51defc2b551bac6 Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 10 Apr 2023 22:00:22 +0800 Subject: [PATCH 70/80] maximise combo width in pro view --- atomic_defi_design/Dex/Exchange/ProView/TickerSelectors.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/atomic_defi_design/Dex/Exchange/ProView/TickerSelectors.qml b/atomic_defi_design/Dex/Exchange/ProView/TickerSelectors.qml index 86df283110..c7a8b395fa 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/TickerSelectors.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/TickerSelectors.qml @@ -22,7 +22,7 @@ Row { id: selectorLeft - width: parent.width * 0.45 + width: 230 height: parent.height left_side: true @@ -40,7 +40,7 @@ Row SwapIcon { - width: parent.width * 0.1 + width: 30 anchors.verticalCenter: parent.verticalCenter top_arrow_ticker: selectorLeft.ticker bottom_arrow_ticker: selectorRight.ticker @@ -63,7 +63,7 @@ Row { id: selectorRight - width: parent.width * 0.45 + width: 230 height: parent.height left_side: false From 5e1e85e467f27eeeb65296ee35151d67468b6e04 Mon Sep 17 00:00:00 2001 From: smk762 Date: Tue, 11 Apr 2023 00:07:05 +0800 Subject: [PATCH 71/80] fix bad contrast coin ticker text colors --- atomic_defi_design/Dex/Constants/Style.qml | 305 +++------------------ 1 file changed, 44 insertions(+), 261 deletions(-) diff --git a/atomic_defi_design/Dex/Constants/Style.qml b/atomic_defi_design/Dex/Constants/Style.qml index 9c90be421c..13bb307ef7 100644 --- a/atomic_defi_design/Dex/Constants/Style.qml +++ b/atomic_defi_design/Dex/Constants/Style.qml @@ -220,285 +220,68 @@ QtObject { } } - function getCoinColor(ticker) { - let info = API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker) - let color = getCoinTypeTextColor(info.type) - if (colorCoin.hasOwnProperty(info.type)) + function getCoinGroupTextColor(type) + { + switch (type) { - color = colorCoin[info.type] + case 'IDO': return "#536E93" + case 'AVX-20': return colorCoin["AVAX"] + case 'ZHTLC': return colorCoin["ARRR"] + case 'COSMOS': return colorCoin["ATOM"] + case 'SLP': return colorCoin["BCH"] + case 'BEP-20': return colorCoin["BNB"] + case 'RSK Smart Bitcoin': return colorCoin["BTC"] + case 'UTXO': return colorCoin["BTC"] + case 'Ethereum Classic': return colorCoin["ETC"] + case 'Arbitrum': return colorCoin["ETH"] + case 'ERC-20': return colorCoin["ETH"] + case 'FTM-20': return colorCoin["FTM"] + case 'Moonbeam': return colorCoin["GLMR"] + case 'HecoChain': return colorCoin["HECO"] + case 'QRC-20': return colorCoin["QTUM"] + case 'KRC-20': return colorCoin["KCS"] + case 'Smart Chain': return colorCoin["KMD"] + case 'Matic': return colorCoin["MATIC"] + case 'Moonriver': return colorCoin["MOVR"] + case 'HRC-20': return colorCoin["ONE"] + case 'SmartBCH': return colorCoin["SBCH"] + case 'Ubiq': return colorCoin["UBQ"] + case 'Optimism': return "#BB2100" + case 'WALLET ONLY': return "#4D4D4D" + default: return dark_theme ? "#FFFFFF" : "#456078" } - else if (colorCoin.hasOwnProperty(atomic_qt_utilities.retrieve_main_ticker(ticker))) + } + + function getCoinColor(ticker) { + let info = API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker) + let color = getCoinGroupTextColor(info.type) + let base_ticker = atomic_qt_utilities.retrieve_main_ticker(ticker) + if (colorCoin.hasOwnProperty(base_ticker)) { - color = colorCoin[atomic_qt_utilities.retrieve_main_ticker(ticker)] + color = colorCoin[base_ticker] } return color } readonly property var colorCoin: ({ - "ABY": "#8B0D10", - "ACTN": "#E84142", - "ADA": "#214D78", - "ADX": "#1B75BC", - "ANKR": "#2075E8", - "APE": "#0052F2", - "ARPA": "#CCD9E2", "ARRR": "#C7A34C", - "ATOM": "#474B6C", - "AUR": "#0A6C5E", - "AVA": "#5B567F", + "ATOM": "#963b9a", "AVAX": "#E84142", - "AVN": "#33E0CE", - "AXS": "#0055D5", - "BAL": "#4D4D4D", - "BNB": "#F9D987", + "BNB": "#f0900b", "BCH": "#8DC351", - "BIDR": "#F0B90B", - "BRZ": "#B5DEC3", - "BSTY": "#78570D", "BTC": "#E9983C", - "RBTC": "#E9983C", - "BTT": "#666666", - "BTTC": "#666666", - "BTE": "#FFE201", - "BTX": "#FB30A6", - "CAKE": "#D1884F", - "CASE": "#FFFF12", - "CDN": "#90191C", - "CLC": "#0970DC", - "CRV": "#517AB5", - "DGC": "#BC7600", - "DIMI": "#0BFBE2", - "DOI": "#120641", - "DUST": "#6A032F", - "EOS": "#4D4D4D", - "FET": "#202944", - "FLOW": "#00EF8B", - "FTC": "#FFFFFF", - "FTM": "#13B5EC", - "GALA": "#011B36", - "GLEEC": "#8C41FF", - "GRMS": "#12B690", - "GLM": "#0050E6", - "GMS": "#0BFBE2", - "GMT": "#E9CB7B", - "GMX": "#07A9E6", - "GRS": "#377E96", - "GRT": "#6E54DB", - "GST": "#D7D7D7", - "IOTA": "#404040", - "ILNF": "#28873b", - "IC": "#72009D", - "JST": "#B41514", - "JSTR": "#627EEA", - "DOGE": "#C3A634", "ETC": "#328432", "ETH": "#687DE3", - "ETHR": "#627EEA", - "KMD": "#7490AA", - "KCS": "#25AF90", - "KSM": "#595959", - "MORTY": "#A4764D", - "RICK": "#A5CBDD", - "EMC2": "#00CCFF", - "INJ": "#17EAE9", - "JPYC": "#16449A", - "DASH": "#008CE7", - "RVN": "#384182", - "SAND": "#05C1F4", - "CADC": "#FF6666", - "DGB": "#0b77e1", - "DIA": "#B94897", - "DOT": "#E80082", - "FLUX": "#2B61D1", - "FIRO": "#BB2100", - "LBC": "#00775C", - "LDO": "#F69988", - "LOOM": "#48BEFF", - "LTC": "#BFBBBB", - "LUNA": "#FFD83D", - "LYNX": "#0071BA", - "LTFN": "#0099CC", - "MIR": "#2C9FEF", - "XPM": "#A67522", - "XVC": "#B50126", - "ZEC": "#ECB244", - "ZER": "#FFFFFF", - "NAV": "#7D59B5", - "DP": "#E41D25", - "ECA": "#A915DC", + "FTM": "#13B5EC", + "HECO": "#00953F", + "GLMR": "#F6007C", "QTUM": "#2E9AD0", - "UBQ": "#00EB90", - "CHIPS": "#598182", - "CIPHS": "#ECD900", - "AXE": "#C63877", - "PANGEA": "#D88245", - "JUMBLR": "#2B4649", - "DEX": "#43B7B6", - "CRYPTO": "#F58736", - "LABS": "#C1F6E1", - "LCC": "#068210", - "LNC": "#C3A635", - "MESH": "#0098DA", - "MGW": "#854F2F", - "MONA": "#DEC799", + "KCS": "#25AF90", + "KMD": "#7490AA", "MOVR": "#52CCC9", - "GLMR": "#F6007C", - "NMC": "#2286c0", - "NZDS": "#1B3044", - "RFOX": "#D83331", - "BOTS": "#F69B57", - "MC": "#E16428", - "MCL": "#EA0000", - "ILNSW": "#28873B", - "MM": "#F5B700", - "CCL": "#FFE400", - "BET": "#F69B57", - "JCHF": "#D80027", - "JEUR": "#003399", - "JGBP": "#C8102E", - "JJPY": "#BC002D", - "JRT": "#5EFC84", - "SUPERNET": "#F69B57", - "REVS": "#F69B57", - "EILN": "#1ADEC9", - "ILN": "#814EB1", - "VRSC": "#3164D3", - "WCN": "#E49F00", - "WWCN": "#E49F00", - "TFT": "#80C7CF", - "THC": "#819F6F", - "1INCH": "#95A7C5", - "BABYDOGE": "#F3AA47", - "BAT": "#FF5000", - "BUSD": "#F0B90B", - "HUSD": "#0075FB", - "DAI": "#B68900", - "USDC": "#317BCB", - "USDI": "#C29E47", - "USDT": "#26A17B", - "PAX": "#408C69", - "PAXG": "#DABE37", - "REN": "#595959", - "SMTF": "#F75836", - "SUSHI": "#E25DA8", - "TRYB": "#5c74d6", - "TUSD": "#2E3181", - "AWC": "#31A5F6", - "VRA": "#D70A41", - "SPACE": "#E44C65", - "QC": "#00D7B3", - "PBC": "#64A3CB", - "AAVE": "#9C64A6", - "ANT": "#33DAE6", - "AGIX": "#6815FF", - "BAND": "#526BFF", - "BLK": "#595959", - "IL8P": "#696969", - "BNT": "#0000FF", - "BTCZ": "#F5B036", - "CEL": "#4055A6", - "CELR": "#595959", - "CENNZ": "#2E87F1", - "CHTA": "#C3A634", - "COMP": "#00DBA3", - "CRO": "#445790", - "CVC": "#3AB03E", - "CVT": "#4B0082", - "PIC": "#04D9FF", - "DODO": "#FAF621", - "EFL": "#FF940B", - "EGLD": "#1D4CB5", - "ELF": "#2B5EBB", - "ENJ": "#6752C3", - "EURS": "#2F77ED", - "FIL": "#4CCAD2", - "FJC": "#00AFEC", - "FJCB": "#FFCC33", - "FUN": "#EF1C70", - "GNO": "#00B0CC", - "HOT": "#983EFF", - "HECO": "#00953F", - "IOTX": "#00CDCE", - "KNC": "#117980", - "LEO": "#F79B2C", - "LINK": "#356CE4", - "LRC": "#32C2F8", - "LSTR": "#7E3193", - "MANA": "#FF3C6C", "MATIC": "#804EE1", - "MKR": "#1BAF9F", - "MINDS": "#687DE3", - "NEAR": "#595959", - "NENG": "#BFBBBB", - "NEXO": "#A3B3D6", - "NVC": "#FCF96D", - "NYAN": "#008CE7", - "OCEAN": "#595959", - "OMG": "#595959", "ONE": "#00BEEE", - "ONT": "#2692AF", - "PND": "#EBD430", - "POWR": "#05BCAA", - "PPC": "#46BC60", - "PRUX": "#FF8000", - "PRCY": "#012828", - "QI": "#FFFFFF", - "QIAIR": "#FEFEFE", - "QKC": "#2175B4", - "QNT": "#000000", - "REP": "#0E0E21", - "REV": "#78034D", - "RLC": "#FFE100", - "RTM": "#B74427", "SBCH": "#74dd54", - "SIBM": "#0C4855", - "SFUSD": "#9881B8", - "SNT": "#596BED", - "SNX": "#00D1FF", - "SOL": "#7BFBB5", - "SOULJA": "#8F734A", - "STFIRO": "#00D4F7", - "STORJ": "#2683FF", - "SXP": "#FD5F3B", - "SYS": "#0084C7", - "TEL": "#1BD8FF", - "TKL": "#536E93", - "TON": "#0088CC", - "TRC": "#096432", - "TRX": "#F30031", - "TSL": "#64B082", - "UIS": "#008DCD", - "UNO": "#2F87BB", - "UST": "#5493F7", - "VAL": "#1EEC84", - "VET": "#18C6FF", - "VITE": "#007AFF", - "VRM": "#586A7A", - "VTC": "#049161", - "WSB": "#FEBB84", - "WAVES": "#016BFF", - "WBTC": "#CCCCCC", - "WHIVE": "#FFCC00", - "WOO": "#595959", - "XEC": "#273498", - "XEP": "#0277E5", - "XLM": "#737373", - "XMY": "#F01385", - "XRP": "#2E353D", - "XRG": "#162D50", - "XSGD": "#1048E5", - "XTZ": "#A8E000", - "XVS": "#F4BC54", - "YFI": "#006BE6", - "YFII": "#FF2A79", - "ZET": "#155169", - "ZIL": "#42BBB9", - "ZOMBIE": "#72B001", - "ZRX": "#302C2C", - "UNI": "#FF007A", - "USBL": "#279553", - "RUNES": "#336699", - "SIX": "#ed0909", - "NATURE": "#04cf13" + "UBQ": "#00EB90", }) } From fc17cceeea6753305daa15e44fb89456a0957d4b Mon Sep 17 00:00:00 2001 From: smk762 Date: Tue, 11 Apr 2023 00:09:31 +0800 Subject: [PATCH 72/80] rm leftover comma --- atomic_defi_design/Dex/Constants/Style.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atomic_defi_design/Dex/Constants/Style.qml b/atomic_defi_design/Dex/Constants/Style.qml index 13bb307ef7..d40019d988 100644 --- a/atomic_defi_design/Dex/Constants/Style.qml +++ b/atomic_defi_design/Dex/Constants/Style.qml @@ -282,6 +282,6 @@ QtObject { "MATIC": "#804EE1", "ONE": "#00BEEE", "SBCH": "#74dd54", - "UBQ": "#00EB90", + "UBQ": "#00EB90" }) } From 5a2e5ffa45e0c59a29b23b80f4485cd8866a8857 Mon Sep 17 00:00:00 2001 From: smk762 Date: Tue, 11 Apr 2023 16:52:56 +0800 Subject: [PATCH 73/80] allow theme based coin text color definitions --- atomic_defi_design/Dex/Constants/Style.qml | 145 +++++++++++------- .../Dex/Portfolio/AssetsList.qml | 2 +- 2 files changed, 91 insertions(+), 56 deletions(-) diff --git a/atomic_defi_design/Dex/Constants/Style.qml b/atomic_defi_design/Dex/Constants/Style.qml index d40019d988..642d778762 100644 --- a/atomic_defi_design/Dex/Constants/Style.qml +++ b/atomic_defi_design/Dex/Constants/Style.qml @@ -1,6 +1,7 @@ pragma Singleton import QtQuick 2.15 import Qaterial 1.0 as Qaterial +import Dex.Themes 1.0 as Dex QtObject { function setQaterialStyle() { @@ -65,7 +66,7 @@ QtObject { readonly property double hoverLightMultiplier: 1.5 readonly property double hoverOpacity: 0.6 - property bool dark_theme: true + property bool dark_theme: Dex.CurrentTheme.getColorMode() === Dex.CurrentTheme.ColorMode.Dark function applyOpacity(hex, opacity="00") { @@ -184,30 +185,31 @@ QtObject { { switch (type) { - case 'ERC-20': return colorCoin["ETH"] - case 'ZHTLC': return colorCoin["ARRR"] - case 'QRC-20': return colorCoin["QTUM"] - case 'Smart Chain': return colorCoin["KMD"] - case 'WALLET ONLY': return "#4D4D4D" - case 'UTXO': return colorCoin["BTC"] - case 'BEP-20': return colorCoin["BNB"] - case 'SLP': return colorCoin["BCH"] - case 'IDO': return colorCoin["TKL"] - case 'Matic': return colorCoin["MATIC"] - case 'Optimism': return "#BB2100" - case 'Arbitrum': return colorCoin["ETH"] - case 'AVX-20': return colorCoin["AVAX"] - case 'FTM-20': return colorCoin["FTM"] - case 'HRC-20': return colorCoin["ONE"] - case 'Ubiq': return colorCoin["UBQ"] - case 'KRC-20': return colorCoin["KCS"] - case 'Moonriver': return colorCoin["MOVR"] - case 'Moonbeam': return colorCoin["GLMR"] - case 'HecoChain': return colorCoin["HECO"] - case 'SmartBCH': return colorCoin["SBCH"] - case 'Ethereum Classic': return colorCoin["ETC"] - case 'RSK Smart Bitcoin': return colorCoin["BTC"] - default: return colorCoin["BTC"] + case 'IDO': return dark_theme ? colorCoinDark["IDO"] : colorCoin["IDO"] + case 'AVX-20': return dark_theme ? colorCoinDark["AVAX"] : colorCoin["AVAX"] + case 'ZHTLC': return dark_theme ? colorCoinDark["ARRR"] : colorCoin["ARRR"] + case 'COSMOS': return dark_theme ? colorCoinDark["ATOM"] : colorCoin["ATOM"] + case 'SLP': return dark_theme ? colorCoinDark["BCH"] : colorCoin["BCH"] + case 'BEP-20': return dark_theme ? colorCoinDark["BNB"] : colorCoin["BNB"] + case 'RSK Smart Bitcoin': return dark_theme ? colorCoinDark["UTXO"] : colorCoin["UTXO"] + case 'UTXO': return dark_theme ? colorCoinDark["UTXO"] : colorCoin["UTXO"] + case 'Ethereum Classic': return dark_theme ? colorCoinDark["ETC"] : colorCoin["ETC"] + case 'Arbitrum': return dark_theme ? colorCoinDark["ETH"] : colorCoin["ETH"] + case 'ERC-20': return dark_theme ? colorCoinDark["ETH"] : colorCoin["ETH"] + case 'FTM-20': return dark_theme ? colorCoinDark["FTM"] : colorCoin["FTM"] + case 'Moonbeam': return dark_theme ? colorCoinDark["GLMR"] : colorCoin["GLMR"] + case 'HecoChain': return dark_theme ? colorCoinDark["HECO"] : colorCoin["HECO"] + case 'QRC-20': return dark_theme ? colorCoinDark["QTUM"] : colorCoin["QTUM"] + case 'KRC-20': return dark_theme ? colorCoinDark["KCS"] : colorCoin["KCS"] + case 'Smart Chain': return dark_theme ? colorCoinDark["KMD"] : colorCoin["KMD"] + case 'Matic': return dark_theme ? colorCoinDark["MATIC"] : colorCoin["MATIC"] + case 'Moonriver': return dark_theme ? colorCoinDark["MOVR"] : colorCoin["MOVR"] + case 'HRC-20': return dark_theme ? colorCoinDark["ONE"] : colorCoin["ONE"] + case 'SmartBCH': return dark_theme ? colorCoinDark["SBCH"] : colorCoin["SBCH"] + case 'Ubiq': return dark_theme ? colorCoinDark["UBQ"] : colorCoin["UBQ"] + case 'Optimism': return "#BB2100" + case 'WALLET ONLY': return dark_theme ? colorCoinDark["WALLET ONLY"] : colorCoin["WALLET ONLY"] + default: return dark_theme ? colorCoinDark["default"] : colorCoin["default"] } } @@ -224,41 +226,46 @@ QtObject { { switch (type) { - case 'IDO': return "#536E93" - case 'AVX-20': return colorCoin["AVAX"] - case 'ZHTLC': return colorCoin["ARRR"] - case 'COSMOS': return colorCoin["ATOM"] - case 'SLP': return colorCoin["BCH"] - case 'BEP-20': return colorCoin["BNB"] - case 'RSK Smart Bitcoin': return colorCoin["BTC"] - case 'UTXO': return colorCoin["BTC"] - case 'Ethereum Classic': return colorCoin["ETC"] - case 'Arbitrum': return colorCoin["ETH"] - case 'ERC-20': return colorCoin["ETH"] - case 'FTM-20': return colorCoin["FTM"] - case 'Moonbeam': return colorCoin["GLMR"] - case 'HecoChain': return colorCoin["HECO"] - case 'QRC-20': return colorCoin["QTUM"] - case 'KRC-20': return colorCoin["KCS"] - case 'Smart Chain': return colorCoin["KMD"] - case 'Matic': return colorCoin["MATIC"] - case 'Moonriver': return colorCoin["MOVR"] - case 'HRC-20': return colorCoin["ONE"] - case 'SmartBCH': return colorCoin["SBCH"] - case 'Ubiq': return colorCoin["UBQ"] + case 'IDO': return dark_theme ? colorCoinDark["IDO"] : colorCoin["IDO"] + case 'AVX-20': return dark_theme ? colorCoinDark["AVAX"] : colorCoin["AVAX"] + case 'ZHTLC': return dark_theme ? colorCoinDark["ARRR"] : colorCoin["ARRR"] + case 'COSMOS': return dark_theme ? colorCoinDark["ATOM"] : colorCoin["ATOM"] + case 'SLP': return dark_theme ? colorCoinDark["BCH"] : colorCoin["BCH"] + case 'BEP-20': return dark_theme ? colorCoinDark["BNB"] : colorCoin["BNB"] + case 'RSK Smart Bitcoin': return dark_theme ? colorCoinDark["UTXO"] : colorCoin["UTXO"] + case 'UTXO': return dark_theme ? colorCoinDark["UTXO"] : colorCoin["UTXO"] + case 'Ethereum Classic': return dark_theme ? colorCoinDark["ETC"] : colorCoin["ETC"] + case 'Arbitrum': return dark_theme ? colorCoinDark["ETH"] : colorCoin["ETH"] + case 'ERC-20': return dark_theme ? colorCoinDark["ETH"] : colorCoin["ETH"] + case 'FTM-20': return dark_theme ? colorCoinDark["FTM"] : colorCoin["FTM"] + case 'Moonbeam': return dark_theme ? colorCoinDark["GLMR"] : colorCoin["GLMR"] + case 'HecoChain': return dark_theme ? colorCoinDark["HECO"] : colorCoin["HECO"] + case 'QRC-20': return dark_theme ? colorCoinDark["QTUM"] : colorCoin["QTUM"] + case 'KRC-20': return dark_theme ? colorCoinDark["KCS"] : colorCoin["KCS"] + case 'Smart Chain': return dark_theme ? colorCoinDark["KMD"] : colorCoin["KMD"] + case 'Matic': return dark_theme ? colorCoinDark["MATIC"] : colorCoin["MATIC"] + case 'Moonriver': return dark_theme ? colorCoinDark["MOVR"] : colorCoin["MOVR"] + case 'HRC-20': return dark_theme ? colorCoinDark["ONE"] : colorCoin["ONE"] + case 'SmartBCH': return dark_theme ? colorCoinDark["SBCH"] : colorCoin["SBCH"] + case 'Ubiq': return dark_theme ? colorCoinDark["UBQ"] : colorCoin["UBQ"] case 'Optimism': return "#BB2100" - case 'WALLET ONLY': return "#4D4D4D" - default: return dark_theme ? "#FFFFFF" : "#456078" + case 'WALLET ONLY': return dark_theme ? colorCoinDark["WALLET ONLY"] : colorCoin["WALLET ONLY"] + default: return dark_theme ? colorCoinDark["default"] : colorCoin["default"] } } function getCoinColor(ticker) { let info = API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker) + if (!info.type) { return dark_theme ? colorCoin["default"] : colorCoinDark["default"] } let color = getCoinGroupTextColor(info.type) let base_ticker = atomic_qt_utilities.retrieve_main_ticker(ticker) - if (colorCoin.hasOwnProperty(base_ticker)) + if (colorCoin.hasOwnProperty(base_ticker) && !dark_theme) + { + return colorCoin[base_ticker] + } + if (colorCoinDark.hasOwnProperty(base_ticker) && dark_theme) { - color = colorCoin[base_ticker] + return colorCoinDark[base_ticker] } return color } @@ -267,9 +274,33 @@ QtObject { "ARRR": "#C7A34C", "ATOM": "#963b9a", "AVAX": "#E84142", - "BNB": "#f0900b", + "BNB": "#b35900", + "BCH": "#8DC351", + "ETC": "#328432", + "ETH": "#687DE3", + "FTM": "#13B5EC", + "HECO": "#00953F", + "GLMR": "#F6007C", + "QTUM": "#2E9AD0", + "KCS": "#25AF90", + "KMD": "#2d4f86", + "MOVR": "#52CCC9", + "MATIC": "#804EE1", + "ONE": "#00BEEE", + "SBCH": "#74dd54", + "UBQ": "#00EB90", + "UTXO": "#349d5f", + "default": "#2f2f2f", + "IDO": "#536E93", + "WALLET ONLY": "#404040" + }) + + readonly property var colorCoinDark: ({ + "ARRR": "#C7A34C", + "ATOM": "#963b9a", + "AVAX": "#E84142", + "BNB": "#ffc266", "BCH": "#8DC351", - "BTC": "#E9983C", "ETC": "#328432", "ETH": "#687DE3", "FTM": "#13B5EC", @@ -277,11 +308,15 @@ QtObject { "GLMR": "#F6007C", "QTUM": "#2E9AD0", "KCS": "#25AF90", - "KMD": "#7490AA", + "KMD": "#799bd2", "MOVR": "#52CCC9", "MATIC": "#804EE1", "ONE": "#00BEEE", "SBCH": "#74dd54", - "UBQ": "#00EB90" + "UBQ": "#00EB90", + "UTXO": "#349d5f", + "default": "#c8c8c8", + "IDO": "#536E93", + "WALLET ONLY": "#cccccc" }) } diff --git a/atomic_defi_design/Dex/Portfolio/AssetsList.qml b/atomic_defi_design/Dex/Portfolio/AssetsList.qml index 9bf89b1623..2ee0e4582e 100644 --- a/atomic_defi_design/Dex/Portfolio/AssetsList.qml +++ b/atomic_defi_design/Dex/Portfolio/AssetsList.qml @@ -165,7 +165,7 @@ Dex.DexListView text: model.type font: Dex.DexTypo.overLine opacity: .7 - color: Dex.Style.getCoinTypeColor(model.type) + color: Dex.Style.getCoinColor(ticker) Dex.DexLabel { From 59fe417f62488f47e4b3abbd9504862fb0cb995b Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 12 Apr 2023 17:30:43 +0800 Subject: [PATCH 74/80] Set BTC-segwit to wallet only --- src/core/atomicdex/constants/dex.constants.hpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/core/atomicdex/constants/dex.constants.hpp b/src/core/atomicdex/constants/dex.constants.hpp index 2a9581bfcb..22944920db 100644 --- a/src/core/atomicdex/constants/dex.constants.hpp +++ b/src/core/atomicdex/constants/dex.constants.hpp @@ -11,7 +11,6 @@ namespace atomic_dex g_primary_dex_coin, g_second_primary_dex_coin, "VOTE2023", - "KIP0001", "BTC" }; inline const std::vector g_wallet_only_coins{ @@ -32,7 +31,7 @@ namespace atomic_dex "REVS", "SUPERNET", "XPM", - "KIP0001", + "BTC-segwit", "VOTE2023", "ATOM" }; From 6b22de9e36494c753f9e6988f29675c1868773e4 Mon Sep 17 00:00:00 2001 From: smk762 Date: Wed, 12 Apr 2023 23:10:07 +0800 Subject: [PATCH 75/80] fix filename error for smart chain icon --- atomic_defi_design/Dex/Constants/General.qml | 7 +- .../assets/languages/atomic_defi_de.ts | 385 ++++++++--------- .../assets/languages/atomic_defi_en.ts | 379 ++++++++--------- .../assets/languages/atomic_defi_es.ts | 385 ++++++++--------- .../assets/languages/atomic_defi_fr.ts | 389 +++++++++--------- .../assets/languages/atomic_defi_ru.ts | 387 ++++++++--------- .../assets/languages/atomic_defi_tr.ts | 389 +++++++++--------- 7 files changed, 1190 insertions(+), 1131 deletions(-) diff --git a/atomic_defi_design/Dex/Constants/General.qml b/atomic_defi_design/Dex/Constants/General.qml index 0dd9eac874..dfc2128cf2 100644 --- a/atomic_defi_design/Dex/Constants/General.qml +++ b/atomic_defi_design/Dex/Constants/General.qml @@ -32,8 +32,13 @@ QtObject { { return coin_icons_path + ticker.toString().toLowerCase().replace('-', '_') + ".png" } + if (['SMART CHAIN'].indexOf(ticker) >= 0) + { + return coin_icons_path + ticker.toString().toLowerCase().replace(' ', '_') + ".png" + } const coin_info = API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker) - return (coin_info.is_custom_coin ? custom_coin_icons_path : coin_icons_path) + atomic_qt_utilities.retrieve_main_ticker(ticker.toString()).toLowerCase() + ".png" + let icon = atomic_qt_utilities.retrieve_main_ticker(ticker.toString()).toLowerCase() + ".png" + return (coin_info.is_custom_coin ? custom_coin_icons_path : coin_icons_path) + icon } } diff --git a/atomic_defi_design/assets/languages/atomic_defi_de.ts b/atomic_defi_design/assets/languages/atomic_defi_de.ts index 47450a6cc9..9c2a9587b7 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_de.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_de.ts @@ -4,53 +4,53 @@ AddAddressForm - + Use standard network address Standard-Netzwerkadresse verwenden - + Label Bezeichnung - + This key already exists. Dieser Schlüssel existiert bereits. - + Address Adresse - - + + Cancel Abbrechen - + Convert Umwandeln - + Edit Bearbeiten - + Add Hinzufügen - + You need to enable %1 before adding this kind of address. Sie müssen %1 aktivieren, bevor Sie diese Art von Adresse hinzufügen. - + Enable Aktivieren @@ -307,7 +307,7 @@ - + Price provider is: %1 Preisanbieter ist: %1 @@ -502,14 +502,19 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 Chart - + Loading market data Laden von Marktdaten - - There is no chart data for this pair yet - Für dieses Paar liegen noch keine Chartdaten vor + + There is no chart data for this pair + + + + + There is no chart data for %1 (testcoin) pairs + @@ -738,78 +743,78 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456Bestätigen Sie die Austausch-Details - + Trade price is more than 50% different to CEX! Confirm? Der Handelspreis unterscheidet sich um mehr als 50% vom CEX-Preis. Bestätigen? - + This swap request can not be undone and is a final event! Diese Tauschanfrage kann nicht rückgängig gemacht werden und ist ein endgültiges Ereignis! - + This transaction can take up to 60 mins - DO NOT close this application! Diese Transaktion kann bis zu 60 Minuten dauern - schließen Sie diese Anwendung NICHT! - + Loading fees... Lade Gebühren... - + <b>Total %1 fees:</b> <b>Gesamt %1 Gebühren:</b> - + Security configuration Sicherheitskonfiguration - + %1 confirmations for incoming %2 transactions %1 Bestätigungen für eingehende %2 Transaktionen - + Read more about dPoW Lesen Sie mehr über dPoW - + Use custom protection settings for incoming %1 transactions TICKER Benutzerdefinierte Schutzeinstellungen für eingehende %1 Transaktionen verwenden - + Enable Komodo dPoW security Komodo dPoW-Sicherheit aktivieren - + dPoW protected dPoW-gesichert - + Required Confirmations Erforderliche Bestätigungen - + Warning, this atomic swap is not dPoW protected! Achtung, dieser Atomic Swap ist nicht dPoW-geschützt! - + Cancel Abbrechen - + Confirm Bestätigen @@ -825,182 +830,182 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 Dashboard - + The current number of enabled coins does not match your configuration specification. Your assets configuration will be reset. Die aktuelle Anzahl aktivierter Coins stimmt nicht mit Ihrer Konfigurationsvorgabe überein. Die Konfiguration der Assets wird zurückgesetzt. - + Matching Zusammenführung - + Order Matching Order wird zusammengeführt - + Matched Zusammengeführt - + Order Matched Order wurde zusammengeführt - + Ongoing Laufend - + Swap Ongoing Austausch läuft - + Successful Erfolgreich - + Swap Successful Tausch erfolgreich - + Refunding Rückzahlung - + Failed Fehlgeschlagen - + Swap Failed Tausch fehlgeschlagen - + Unknown Unbekannt - + Unknown State Unbekannter Status - + Started Gestartet - + Negotiated Ausgehandelt - + Taker fee sent Taker-Gebühr gesendet - + Maker payment received Maker-Zahlung erhalten - + Maker payment wait confirm started Warten auf die Zahlungsbestätigung des Makers gestartet - + Maker payment validated and confirmed Maker-Zahlung validiert und bestätigt - + Taker payment sent Taker-Zahlung gesendet - + Taker payment spent Taker-Zahlung ausgegeben - + Maker payment spent Maker-Zahlung ausgegeben - + Finished Fertig - + Start failed Start fehlgeschlagen - + Negotiate failed Verhandeln fehlgeschlagen - + Taker fee validate failed Validierung der Abnehmergebühr fehlgeschlagen - + Maker payment transaction failed Maker-Zahlungstransaktion fehlgeschlagen - + Maker payment Data send failed Fehler beim Senden der Maker-Zahlungsdaten - + Maker payment wait confirm failed Warten auf die Zahlungsbestätigung des Makers fehlgeschlagen - + Taker payment validate failed Validierung der Taker-Zahlung fehlgeschlagen - + Taker payment wait confirm failed Warten auf die Zahlungsbestätigung des Takers fehlgeschlagen - + Taker payment spend failed Zahlungsausgabe des Takers fehlgeschlagen - + Maker payment wait refund started Countdown für die Rückerstattung der Maker-Zahlung hat begonnen - + Maker payment refunded Maker-Zahlung zurückerstattet - + Maker payment refund failed Rückerstattung der Maker-Zahlung fehlgeschlagen @@ -1385,7 +1390,7 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 General - + %n day(s) %n Tag @@ -1393,7 +1398,7 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 - + %nd day @@ -1402,7 +1407,7 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 - + %nh hours @@ -1411,7 +1416,7 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 - + %nm minutes @@ -1420,7 +1425,7 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 - + %ns seconds @@ -1429,7 +1434,7 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 - + %nms milliseconds @@ -1438,117 +1443,117 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 - + - - - + <b>Taker tx fee:</b> <b>Taker tx Gebühren:</b> - + <b>Dex tx fee:</b> <b>Dex tx Gebühren:</b> - + <b>Dex fee:</b> <b>Dex Gebühren:</b> - + <b>Maker tx fee:</b> <b>Maker tx Gebühren:</b> - + %1 balance is zero - + Activating %1 (%2%) - + Loading wallet... - + Min: %1 Minimum: %1 - + Enter an amount Betrag eingeben - + Trading Fee Handelsgebühr - + Minimum Trading Amount Mindesthandelsbetrag - + Wallet %1 already exists WALLETNAME Brieftasche %1 existiert bereits - + %1 balance is lower than the fees amount: %2 %3 Das %1 Guthaben ist niedriger als der Gebührenbetrag: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount Handelbares %1 Guthaben (nach Gebühren) ist niedriger als der Mindesthandelsbetrag - + Please fill the price field Bitte füllen Sie das Preisfeld aus - + Please fill the volume field - - + + Please wait for %1 to fully activate - - + + %1 volume is lower than minimum trade amount %1 Volumen ist niedriger als der minimale Handelsbetrag - - + + %1 needs to be enabled in order to use %2 %1 muss aktiviert werden, um %2 verwenden zu können - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions Das %1 Guthaben muss finanziert werden, ein Guthaben größer Null ist erforderlich, um das Benzin von %2 Transaktionen zu bezahlen - + Unknown Error Unbekannter Fehler @@ -1745,10 +1750,15 @@ Try again or select 'Allow custom seed' to continue. ListDelegate - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> %1 ist nicht aktiviert - Möchten Sie es aktivieren, um die günstigsten Order von %2 auswählen zu können? <br><a href='#'>Ja</a> - <a href='#no'>Nein</a> + + + %1 is not enabled - Please enable it through the coin activation menu + + This order requires a minimum amount of %1 %2 <br>You don't have enough funds.<br> %3 @@ -1876,11 +1886,6 @@ They will be removed from the orderbook until you log in again. Change 24hr 24h Veränderung - - - Porfolio - Portfolio - Contract Address @@ -1912,10 +1917,16 @@ They will be removed from the orderbook until you log in again. Empfangen + Swap Tausch + + + Portfolio + Portfolio + is wallet only @@ -1979,29 +1990,24 @@ They will be removed from the orderbook until you log in again. Klicken Sie hier, um Ihre Adresse im %1 (%2) Block-Explorer anzuzeigen - - Trade - Handeln - - - + Trading Information Handelsinformationen - + Chart Chart - - + + Orders Order - - + + History Historie @@ -2129,17 +2135,17 @@ They will be removed from the orderbook until you log in again. NewContactPopup - + Contact name Kontaktname - + This contact name already exists. Dieser Kontaktname existiert bereits. - + + ADD + HINZUFÜGEN @@ -2296,32 +2302,32 @@ They will be removed from the orderbook until you log in again. Ihre Seed-Phrase ist wichtig – deshalb stellen wir gerne sicher, dass sie korrekt ist. Wir stellen Ihnen drei verschiedene Fragen zu Ihrer Seed-Phrase, um sicherzustellen, dass Sie Ihre Wallet jederzeit problemlos wiederherstellen können. - + Enter the Geben Sie das - + word Wort ein - + Check Prüfen - + Enter password - + Enter the same password to confirm Geben Sie zur Bestätigung dasselbe Kennwort ein - + Continue Fortsetzen @@ -2526,18 +2532,13 @@ They will be removed from the orderbook until you log in again. - Volume - Volumen - - - - Amount to sell - Zu verkaufender Betrag + Send + Senden - - Amount to receive - Zu erhaltender Betrag + + Receive + Empfangen @@ -2619,114 +2620,104 @@ They will be removed from the orderbook until you log in again. OrderModal - - Swap Details - Tauschdetails - - - - Order Details - Orderdetails - - - + Order Type Orderart - + Maker Order Maker-Order - + Taker Order Taker-Order - + Refund State Rückerstattungsstatus - + Your swap failed but the auto-refund process for your payment started already. Please wait and keep application opened until you receive your payment back Ihr Umtausch ist fehlgeschlagen, aber der automatische Rückerstattungsprozess für Ihre Zahlung hat bereits begonnen. Bitte warten Sie und lassen Sie die Anwendung geöffnet, bis Sie Ihre Zahlung zurückerhalten - + Date Datum - + Error ID Fehler-ID - - + + Error Log Fehlerprotokoll - + Close Schließen - + Cancel Order Order Abbrechen - - + + Swap ID Swap ID - + Maker Payment Sent Transaction ID Maker-Zahlung gesendet: Transaktions-ID - + Maker Payment Spent Transaction ID Maker-Zahlung ausgegeben: Transaktions-ID - + Maker Payment TXID Maker-Zahlung: TXID - + Taker Payment Spent Transaction ID Taker-Zahlung ausgegeben: Transaktions-ID - + Taker Payment Sent Transaction ID Taker-Zahlung gesendet: Transaktions-ID - + Taker Payment TXID Taker-Zahlung: TXID - + Recover Funds Rückerstattung der Geldmittel - + Refunding... Rückzahlung… - + View on Explorer Ansicht im Explorer @@ -2755,42 +2746,42 @@ Bitte wählen Sie eine neue Order aus. OrdersPage - + Filter Filter - + Date Datum - + Export CSV CSV exportieren - + Apply Filter Filter anwenden - + Cancel All Alles stornieren - + From Von - + To Bis - + Please choose the CSV export name and location Bitte wählen Sie den CSV-Exportnamen und den Speicherort aus @@ -2872,12 +2863,12 @@ Bitte wählen Sie eine neue Order aus. Asset suchen - + Show only coins with balance Nur Coins mit Guthaben anzeigen - + (%1/%2) (%1/%2) @@ -3109,17 +3100,17 @@ Bitte wählen Sie eine neue Order aus. RestartModal - + Applying the changes... Übernehmen der Änderungen... - + Restarting the application. %1 Neustart der Anwendung. %1 - + Restarting the application... Neustart der Anwendung... @@ -3649,12 +3640,12 @@ Bitte wählen Sie eine neue Order aus. Sidebar - + Search Suchen - + ADD CRYPTO @@ -3687,10 +3678,15 @@ Bitte wählen Sie eine neue Order aus. CEX-Kurs - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> %1 ist nicht aktiviert - Möchten Sie es aktivieren, um die günstigsten Order von %2 auswählen zu können? <br><a href='#'>Ja</a> - <a href='#no'>Nein</a> + + + %1 is not enabled - Please enable it through the coin activation menu + + SubCoinSelector @@ -3787,7 +3783,7 @@ Bitte wählen Sie eine neue Order aus. SubOrders - + Orders Order @@ -3832,12 +3828,12 @@ Bitte wählen Sie eine neue Order aus. Abbrechen - + Apply filter Filter anwenden - + No results found Keine Ergebnisse gefunden @@ -4057,6 +4053,19 @@ Die Netzwerkgebühren können je nach ausgewähltem Handelspaar stark variieren. Klicken Sie hier, um die Details anzuzeigen + + TotalView + + + Receive %1 + + + + + Send %1 + + + Trade @@ -4472,7 +4481,7 @@ This might take a few minutes... atomic_dex::settings_page - + An error has occurred. @@ -4548,7 +4557,7 @@ This might take a few minutes... Abmelden - + Balance Balance diff --git a/atomic_defi_design/assets/languages/atomic_defi_en.ts b/atomic_defi_design/assets/languages/atomic_defi_en.ts index 1c7bae05ce..2db436f1bd 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_en.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_en.ts @@ -4,53 +4,53 @@ AddAddressForm - + Use standard network address - + Label - + This key already exists. - + Address - - + + Cancel Cancel - + Convert - + Edit - + Add - + You need to enable %1 before adding this kind of address. - + Enable @@ -307,7 +307,7 @@ - + Price provider is: %1 @@ -501,13 +501,18 @@ Chart - + Loading market data - - There is no chart data for this pair yet + + There is no chart data for this pair + + + + + There is no chart data for %1 (testcoin) pairs @@ -737,78 +742,78 @@ - + Trade price is more than 50% different to CEX! Confirm? - + This swap request can not be undone and is a final event! - + This transaction can take up to 60 mins - DO NOT close this application! - + Loading fees... - + <b>Total %1 fees:</b> - + Security configuration - + %1 confirmations for incoming %2 transactions - + Read more about dPoW - + Use custom protection settings for incoming %1 transactions TICKER - + Enable Komodo dPoW security - + dPoW protected - + Required Confirmations - + Warning, this atomic swap is not dPoW protected! - + Cancel Cancel - + Confirm @@ -824,182 +829,182 @@ Dashboard - + The current number of enabled coins does not match your configuration specification. Your assets configuration will be reset. - + Matching - + Order Matching - + Matched - + Order Matched - + Ongoing - + Swap Ongoing - + Successful - + Swap Successful - + Refunding - + Failed - + Swap Failed - + Unknown - + Unknown State - + Started - + Negotiated - + Taker fee sent - + Maker payment received - + Maker payment wait confirm started - + Maker payment validated and confirmed - + Taker payment sent - + Taker payment spent - + Maker payment spent - + Finished - + Start failed - + Negotiate failed - + Taker fee validate failed - + Maker payment transaction failed - + Maker payment Data send failed - + Maker payment wait confirm failed - + Taker payment validate failed - + Taker payment wait confirm failed - + Taker payment spend failed - + Maker payment wait refund started - + Maker payment refunded - + Maker payment refund failed @@ -1384,7 +1389,7 @@ General - + %n day(s) @@ -1392,7 +1397,7 @@ - + %nd day @@ -1401,7 +1406,7 @@ - + %nh hours @@ -1410,7 +1415,7 @@ - + %nm minutes @@ -1419,7 +1424,7 @@ - + %ns seconds @@ -1428,7 +1433,7 @@ - + %nms milliseconds @@ -1437,117 +1442,117 @@ - + - - + <b>Taker tx fee:</b> - + <b>Dex tx fee:</b> - + <b>Dex fee:</b> - + <b>Maker tx fee:</b> - + %1 balance is zero - + Activating %1 (%2%) - + Loading wallet... - + Min: %1 - + Enter an amount - + Trading Fee - + Minimum Trading Amount - + Wallet %1 already exists WALLETNAME - + %1 balance is lower than the fees amount: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount - + Please fill the price field - + Please fill the volume field - - + + Please wait for %1 to fully activate - - + + %1 volume is lower than minimum trade amount - - + + %1 needs to be enabled in order to use %2 - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions - + Unknown Error @@ -1744,10 +1749,15 @@ Try again or select 'Allow custom seed' to continue. ListDelegate - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> + + + %1 is not enabled - Please enable it through the coin activation menu + + This order requires a minimum amount of %1 %2 <br>You don't have enough funds.<br> %3 @@ -1875,11 +1885,6 @@ They will be removed from the orderbook until you log in again. Change 24hr - - - Porfolio - - Contract Address @@ -1911,10 +1916,16 @@ They will be removed from the orderbook until you log in again. + Swap + + + Portfolio + + is wallet only @@ -1978,29 +1989,24 @@ They will be removed from the orderbook until you log in again. - - Trade - - - - + Trading Information - + Chart - - + + Orders - - + + History @@ -2128,17 +2134,17 @@ They will be removed from the orderbook until you log in again. NewContactPopup - + Contact name - + This contact name already exists. - + + ADD @@ -2295,32 +2301,32 @@ They will be removed from the orderbook until you log in again. - + Enter the - + word - + Check - + Enter password - + Enter the same password to confirm - + Continue @@ -2525,17 +2531,12 @@ They will be removed from the orderbook until you log in again. - Volume - - - - - Amount to sell + Send - - Amount to receive + + Receive @@ -2618,114 +2619,104 @@ They will be removed from the orderbook until you log in again. OrderModal - - Swap Details - - - - - Order Details - - - - + Order Type - + Maker Order - + Taker Order - + Refund State - + Your swap failed but the auto-refund process for your payment started already. Please wait and keep application opened until you receive your payment back - + Date - + Error ID - - + + Error Log - + Close - + Cancel Order - - + + Swap ID - + Maker Payment Sent Transaction ID - + Maker Payment Spent Transaction ID - + Maker Payment TXID - + Taker Payment Spent Transaction ID - + Taker Payment Sent Transaction ID - + Taker Payment TXID - + Recover Funds - + Refunding... - + View on Explorer @@ -2753,42 +2744,42 @@ Please select a new order. OrdersPage - + Filter - + Date - + Export CSV - + Apply Filter - + Cancel All - + From - + To - + Please choose the CSV export name and location @@ -2870,12 +2861,12 @@ Please select a new order. - + Show only coins with balance - + (%1/%2) @@ -3107,17 +3098,17 @@ Please select a new order. RestartModal - + Applying the changes... - + Restarting the application. %1 - + Restarting the application... @@ -3647,12 +3638,12 @@ Please select a new order. Sidebar - + Search - + ADD CRYPTO @@ -3685,10 +3676,15 @@ Please select a new order. - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> + + + %1 is not enabled - Please enable it through the coin activation menu + + SubCoinSelector @@ -3785,7 +3781,7 @@ Please select a new order. SubOrders - + Orders @@ -3830,12 +3826,12 @@ Please select a new order. Cancel - + Apply filter - + No results found @@ -4039,6 +4035,19 @@ Network fees can vary greatly depending on your selected trading pair. + + TotalView + + + Receive %1 + + + + + Send %1 + + + Trade @@ -4454,7 +4463,7 @@ This might take a few minutes... atomic_dex::settings_page - + An error has occurred. @@ -4530,7 +4539,7 @@ This might take a few minutes... - + Balance diff --git a/atomic_defi_design/assets/languages/atomic_defi_es.ts b/atomic_defi_design/assets/languages/atomic_defi_es.ts index fe0b09d3c6..45a6fb7d48 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_es.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_es.ts @@ -4,53 +4,53 @@ AddAddressForm - + Use standard network address Utilice la dirección de red - + Label Etiqueta - + This key already exists. Esta clave ya existe. - + Address Dirección - - + + Cancel Cancelar - + Convert Convertir - + Edit Editar - + Add Agregar - + You need to enable %1 before adding this kind of address. Debe habilitar %1 antes de agregar este tipo de dirección. - + Enable Habilitar @@ -307,7 +307,7 @@ Activando: - + Price provider is: %1 El proveedor de precios es: %1 @@ -501,14 +501,19 @@ Chart - + Loading market data Cargando datos de mercado - - There is no chart data for this pair yet - Todavía no hay datos de gráficos para este par + + There is no chart data for this pair + + + + + There is no chart data for %1 (testcoin) pairs + @@ -737,78 +742,78 @@ Confirmar Detalles de Intercambio - + Trade price is more than 50% different to CEX! Confirm? ¡El precio comercial es más del 50% diferente al de CEX! ¿Confirmar? - + This swap request can not be undone and is a final event! ¡Esta solicitud de intercambio no se puede deshacer y es un evento final! - + This transaction can take up to 60 mins - DO NOT close this application! Esta transacción puede demorar hasta 60 minutos. ¡NO cierre esta aplicación! - + Loading fees... Cargando tarifas... - + <b>Total %1 fees:</b> <b>Cuota total de %1:</b> - + Security configuration Configuración de seguridad - + %1 confirmations for incoming %2 transactions %1 confirmaciones para %2 transacciones entrantes - + Read more about dPoW Obtenga más información sobre dPoW - + Use custom protection settings for incoming %1 transactions TICKER Utilice configuraciones de protección personalizadas para %1 transacciones entrantes - + Enable Komodo dPoW security Habilite la seguridad dPoW de Komodo - + dPoW protected Protegido por dPoW - + Required Confirmations Confirmaciones Requeridas - + Warning, this atomic swap is not dPoW protected! Advertencia, este intercambio atómico no está protegido por dPoW! - + Cancel Cancelar - + Confirm Confirmar @@ -824,182 +829,182 @@ Dashboard - + The current number of enabled coins does not match your configuration specification. Your assets configuration will be reset. El número actual de monedas habilitadas no coincide con su especificación de configuración. Se restablecerá la configuración de sus activos. - + Matching Emparejando - + Order Matching Emparejando Orden - + Matched Emparejado - + Order Matched Orden Emparejada - + Ongoing En Curso - + Swap Ongoing Intercambio En Curso - + Successful Exitoso - + Swap Successful Intercambio exitoso - + Refunding Reembolso - + Failed Fallo - + Swap Failed Intercambio fallido - + Unknown Desconocido - + Unknown State Estado Desconocido - + Started Iniciado - + Negotiated Negociado - + Taker fee sent Tarifa taker enviada - + Maker payment received Pago de maker recibido - + Maker payment wait confirm started Inicio de espera de confirmacion de pago de maker - + Maker payment validated and confirmed Validacion y confirmacion de pago de maker - + Taker payment sent Pago de taker enviado - + Taker payment spent Pago del taker gastado - + Maker payment spent Pago del maker gastado - + Finished Terminado - + Start failed Inicio fallido - + Negotiate failed Negociacion fallida - + Taker fee validate failed Validación de tarifa del taker fallida - + Maker payment transaction failed Transacción de pago de maker fallo - + Maker payment Data send failed Envio de data de pago de maker fallo - + Maker payment wait confirm failed Espera de confirmacion de pago de maker fallo - + Taker payment validate failed Validacion de pago de taker fallo - + Taker payment wait confirm failed Espera de confirmacion de pago de taker fallo - + Taker payment spend failed Gasto de pago de taker fallo - + Maker payment wait refund started Reembolso de espera de pago de maker iniciado - + Maker payment refunded Pago de maker reembolsado - + Maker payment refund failed Reembolso del pago de maker fallo @@ -1384,7 +1389,7 @@ General - + %n day(s) %n día @@ -1392,7 +1397,7 @@ - + %nd day @@ -1401,7 +1406,7 @@ - + %nh hours @@ -1410,7 +1415,7 @@ - + %nm minutes @@ -1419,7 +1424,7 @@ - + %ns seconds @@ -1428,7 +1433,7 @@ - + %nms milliseconds @@ -1437,117 +1442,117 @@ - + - - - + <b>Taker tx fee:</b> <b>Cuota de tx del taker:</b> - + <b>Dex tx fee:</b> <b>Cuota de tx del Dex:</b> - + <b>Dex fee:</b> <b>Cuota Dex:</b> - + <b>Maker tx fee:</b> <b>Cuota tx del maker:</b> - + %1 balance is zero - + Activating %1 (%2%) - + Loading wallet... - + Min: %1 Mín.: %1 - + Enter an amount Ingrese una cantidad - + Trading Fee Tarifa de Intercambio - + Minimum Trading Amount Cantidad Mínima de Intercambio - + Wallet %1 already exists WALLETNAME Monedero %1 ya existe - + %1 balance is lower than the fees amount: %2 %3 El saldo de %1 es inferior al monto de las tarifas: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount El saldo de %1 (después de las tarifas) es inferior al monto mínimo de intercambio - + Please fill the price field Por favor complete el campo de precio - + Please fill the volume field Complete el campo de volumen - - + + Please wait for %1 to fully activate Espere a que %1 se active por completo - - + + %1 volume is lower than minimum trade amount El volumen de %1 es inferior al monto mínimo de intercambio - - + + %1 needs to be enabled in order to use %2 %1 debe habilitarse para usar %2 - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions se debe rellenar el saldo de %1, se requiere un saldo distinto de cero para pagar el gas de %2 transacciones - + Unknown Error Error Desconocido @@ -1745,10 +1750,15 @@ Vuelva a intentarlo o seleccione 'Permitir semilla personalizada' pers ListDelegate - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> %1 no está habilitado. ¿Desea habilitarlo para poder seleccionar %2 mejores ordenes?<br><a href='#'>Sí</a> - <a href='#no'>No</a> + + + %1 is not enabled - Please enable it through the coin activation menu + + This order requires a minimum amount of %1 %2 <br>You don't have enough funds.<br> %3 @@ -1878,11 +1888,6 @@ Se eliminarán del libro de pedidos hasta que vuelva a iniciar sesión.Change 24hr Cambio - - - Porfolio - Cartera - Contract Address @@ -1914,10 +1919,16 @@ Se eliminarán del libro de pedidos hasta que vuelva a iniciar sesión.Recibir + Swap Intercambiar + + + Portfolio + Cartera + is wallet only @@ -1981,29 +1992,24 @@ Se eliminarán del libro de pedidos hasta que vuelva a iniciar sesión.Haga clic para ver su dirección en %1 (%2) explorador de bloques - - Trade - Intercambio - - - + Trading Information Información de Intercambios - + Chart Gráfico - - + + Orders Pedidos - - + + History Historial @@ -2131,17 +2137,17 @@ Se eliminarán del libro de pedidos hasta que vuelva a iniciar sesión. NewContactPopup - + Contact name Nombre - + This contact name already exists. Este nombre de contacto ya existe. - + + ADD + Añadir @@ -2298,32 +2304,32 @@ Se eliminarán del libro de pedidos hasta que vuelva a iniciar sesión.Su frase semilla es importante, por eso nos gusta asegurarnos de que sea correcta. Le haremos tres preguntas diferentes sobre su frase semilla para asegurarnos de que podrá restaurar fácilmente su billetera cuando lo desee. - + Enter the Ingresa la - + word palabra - + Check Verificar - + Enter password - + Enter the same password to confirm Ingrese la misma contraseña para confirmar - + Continue Continuar @@ -2528,18 +2534,13 @@ Se eliminarán del libro de pedidos hasta que vuelva a iniciar sesión. - Volume - Volumen - - - - Amount to sell - Importe para vender + Send + Enviar - - Amount to receive - Importe para recibir + + Receive + Recibir @@ -2621,114 +2622,104 @@ Se eliminarán del libro de pedidos hasta que vuelva a iniciar sesión. OrderModal - - Swap Details - Detalles de Intercambio - - - - Order Details - Detalles de Orden - - - + Order Type Tipo de Orden - + Maker Order Orden de Maker - + Taker Order Orden de Taker - + Refund State Estado del Reembolso - + Your swap failed but the auto-refund process for your payment started already. Please wait and keep application opened until you receive your payment back Su intercambio falló, pero el proceso de reembolso automático para su pago ya comenzó. Espere y mantenga la aplicación abierta hasta que reciba su pago - + Date Fecha - + Error ID ID de Error - - + + Error Log Registro de Error - + Close Cerrar - + Cancel Order Cancelar Pedido - - + + Swap ID ID de Intercambio - + Maker Payment Sent Transaction ID ID de la transacción pago enviada de Maker - + Maker Payment Spent Transaction ID ID de la transacción pago gastado de Maker - + Maker Payment TXID TXID del pago de Maker - + Taker Payment Spent Transaction ID ID de la transacción pago gastado de Taker - + Taker Payment Sent Transaction ID ID de la transacción pago enviada de Taker - + Taker Payment TXID TXID del pago de Taker - + Recover Funds Recuperar fondos - + Refunding... Reembolso... - + View on Explorer Ver en Explorer @@ -2757,42 +2748,42 @@ Seleccione un nuevo pedido. OrdersPage - + Filter Filtrar - + Date Fecha - + Export CSV Exportar CSV - + Apply Filter Aplicar Filtro - + Cancel All Cancelar Todo - + From Desde - + To A - + Please choose the CSV export name and location Por favor, elija el nombre y la ubicación de exportación CSV @@ -2874,12 +2865,12 @@ Seleccione un nuevo pedido. Buscar activo - + Show only coins with balance Mostrar solo monedas con saldo - + (%1/%2) (%1/%2) @@ -3111,17 +3102,17 @@ Seleccione un nuevo pedido. RestartModal - + Applying the changes... Aplicando los cambios... - + Restarting the application. %1 Reiniciando la aplicación. %1 - + Restarting the application... Reiniciando la aplicación... @@ -3651,12 +3642,12 @@ Seleccione un nuevo pedido. Sidebar - + Search Buscar - + ADD CRYPTO @@ -3689,10 +3680,15 @@ Seleccione un nuevo pedido. Tasa CEX - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> %1 no está habilitado. ¿Desea habilitarlo para poder seleccionar %2 mejores ordenes?<br><a href='#'>Sí</a> - <a href='#no'>No</a> + + + %1 is not enabled - Please enable it through the coin activation menu + + SubCoinSelector @@ -3789,7 +3785,7 @@ Seleccione un nuevo pedido. SubOrders - + Orders Pedidos @@ -3834,12 +3830,12 @@ Seleccione un nuevo pedido. Cancelar - + Apply filter Aplicar filtro - + No results found No se encontraron resultados @@ -4059,6 +4055,19 @@ Las tarifas de la red pueden variar mucho según el par comercial seleccionado.< Haga clic aquí para ver los detalles + + TotalView + + + Receive %1 + Recibir %1 + + + + Send %1 + + + Trade @@ -4475,7 +4484,7 @@ Esto puede tardar unos minutos... atomic_dex::settings_page - + An error has occurred. Se ha producido un error. @@ -4551,7 +4560,7 @@ Esto puede tardar unos minutos... Cerrar sesión - + Balance Saldo diff --git a/atomic_defi_design/assets/languages/atomic_defi_fr.ts b/atomic_defi_design/assets/languages/atomic_defi_fr.ts index 80242b19bf..b4ad8162ff 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_fr.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_fr.ts @@ -4,53 +4,53 @@ AddAddressForm - + Use standard network address - + Label - + This key already exists. Cette clé existe déjà. - + Address Adresse - - + + Cancel Annuler - + Convert - + Edit Éditer - + Add Ajouter - + You need to enable %1 before adding this kind of address. - + Enable Activer @@ -307,7 +307,7 @@ - + Price provider is: %1 Fournisseur de prix : %1 @@ -501,14 +501,19 @@ Chart - + Loading market data Chargement des données de marché - - There is no chart data for this pair yet - Il n'y a pas encore de données graphiques pour cette paire + + There is no chart data for this pair + + + + + There is no chart data for %1 (testcoin) pairs + @@ -737,78 +742,78 @@ Détails de la confirmation de l'échange - + This swap request can not be undone and is a final event! La requête de ce swap ne peut pas être annulé, c'est irréversible ! - + Security configuration Configuration de la sécurité - + Read more about dPoW En savoir plus sur dPoW - + Use custom protection settings for incoming %1 transactions TICKER Utiliser les paramètres de protection personnalisés pour les transactions %1 entrantes - + Enable Komodo dPoW security Activer la sécurité de Komodo dPoW - + %1 confirmations for incoming %2 transactions Il y a %1 confirmations pour les transactions entrantes du ticker %2 - + This transaction can take up to 60 mins - DO NOT close this application! Cette transaction peut prendre jusqu'à 60 minutes - NE fermez PAS cette application ! - + Trade price is more than 50% different to CEX! Confirm? Le prix est supérieur à 50% du prix sur les CEX ! Êtes-vous sûr ? - + Loading fees... - + <b>Total %1 fees:</b> Frais totaux %1: - + dPoW protected Protégé par dPoW - + Required Confirmations Confirmations requises - + Warning, this atomic swap is not dPoW protected! Attention, ce swap atomique n'est pas protégé par dPoW ! - + Cancel Annuler - + Confirm Confirmer @@ -824,182 +829,182 @@ Dashboard - + The current number of enabled coins does not match your configuration specification. Your assets configuration will be reset. Le nombre actuel d'actifs activées ne correspond pas à vos spécifications de configuration. La configuration de vos actifs sera réinitialisée. - + Matching Recherche en cours - + Order Matching Recherche d'un ordre - + Matched Trouvé - + Order Matched Ordre trouvé - + Ongoing En cours - + Swap Ongoing Échange en cours - + Successful Réussi - + Swap Successful Échange terminé - + Refunding En cours de remboursement - + Failed Échoué - + Swap Failed Erreur lors de l'échange - + Unknown Inconnue - + Unknown State État inconnu - + Started Commencé - + Negotiated Négocié - + Taker fee sent Frais de preneur envoyés - + Maker payment received Paiement de l'envoyeur reçu - + Maker payment wait confirm started La confirmation d'attente de paiement de l'envoyeur a commencé - + Maker payment validated and confirmed Paiement de l'envoyeur validé et confirmé - + Taker payment sent Paiement du preneur envoyé - + Taker payment spent Paiement du preneur dépensé - + Maker payment spent Paiement de l'envoyeur dépensé - + Finished Fini - + Start failed Le démarrage a échoué - + Negotiate failed La négociation a échoué - + Taker fee validate failed Échec de la validation des frais du preneur - + Maker payment transaction failed La transaction de paiement du créateur a échoué - + Maker payment Data send failed Échec de l'envoi des données de paiement du créateur - + Maker payment wait confirm failed La confirmation de l'attente de paiement du créateur a échoué - + Taker payment validate failed La validation du paiement du preneur a échoué - + Taker payment wait confirm failed La confirmation de l'attente de paiement du preneur a échoué - + Taker payment spend failed Échec des dépenses de paiement du preneur - + Maker payment wait refund started attente de paiement du créateur, remboursement commencé - + Maker payment refunded Paiement du créateur remboursé - + Maker payment refund failed échec du remboursement du paiement du créateur @@ -1384,7 +1389,7 @@ General - + %n day(s) %n jour(s) @@ -1392,7 +1397,7 @@ - + %nd day @@ -1401,7 +1406,7 @@ - + %nh hours @@ -1410,7 +1415,7 @@ - + %nm minutes @@ -1419,7 +1424,7 @@ - + %ns seconds @@ -1428,7 +1433,7 @@ - + %nms milliseconds @@ -1437,117 +1442,117 @@ - + - - - + <b>Taker tx fee:</b> Taxes de transaction du preneur: - + <b>Dex tx fee:</b> Taxes de transaction de DEX: - + <b>Dex fee:</b> Taxes de DEX: - + <b>Maker tx fee:</b> Taxes de transaction du créateur - + %1 balance is zero - + Activating %1 (%2%) - + Loading wallet... - + Min: %1 - + Enter an amount Entrez un montant - + Trading Fee Frais d'échanges - + Minimum Trading Amount Frais d'échange minimum - + Wallet %1 already exists WALLETNAME Le portefeuille %1 existe déjà - + %1 balance is lower than the fees amount: %2 %3 La %1 balance est inférieur aux frais: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount Le solde négociable (après frais) %1 est inférieur au montant minimum de la transaction - + Please fill the price field Veuillez remplir le champ de prix - + Please fill the volume field - - + + Please wait for %1 to fully activate - - + + %1 volume is lower than minimum trade amount Le volume de %1 est inférieur au montant minimum de la transaction - - + + %1 needs to be enabled in order to use %2 %1 doit être activé pour utiliser %2 - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions Le solde %1 doit être financé, un solde différent de zéro est requis pour payer les frais de transactions de %2 - + Unknown Error Erreur inconnue @@ -1744,10 +1749,15 @@ Try again or select 'Allow custom seed' to continue. ListDelegate - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> %1 n'est pas activé - Souhaitez vous l'activer pour pouvoir selectionnez les meilleurs offres %2 ?<br><a href='#'>Oui</a> - <a href='#no'>Non</a> + + + %1 is not enabled - Please enable it through the coin activation menu + + This order requires a minimum amount of %1 %2 <br>You don't have enough funds.<br> %3 @@ -1875,11 +1885,6 @@ They will be removed from the orderbook until you log in again. Change 24hr - - - Porfolio - - Contract Address @@ -1911,10 +1916,16 @@ They will be removed from the orderbook until you log in again. Recevoir + Swap Échange + + + Portfolio + Portfolio + is wallet only @@ -1978,29 +1989,24 @@ They will be removed from the orderbook until you log in again. - - Trade - Échanger - - - + Trading Information Informations de Trading - + Chart Chart - - + + Orders Ordres - - + + History Historique @@ -2128,17 +2134,17 @@ They will be removed from the orderbook until you log in again. NewContactPopup - + Contact name - + This contact name already exists. Ce nom de contact existe déjà. - + + ADD @@ -2295,32 +2301,32 @@ They will be removed from the orderbook until you log in again. Votre phrase de récupération est importante - c'est pourquoi nous aimons nous assurer qu'elle est correcte. Nous vous poserons trois questions différentes au sujet de votre phrase source pour vous assurer que vous pourrez facilement restaurer votre portefeuille à tout moment. - + Enter the - + word - + Check Vérifier - + Enter password - + Enter the same password to confirm Entrez le même mot de passe pour confirmer - + Continue Continuer @@ -2504,14 +2510,14 @@ They will be removed from the orderbook until you log in again. OrderForm - - Amount to sell - Montant à vendre + + Send + Envoyez - - Amount to receive - Montant à recevoir + + Receive + Recevoir @@ -2593,11 +2599,6 @@ They will be removed from the orderbook until you log in again. Increase 1% relative to CEX market price. - - - Volume - Volume - OrderLine @@ -2618,114 +2619,104 @@ They will be removed from the orderbook until you log in again. OrderModal - - Swap Details - Détails de l'échange - - - - Order Details - Détails de l'ordre - - - + Order Type - + Maker Order Ordre de vente - + Taker Order Ordre d'achat - + Refund State État de remboursement - + Your swap failed but the auto-refund process for your payment started already. Please wait and keep application opened until you receive your payment back Votre échange a échoué, mais le processus de remboursement automatique de votre paiement a déjà commencé. Veuillez patienter et garder l'application ouverte jusqu'à ce que vous receviez votre remboursement - + Date Date - + Recover Funds Récupérer des fonds - + Refunding... Remboursement... - + View on Explorer Voir dans l'explorateur - + Cancel Order Annuler l'ordre - + Error ID ID de l'erreur - - + + Swap ID ID du Swap - + Maker Payment Sent Transaction ID - + Maker Payment Spent Transaction ID - + Maker Payment TXID - + Taker Payment Spent Transaction ID - + Taker Payment Sent Transaction ID - + Taker Payment TXID - - + + Error Log Journal des erreurs - + Close Fermer @@ -2752,43 +2743,43 @@ Please select a new order. OrdersPage - + From De - + To Vers - + Apply Filter Appliquer les changements - + Filter Filtrer - + Date Date - + Export CSV Exporter CSV - + Cancel All - + Please choose the CSV export name and location Veuillez choisir le nom et l'emplacement de l'exportation CSV @@ -2870,12 +2861,12 @@ Please select a new order. Rechercher un actif - + Show only coins with balance Afficher uniquement les assets avec solde - + (%1/%2) (%1/%2) @@ -3107,17 +3098,17 @@ Please select a new order. RestartModal - + Applying the changes... Application des modifications... - + Restarting the application... Redémarrage de l'application ... - + Restarting the application. %1 Redémarrage de l'application. %1 @@ -3647,12 +3638,12 @@ Please select a new order. Sidebar - + Search Rechercher - + ADD CRYPTO @@ -3685,10 +3676,15 @@ Please select a new order. Taux CEX - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> %1 n'est pas activé - Souhaitez vous l'activer pour pouvoir selectionnez les meilleurs offres %2 ?<br><a href='#'>Oui</a> - <a href='#no'>Non</a> + + + %1 is not enabled - Please enable it through the coin activation menu + + SubCoinSelector @@ -3785,7 +3781,7 @@ Please select a new order. SubOrders - + Orders Ordres @@ -3830,12 +3826,12 @@ Please select a new order. Annuler - + Apply filter Appliquer changement - + No results found Aucun résultat trouvé @@ -4041,6 +4037,19 @@ Network fees can vary greatly depending on your selected trading pair. Cliquez ici pour voir les détails + + TotalView + + + Receive %1 + + + + + Send %1 + + + Trade @@ -4212,7 +4221,7 @@ Network fees can vary greatly depending on your selected trading pair. There is no chart data for this ticker yet - + Il n'y a pas encore de données graphiques pour ce ticker @@ -4456,7 +4465,7 @@ This might take a few minutes... atomic_dex::settings_page - + An error has occurred. @@ -4532,7 +4541,7 @@ This might take a few minutes... Se déconnecter - + Balance Balance diff --git a/atomic_defi_design/assets/languages/atomic_defi_ru.ts b/atomic_defi_design/assets/languages/atomic_defi_ru.ts index 4de7d0f1bc..969309617b 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_ru.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_ru.ts @@ -4,53 +4,53 @@ AddAddressForm - + Use standard network address - + Label - + This key already exists. Этот ключ уже существует. - + Address Адрес - - + + Cancel - + Convert Преобразовать - + Edit Редактировать - + Add Добавить - + You need to enable %1 before adding this kind of address. - + Enable Добавить @@ -307,7 +307,7 @@ - + Price provider is: %1 Провайдер цены: %1 @@ -501,14 +501,19 @@ Chart - + Loading market data Загрузка рыночных данных - - There is no chart data for this pair yet - Нет данных для построения графика для этой торговой пары + + There is no chart data for this pair + + + + + There is no chart data for %1 (testcoin) pairs + @@ -737,78 +742,78 @@ Подтвердить данные обмена - + Trade price is more than 50% different to CEX! Confirm? Стоимость обмена в сравнении с CEX дороже более чем на 50%, вы подтверждаете сделку? - + This swap request can not be undone and is a final event! Этот запрос на своп не может быть отменен и является окончательным! - + This transaction can take up to 60 mins - DO NOT close this application! Эта транзакция может занять до 60 минут - НЕ закрывайте приложение! - + Loading fees... - + <b>Total %1 fees:</b> - + Security configuration Настройки безопасности - + %1 confirmations for incoming %2 transactions %1 подтверждений для входящих %2 транзакций - + Read more about dPoW Узнать больше о dPoW - + Use custom protection settings for incoming %1 transactions TICKER Использовать пользовательские настройки защиты для входящих транзакций %1 - + Enable Komodo dPoW security Включить Komodo dPoW - + dPoW protected dPoW защита - + Required Confirmations Необходимое количество подтверждений - + Warning, this atomic swap is not dPoW protected! Предупреждение, этот атомарный своп не защищен dPoW! - + Cancel Отменить - + Confirm Подтверждение @@ -824,182 +829,182 @@ Dashboard - + The current number of enabled coins does not match your configuration specification. Your assets configuration will be reset. Текущее количество включенных монет не совпадает с конфигурацией. Ваша конфигурация активов будет сброшена. - + Matching Матчинг - + Order Matching Матчинг ордеров - + Matched Сматчен - + Order Matched Ордер сматчен - + Ongoing В процессе - + Swap Ongoing Своп продолжается - + Successful Успешно - + Swap Successful Своп успешно завершен - + Refunding Проводится возврат - + Failed Не завершено - + Swap Failed Своп не был завершен - + Unknown Неизвестно - + Unknown State Статус неизвестен - + Started Начат - + Negotiated Согласован - + Taker fee sent Комиссия тейкера отправлена - + Maker payment received Платеж мейкера получен - + Maker payment wait confirm started Ожидание платежа мейкера - + Maker payment validated and confirmed Платеж мейкера валидирован и подтвержден - + Taker payment sent Платеж тейкера отправлен - + Taker payment spent Платеж тейкера потрачен - + Maker payment spent Платеж мейкера потрачен - + Finished Завершено - + Start failed Не удалось начать - + Negotiate failed Согласование не прошло - + Taker fee validate failed Валидация комиссии тейкера не прошла - + Maker payment transaction failed Платежная транзакция мейкера не прошла - + Maker payment Data send failed Отправка платежных данных мейкера не прошла - + Maker payment wait confirm failed Платежная транзакция мейкера не была подтверждена - + Taker payment validate failed Не прошла валидация платежа тейкера - + Taker payment wait confirm failed Платежная транзакция тейкера не была подтверждена - + Taker payment spend failed Spend платежа тейкера не прошел - + Maker payment wait refund started Ожидание возврата платежа мейкера - + Maker payment refunded Платеж мейкера возвращен - + Maker payment refund failed Возврат платежа мейкера не выполнен @@ -1384,7 +1389,7 @@ General - + %n day(s) %n день @@ -1393,7 +1398,7 @@ - + %nd day @@ -1403,7 +1408,7 @@ - + %nh hours @@ -1413,7 +1418,7 @@ - + %nm minutes @@ -1423,7 +1428,7 @@ - + %ns seconds @@ -1433,7 +1438,7 @@ - + %nms milliseconds @@ -1443,117 +1448,117 @@ - + - - - + <b>Taker tx fee:</b> - + <b>Dex tx fee:</b> - + <b>Dex fee:</b> - + <b>Maker tx fee:</b> - + %1 balance is zero - + Activating %1 (%2%) - + Loading wallet... - + Min: %1 Мин: %1 - + Enter an amount Введите количество - + Trading Fee Торговая комиссия - + Minimum Trading Amount Минимальный объем сделки - + Wallet %1 already exists WALLETNAME Кошелек %1 уже существует - + %1 balance is lower than the fees amount: %2 %3 %1 баланс менее чем размер комиссий: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount Торгуемый (после комиссий) баланс %1 - меньше минимальной суммы сделки - + Please fill the price field Пожалуйста, укажите цену - + Please fill the volume field - - + + Please wait for %1 to fully activate - - + + %1 volume is lower than minimum trade amount Сумма %1 меньше минимальной суммы сделки - - + + %1 needs to be enabled in order to use %2 %1 должен быть активным для использования %2 - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions нужно пополнить баланс %1 для оплаты газа %2 транзакций - + Unknown Error Неизвестная ошибка @@ -1750,10 +1755,15 @@ Try again or select 'Allow custom seed' to continue. ListDelegate - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> %1 не активирован -Вы хотите активировать этот %2 актив чтобы видеть лучшие ордеры для него ?<br><a href='#'>Да</a> - <a href='#no'>Нет</a> + + + %1 is not enabled - Please enable it through the coin activation menu + + This order requires a minimum amount of %1 %2 <br>You don't have enough funds.<br> %3 @@ -1881,11 +1891,6 @@ They will be removed from the orderbook until you log in again. Change 24hr - - - Porfolio - - Contract Address @@ -1917,10 +1922,16 @@ They will be removed from the orderbook until you log in again. Получить + Swap Обменять + + + Portfolio + Портфолио + is wallet only @@ -1984,29 +1995,24 @@ They will be removed from the orderbook until you log in again. - - Trade - торговля - - - + Trading Information Торговая информация - + Chart График - - + + Orders Ордеры - - + + History История @@ -2134,17 +2140,17 @@ They will be removed from the orderbook until you log in again. NewContactPopup - + Contact name - + This contact name already exists. Контакт с таким именем уже существует. - + + ADD @@ -2301,32 +2307,32 @@ They will be removed from the orderbook until you log in again. Ваш seed ключ важен, и поэтому мы хотим убедиться, что вы его сохранили. Мы зададим вам три разных вопроса о вашем seed ключе, чтобы убедиться, что вы сможете легко восстановить свой кошелек, когда захотите. - + Enter the - + word - + Check Проверить - + Enter password - + Enter the same password to confirm Введите тот же пароль для подтверждения - + Continue Продолжить @@ -2531,18 +2537,13 @@ They will be removed from the orderbook until you log in again. - Volume - Объем - - - - Amount to sell - Сумма для продажи + Send + Отправить - - Amount to receive - Получаемая сумма + + Receive + Получить @@ -2624,114 +2625,104 @@ They will be removed from the orderbook until you log in again. OrderModal - - Swap Details - Детали свопа - - - - Order Details - Детали ордера - - - + Order Type - + Maker Order Мейкер ордер - + Taker Order Тейкер ордер - + Refund State Статус рефанда - + Your swap failed but the auto-refund process for your payment started already. Please wait and keep application opened until you receive your payment back Обмен не был завершен, но процесс автоматического рефанда уже начался. Пожалуйста, подождите, оставляя приложение открытым, пока вы не получите свои средства - + Date Дата - + Error ID ID ошибки - - + + Error Log Лог ошибки - + Close Закрыть - + Cancel Order Отменить ордер - - + + Swap ID ID обмена - + Maker Payment Sent Transaction ID - + Maker Payment Spent Transaction ID - + Maker Payment TXID - + Taker Payment Spent Transaction ID - + Taker Payment Sent Transaction ID - + Taker Payment TXID - + Recover Funds Восстановить средства - + Refunding... Возмещается... - + View on Explorer Показать в эксплорере @@ -2758,43 +2749,43 @@ Please select a new order. OrdersPage - + From От - + To Кому - + Export CSV Скачать CSV - + Filter Фильтр - + Date Дата - + Apply Filter Применить фильтр - + Cancel All - + Please choose the CSV export name and location Выберите название и расположение загружаемого файла @@ -2876,12 +2867,12 @@ Please select a new order. Поиск актива - + Show only coins with balance Показывать только монеты с балансом - + (%1/%2) (%1/%2) @@ -3113,17 +3104,17 @@ Please select a new order. RestartModal - + Applying the changes... Применяю изменения... - + Restarting the application... Перезапуск приложения... - + Restarting the application. %1 Перезапуск приложения. %1 @@ -3653,12 +3644,12 @@ Please select a new order. Sidebar - + Search Поиск - + ADD CRYPTO @@ -3691,10 +3682,15 @@ Please select a new order. CEX цена - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> %1 не активирован -Вы хотите активировать этот %2 актив чтобы видеть лучшие ордеры для него ?<br><a href='#'>Да</a> - <a href='#no'>Нет</a> + + + %1 is not enabled - Please enable it through the coin activation menu + + SubCoinSelector @@ -3791,7 +3787,7 @@ Please select a new order. SubOrders - + Orders Ордеры @@ -3836,12 +3832,12 @@ Please select a new order. Отменить - + Apply filter Применить фильтр - + No results found Не найдено результатов @@ -4045,6 +4041,19 @@ Network fees can vary greatly depending on your selected trading pair. Нажмите, чтобы узнать подробности + + TotalView + + + Receive %1 + + + + + Send %1 + + + Trade @@ -4216,7 +4225,7 @@ Network fees can vary greatly depending on your selected trading pair. There is no chart data for this ticker yet - + Для данного актива пока еще нет графиков данных @@ -4460,7 +4469,7 @@ This might take a few minutes... atomic_dex::settings_page - + An error has occurred. @@ -4536,7 +4545,7 @@ This might take a few minutes... Выход - + Balance Баланс diff --git a/atomic_defi_design/assets/languages/atomic_defi_tr.ts b/atomic_defi_design/assets/languages/atomic_defi_tr.ts index 34e9b6e6db..708b7d982d 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_tr.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_tr.ts @@ -4,53 +4,53 @@ AddAddressForm - + Use standard network address - + Label - + This key already exists. Bu anahtar zaten mevcut. - + Address Adres - - + + Cancel İptal - + Convert - + Edit Düzenle - + Add Ekle - + You need to enable %1 before adding this kind of address. - + Enable Etkinleştir @@ -307,7 +307,7 @@ - + Price provider is: %1 @@ -501,14 +501,19 @@ Chart - + Loading market data Piyasa bilgisi yükleniyor - - There is no chart data for this pair yet - Bu parite için henüz grafik verisi yok + + There is no chart data for this pair + + + + + There is no chart data for %1 (testcoin) pairs + @@ -737,78 +742,78 @@ Al-Sat Detaylarını Onayla - + This swap request can not be undone and is a final event! Bu takas isteği geri döndürülemez! - + Security configuration Güvenlik yapılandırması - + Read more about dPoW dPoW hakkında daha fazla bilgi - + Use custom protection settings for incoming %1 transactions TICKER %1 işlemleri için özel güvenlik ayarları kullan - + Enable Komodo dPoW security Komodo dPoW güvenliğini etkinleştir - + %1 confirmations for incoming %2 transactions Gelen %2 işlemleri için %1 onay - + This transaction can take up to 60 mins - DO NOT close this application! Bu işlem 60 dakikayı bulabilir - Programı KAPATMAYINIZ! - + Trade price is more than 50% different to CEX! Confirm? Takas ücreti CEX ile karşılaştırıldığında %50'den daha fazla farka sahip. Onaylıyor musunuz? - + Loading fees... - + <b>Total %1 fees:</b> <b>Toplam %1 işlem giderleri: </b> - + dPoW protected dPoW korumalı - + Required Confirmations Gereken Onaylar - + Warning, this atomic swap is not dPoW protected! Uyarı, bu atomik takas dPoW korumalı değil! - + Cancel İptal - + Confirm Onayla @@ -824,182 +829,182 @@ Dashboard - + The current number of enabled coins does not match your configuration specification. Your assets configuration will be reset. Etkinleştirilmiş koinlerin mevcut sayısı yapılandırma ayarlarınızla eşleşmiyor. Varlık yapılandırmanız sıfırlanacak. - + Matching Eşleşiyor - + Order Matching Emir Eşleşiyor - + Matched Eşleşti - + Order Matched Emir Eşleşti - + Ongoing Devam ediyor - + Swap Ongoing Takas Devam Ediyor - + Successful Başarılı - + Swap Successful Takas Başarılı - + Refunding Geri ödeniyor - + Failed Başarısız - + Swap Failed Takas Başarısız - + Unknown Bilinmiyor - + Unknown State Bilinmeyen durum - + Started Başlatıldı - + Negotiated Pazarlık yapıldı - + Taker fee sent Alıcı ücreti gönderildi - + Maker payment received Yapıcı ödemesi alındı - + Maker payment wait confirm started Yapıcı ödemesi bekleme onayı başladı - + Maker payment validated and confirmed Yapıcı ödemesi doğrulandı ve onaylandı - + Taker payment sent Alıcı ödemesi gönderildi - + Taker payment spent Alıcı ödemesi harcandı - + Maker payment spent Yapıcı ödemesi harcandı - + Finished Tamamlandı - + Start failed Başlatılamadı - + Negotiate failed Pazarlık başarısız - + Taker fee validate failed Alıcı ücreti doğrulanamadı - + Maker payment transaction failed Yapıcı ödeme işlemi başarısız - + Maker payment Data send failed Yapıcı ödeme verileri gönderilemedi - + Maker payment wait confirm failed Yapıcı ödemesi bekleme onayı başarısız - + Taker payment validate failed Alıcı ödemesi doğrulanamadı - + Taker payment wait confirm failed Alıcı ödemesi bekleme onayı başarısız oldu - + Taker payment spend failed Alıcı ödeme harcaması başarısız oldu - + Maker payment wait refund started Yapıcı ödemesi bekleme iadesi başladı - + Maker payment refunded Yapıcı ödemesi iade edildi - + Maker payment refund failed Yapıcı ödeme iadesi başarısız @@ -1384,14 +1389,14 @@ General - + %n day(s) %n gün - + %nd day @@ -1399,7 +1404,7 @@ - + %nh hours @@ -1407,7 +1412,7 @@ - + %nm minutes @@ -1415,7 +1420,7 @@ - + %ns seconds @@ -1423,7 +1428,7 @@ - + %nms milliseconds @@ -1431,117 +1436,117 @@ - + - - - + <b>Taker tx fee:</b> - + <b>Dex tx fee:</b> - + <b>Dex fee:</b> - + <b>Maker tx fee:</b> - + %1 balance is zero - + Activating %1 (%2%) - + Loading wallet... - + Min: %1 - + Enter an amount Bir miktar gir - + Trading Fee Takas Ücreti - + Minimum Trading Amount Minimum Takas Hacmi - + Wallet %1 already exists WALLETNAME %1 cüzdanı zaten mevcut - + %1 balance is lower than the fees amount: %2 %3 %1 bakiye ücret tutarının altında: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount Takas edilebilir (ücretlerden sonra)%1 bakiyesi minimum işlem ücretinden düşük - + Please fill the price field Lütfen fiyat alanını doldurun - + Please fill the volume field - - + + Please wait for %1 to fully activate - - + + %1 volume is lower than minimum trade amount %1 hacmi, minimum işlem ücretinden düşük - - + + %1 needs to be enabled in order to use %2 - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions - + Unknown Error Bilinmeyen Hata @@ -1738,10 +1743,15 @@ Try again or select 'Allow custom seed' to continue. ListDelegate - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> %1 etkin değil - En iyi %2 siparişini seçebilmesi için etkinleştirmek istiyor musunuz ? <br><a href='#'>Evet</a> - <a href='#no'>Hayır</a> + + + %1 is not enabled - Please enable it through the coin activation menu + + This order requires a minimum amount of %1 %2 <br>You don't have enough funds.<br> %3 @@ -1869,11 +1879,6 @@ They will be removed from the orderbook until you log in again. Change 24hr - - - Porfolio - - Contract Address @@ -1905,10 +1910,16 @@ They will be removed from the orderbook until you log in again. Al + Swap Takasla + + + Portfolio + + is wallet only @@ -1972,29 +1983,24 @@ They will be removed from the orderbook until you log in again. - - Trade - Al Sat - - - + Trading Information Al Sat Bilgisi - + Chart Grafik - - + + Orders Emirler - - + + History Tarihçe @@ -2122,17 +2128,17 @@ They will be removed from the orderbook until you log in again. NewContactPopup - + Contact name - + This contact name already exists. Bu kişi adı zaten mevcut. - + + ADD @@ -2289,32 +2295,32 @@ They will be removed from the orderbook until you log in again. Seed kelimeleriniz önemlidir - bu yüzden doğru olduğundan emin olmak istiyoruz. Cüzdanınızı istediğiniz zaman kolayca kurtarabileceğinizden emin olmak için seed kelimeleriniz hakkında üç farklı soru soracağız. - + Enter the - + word - + Check - + Enter password - + Enter the same password to confirm Doğrulamak için aynı parolayı giriniz - + Continue Devam @@ -2498,14 +2504,14 @@ They will be removed from the orderbook until you log in again. OrderForm - - Amount to sell - Satılacak miktar + + Send + Gönder - - Amount to receive - Alınacak miktar + + Receive + Al @@ -2587,11 +2593,6 @@ They will be removed from the orderbook until you log in again. Increase 1% relative to CEX market price. - - - Volume - Hacim - OrderLine @@ -2612,114 +2613,104 @@ They will be removed from the orderbook until you log in again. OrderModal - - Swap Details - Takas Detayları - - - - Order Details - Emir Detayları - - - + Order Type - + Maker Order Yapıcı Emri - + Taker Order Alıcı Emri - + Refund State Geri Ödeme Durumu - + Your swap failed but the auto-refund process for your payment started already. Please wait and keep application opened until you receive your payment back Takas işlemi başarısız oldu, ancak otomatik geri ödeme süreci başladı. Lütfen bekleyin ve ödemenizi geri alana kadar uygulamayı açık tutun - + Date Tarih - + Recover Funds Fon Kurtar - + Refunding... - + View on Explorer Explorer'da Göster - + Cancel Order Emri İptal Et - + Error ID Hata ID - - + + Swap ID - + Maker Payment Sent Transaction ID - + Maker Payment Spent Transaction ID - + Maker Payment TXID - + Taker Payment Spent Transaction ID - + Taker Payment Sent Transaction ID - + Taker Payment TXID - - + + Error Log Hata Kaydı - + Close Kapat @@ -2746,43 +2737,43 @@ Please select a new order. OrdersPage - + From Gönderen - + To Alan - + Apply Filter Filtreyi Uygula - + Filter - + Date Tarih - + Export CSV CSV'yi dışa aktar - + Cancel All - + Please choose the CSV export name and location Lütfen CSV dışa aktarma adını ve konumunu seçin @@ -2864,12 +2855,12 @@ Please select a new order. - + Show only coins with balance Sadece bakiyesi olan koinleri göster - + (%1/%2) @@ -3101,17 +3092,17 @@ Please select a new order. RestartModal - + Applying the changes... Değişiklikler uygulanıyor... - + Restarting the application... Uygulama yeniden başlatılıyor... - + Restarting the application. %1 @@ -3641,12 +3632,12 @@ Please select a new order. Sidebar - + Search Ara - + ADD CRYPTO @@ -3679,10 +3670,15 @@ Please select a new order. CEX Oranı - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> %1 etkin değil - En iyi %2 siparişini seçebilmesi için etkinleştirmek istiyor musunuz ? <br><a href='#'>Evet</a> - <a href='#no'>Hayır</a> + + + %1 is not enabled - Please enable it through the coin activation menu + + SubCoinSelector @@ -3779,7 +3775,7 @@ Please select a new order. SubOrders - + Orders Emirler @@ -3824,12 +3820,12 @@ Please select a new order. İptal - + Apply filter Filtreyi uygula - + No results found @@ -4033,6 +4029,19 @@ Network fees can vary greatly depending on your selected trading pair. Detayları görmek için buraya tıklayın + + TotalView + + + Receive %1 + + + + + Send %1 + + + Trade @@ -4204,7 +4213,7 @@ Network fees can vary greatly depending on your selected trading pair. There is no chart data for this ticker yet - + Henüz bu hisse senedi için grafik verisi yok @@ -4448,7 +4457,7 @@ This might take a few minutes... atomic_dex::settings_page - + An error has occurred. @@ -4524,7 +4533,7 @@ This might take a few minutes... Çıkış - + Balance Bakiye From 259779eb302b26f0b6c593e40b1148d32b31f07e Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 13 Apr 2023 00:48:49 +0800 Subject: [PATCH 76/80] fix implicitHeight binding loop in combo searchbar --- atomic_defi_design/Dex/Components/ComboBoxWithSearchBar.qml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/atomic_defi_design/Dex/Components/ComboBoxWithSearchBar.qml b/atomic_defi_design/Dex/Components/ComboBoxWithSearchBar.qml index 0009bc9d0a..bbd86393f1 100644 --- a/atomic_defi_design/Dex/Components/ComboBoxWithSearchBar.qml +++ b/atomic_defi_design/Dex/Components/ComboBoxWithSearchBar.qml @@ -24,8 +24,7 @@ ComboBox background: Rectangle { id: bg - implicitWidth: control.width - implicitHeight: control.height + anchors.fill: parent color: control.backgroundColor radius: control.radius } From 8aa55d46bec79ade517680f10ffb987b71e006d6 Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 13 Apr 2023 00:49:56 +0800 Subject: [PATCH 77/80] unwrap assetrow --- .../Dex/Addressbook/AddressTypeSelector.qml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/atomic_defi_design/Dex/Addressbook/AddressTypeSelector.qml b/atomic_defi_design/Dex/Addressbook/AddressTypeSelector.qml index b8ad13881b..94fee46e9f 100644 --- a/atomic_defi_design/Dex/Addressbook/AddressTypeSelector.qml +++ b/atomic_defi_design/Dex/Addressbook/AddressTypeSelector.qml @@ -77,16 +77,13 @@ Dex.ComboBoxWithSearchBar } } - contentItem: Item + contentItem: AssetRow { - AssetRow - { - id: _contentRow + id: _contentRow - anchors.left: parent.left - anchors.leftMargin: 13 - anchors.verticalCenter: parent.verticalCenter - } + anchors.left: parent.left + anchors.leftMargin: 13 + anchors.verticalCenter: parent.verticalCenter } onCurrentIndexChanged: From f11c5b590e509146f30c512cd6904d1a8e931481 Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 13 Apr 2023 00:58:56 +0800 Subject: [PATCH 78/80] fix typeError in AddressTypeSelector --- atomic_defi_design/Dex/Addressbook/AddressTypeSelector.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/atomic_defi_design/Dex/Addressbook/AddressTypeSelector.qml b/atomic_defi_design/Dex/Addressbook/AddressTypeSelector.qml index 94fee46e9f..6e79fabad7 100644 --- a/atomic_defi_design/Dex/Addressbook/AddressTypeSelector.qml +++ b/atomic_defi_design/Dex/Addressbook/AddressTypeSelector.qml @@ -38,9 +38,9 @@ Dex.ComboBoxWithSearchBar } else { - _contentRow.ticker = model.data(model.index(index, 0), Qt.UserRole + 1) - _contentRow.name = model.data(model.index(index, 0), Qt.UserRole + 3) - _contentRow.type = model.data(model.index(index, 0), Qt.UserRole + 9) + _contentRow.ticker = model.data ? model.data(model.index(index, 0), Qt.UserRole + 1) : "" + _contentRow.name = model.data ? model.data(model.index(index, 0), Qt.UserRole + 3) : "" + _contentRow.type = model.data ? model.data(model.index(index, 0), Qt.UserRole + 9) : "" } } From 44a179650f4e359e31a6bae51bc5947d93fe2d35 Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 13 Apr 2023 02:05:09 +0800 Subject: [PATCH 79/80] fix typeError in searchField file when model is array --- atomic_defi_design/Dex/Components/SearchField.qml | 6 ++++-- atomic_defi_design/Dex/Constants/General.qml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/atomic_defi_design/Dex/Components/SearchField.qml b/atomic_defi_design/Dex/Components/SearchField.qml index 1c18a39086..40bcae12df 100644 --- a/atomic_defi_design/Dex/Components/SearchField.qml +++ b/atomic_defi_design/Dex/Components/SearchField.qml @@ -51,8 +51,10 @@ Rectangle placeholderText: qsTr("Search") placeholderTextColor: Dex.CurrentTheme.textPlaceholderColor - onTextChanged: searchModel.setFilterFixedString(_textField.text) - Component.onDestruction: searchModel.setFilterFixedString("") + onTextChanged: Array.isArray(searchModel) ? "" : searchModel.setFilterFixedString(_textField.text) + + + Component.onDestruction: Array.isArray(searchModel) ? "" : searchModel.setFilterFixedString("") } DefaultRectangle diff --git a/atomic_defi_design/Dex/Constants/General.qml b/atomic_defi_design/Dex/Constants/General.qml index dfc2128cf2..1a43d617e6 100644 --- a/atomic_defi_design/Dex/Constants/General.qml +++ b/atomic_defi_design/Dex/Constants/General.qml @@ -32,7 +32,7 @@ QtObject { { return coin_icons_path + ticker.toString().toLowerCase().replace('-', '_') + ".png" } - if (['SMART CHAIN'].indexOf(ticker) >= 0) + if (['Smart Chain'].indexOf(ticker) >= 0) { return coin_icons_path + ticker.toString().toLowerCase().replace(' ', '_') + ".png" } From 2d33fcbd3b83829a41f200bc7d7ed3da391e3b5d Mon Sep 17 00:00:00 2001 From: smk762 Date: Thu, 13 Apr 2023 16:40:45 +0800 Subject: [PATCH 80/80] handle button where no notifications --- atomic_defi_design/Dex/Dashboard/NotificationsModal.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/atomic_defi_design/Dex/Dashboard/NotificationsModal.qml b/atomic_defi_design/Dex/Dashboard/NotificationsModal.qml index 4b494de500..8753f8abc8 100644 --- a/atomic_defi_design/Dex/Dashboard/NotificationsModal.qml +++ b/atomic_defi_design/Dex/Dashboard/NotificationsModal.qml @@ -622,8 +622,8 @@ DexPopup } OutlineButton - { - text: qsTr('Mark all as read') + { + text: notifications_list.length !== 0 ? qsTr('Mark all as read') : qsTr('Close') height: 40 width: 260 Layout.alignment: Qt.AlignHCenter