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

Add cute color icons to color dropdown ui

Browse Source 
Fix current_side not using the character's preferred one after changing character
Add cool tool tip describing how to do cool select+color thing
Fix chatlogpiece not appending ": " in the log files
This commit is contained in:
Crystalwarrior 2019-09-27 15:52:51 +03:00
parent 3c27988423
commit 8c9275c497
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/chatlogpiece.cpp
View File

@ -69,6 +69,8 @@ QString chatlogpiece::get_full()
full.append(")"); full.append(")");
if (p_is_song) if (p_is_song)
full.append(" has played a song: "); full.append(" has played a song: ");
else
full.append(": ");
full.append(get_message()); full.append(get_message());
return full; return full;

12
src/courtroom.cpp
View File

@ -776,7 +776,8 @@ void Courtroom::set_widgets()
ui_prosecution_minus->setToolTip(tr("Decrease the health bar.")); ui_prosecution_minus->setToolTip(tr("Decrease the health bar."));
set_size_and_pos(ui_text_color, "text_color"); set_size_and_pos(ui_text_color, "text_color");
ui_text_color->setToolTip(tr("Change the text color of the spoken message.")); ui_text_color->setToolTip(tr("Change the text color of the spoken message.\n"
"You can also select a part of your currently typed message and use the dropdown to change its color!"));
set_text_color_dropdown(); set_text_color_dropdown();
set_size_and_pos(ui_music_slider, "music_slider"); set_size_and_pos(ui_music_slider, "music_slider");
@ -1059,6 +1060,7 @@ void Courtroom::update_character(int p_cid)
} }
current_char = f_char; current_char = f_char;
current_side = "";
current_emote_page = 0; current_emote_page = 0;
current_emote = 0; current_emote = 0;
@ -1621,7 +1623,7 @@ void Courtroom::handle_chatmessage(QStringList *p_contents)
//Let the server handle actually checking if they're allowed to do this. //Let the server handle actually checking if they're allowed to do this.
is_additive = m_chatmessage[ADDITIVE].toInt() == 1; is_additive = m_chatmessage[ADDITIVE].toInt() == 1;
chatlogpiece* temp = new chatlogpiece(ao_app->get_showname(char_list.at(f_char_id).name), f_showname, ": " + m_chatmessage[MESSAGE], false); chatlogpiece* temp = new chatlogpiece(ao_app->get_showname(char_list.at(f_char_id).name), f_showname, m_chatmessage[MESSAGE], false);
ic_chatlog_history.append(*temp); ic_chatlog_history.append(*temp);
ao_app->append_to_file(temp->get_full(), ao_app->log_filename, true); ao_app->append_to_file(temp->get_full(), ao_app->log_filename, true);
@ -3896,7 +3898,8 @@ void Courtroom::set_text_color_dropdown()
//Update markdown colors. TODO: make a loading function that only loads the config file once instead of several times //Update markdown colors. TODO: make a loading function that only loads the config file once instead of several times
for (int c = 0; c < max_colors; ++c) for (int c = 0; c < max_colors; ++c)
{ {
color_rgb_list.append(ao_app->get_chat_color(QString::number(c), current_char)); QColor color = ao_app->get_chat_color(QString::number(c), current_char);
color_rgb_list.append(color);
color_markdown_start_list.append(ao_app->get_chat_markdown("c" + QString::number(c) + "_start", current_char)); color_markdown_start_list.append(ao_app->get_chat_markdown("c" + QString::number(c) + "_start", current_char));
color_markdown_end_list.append(ao_app->get_chat_markdown("c" + QString::number(c) + "_end", current_char)); color_markdown_end_list.append(ao_app->get_chat_markdown("c" + QString::number(c) + "_end", current_char));
color_markdown_remove_list.append(ao_app->get_chat_markdown("c" + QString::number(c) + "_remove", current_char) == "1"); color_markdown_remove_list.append(ao_app->get_chat_markdown("c" + QString::number(c) + "_remove", current_char) == "1");
@ -3910,6 +3913,9 @@ void Courtroom::set_text_color_dropdown()
color_name = tr("Default"); color_name = tr("Default");
} }
ui_text_color->addItem(color_name); ui_text_color->addItem(color_name);
QPixmap pixmap(16,16);
pixmap.fill(color);
ui_text_color->setItemIcon(ui_text_color->count() - 1, QIcon(pixmap));
color_row_to_number.append(c); color_row_to_number.append(c);
} }
} }