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

Merge pull request #657 from AttorneyOnline/icons-for-all

Browse Source 
Add icons for iniswaps and emotes in the dropdown
This commit is contained in:
oldmud0 2022-02-20 23:00:04 -06:00 committed by GitHub
commit bcbbb899f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/courtroom.cpp
View File

@ -4343,6 +4343,10 @@ void Courtroom::set_iniswap_dropdown()
QStringList iniswaps =
ao_app->get_list_file(ao_app->get_character_path(char_list.at(m_cid).name, "iniswaps.ini")) +
ao_app->get_list_file(ao_app->get_base_path() + "iniswaps.ini");
if (ao_app->get_char_name(char_list.at(m_cid).name) != char_list.at(m_cid).name)
iniswaps.append(ao_app->get_char_name(char_list.at(m_cid).name));
iniswaps.removeDuplicates();
iniswaps.prepend(char_list.at(m_cid).name);
if (iniswaps.size() <= 0) {
@ -4351,16 +4355,17 @@ void Courtroom::set_iniswap_dropdown()
return;
}
ui_iniswap_dropdown->show();
ui_iniswap_dropdown->addItems(iniswaps);
for (int i = 0; i < iniswaps.size(); ++i) {
ui_iniswap_dropdown->addItem(iniswaps.at(i));
QString icon_path = ao_app->get_image_suffix(ao_app->get_character_path(
iniswaps.at(i), "char_icon"));
ui_iniswap_dropdown->setItemIcon(i, QIcon(icon_path));
if (iniswaps.at(i) == current_char) {
ui_iniswap_dropdown->setCurrentIndex(i);
if (i != 0)
ui_iniswap_remove->show();
else
ui_iniswap_remove->hide();
break;
}
}
ui_iniswap_dropdown->blockSignals(false);
@ -4386,6 +4391,9 @@ void Courtroom::on_iniswap_dropdown_changed(int p_index)
ui_iniswap_dropdown->setCurrentIndex(p_index);
ui_iniswap_dropdown->blockSignals(false);
update_character(m_cid);
QString icon_path = ao_app->get_image_suffix(ao_app->get_character_path(
iniswap, "char_icon"));
ui_iniswap_dropdown->setItemIcon(p_index, QIcon(icon_path));
if (p_index != 0)
ui_iniswap_remove->show();
else

10
src/emotes.cpp
View File

@ -141,14 +141,14 @@ void Courtroom::set_emote_dropdown()
ui_emote_dropdown->clear();
int total_emotes = ao_app->get_emote_number(current_char);
QStringList emote_list;
for (int n = 0; n < total_emotes; ++n) {
emote_list.append(QString::number(n + 1) + ": " +
ao_app->get_emote_comment(current_char, n));
ui_emote_dropdown->addItem(QString::number(n + 1) + ": " +
ao_app->get_emote_comment(current_char, n));
QString icon_path = ao_app->get_image_suffix(ao_app->get_character_path(
current_char, "emotions/button" + QString::number(n + 1) + "_off"));
ui_emote_dropdown->setItemIcon(n, QIcon(icon_path));
}
ui_emote_dropdown->addItems(emote_list);
}
void Courtroom::select_emote(int p_id)