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

Add a p_char optional argument to set_fonts() (#209)

Browse Source 
Add overrides to set_font for font name and size (this is to preserve the chat_size and chat_font char.ini arguments that were implemented way earlier)
Cease the baddening with set_font that was there before and condense it into a proper set_font function call
Implement set_font for custom showname shenanigans from the misc folder
This commit is contained in:
Crystalwarrior 2020-07-31 23:06:55 +03:00 committed by GitHub
parent a0ce2089f2
commit 740d825fd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/courtroom.h
View File

@ -118,7 +118,7 @@ public:
void set_widgets(); void set_widgets();
// sets font size based on theme ini files // sets font size based on theme ini files
void set_font(QWidget *widget, QString class_name, QString p_identifier); void set_font(QWidget *widget, QString class_name, QString p_identifier, QString p_char="", QString font_name="", int f_pointsize=0);
// Get the properly constructed font // Get the properly constructed font
QFont get_qfont(QString font_name, int f_pointsize, bool antialias = true); QFont get_qfont(QString font_name, int f_pointsize, bool antialias = true);
@ -128,7 +128,7 @@ public:
QColor f_color = Qt::black, bool bold = false); QColor f_color = Qt::black, bool bold = false);
// helper function that calls above function on the relevant widgets // helper function that calls above function on the relevant widgets
void set_fonts(); void set_fonts(QString p_char="");
// sets dropdown menu stylesheet // sets dropdown menu stylesheet
void set_dropdown(QWidget *widget); void set_dropdown(QWidget *widget);

76
src/courtroom.cpp
View File

