diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2022-02-20 23:00:04 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-20 23:00:04 -0600 |
| commit | bcbbb899f9b3ec9831c59d06d6bbdd1d60b4f36c (patch) | |
| tree | a7721c47ee3fa53ee0c77de7b08eeb4893bd2525 /src/courtroom.cpp | |
| parent | d0336c1035a67d4b7db13f18f74ecaf51abd2579 (diff) | |
| parent | 0e2bd0b110fe44f485871d20b5e614a214470f12 (diff) | |
Merge pull request #657 from AttorneyOnline/icons-for-all
Add icons for iniswaps and emotes in the dropdown
Diffstat (limited to 'src/courtroom.cpp')
| -rw-r--r-- | src/courtroom.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp index 1d0888df..696de02a 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -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 |