From 86b02ed9141083ce360602fc798f78240d9b0b02 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 27 Feb 2023 18:42:29 +0100 Subject: [PATCH] Use Noto font instead of Ubuntu On Debian, the Ubuntu font isn't in "main" Forwarded: not-needed --- .../tools/bitmaptextbuilder/bitmaptextbuilder.cpp | 2 +- src/LomiriToolkit/lomiritoolkitmodule.cpp | 4 ++-- src/LomiriToolkit/uclabel.cpp | 2 +- src/LomiriToolkit/uctheme.cpp | 2 +- src/imports/Components/1.0/Button.qml | 2 +- src/imports/Components/1.1/Button.qml | 2 +- src/imports/Components/Themes/Ambiance/1.2/ButtonStyle.qml | 2 +- src/imports/Components/Themes/Ambiance/1.3/ButtonStyle.qml | 2 +- .../Components/Themes/Ambiance/1.3/ComboButtonStyle.qml | 2 +- src/imports/Components/Themes/Ambiance/2.0/ButtonStyle.qml | 2 +- .../Components/Themes/Ambiance/2.0/ComboButtonStyle.qml | 2 +- tests/resources/lomirishape/AnimatedShaderEffectSource.qml | 2 +- tests/resources/lomirishape/FrameTest.qml | 2 +- tests/resources/lomirishape/LomiriShapeOverlayTest.qml | 2 +- tests/resources/lomirishape/LomiriShapeTest.qml | 2 +- tests/resources/lomirishape/ProportionalShapeTest.qml | 2 +- tests/resources/urihandler/UriHandlerTest.qml | 2 +- tests/unit/components/tst_button.qml | 2 +- tests/unit/components/tst_label.qml | 2 +- tests/unit/components13/tst_button.qml | 2 +- tests/unit/components13/tst_label.qml | 2 +- tests/unit/components13/tst_label13.qml | 2 +- tests/unit/statesaver/tst_statesaver.cpp | 2 +- tests/unit/visual/tst_combobutton.qml | 2 +- tests/unit/visual13/tst_combobutton.11.qml | 2 +- tests/unit/visual13/tst_combobutton.13.qml | 2 +- 26 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/LomiriMetrics/tools/bitmaptextbuilder/bitmaptextbuilder.cpp b/src/LomiriMetrics/tools/bitmaptextbuilder/bitmaptextbuilder.cpp index 3bfcf59c9..66c0200bc 100644 --- a/src/LomiriMetrics/tools/bitmaptextbuilder/bitmaptextbuilder.cpp +++ b/src/LomiriMetrics/tools/bitmaptextbuilder/bitmaptextbuilder.cpp @@ -28,7 +28,7 @@ // Input data. // FIXME(loicm) Make that command line arguments? const char* fileName = "bitmaptextfont_p.h"; -const char* fontFamily = "Ubuntu Mono"; // Must be monospace. +const char* fontFamily = "Noto Mono"; // Must be monospace. const int fontPixelSizeMin = 12; // Must be an even number. const int fontPixelSizeMax = 20; // Must be an even number, higher than fontPixelSizeMin. const bool outline = false; diff --git a/src/LomiriToolkit/lomiritoolkitmodule.cpp b/src/LomiriToolkit/lomiritoolkitmodule.cpp index bb5533b52..f5492398e 100644 --- a/src/LomiriToolkit/lomiritoolkitmodule.cpp +++ b/src/LomiriToolkit/lomiritoolkitmodule.cpp @@ -492,7 +492,7 @@ void LomiriToolkitModule::defineModule(const char *uri) // FIXME/DEPRECATED: Ubuntu.* is exported for backwards compatibility only qmlRegisterType(uri, 1, 2, "UbuntuShape"); qmlRegisterType(uri, 1, 2, "UbuntuShapeOverlay"); - qmlRegisterSimpleSingletonType(uri, 1, 2, "Ubuntu"); + qmlRegisterSimpleSingletonType(uri, 1, 2, "Noto Sans"); } else { qmlRegisterType(uri, 1, 2, "LomiriShape"); qmlRegisterType(uri, 1, 2, "LomiriShapeOverlay"); @@ -510,7 +510,7 @@ void LomiriToolkitModule::defineModule(const char *uri) if (QLatin1String(uri) == QLatin1String("Ubuntu.Components")) { // FIXME/DEPRECATED: Ubuntu.* is exported for backwards compatibility only qmlRegisterType(uri, 1, 3, "UbuntuShape"); - qmlRegisterSimpleSingletonType(uri, 1, 3, "Ubuntu"); + qmlRegisterSimpleSingletonType(uri, 1, 3, "Noto Sans"); } else { qmlRegisterType(uri, 1, 3, "LomiriShape"); qmlRegisterSimpleSingletonType(uri, 1, 3, "Lomiri"); diff --git a/src/LomiriToolkit/uclabel.cpp b/src/LomiriToolkit/uclabel.cpp index db4155263..b792f1332 100644 --- a/src/LomiriToolkit/uclabel.cpp +++ b/src/LomiriToolkit/uclabel.cpp @@ -135,7 +135,7 @@ void UCLabelPrivate::init() updatePixelSize(); QFont defaultFont = q->font(); - defaultFont.setFamily(QStringLiteral("Ubuntu")); + defaultFont.setFamily(QStringLiteral("Noto Sans")); defaultFont.setWeight(QFont::Light); q->setFont(defaultFont); updateRenderType(); diff --git a/src/LomiriToolkit/uctheme.cpp b/src/LomiriToolkit/uctheme.cpp index e05a22de3..461056660 100644 --- a/src/LomiriToolkit/uctheme.cpp +++ b/src/LomiriToolkit/uctheme.cpp @@ -443,7 +443,7 @@ void UCTheme::setupDefault() // FIXME: move this into QPA // set the default font QFont defaultFont = QGuiApplication::font(); - defaultFont.setFamily(QStringLiteral("Ubuntu")); + defaultFont.setFamily(QStringLiteral("Noto Sans")); defaultFont.setPixelSize(UCFontUtils::instance()->sizeToPixels(QStringLiteral("medium"))); defaultFont.setWeight(QFont::Light); QGuiApplication::setFont(defaultFont); diff --git a/src/imports/Components/1.0/Button.qml b/src/imports/Components/1.0/Button.qml index f4451df4d..15922c50b 100644 --- a/src/imports/Components/1.0/Button.qml +++ b/src/imports/Components/1.0/Button.qml @@ -28,7 +28,7 @@ AbstractButton { property Gradient gradient: __styleInstance.defaultGradient - property font font: __styleInstance ? __styleInstance.defaultFont : Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")}) + property font font: __styleInstance ? __styleInstance.defaultFont : Qt.font({family: "Noto Sans", pixelSize: FontUtils.sizeToPixels("medium")}) property string iconPosition: "left" diff --git a/src/imports/Components/1.1/Button.qml b/src/imports/Components/1.1/Button.qml index c5e1d8367..f025153cd 100644 --- a/src/imports/Components/1.1/Button.qml +++ b/src/imports/Components/1.1/Button.qml @@ -105,7 +105,7 @@ AbstractButton { /*! The font used for the button's text. */ - property font font: __styleInstance ? __styleInstance.defaultFont : Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")}) + property font font: __styleInstance ? __styleInstance.defaultFont : Qt.font({family: "Noto Sans", pixelSize: FontUtils.sizeToPixels("medium")}) /*! The position of the icon relative to the text. Options diff --git a/src/imports/Components/Themes/Ambiance/1.2/ButtonStyle.qml b/src/imports/Components/Themes/Ambiance/1.2/ButtonStyle.qml index d2847cc65..a8653ee75 100644 --- a/src/imports/Components/Themes/Ambiance/1.2/ButtonStyle.qml +++ b/src/imports/Components/Themes/Ambiance/1.2/ButtonStyle.qml @@ -27,7 +27,7 @@ Item { property real horizontalPadding: units.gu(1) // FIXME: Add this color to the palette property color defaultColor: "#b2b2b2" - property font defaultFont: Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")}) + property font defaultFont: Qt.font({family: "Noto Sans", pixelSize: FontUtils.sizeToPixels("medium")}) property Gradient defaultGradient property real buttonFaceOffset: 0 property bool stroke: button.hasOwnProperty("strokeColor") && button.strokeColor != Qt.rgba(0.0, 0.0, 0.0, 0.0) diff --git a/src/imports/Components/Themes/Ambiance/1.3/ButtonStyle.qml b/src/imports/Components/Themes/Ambiance/1.3/ButtonStyle.qml index 433e021fe..a526afdd5 100644 --- a/src/imports/Components/Themes/Ambiance/1.3/ButtonStyle.qml +++ b/src/imports/Components/Themes/Ambiance/1.3/ButtonStyle.qml @@ -26,7 +26,7 @@ Item { property real minimumWidth: units.gu(10) property real horizontalPadding: units.gu(1) property color defaultColor: LomiriColors.graphite - property font defaultFont: Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")}) + property font defaultFont: Qt.font({family: "Noto Sans", pixelSize: FontUtils.sizeToPixels("medium")}) property Gradient defaultGradient property real buttonFaceOffset: 0 property bool stroke: button.hasOwnProperty("strokeColor") && button.strokeColor != Qt.rgba(0.0, 0.0, 0.0, 0.0) diff --git a/src/imports/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml b/src/imports/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml index f5f1e0ff5..1319eb797 100644 --- a/src/imports/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml +++ b/src/imports/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml @@ -46,7 +46,7 @@ Style.ComboButtonStyle { property real minimumWidth: units.gu(36) property real horizontalPadding: units.gu(4) property color defaultColor: theme.palette.normal.foreground - property font defaultFont: Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")}) + property font defaultFont: Qt.font({family: "Noto Sans", pixelSize: FontUtils.sizeToPixels("medium")}) property Gradient defaultGradient: null property real buttonFaceOffset: -dropDownWidth/2 property bool stroke: false diff --git a/src/imports/Components/Themes/Ambiance/2.0/ButtonStyle.qml b/src/imports/Components/Themes/Ambiance/2.0/ButtonStyle.qml index daa5d8e53..8eb139e89 100644 --- a/src/imports/Components/Themes/Ambiance/2.0/ButtonStyle.qml +++ b/src/imports/Components/Themes/Ambiance/2.0/ButtonStyle.qml @@ -26,7 +26,7 @@ Item { property real minimumWidth: units.gu(10) property real horizontalPadding: units.gu(1) property color defaultColor: LomiriColors.graphite - property font defaultFont: Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")}) + property font defaultFont: Qt.font({family: "Noto Sans", pixelSize: FontUtils.sizeToPixels("medium")}) property Gradient defaultGradient property real buttonFaceOffset: 0 property bool stroke: button.hasOwnProperty("strokeColor") && button.strokeColor !== Qt.rgba(0.0, 0.0, 0.0, 0.0) diff --git a/src/imports/Components/Themes/Ambiance/2.0/ComboButtonStyle.qml b/src/imports/Components/Themes/Ambiance/2.0/ComboButtonStyle.qml index c0fc091ea..39c828fe4 100644 --- a/src/imports/Components/Themes/Ambiance/2.0/ComboButtonStyle.qml +++ b/src/imports/Components/Themes/Ambiance/2.0/ComboButtonStyle.qml @@ -46,7 +46,7 @@ Style.ComboButtonStyle { property real minimumWidth: units.gu(36) property real horizontalPadding: units.gu(4) property color defaultColor: theme.palette.normal.foreground - property font defaultFont: Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")}) + property font defaultFont: Qt.font({family: "Noto Sans", pixelSize: FontUtils.sizeToPixels("medium")}) property Gradient defaultGradient: null property real buttonFaceOffset: -dropDownWidth/2 property bool stroke: false diff --git a/tests/resources/lomirishape/AnimatedShaderEffectSource.qml b/tests/resources/lomirishape/AnimatedShaderEffectSource.qml index f12839562..9e4454be2 100644 --- a/tests/resources/lomirishape/AnimatedShaderEffectSource.qml +++ b/tests/resources/lomirishape/AnimatedShaderEffectSource.qml @@ -28,7 +28,7 @@ Rectangle { Text { id: text anchors.centerIn: parent - font.family: "Ubuntu" + font.family: "Noto Sans" font.pixelSize: 34 color: "#c0c0c0" text: "This is a scrolling text... " diff --git a/tests/resources/lomirishape/FrameTest.qml b/tests/resources/lomirishape/FrameTest.qml index cbe2528b5..611a8b364 100644 --- a/tests/resources/lomirishape/FrameTest.qml +++ b/tests/resources/lomirishape/FrameTest.qml @@ -49,7 +49,7 @@ Item { anchors.topMargin: 10 anchors.left: parent.left anchors.leftMargin: 10 - font.family: "Ubuntu Mono" + font.family: "Noto Mono" font.pixelSize: 14 font.weight: Font.Bold color: "black" diff --git a/tests/resources/lomirishape/LomiriShapeOverlayTest.qml b/tests/resources/lomirishape/LomiriShapeOverlayTest.qml index 2c04b5fdd..fb4fa6e08 100644 --- a/tests/resources/lomirishape/LomiriShapeOverlayTest.qml +++ b/tests/resources/lomirishape/LomiriShapeOverlayTest.qml @@ -152,7 +152,7 @@ Item { anchors.topMargin: 10 anchors.left: parent.left anchors.leftMargin: 10 - font.family: "Ubuntu Mono" + font.family: "Noto Mono" font.pixelSize: 14 font.weight: Font.Bold color: "black" diff --git a/tests/resources/lomirishape/LomiriShapeTest.qml b/tests/resources/lomirishape/LomiriShapeTest.qml index d75e4dfbc..ec2b97b43 100644 --- a/tests/resources/lomirishape/LomiriShapeTest.qml +++ b/tests/resources/lomirishape/LomiriShapeTest.qml @@ -150,7 +150,7 @@ Item { anchors.topMargin: 10 anchors.left: parent.left anchors.leftMargin: 10 - font.family: "Ubuntu Mono" + font.family: "Noto Mono" font.pixelSize: 14 font.weight: Font.Bold color: "black" diff --git a/tests/resources/lomirishape/ProportionalShapeTest.qml b/tests/resources/lomirishape/ProportionalShapeTest.qml index af05e7a69..a8c16e6d8 100644 --- a/tests/resources/lomirishape/ProportionalShapeTest.qml +++ b/tests/resources/lomirishape/ProportionalShapeTest.qml @@ -99,7 +99,7 @@ Item { anchors.topMargin: 10 anchors.left: parent.left anchors.leftMargin: 10 - font.family: "Ubuntu Mono" + font.family: "Noto Mono" font.pixelSize: 14 font.weight: Font.Bold color: "black" diff --git a/tests/resources/urihandler/UriHandlerTest.qml b/tests/resources/urihandler/UriHandlerTest.qml index a53622dcf..024b77b49 100644 --- a/tests/resources/urihandler/UriHandlerTest.qml +++ b/tests/resources/urihandler/UriHandlerTest.qml @@ -37,7 +37,7 @@ Item { verticalAlignment: Text.AlignVCenter font.pixelSize: 20 font.bold: true - font.family: "Ubuntu" + font.family: "Noto Sans" color: "white" text: "Uri: \"\"" } diff --git a/tests/unit/components/tst_button.qml b/tests/unit/components/tst_button.qml index 18c196f12..5d7da7d0b 100644 --- a/tests/unit/components/tst_button.qml +++ b/tests/unit/components/tst_button.qml @@ -54,7 +54,7 @@ TestCase { } function test_font() { - verify(button.font === Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")}), "Default font differs"); + verify(button.font === Qt.font({family: "Noto Sans", pixelSize: FontUtils.sizeToPixels("medium")}), "Default font differs"); } function test_hovered() { diff --git a/tests/unit/components/tst_label.qml b/tests/unit/components/tst_label.qml index 7d840fc88..8fb9cf53f 100644 --- a/tests/unit/components/tst_label.qml +++ b/tests/unit/components/tst_label.qml @@ -27,7 +27,7 @@ TestCase { } function test_0_defaults() { - compare(textCustom.font.family, "Ubuntu", "Default font family"); + compare(textCustom.font.family, "Noto Sans", "Default font family"); compare(textCustom.font.weight, Font.Light, "Default font weight"); compare(textCustom.textSize, Label.Medium, "textSize is 'medium' by default"); } diff --git a/tests/unit/components13/tst_button.qml b/tests/unit/components13/tst_button.qml index 61c2b27f0..8e5e4514d 100644 --- a/tests/unit/components13/tst_button.qml +++ b/tests/unit/components13/tst_button.qml @@ -54,7 +54,7 @@ TestCase { } function test_font() { - verify(button.font === Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")}), "Default font differs"); + verify(button.font === Qt.font({family: "Noto Sans", pixelSize: FontUtils.sizeToPixels("medium")}), "Default font differs"); } function test_hovered() { diff --git a/tests/unit/components13/tst_label.qml b/tests/unit/components13/tst_label.qml index 67bf5a615..cf0ff13b5 100644 --- a/tests/unit/components13/tst_label.qml +++ b/tests/unit/components13/tst_label.qml @@ -27,7 +27,7 @@ TestCase { } function test_0_defaults() { - compare(textCustom.font.family, "Ubuntu", "Default font family"); + compare(textCustom.font.family, "Noto Sans", "Default font family"); compare(textCustom.font.weight, Font.Light, "Default font weight"); compare(textCustom.fontSize,"medium","fontSize is 'medium' by default") } diff --git a/tests/unit/components13/tst_label13.qml b/tests/unit/components13/tst_label13.qml index ee3393447..3f5976d5c 100644 --- a/tests/unit/components13/tst_label13.qml +++ b/tests/unit/components13/tst_label13.qml @@ -27,7 +27,7 @@ TestCase { } function initTestCase() { - compare(textCustom.font.family, "Ubuntu", "Default font family"); + compare(textCustom.font.family, "Noto Sans", "Default font family"); compare(textCustom.font.weight, Font.Light, "Default font weight"); compare(textCustom.fontSize, "medium", "fontSize is 'medium' by default") compare(textCustom.textSize, Label.Medium, "fontSize is 'medium' by default") diff --git a/tests/unit/statesaver/tst_statesaver.cpp b/tests/unit/statesaver/tst_statesaver.cpp index 54a4f4fd7..e239530ab 100644 --- a/tests/unit/statesaver/tst_statesaver.cpp +++ b/tests/unit/statesaver/tst_statesaver.cpp @@ -195,7 +195,7 @@ private Q_SLOTS: values.insert("rect", QRectF(100, 100, 200, 200)); values.insert("size", QSizeF(345, 678)); values.insert("color", QColor("blue")); - values.insert("font", QFont("Ubuntu")); + values.insert("font", QFont("Noto Sans")); values.insert("vector2d", QVector2D(100.0, 200.0)); values.insert("vector3d", QVector3D(100.0, 200.0, 300.0)); values.insert("vector4d", QVector4D(100.0, 200.0, 300.0, 400.0)); diff --git a/tests/unit/visual/tst_combobutton.qml b/tests/unit/visual/tst_combobutton.qml index 597aca5a7..f89602bda 100644 --- a/tests/unit/visual/tst_combobutton.qml +++ b/tests/unit/visual/tst_combobutton.qml @@ -121,7 +121,7 @@ Item { var lheight = combo.expandedHeight - combo.collapsedHeight - combo.__styleInstance.comboListMargin; compare(combo.comboListHeight, lheight, "comboListHeight default"); compare(combo.comboList.length, 0, "comboList is empty"); - verify(combo.font === Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")}), "Default font differs."); + verify(combo.font === Qt.font({family: "Noto Sans", pixelSize: FontUtils.sizeToPixels("medium")}), "Default font differs."); } function test_comboListWidth() { diff --git a/tests/unit/visual13/tst_combobutton.11.qml b/tests/unit/visual13/tst_combobutton.11.qml index 8b60be601..75e8605b0 100644 --- a/tests/unit/visual13/tst_combobutton.11.qml +++ b/tests/unit/visual13/tst_combobutton.11.qml @@ -121,7 +121,7 @@ Item { var lheight = combo.expandedHeight - combo.collapsedHeight - combo.__styleInstance.comboListMargin; compare(combo.comboListHeight, lheight, "comboListHeight default"); compare(combo.comboList.length, 0, "comboList is empty"); - verify(combo.font === Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")}), "Default font differs."); + verify(combo.font === Qt.font({family: "Noto Sans", pixelSize: FontUtils.sizeToPixels("medium")}), "Default font differs."); verify(combo.dropdownColor === combo.__styleInstance.defaultDropdownColor, "Default dropdown color differs"); } diff --git a/tests/unit/visual13/tst_combobutton.13.qml b/tests/unit/visual13/tst_combobutton.13.qml index f14b9b1dd..a4a964108 100644 --- a/tests/unit/visual13/tst_combobutton.13.qml +++ b/tests/unit/visual13/tst_combobutton.13.qml @@ -121,7 +121,7 @@ Item { var lheight = combo.expandedHeight - combo.collapsedHeight - combo.__styleInstance.comboListMargin; compare(combo.comboListHeight, lheight, "comboListHeight default"); compare(combo.comboList.length, 0, "comboList is empty"); - verify(combo.font === Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")}), "Default font differs."); + verify(combo.font === Qt.font({family: "Noto Sans", pixelSize: FontUtils.sizeToPixels("medium")}), "Default font differs."); } function test_comboListWidth() { -- 2.53.0