Skip to content

Commit 1952847

Browse files
authored
Merge pull request #2426 from KomodoPlatform/dev
v0.7.1 rc
2 parents 28dddc4 + 3f25b37 commit 1952847

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1916
-2038
lines changed

.github/workflows/atomicdex-desktop-ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
- master
99
schedule:
1010
- cron: '0 0 * * 1'
11+
workflow_dispatch:
1112

1213
env:
1314
DEX_API: "mm2_kmd"

.github/workflows/sync_mirror.yml

-26
This file was deleted.

.gitlab-ci.yml

-112
This file was deleted.

atomic_defi_design/Dex/Components/DexGradientAppButton.qml

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ DexRectangle
2222

2323
property bool text_left_align: false
2424

25-
property int minWidth: 90
2625

2726
property real textScale: 1
2827

atomic_defi_design/Dex/Components/PairItemBadge.qml

+10
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,21 @@ DexRectangle
2424
property int padding: 0
2525
property alias middle_text: middle_line.text_value
2626
property alias bottom_text: bottom_line.text_value
27+
property bool is_left: false
2728
Layout.fillHeight: true
2829
Layout.fillWidth: true
2930
Layout.leftMargin: 10
3031
Layout.rightMargin: 20
3132

33+
Dex.Text{
34+
anchors.bottom: parent.top
35+
anchors.bottomMargin: 5
36+
anchors.horizontalCenter: parent.horizontalCenter
37+
text: is_left ? "Outgoing" : "Incoming"
38+
font: Dex.DexTypo.italic12
39+
color: Dex.CurrentTheme.foregroundColor2
40+
}
41+
3242
RowLayout
3343
{
3444
anchors.fill: parent

atomic_defi_design/Dex/Constants/DexTypo.qml

+7
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,13 @@ QtObject {
154154
family: "Courier",
155155
weight: Font.Normal
156156
})
157+
property font italic12: Qt.font({
158+
pixelSize: 12 * fontDensity,
159+
letterSpacing: 0.2,
160+
family: fontFamily,
161+
weight: Font.Normal,
162+
italic: true
163+
})
157164
property font inputFieldFont: Qt.font({
158165
pixelSize: (16 * DexTypo.fontDensity) * (Screen.pixelDensity / 160),
159166
letterSpacing: 0.5,

atomic_defi_design/Dex/Constants/General.qml

+5
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,11 @@ QtObject {
8888
return API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker).is_faucet_coin
8989
}
9090

91+
function isVoteCoin(ticker)
92+
{
93+
return API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker).is_vote_coin
94+
}
95+
9196
function isCoinWithMemo(ticker)
9297
{
9398
return API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker).has_memos

atomic_defi_design/Dex/Exchange/ProView/Chart.qml

+11
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ Item
7070
transform: scale(${Math.min(scale_x, scale_y)});
7171
transform-origin: top left;
7272
}
73+
a { pointer-events: none; }
7374
</style>
7475
<script defer src="https://www.livecoinwatch.com/static/lcw-widget.js"></script>
7576
<div class="livecoinwatch-widget-1" lcw-coin="${rel_ticker}" lcw-base="${base_ticker}" lcw-secondary="USDC" lcw-period="w" lcw-color-tx="${Dex.CurrentTheme.foregroundColor}" lcw-color-pr="#58c7c5" lcw-color-bg="${Dex.CurrentTheme.comboBoxBackgroundColor}" lcw-border-w="0" lcw-digits="8" ></div>
@@ -226,6 +227,16 @@ Item
226227
}
227228
}
228229

230+
MouseArea {
231+
id: chart_mousearea
232+
anchors.fill: webEngineViewPlaceHolder
233+
onClicked: {
234+
if (webEngineView.visible) {
235+
Qt.openUrlExternally("https://www.livecoinwatch.com")
236+
}
237+
}
238+
}
239+
229240
Connections
230241
{
231242
target: app

atomic_defi_design/Dex/Exchange/ProView/DexComboBoxLine.qml

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ RowLayout
7878
Layout.preferredWidth: parent.width - 15
7979

8080
text_value: !details ? "" :
81-
`<font color="${root.color}"><b>${details.ticker}</b></font>&nbsp;&nbsp;&nbsp;<font color="${Dex.CurrentTheme.foregroundColor}">${details.name}</font>`
81+
`<font color="${root.color}"><b>${details.ticker}</b></font><br /><font color="${Dex.CurrentTheme.foregroundColor2}">${details.name}</font>`
8282
font.pixelSize: Style.textSizeSmall3
8383
elide: Text.ElideRight
8484
wrapMode: Text.NoWrap
@@ -96,7 +96,7 @@ RowLayout
9696
font: DexTypo.body2
9797
wrapMode: Label.NoWrap
9898
ToolTip.text: coin_value
99-
Component.onCompleted: font.pixelSize = 11.5
99+
Component.onCompleted: font.pixelSize = 11
100100
}
101101

102102
Dex.Text
@@ -112,7 +112,7 @@ RowLayout
112112
font: DexTypo.body2
113113
wrapMode: Label.NoWrap
114114
ToolTip.text: fiat_value
115-
Component.onCompleted: font.pixelSize = 11.5
115+
Component.onCompleted: font.pixelSize = 11
116116
}
117117
}
118118
}

0 commit comments

Comments
 (0)