Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Attorney_Online_remake.pro

4 files changed, 16 insertions, 0 deletions

diff --git a/Attorney_Online_remake.pro b/Attorney_Online_remake.pro
index b107a5aa..f41ce627 100644
--- a/Attorney_Online_remake.pro
+++ b/Attorney_Online_remake.pro
@@ -75,3 +75,7 @@ android:LIBS += -L$$PWD\android\libs\armeabi-v7a\ -lbass
 
 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
 
+RESOURCES += \
+    resources.qrc
+
+DISTFILES +=
diff --git a/courtroom.cpp b/courtroom.cpp
index b8940931..583716c0 100644
--- a/courtroom.cpp
+++ b/courtroom.cpp
@@ -564,6 +564,13 @@ void Courtroom::set_fonts()
   QString design_file = "courtroom_fonts.ini";
 
   set_font(ui_vp_showname, ao_app->get_font_size("showname", design_file));
+  /*
+  int id = QFontDatabase::addApplicationFont(":/resource/fonts/Ace-Attorney.ttf");
+  QString family = QFontDatabase::applicationFontFamilies(id).at(0);
+  QFont monospace(family);
+  monospace.setPointSize(ao_app->get_font_size("message", design_file));
+  ui_vp_message->setFont(monospace);
+  */
   set_font(ui_vp_message, ao_app->get_font_size("message", design_file));
   set_font(ui_ic_chatlog, ao_app->get_font_size("ic_chatlog", design_file));
   set_font(ui_ms_chatlog, ao_app->get_font_size("ms_chatlog", design_file));
diff --git a/resource/fonts/Ace-Attorney.ttf b/resource/fonts/Ace-Attorney.ttf
new file mode 100644
index 00000000..702049f9
--- /dev/null
+++ b/resource/fonts/Ace-Attorney.ttf
diff --git a/resources.qrc b/resources.qrc
new file mode 100644
index 00000000..d0c2f22b
--- /dev/null
+++ b/resources.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource>
+    <file>resource/fonts/Ace-Attorney.ttf</file>
+    </qresource>
+</RCC>