@ -937,33 +937,48 @@ void Courtroom::set_widgets()
refresh_evidence(); refresh_evidence();
} }
void Courtroom::set_fonts() void Courtroom::set_fonts(QString p_char)
{ {
set_font(ui_vp_showname, "", "showname"); set_font(ui_vp_showname, "", "showname", p_char);
set_font(ui_vp_message, "", "message"); set_font(ui_vp_message, "", "message", p_char);
set_font(ui_ic_chatlog, "", "ic_chatlog"); set_font(ui_ic_chatlog, "", "ic_chatlog", p_char);
set_font(ui_ms_chatlog, "", "ms_chatlog"); set_font(ui_ms_chatlog, "", "ms_chatlog", p_char);
set_font(ui_server_chatlog, "", "server_chatlog"); set_font(ui_server_chatlog, "", "server_chatlog", p_char);
set_font(ui_music_list, "", "music_list"); set_font(ui_music_list, "", "music_list", p_char);
set_font(ui_area_list, "", "area_list"); set_font(ui_area_list, "", "area_list", p_char);
set_font(ui_music_name, "", "music_name"); set_font(ui_music_name, "", "music_name", p_char);
set_dropdowns(); set_dropdowns();
} }
void Courtroom::set_font(QWidget *widget, QString class_name, void Courtroom::set_font(QWidget *widget, QString class_name,
QString p_identifier) QString p_identifier, QString p_char,
QString font_name, int f_pointsize)
{ {
QString design_file = "courtroom_fonts.ini"; QString design_file = "courtroom_fonts.ini";
int f_pointsize = ao_app->get_font_size(p_identifier, design_file); if (f_pointsize <= 0)
QString font_name = f_pointsize = ao_app->get_design_element(p_identifier, design_file, p_char).toInt();
ao_app->get_font_name(p_identifier + "_font", design_file); if (font_name == "")
QColor f_color = ao_app->get_color(p_identifier + "_color", design_file); font_name =
bool bold = ao_app->get_font_size(p_identifier + "_bold", design_file) == ao_app->get_design_element(p_identifier + "_font", design_file, p_char);
QString f_color_result = ao_app->get_design_element(p_identifier + "_color", design_file, p_char);
QColor f_color(0, 0, 0);
if (f_color_result != "")
{
QStringList color_list = f_color_result.split(",");
if (color_list.size() >= 3)
{
f_color.setRed(color_list.at(0).toInt());
f_color.setGreen(color_list.at(1).toInt());
f_color.setBlue(color_list.at(2).toInt());
}
}
bool bold = ao_app->get_design_element(p_identifier + "_bold", design_file, p_char) ==
1; // is the font bold or not? 1; // is the font bold or not?
bool antialias = bool antialias =
ao_app->get_font_size(p_identifier + "_sharp", design_file) != ao_app->get_design_element(p_identifier + "_sharp", design_file, p_char) !=
1; // is the font anti-aliased or not? "1"; // is the font anti-aliased or not?
this->set_qfont(widget, class_name, this->set_qfont(widget, class_name,
get_qfont(font_name, f_pointsize, antialias), f_color, bold); get_qfont(font_name, f_pointsize, antialias), f_color, bold);
@ -1946,6 +1961,9 @@ void Courtroom::handle_chatmessage_2()
ui_vp_showname->setText(m_chatmessage[SHOWNAME]); ui_vp_showname->setText(m_chatmessage[SHOWNAME]);
} }
QString customchar;
if (ao_app->is_customchat_enabled())
customchar = m_chatmessage[CHAR_NAME];
if (ui_vp_showname->text().trimmed().isEmpty()) // Whitespace showname if (ui_vp_showname->text().trimmed().isEmpty()) // Whitespace showname
{ {
ui_vp_chatbox->set_image("chatblank"); ui_vp_chatbox->set_image("chatblank");
@ -1963,10 +1981,7 @@ void Courtroom::handle_chatmessage_2()
int fm_width = fm.boundingRect((ui_vp_showname->text())).width(); int fm_width = fm.boundingRect((ui_vp_showname->text())).width();
#endif #endif
QString chatbox_path = ao_app->get_theme_path("chat"); QString chatbox_path = ao_app->get_theme_path("chat");
QString chatbox = ao_app->get_chat(m_chatmessage[CHAR_NAME]); QString chatbox = ao_app->get_chat(customchar);
QString customchar;
if (ao_app->is_customchat_enabled())
customchar = m_chatmessage[CHAR_NAME];
if (chatbox != "" && ao_app->is_customchat_enabled()) { if (chatbox != "" && ao_app->is_customchat_enabled()) {
chatbox_path = ao_app->get_base_path() + "misc/" + chatbox + "/chat"; chatbox_path = ao_app->get_base_path() + "misc/" + chatbox + "/chat";
@ -2028,6 +2043,8 @@ void Courtroom::handle_chatmessage_2()
} }
else else
ui_vp_showname->resize(default_width.width, ui_vp_showname->height()); ui_vp_showname->resize(default_width.width, ui_vp_showname->height());
set_font(ui_vp_showname, "", "showname", customchar);
} }
else else
{ {
@ -2038,25 +2055,16 @@ void Courtroom::handle_chatmessage_2()
ui_vp_message->hide(); ui_vp_message->hide();
ui_vp_chatbox->hide(); ui_vp_chatbox->hide();
// todo: put this in its own function or update QString font_name;
QString design_file = "courtroom_fonts.ini";
int f_pointsize = ao_app->get_font_size("message", design_file);
QString font_name = ao_app->get_font_name("message_font", design_file);
QColor f_color = ao_app->get_color("message_color", design_file);
bool bold = ao_app->get_font_size("message_bold", design_file) ==
1; // is the font bold or not?
bool antialias = ao_app->get_font_size("message_sharp", design_file) !=
1; // is the font anti-aliased or not?
QString chatfont = ao_app->get_chat_font(m_chatmessage[CHAR_NAME]); QString chatfont = ao_app->get_chat_font(m_chatmessage[CHAR_NAME]);
if (chatfont != "") if (chatfont != "")
font_name = chatfont; font_name = chatfont;
int f_pointsize = 0;
int chatsize = ao_app->get_chat_size(m_chatmessage[CHAR_NAME]); int chatsize = ao_app->get_chat_size(m_chatmessage[CHAR_NAME]);
if (chatsize != -1) if (chatsize > 0)
f_pointsize = chatsize; f_pointsize = chatsize;
this->set_qfont(ui_vp_message, "", set_font(ui_vp_message, "", "message", customchar, font_name, f_pointsize);
get_qfont(font_name, f_pointsize, antialias), f_color, bold);
set_scene(m_chatmessage[DESK_MOD], m_chatmessage[SIDE]); set_scene(m_chatmessage[DESK_MOD], m_chatmessage[SIDE]);