diff --git a/src/GUI/qml/AircraftCompactDelegate.qml b/src/GUI/qml/AircraftCompactDelegate.qml index 503ceded7..afa61fe70 100644 --- a/src/GUI/qml/AircraftCompactDelegate.qml +++ b/src/GUI/qml/AircraftCompactDelegate.qml @@ -95,6 +95,7 @@ Item { width: parent.width text: root.__showAlternateText ? root.alternateText() : model.description + font.pixelSize: Style.baseFontPixelSize maximumLineCount: 3 wrapMode: Text.WordWrap elide: Text.ElideRight diff --git a/src/GUI/qml/AircraftDetailsView.qml b/src/GUI/qml/AircraftDetailsView.qml index 2241ca9b8..3f85a1a24 100644 --- a/src/GUI/qml/AircraftDetailsView.qml +++ b/src/GUI/qml/AircraftDetailsView.qml @@ -100,7 +100,7 @@ Rectangle { width: parent.width wrapMode: Text.WordWrap visible: aircraft.description != "" - font.pixelSize: 14 + font.pixelSize: Style.baseFontPixelSize } Text { @@ -110,7 +110,7 @@ Rectangle { anchors.horizontalCenter: parent.horizontalCenter wrapMode: Text.WordWrap visible: (aircraft.authors != undefined) - + font.pixelSize: Style.baseFontPixelSize } } @@ -146,6 +146,7 @@ Rectangle { Text { id: ratingsLabel text: qsTr("Ratings:") + font.pixelSize: Style.baseFontPixelSize } @@ -192,6 +193,7 @@ Rectangle { width: parent.width wrapMode: Text.WrapAtWordBoundaryOrAnywhere visible: aircraft.pathOnDisk != undefined + font.pixelSize: Style.baseFontPixelSize } } // main layout column diff --git a/src/GUI/qml/AircraftDownloadPanel.qml b/src/GUI/qml/AircraftDownloadPanel.qml index 54dc49300..e488b9c5a 100644 --- a/src/GUI/qml/AircraftDownloadPanel.qml +++ b/src/GUI/qml/AircraftDownloadPanel.qml @@ -1,5 +1,6 @@ import QtQuick 2.0 import FlightGear.Launcher 1.0 +import "." // -> forces the qmldir to be loaded Item { id: root @@ -143,6 +144,7 @@ Item { anchors.leftMargin: 6 anchors.verticalCenter: button.verticalCenter text: "Size: " + (root.packageSize / 0x100000).toFixed(1) + "MB" + font.pixelSize: Style.baseFontPixelSize } Column { @@ -185,6 +187,7 @@ Item { visible: false text: (compact ? "" : "Downloaded ") + (root.downloadedBytes / 0x100000).toFixed(1) + "MB of " + (root.packageSize / 0x100000).toFixed(1) + "MB"; + font.pixelSize: Style.baseFontPixelSize } } // item container for progress bar and text } diff --git a/src/GUI/qml/AircraftRating.qml b/src/GUI/qml/AircraftRating.qml index e04487d68..08ec59d68 100644 --- a/src/GUI/qml/AircraftRating.qml +++ b/src/GUI/qml/AircraftRating.qml @@ -18,6 +18,7 @@ Item { horizontalAlignment: Text.AlignRight text: root.title + ":" + font.pixelSize: Style.baseFontPixelSize } Row { diff --git a/src/GUI/qml/AircraftVariantChoice.qml b/src/GUI/qml/AircraftVariantChoice.qml index 5ad5f4e08..9a11453cc 100644 --- a/src/GUI/qml/AircraftVariantChoice.qml +++ b/src/GUI/qml/AircraftVariantChoice.qml @@ -1,5 +1,6 @@ import QtQuick 2.0 import QtQuick.Window 2.0 +import "." // -> forces the qmldir to be loaded import FlightGear.Launcher 1.0 @@ -37,8 +38,9 @@ Rectangle { anchors.rightMargin: 4 horizontalAlignment: Text.AlignHCenter - font.pixelSize: 24 + font.pixelSize: Style.baseFontPixelSize * 2 text: aircraftInfo.name + fontSizeMode: Text.Fit elide: Text.ElideRight maximumLineCount: 1 diff --git a/src/GUI/qml/Button.qml b/src/GUI/qml/Button.qml index 4733c7434..97679b75a 100644 --- a/src/GUI/qml/Button.qml +++ b/src/GUI/qml/Button.qml @@ -20,6 +20,7 @@ Rectangle { anchors.centerIn: parent color: "white" text: (mouse.containsMouse && hoverText != "") ? root.hoverText : root.text + font.pixelSize: Style.baseFontPixelSize } MouseArea { diff --git a/src/GUI/qml/Slider.qml b/src/GUI/qml/Slider.qml index 9bfd3f4b1..901f37f74 100644 --- a/src/GUI/qml/Slider.qml +++ b/src/GUI/qml/Slider.qml @@ -20,6 +20,7 @@ Item { id: labelText width: parent.width - (emptyTrack.width + Style.margin) horizontalAlignment: Text.AlignRight + font.pixelSize: Style.baseFontPixelSize } Rectangle { diff --git a/src/GUI/qml/Style.qml b/src/GUI/qml/Style.qml index 26f117031..05f075d2d 100644 --- a/src/GUI/qml/Style.qml +++ b/src/GUI/qml/Style.qml @@ -18,5 +18,7 @@ QtObject readonly property string inactiveThemeColor: "#9f9f9f" readonly property string baseTextColor: "#3f3f3f" + + readonly property int baseFontPixelSize: 12 } diff --git a/src/GUI/qml/ToggleSwitch.qml b/src/GUI/qml/ToggleSwitch.qml index e47ff317a..2eb45c43b 100644 --- a/src/GUI/qml/ToggleSwitch.qml +++ b/src/GUI/qml/ToggleSwitch.qml @@ -45,6 +45,7 @@ Item { anchors.left: track.right anchors.leftMargin: Style.margin anchors.verticalCenter: parent.verticalCenter + font.pixelSize: Style.baseFontPixelSize } MouseArea {