diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,4 +53,4 @@ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) -message("** plasma-integration uses Noto Sans (https://www.google.com/get/noto/) and Oxygen Mono (http://download.kde.org/stable/plasma/5.4.0/oxygen-fonts-5.4.0.tar.xz) fonts, ensure these are installed for use at runtime") +message("** plasma-integration uses Noto Sans (https://www.google.com/get/noto/) and Noto Mono (NotoMono-Regular.ttf, only in Git repository not in download tar https://github.com/googlei18n/noto-fonts) fonts, ensure these are installed for use at runtime") diff --git a/src/platformtheme/CMakeLists.txt b/src/platformtheme/CMakeLists.txt --- a/src/platformtheme/CMakeLists.txt +++ b/src/platformtheme/CMakeLists.txt @@ -51,3 +51,4 @@ install(TARGETS KDEPlasmaPlatformTheme DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/platformthemes) +install(FILES mono_font.upd mono_font.sh DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kconf_update) diff --git a/src/platformtheme/kfontsettingsdata.cpp b/src/platformtheme/kfontsettingsdata.cpp --- a/src/platformtheme/kfontsettingsdata.cpp +++ b/src/platformtheme/kfontsettingsdata.cpp @@ -54,7 +54,7 @@ static const KFontData DefaultFontData[KFontSettingsData::FontTypesCount] = { { GeneralId, "font", DefaultFont, 10, -1, QFont::SansSerif }, - { GeneralId, "fixed", "Oxygen Mono", 9, -1, QFont::Monospace }, + { GeneralId, "fixed", "Noto Mono", 9, -1, QFont::Monospace }, { GeneralId, "toolBarFont", DefaultFont, 9, -1, QFont::SansSerif }, { GeneralId, "menuFont", DefaultFont, 10, -1, QFont::SansSerif }, { "WM", "activeFont", DefaultFont, 10, -1, QFont::SansSerif }, diff --git a/src/platformtheme/mono_font.sh b/src/platformtheme/mono_font.sh new file mode 100755 --- /dev/null +++ b/src/platformtheme/mono_font.sh @@ -0,0 +1,2 @@ +#!/bin/bash +sed 's,fixed=Oxygen Mono,fixed=Noto Mono,' diff --git a/src/platformtheme/mono_font.upd b/src/platformtheme/mono_font.upd new file mode 100644 --- /dev/null +++ b/src/platformtheme/mono_font.upd @@ -0,0 +1,4 @@ +Version=5 +Id=Plasma_Mono_Font +File=kdeglobals +Script=mono_font.sh