From f00801feb678ab1ee5935116694e2c95c254bf97 Mon Sep 17 00:00:00 2001 From: in1tiate <32779090+in1tiate@users.noreply.github.com> Date: Fri, 9 Oct 2020 10:22:58 -0500 Subject: [PATCH 1/3] add indicator when song is not found --- src/courtroom.cpp | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/courtroom.cpp b/src/courtroom.cpp index e8d3262..afacda0 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -1533,9 +1533,8 @@ void Courtroom::on_chat_return_pressed() return; ui_ic_chat_message->blockSignals(true); - QTimer::singleShot(600, this, [=] { - ui_ic_chat_message->blockSignals(false); - }); + QTimer::singleShot(600, this, + [=] { ui_ic_chat_message->blockSignals(false); }); // MS# // deskmod# // pre-emote# @@ -3159,8 +3158,12 @@ void Courtroom::handle_song(QStringList *p_contents) } music_player->play(f_song, channel, looping, effect_flags); - if (channel == 0) - ui_music_name->setText(f_song_clear); + if (channel == 0) { + if (file_exists(ao_app->get_sfx_suffix(ao_app->get_music_path(f_song)))) + ui_music_name->setText(f_song_clear); + else + ui_music_name->setText("[MISSING] " + f_song_clear); + } } else { QString str_char = char_list.at(n_char).name; @@ -3191,8 +3194,12 @@ void Courtroom::handle_song(QStringList *p_contents) append_ic_text(f_song_clear, str_show, tr("has played a song")); music_player->play(f_song, channel, looping, effect_flags); - if (channel == 0) - ui_music_name->setText(f_song_clear); + if (channel == 0) { + if (file_exists(ao_app->get_sfx_suffix(ao_app->get_music_path(f_song)))) + ui_music_name->setText(f_song_clear); + else + ui_music_name->setText("[MISSING] " + f_song_clear); + } } } } From 74c15447b55b2548fbc596c9f8ebb78a8cc4cfd0 Mon Sep 17 00:00:00 2001 From: in1tiate <32779090+in1tiate@users.noreply.github.com> Date: Fri, 9 Oct 2020 10:24:03 -0500 Subject: [PATCH 2/3] [MISSING] should be translatable --- src/courtroom.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/courtroom.cpp b/src/courtroom.cpp index afacda0..4fa0b74 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -3162,7 +3162,7 @@ void Courtroom::handle_song(QStringList *p_contents) if (file_exists(ao_app->get_sfx_suffix(ao_app->get_music_path(f_song)))) ui_music_name->setText(f_song_clear); else - ui_music_name->setText("[MISSING] " + f_song_clear); + ui_music_name->setText(tr("[MISSING] ") + f_song_clear); } } else { @@ -3198,7 +3198,7 @@ void Courtroom::handle_song(QStringList *p_contents) if (file_exists(ao_app->get_sfx_suffix(ao_app->get_music_path(f_song)))) ui_music_name->setText(f_song_clear); else - ui_music_name->setText("[MISSING] " + f_song_clear); + ui_music_name->setText(tr("[MISSING] ") + f_song_clear); } } } From 5fc87a93d2c265c4d7edce4163cb3009ca73c8ef Mon Sep 17 00:00:00 2001 From: in1tiate <32779090+in1tiate@users.noreply.github.com> Date: Fri, 9 Oct 2020 20:17:23 -0500 Subject: [PATCH 3/3] Inmplement suggested change --- src/courtroom.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/courtroom.cpp b/src/courtroom.cpp index 4fa0b74..521e429 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -3162,7 +3162,7 @@ void Courtroom::handle_song(QStringList *p_contents) if (file_exists(ao_app->get_sfx_suffix(ao_app->get_music_path(f_song)))) ui_music_name->setText(f_song_clear); else - ui_music_name->setText(tr("[MISSING] ") + f_song_clear); + ui_music_name->setText(tr("[MISSING] %1").arg(f_song_clear)); } } else { @@ -3198,7 +3198,7 @@ void Courtroom::handle_song(QStringList *p_contents) if (file_exists(ao_app->get_sfx_suffix(ao_app->get_music_path(f_song)))) ui_music_name->setText(f_song_clear); else - ui_music_name->setText(tr("[MISSING] ") + f_song_clear); + ui_music_name->setText(tr("[MISSING] %1").arg(f_song_clear)); } } }