fly/flightgear
1
0
Fork 0
Code Activity

Launcher styling tweaks

Browse source
This commit is contained in:
James Turner 2018-06-24 11:15:01 +01:00
parent c38e820756
commit 0987b82fa8
9 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/GUI/qml/AddButton.qml
View file

@ -22,6 +22,7 @@ Rectangle {
leftMargin: Style.margin leftMargin: Style.margin
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
} }
font.pixelSize: Style.baseFontPixelSize
} }
Image { Image {

1
src/GUI/qml/AdvancedSettingsToggle.qml
View file

@ -34,6 +34,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
color: "white" color: "white"
font.underline: mouse.containsMouse font.underline: mouse.containsMouse
font.pixelSize: Style.baseFontPixelSize
} }

1
src/GUI/qml/DoubleSpinbox.qml
View file

@ -129,6 +129,7 @@ FocusScope {
selectByMouse: true selectByMouse: true
width: metrics.width width: metrics.width
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
font.pixelSize: Style.baseFontPixelSize
focus: true focus: true
color: enabled ? (activeFocus ? Style.themeColor : Style.baseTextColor) : Style.disabledTextColor color: enabled ? (activeFocus ? Style.themeColor : Style.baseTextColor) : Style.disabledTextColor

1
src/GUI/qml/IntegerSpinbox.qml
View file

@ -127,6 +127,7 @@ FocusScope {
selectByMouse: true selectByMouse: true
width: metrics.width width: metrics.width
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
font.pixelSize: Style.baseFontPixelSize
focus: true focus: true
color: enabled ? (activeFocus ? Style.themeColor : Style.baseTextColor) : Style.disabledTextColor color: enabled ? (activeFocus ? Style.themeColor : Style.baseTextColor) : Style.disabledTextColor

2
src/GUI/qml/LineEdit.qml
View file

@ -55,7 +55,7 @@ FocusScope {
selectByMouse: true selectByMouse: true
focus: true focus: true
color: enabled ? (activeFocus ? Style.themeColor : Style.baseTextColor) : Style.disabledTextColor color: enabled ? (activeFocus ? Style.themeColor : Style.baseTextColor) : Style.disabledTextColor
font.pixelSize: Style.baseFontPixelSize
StyledText { StyledText {
id: placeholder id: placeholder
visible: (edit.text.length == 0) && !edit.activeFocus visible: (edit.text.length == 0) && !edit.activeFocus

9
src/GUI/qml/LocationAirportView.qml
View file

@ -83,9 +83,10 @@ Item {
spacing: Style.margin spacing: Style.margin
width: parent.width width: parent.width
Text { // heading text StyledText { // heading text
id: airportHeading id: airportHeading
width: parent.width width: parent.width
font.pixelSize: Style.headingFontPixelSize
text: isHeliport ? qsTr("Heliport: ") + airportData.ident + " / " + airportData.name text: isHeliport ? qsTr("Heliport: ") + airportData.ident + " / " + airportData.name
: qsTr("Airport: ") + airportData.ident + " / " + airportData.name : qsTr("Airport: ") + airportData.ident + " / " + airportData.name
} }
@ -104,7 +105,7 @@ Item {
} }
} }
Text { StyledText {
text: isHeliport ? qsTr("Pad") : qsTr("Runway") text: isHeliport ? qsTr("Pad") : qsTr("Runway")
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
@ -185,7 +186,7 @@ Item {
enabled: runwayRadio.selected && onFinalToggle.checked enabled: runwayRadio.selected && onFinalToggle.checked
} }
Text { StyledText {
text: qsTr(" from the threshold") text: qsTr(" from the threshold")
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
@ -223,7 +224,7 @@ Item {
} }
} }
Text { StyledText {
text: qsTr("Parking") text: qsTr("Parking")
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }

4
src/GUI/qml/LocationNavaidView.qml
View file

@ -57,11 +57,11 @@ Item {
spacing: Style.margin spacing: Style.margin
width: parent.width width: parent.width
Text { // heading text StyledText { // heading text
id: headingText id: headingText
width: parent.width width: parent.width
text: "format lat-lon as string!" text: "format lat-lon as string!"
font.pixelSize: Style.headingFontPixelSize
Binding { Binding {
when: navaidData.valid when: navaidData.valid
target: headingText target: headingText

1
src/GUI/qml/SidebarButton.qml
View file

@ -37,6 +37,7 @@ Item {
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
anchors.top: iconImage.bottom anchors.top: iconImage.bottom
anchors.topMargin: Style.margin anchors.topMargin: Style.margin
font.pixelSize: Style.baseFontPixelSize
} }
MouseArea { MouseArea {

2
src/GUI/qml/TabButton.qml
View file

@ -14,7 +14,7 @@ Rectangle {
color: mouse.containsMouse ? "#064989" : (active ? "#1b7ad3" : "white") color: mouse.containsMouse ? "#064989" : (active ? "#1b7ad3" : "white")
Text { StyledText {
id: buttonText id: buttonText
anchors.centerIn: parent anchors.centerIn: parent
color: (active | mouse.containsMouse) ? "white" : "#3f3f3f" color: (active | mouse.containsMouse) ? "white" : "#3f3f3f"