瀏覽代碼

UI: Include OpenSans font with OBS

Also reinstates the font-family statement removed in 2941c48
gxalpha 3 年之前
父節點
當前提交
e75b509bba
共有 6 個文件被更改,包括 11 次插入0 次删除
  1. 1 0
      UI/data/themes/Yami.qss
  2. 二進制
      UI/forms/fonts/OpenSans-Bold.ttf
  3. 二進制
      UI/forms/fonts/OpenSans-Italic.ttf
  4. 二進制
      UI/forms/fonts/OpenSans-Regular.ttf
  5. 5 0
      UI/forms/obs.qrc
  6. 5 0
      UI/obs-app.cpp

+ 1 - 0
UI/data/themes/Yami.qss

@@ -82,6 +82,7 @@ QWidget {
     selection-background-color: rgb(40,76,184);
     selection-color: palette(text);
     font-size: 10pt;
+    font-family: 'Open Sans', Helvetica, Arial, 'MS Shell Dlg', sans-serif
 }
 
 QWidget:disabled {

二進制
UI/forms/fonts/OpenSans-Bold.ttf


二進制
UI/forms/fonts/OpenSans-Italic.ttf


二進制
UI/forms/fonts/OpenSans-Regular.ttf


+ 5 - 0
UI/forms/obs.qrc

@@ -73,4 +73,9 @@
     <file>images/settings/hotkeys.svg</file>
     <file>images/settings/accessibility.svg</file>
   </qresource>
+  <qresource prefix="">
+    <file>fonts/OpenSans-Regular.ttf</file>
+    <file>fonts/OpenSans-Bold.ttf</file>
+    <file>fonts/OpenSans-Italic.ttf</file>
+  </qresource>
 </RCC>

+ 5 - 0
UI/obs-app.cpp

@@ -2191,6 +2191,11 @@ static int run_program(fstream &logFile, int argc, char *argv[])
 	OBSApp program(argc, argv, profilerNameStore.get());
 	try {
 		QAccessible::installFactory(accessibleFactory);
+		QFontDatabase::addApplicationFont(
+			":/fonts/OpenSans-Regular.ttf");
+		QFontDatabase::addApplicationFont(":/fonts/OpenSans-Bold.ttf");
+		QFontDatabase::addApplicationFont(
+			":/fonts/OpenSans-Italic.ttf");
 
 		bool created_log = false;