Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	Attorney_Online_remake.pro
This commit is contained in:
stonedDiscord 2017-02-21 19:28:02 +01:00
commit f769741c1d
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Attorney_Online_remake.pro
View File

@ -75,3 +75,7 @@ android:LIBS += -L$$PWD\android\libs\armeabi-v7a\ -lbass
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
RESOURCES += \
resources.qrc
DISTFILES +=

7
courtroom.cpp
View File

@ -564,6 +564,13 @@ void Courtroom::set_fonts()
QString design_file = "courtroom_fonts.ini"; QString design_file = "courtroom_fonts.ini";
set_font(ui_vp_showname, ao_app->get_font_size("showname", design_file)); 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_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_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)); set_font(ui_ms_chatlog, ao_app->get_font_size("ms_chatlog", design_file));

BIN
resource/fonts/Ace-Attorney.ttf Normal file
View File

Binary file not shown.

5
resources.qrc Normal file
View File

@ -0,0 +1,5 @@
<RCC>
<qresource>
<file>resource/fonts/Ace-Attorney.ttf</file>
</qresource>
</RCC>