diff options
| author | stonedDiscord <Tukz@gmx.de> | 2022-12-28 21:35:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-28 21:35:11 +0100 |
| commit | a449aa86e9f1758b5661fba640a626bc12080988 (patch) | |
| tree | 8aa2a5a6272a2b8c93a22e3b019d6773f97db585 /src/courtroom.cpp | |
| parent | 1aca9a19dbc9f2c83de39f71fc2ff284ca33984d (diff) | |
Qt6 (#824)
* Major cleanup of screenshake code
* Add pre-5.10 support for screenshake math
* more compat, uglier too
* add surprise tool
* we don't need inline functions
* only run qsrand on old versions
* Squash compiler warnings
* >= not > please
* don't set codec in qt6
* switch to new regex
* remove qdesktopwidget (was unused)
* make enter event an enter event
* forgot header file
* rename emote_mod enum as there is an enum of the same name in chat_message
* regexp
* no more codec
* fix warning about emote_mod type
* change to new qtconcurrent
* misc was unused
* fix run
* change qtconcurrent for music
* codecs came back
* make CI run on qt6 too
* seperate artifacts
* qFormatLogMessage is wonky here
* maybe actually use the qt version from matrix
* change qt version here as well
* even lower
* use my own fixed installer
* use my own fixed version of qapng
* get websockets
* minor spelling mistake
* yOu nEeD aDdOnS
* aaaaaaaaaaaaaaaaaaaaaaaaaaaaa
* Revert "maybe actually use the qt version from matrix"
This reverts commit 7ab6b1b4c2f1200318d52f325efd2ef46c3fbd6a.
* Revert "Revert "maybe actually use the qt version from matrix""
This reverts commit a6f7c5bedf214a1992c15b296edd195f96a9196a.
* use jurplels again
* Revert "use jurplels again"
This reverts commit 5795474bca64590f1479af3ccbf7d8cc57f427e7.
* revert CI to master
* main not master
Co-authored-by: in1tiate <woodward.randall02+github@gmail.com>
Diffstat (limited to 'src/courtroom.cpp')
| -rw-r--r-- | src/courtroom.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp index b310ac6d..acbcd1de 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -1788,7 +1788,7 @@ void Courtroom::debug_message_handler(QtMsgType type, const QMessageLogContext & }; const QString color_id = QString("debug_log_%1_color").arg(colors.value(type, "info")); ui_debug_log->append_chatmessage( - QString(), qFormatLogMessage(type, context, msg), + colors.value(type, "info"), msg, QString(), ao_app->get_color(color_id, "courtroom_fonts.ini").name()); } @@ -2479,7 +2479,7 @@ bool Courtroom::handle_objection() ao_app->get_chat(m_chatmessage[CHAR_NAME])); } break; - m_chatmessage[EMOTE_MOD] = PREANIM; + m_chatmessage[EMOTE_MOD] = QChar(PREANIM); } ui_vp_objection->load_image( filename, m_chatmessage[CHAR_NAME], @@ -4091,8 +4091,13 @@ void Courtroom::handle_song(QStringList *p_contents) } ui_music_name->setText(tr("[LOADING] %1").arg(f_song_clear)); } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) music_player->music_watcher.setFuture(QtConcurrent::run(music_player, &AOMusicPlayer::play, f_song, channel, looping, effect_flags)); +#else + music_player->music_watcher.setFuture(QtConcurrent::run(&AOMusicPlayer::play, music_player, f_song, channel, + looping, effect_flags)); +#endif } void Courtroom::update_ui_music_name() |