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 Hack (http://sourcefoundry.org/hack/) 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,5 @@ install(TARGETS KDEPlasmaPlatformTheme DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/platformthemes) +install(FILES fonts_global.upd fonts_akregator.upd fonts_kate.upd DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kconf_update) +install(PROGRAMS fonts_global.pl fonts_akregator.pl fonts_kate.pl DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kconf_update) diff --git a/src/platformtheme/fonts_akregator.pl b/src/platformtheme/fonts_akregator.pl new file mode 100755 --- /dev/null +++ b/src/platformtheme/fonts_akregator.pl @@ -0,0 +1,14 @@ +#! /usr/bin/perl + +use strict; + +while (<>) +{ + chomp; + s/Fixed\ Font=Oxygen\ Mono/Fixed\ Font=Hack/; + s/Sans\ Serif\ Font=Oxygen-Sans/Sans\ Serif\ Font=Noto\ Sans/; + s/Serif\ Font=Oxygen-Sans/Serif\ Font=Noto\ Sans/; + s/Standard Font=Oxygen-Sans/Standard\ Font=Noto\ Sans/; + s/Fonts=Oxygen-Sans,Oxygen\ Mono,Oxygen-Sans,Oxygen-Sans/Fonts=Noto\ Sans,Hack,Noto\ Sans,Noto\ Sans/; + print "$_\n"; +} diff --git a/src/platformtheme/fonts_akregator.upd b/src/platformtheme/fonts_akregator.upd new file mode 100644 --- /dev/null +++ b/src/platformtheme/fonts_akregator.upd @@ -0,0 +1,5 @@ +Version=5 +Id=Plasma_Fonts_Akregator +Options=overwrite +File=akregatorrc +Script=fonts_akregator.pl,perl diff --git a/src/platformtheme/fonts_global.pl b/src/platformtheme/fonts_global.pl new file mode 100755 --- /dev/null +++ b/src/platformtheme/fonts_global.pl @@ -0,0 +1,14 @@ +#! /usr/bin/perl + +use strict; + +while (<>) +{ + chomp; + s/font=Oxygen-Sans/font=Noto\ Sans/; + s/fixed=Oxygen\ Mono/fixed=Hack/; + s/menuFont=Oxygen-Sans/menuFont=Noto\ Sans/; + s/smallestReadableFont=Oxygen-Sans/smallestReadableFont=Noto\ Sans/; + s/toolBarFont=Oxygen-Sans/toolBarFont=Noto\ Sans/; + print "$_\n"; +} diff --git a/src/platformtheme/fonts_global.upd b/src/platformtheme/fonts_global.upd new file mode 100644 --- /dev/null +++ b/src/platformtheme/fonts_global.upd @@ -0,0 +1,5 @@ +Version=5 +Id=Fonts_Global +Options=overwrite +File=kdeglobals +Script=fonts_global.pl,perl diff --git a/src/platformtheme/fonts_kate.pl b/src/platformtheme/fonts_kate.pl new file mode 100755 --- /dev/null +++ b/src/platformtheme/fonts_kate.pl @@ -0,0 +1,10 @@ +#! /usr/bin/perl + +use strict; + +while (<>) +{ + chomp; + s/Font=Oxygen\ Mono/Font=Hack/; + print "$_\n"; +} diff --git a/src/platformtheme/fonts_kate.upd b/src/platformtheme/fonts_kate.upd new file mode 100644 --- /dev/null +++ b/src/platformtheme/fonts_kate.upd @@ -0,0 +1,6 @@ +Version=5 +Id=Plasma_Fonts_Kate +Options=overwrite +File=kateschemarc +Group=Normal +Script=fonts_kate.pl,perl 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", "Hack", 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.pl b/src/platformtheme/mono_font.pl new file mode 100755 --- /dev/null +++ b/src/platformtheme/mono_font.pl @@ -0,0 +1,10 @@ +#! /usr/bin/perl + +use strict; + +while (<>) +{ + chomp; + s/fixed=Oxygen\ Mono/fixed=Hack/; + print "$_\n"; +} 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,5 @@ +Version=5 +Id=Plasma_Mono_Font +Options=overwrite +File=kdeglobals,kdeglobals +Script=mono_font.pl,perl