Remove the bundled open sans font

Nheko-Reborn · Oct 7, 2018 · 2295d68 · 2295d68
1 parent 4b80722
commit 2295d68
Show file tree

Hide file tree

Showing 15 changed files with 6 additions and 220 deletions.
diff --git a/README.md b/README.md
@@ -264,10 +264,5 @@ Here is a screen shot to get a feel for the UI, but things will probably change.
 
 ![nheko](https://dl.dropboxusercontent.com/s/3zjcezdtk8kqe4i/nheko-v0.4.0.png)
 
-### Third party
-
-- [Font Awesome](http://fontawesome.io/)
-- [Open Sans](https://fonts.google.com/specimen/Open+Sans)
-
 [Matrix]:https://matrix.org
 [Riot]:https://riot.im
diff --git a/resources/fonts/OpenSans/LICENSE.txt b/resources/fonts/OpenSans/LICENSE.txt
diff --git a/resources/fonts/OpenSans/OpenSans-Bold.ttf b/resources/fonts/OpenSans/OpenSans-Bold.ttf
diff --git a/resources/fonts/OpenSans/OpenSans-BoldItalic.ttf b/resources/fonts/OpenSans/OpenSans-BoldItalic.ttf
diff --git a/resources/fonts/OpenSans/OpenSans-ExtraBold.ttf b/resources/fonts/OpenSans/OpenSans-ExtraBold.ttf
diff --git a/resources/fonts/OpenSans/OpenSans-ExtraBoldItalic.ttf b/resources/fonts/OpenSans/OpenSans-ExtraBoldItalic.ttf
diff --git a/resources/fonts/OpenSans/OpenSans-Italic.ttf b/resources/fonts/OpenSans/OpenSans-Italic.ttf
diff --git a/resources/fonts/OpenSans/OpenSans-Light.ttf b/resources/fonts/OpenSans/OpenSans-Light.ttf
diff --git a/resources/fonts/OpenSans/OpenSans-LightItalic.ttf b/resources/fonts/OpenSans/OpenSans-LightItalic.ttf
diff --git a/resources/fonts/OpenSans/OpenSans-Regular.ttf b/resources/fonts/OpenSans/OpenSans-Regular.ttf
diff --git a/resources/fonts/OpenSans/OpenSans-Semibold.ttf b/resources/fonts/OpenSans/OpenSans-Semibold.ttf
diff --git a/resources/fonts/OpenSans/OpenSans-SemiboldItalic.ttf b/resources/fonts/OpenSans/OpenSans-SemiboldItalic.ttf
diff --git a/resources/res.qrc b/resources/res.qrc
@@ -83,12 +83,6 @@
         <file>nheko-32.png</file>
         <file>nheko-16.png</file>
     </qresource>
-    <qresource prefix="/fonts">
-        <file>fonts/OpenSans/OpenSans-Regular.ttf</file>
-        <file>fonts/OpenSans/OpenSans-Italic.ttf</file>
-        <file>fonts/OpenSans/OpenSans-Bold.ttf</file>
-        <file>fonts/OpenSans/OpenSans-Semibold.ttf</file>
-    </qresource>
     <qresource prefix="/styles">
         <file>styles/system.qss</file>
         <file>styles/nheko.qss</file>

diff --git a/src/TrayIcon.cpp b/src/TrayIcon.cpp
@@ -54,9 +54,13 @@ MsgCountComposedIcon::paint(QPainter *painter,
         brush.setStyle(Qt::SolidPattern);
         brush.setColor(backgroundColor);
 
+        QFont f;
+        f.setPointSizeF(8);
+        f.setWeight(QFont::Thin);
+
         painter->setBrush(brush);
         painter->setPen(Qt::NoPen);
-        painter->setFont(QFont("Open Sans", 8, QFont::Black));
+        painter->setFont(f);
 
         QRectF bubble(rect.width() - BubbleDiameter,
                       rect.height() - BubbleDiameter,

diff --git a/src/main.cpp b/src/main.cpp
@@ -127,11 +127,6 @@ main(int argc, char *argv[])
         parser.addVersionOption();
         parser.process(app);
 
-        QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-Regular.ttf");
-        QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-Italic.ttf");
-        QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-Bold.ttf");
-        QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-Semibold.ttf");
-
         app.setWindowIcon(QIcon(":/logos/nheko.png"));
 
         http::init();
@@ -151,7 +146,7 @@ main(int argc, char *argv[])
 
         QSettings settings;
 
-        QFont font("Open Sans");
+        QFont font;
         font.setPointSizeF(settings.value("user/font_size", font.pointSizeF()).toDouble());
 
         app.setFont(font);