Browse Source

Merge pull request #1073 from yann300/ui_improvement

mix bug fix: windows - unreadable fonts #1051.
cl-refactor
Arkadiy Paronyan 10 years ago
parent
commit
155d0c41cd
  1. 7
      mix/qml/Debugger.qml
  2. 6
      mix/qml/DefaultLabel.qml
  3. 7
      mix/qml/DefaultTextField.qml
  4. 8
      mix/qml/Ether.qml
  5. 2
      mix/qml/StateDialog.qml
  6. 10
      mix/qml/TransactionDialog.qml
  7. 14
      mix/qml/WebPreview.qml

7
mix/qml/Debugger.qml

@ -131,7 +131,14 @@ Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.minimumHeight: 60 Layout.minimumHeight: 60
height: 250 height: 250
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
anchors.leftMargin: machineStates.sideMargin
anchors.rightMargin: machineStates.sideMargin
anchors.topMargin: machineStates.sideMargin
} }
ScrollView ScrollView
{ {
property int sideMargin: 10 property int sideMargin: 10

6
mix/qml/DefaultLabel.qml

@ -4,12 +4,6 @@ import "."
Label { Label {
text: text text: text
font.family: regularFont.name
font.pointSize: Style.generic.size.titlePointSize
SourceSansProLight
{
id: regularFont
}
} }

7
mix/qml/DefaultTextField.qml

@ -3,11 +3,4 @@ import QtQuick.Controls 1.1
TextField { TextField {
id: titleField id: titleField
focus: true
font.family: regularFont.name
SourceSansProRegular
{
id: regularFont;
}
} }

8
mix/qml/Ether.qml

@ -49,10 +49,6 @@ RowLayout {
id: etherValueEdit; id: etherValueEdit;
} }
SourceSansProBold {
id: regularFont;
}
ComboBox ComboBox
{ {
id: units id: units
@ -87,15 +83,11 @@ RowLayout {
ListElement { text: "Kwei"; } ListElement { text: "Kwei"; }
ListElement { text: "wei"; } ListElement { text: "wei"; }
} }
style: ComboBoxStyle {
font: regularFont.name
}
} }
Text Text
{ {
visible: displayFormattedValue visible: displayFormattedValue
id: formattedValue id: formattedValue
font.family: regularFont.name
} }
} }

2
mix/qml/StateDialog.qml

@ -12,7 +12,7 @@ Window {
id: modalStateDialog id: modalStateDialog
modality: Qt.ApplicationModal modality: Qt.ApplicationModal
width: 450 width: 520
height: 480 height: 480
title: qsTr("Edit State") title: qsTr("Edit State")
visible: false visible: false

10
mix/qml/TransactionDialog.qml

@ -10,7 +10,7 @@ import "."
Window { Window {
id: modalTransactionDialog id: modalTransactionDialog
modality: Qt.ApplicationModal modality: Qt.ApplicationModal
width: 450 width: 520
height: (paramsModel.count > 0 ? 500 : 300) height: (paramsModel.count > 0 ? 500 : 300)
visible: false visible: false
color: StateDialogStyle.generic.backgroundColor color: StateDialogStyle.generic.backgroundColor
@ -174,11 +174,6 @@ Window {
anchors.fill: parent anchors.fill: parent
anchors.margins: 10 anchors.margins: 10
SourceSansProLight
{
id: lightFont
}
ColumnLayout { ColumnLayout {
id: dialogContent id: dialogContent
anchors.top: parent.top anchors.top: parent.top
@ -204,9 +199,6 @@ Window {
onCurrentIndexChanged: { onCurrentIndexChanged: {
loadParameters(); loadParameters();
} }
style: ComboBoxStyle {
font: lightFont.name
}
} }
} }

14
mix/qml/WebPreview.qml

@ -162,11 +162,6 @@ Item {
spacing: 0 spacing: 0
Rectangle Rectangle
{ {
SourceSansProLight
{
id: regularFont
}
anchors.leftMargin: 4 anchors.leftMargin: 4
color: WebPreviewStyle.general.headerBackgroundColor color: WebPreviewStyle.general.headerBackgroundColor
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
@ -188,9 +183,7 @@ Item {
currentIndex: -1 currentIndex: -1
onCurrentIndexChanged: changePage() onCurrentIndexChanged: changePage()
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
style: ComboBoxStyle { height: 21
font: regularFont.name
}
} }
Action { Action {
@ -205,12 +198,13 @@ Item {
iconSource: "qrc:/qml/img/available_updates.png" iconSource: "qrc:/qml/img/available_updates.png"
action: buttonReloadAction action: buttonReloadAction
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
width: 26 width: 21
height: 26 height: 21
} }
CheckBox { CheckBox {
id: autoReloadOnSave id: autoReloadOnSave
checked: true checked: true
height: 21
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
style: CheckBoxStyle { style: CheckBoxStyle {
label: DefaultLabel { label: DefaultLabel {

Loading…
Cancel
Save