Skip to content
Snippets Groups Projects
Commit 2c7f7f7a authored by andrey.daragan's avatar andrey.daragan
Browse files

Merge branch 'features-2608' into 'master'

Features 2608

See merge request !59
parents ce53ecbd a66daf77
No related branches found
No related tags found
1 merge request!59Features 2608
Pipeline #1437 passed with stage
in 18 minutes and 53 seconds
......@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
engine.rootContext()->setContextProperty("dapWalletFilterModel", &DapWalletFilterModel::instance());
engine.rootContext()->setContextProperty("dapWalletModel", &DapChainWalletModel::instance());
engine.rootContext()->setContextProperty("clipboard", &DapClipboard::instance());
engine.rootContext()->setContextProperty("pt", 1.3);
engine.rootContext()->setContextProperty("pt", 1.0);
engine.load(QUrl("qrc:/screen/main.qml"));
if (engine.rootObjects().isEmpty())
......
import QtQuick 2.0
import QtQuick.Controls 2.0
import QtQuick.Controls 1.4
import QtQuick.Layouts 1.0
import "../"
......
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick 2.0
import QtQuick.Controls 2.0
RadioButton {
property alias textButton: nameButton.text
......@@ -23,7 +23,7 @@ RadioButton {
spacing: 16 * pt
checked: false
display: AbstractButton.TextBesideIcon
// display: AbstractButton.TextBesideIcon
autoExclusive: true
}
......
......@@ -42,7 +42,7 @@ Rectangle {
normalColorText:"#FFFFFF"
hilightColorTopText:"#332F49"
hilightColor: "#332F49"
fontSizeComboBox: 14*px
fontSizeComboBox: 14*pt
}
Label {
id: titleWalletBalance
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment