diff options
Diffstat (limited to 'src/courtroom.cpp')
| -rw-r--r-- | src/courtroom.cpp | 3451 |
1 files changed, 2020 insertions, 1431 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp index 3056fd92..326f2ad0 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -1,12 +1,12 @@ #include "courtroom.h" #include "options.h" -Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() +Courtroom::Courtroom(AOApplication *p_ao_app) + : QMainWindow() { ao_app = p_ao_app; - this->setWindowFlags((this->windowFlags() | Qt::CustomizeWindowHint) & - ~Qt::WindowMaximizeButtonHint); + this->setWindowFlags((this->windowFlags() | Qt::CustomizeWindowHint) & ~Qt::WindowMaximizeButtonHint); ao_app->initBASS(); #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) // Needed for pre-5.10 RNG stuff @@ -27,54 +27,53 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() sfx_delay_timer = new QTimer(this); sfx_delay_timer->setSingleShot(true); - music_player = new AOMusicPlayer(this, ao_app); + music_player = new AOMusicPlayer(ao_app); music_player->set_muted(true); - connect(&music_player->music_watcher, &QFutureWatcher<QString>::finished, - this, &Courtroom::update_ui_music_name, Qt::QueuedConnection); + connect(&music_player->music_watcher, &QFutureWatcher<QString>::finished, this, &Courtroom::update_ui_music_name, Qt::QueuedConnection); - sfx_player = new AOSfxPlayer(this, ao_app); + sfx_player = new AOSfxPlayer(ao_app); sfx_player->set_muted(true); - objection_player = new AOSfxPlayer(this, ao_app); + objection_player = new AOSfxPlayer(ao_app); objection_player->set_muted(true); - blip_player = new AOBlipPlayer(this, ao_app); + blip_player = new AOBlipPlayer(ao_app); blip_player->set_muted(true); - modcall_player = new AOSfxPlayer(this, ao_app); + modcall_player = new AOSfxPlayer(ao_app); modcall_player->set_volume(50); - ui_background = new AOImage(this, ao_app); + ui_background = new AOImage(ao_app, this); ui_background->setObjectName("ui_background"); ui_viewport = new QWidget(this); ui_viewport->setObjectName("ui_viewport"); - ui_vp_background = new BackgroundLayer(ui_viewport, ao_app); + ui_vp_background = new BackgroundLayer(ao_app, ui_viewport); ui_vp_background->setObjectName("ui_vp_background"); - ui_vp_speedlines = new SplashLayer(ui_viewport, ao_app); + ui_vp_speedlines = new SplashLayer(ao_app, ui_viewport); ui_vp_speedlines->setObjectName("ui_vp_speedlines"); ui_vp_speedlines->stretch = true; - ui_vp_player_char = new CharLayer(ui_viewport, ao_app); + ui_vp_player_char = new CharLayer(ao_app, ui_viewport); ui_vp_player_char->setObjectName("ui_vp_player_char"); ui_vp_player_char->masked = false; - ui_vp_sideplayer_char = new CharLayer(ui_viewport, ao_app); + ui_vp_sideplayer_char = new CharLayer(ao_app, ui_viewport); ui_vp_sideplayer_char->setObjectName("ui_vp_sideplayer_char"); ui_vp_sideplayer_char->masked = false; ui_vp_sideplayer_char->hide(); - ui_vp_desk = new BackgroundLayer(ui_viewport, ao_app); + ui_vp_desk = new BackgroundLayer(ao_app, ui_viewport); ui_vp_desk->setObjectName("ui_vp_desk"); - ui_vp_effect = new EffectLayer(this, ao_app); + ui_vp_effect = new EffectLayer(ao_app, this); ui_vp_effect->setAttribute(Qt::WA_TransparentForMouseEvents); ui_vp_effect->setObjectName("ui_vp_effect"); - ui_vp_evidence_display = new AOEvidenceDisplay(ui_viewport, ao_app); + ui_vp_evidence_display = new AOEvidenceDisplay(ao_app, ui_viewport); ui_vp_evidence_display->setObjectName("ui_vp_evidence_display"); - ui_vp_chatbox = new AOImage(this, ao_app); + ui_vp_chatbox = new AOImage(ao_app, this); ui_vp_chatbox->setObjectName("ui_vp_chatbox"); - ui_vp_sticker = new StickerLayer(this, ao_app); + ui_vp_sticker = new StickerLayer(ao_app, this); ui_vp_sticker->set_play_once(false); ui_vp_sticker->set_cull_image(false); ui_vp_sticker->setAttribute(Qt::WA_TransparentForMouseEvents); @@ -83,7 +82,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() ui_vp_showname = new AOChatboxLabel(ui_vp_chatbox); ui_vp_showname->setObjectName("ui_vp_showname"); ui_vp_showname->setAlignment(Qt::AlignLeft); - ui_vp_chat_arrow = new InterfaceLayer(this, ao_app); + ui_vp_chat_arrow = new InterfaceLayer(ao_app, this); ui_vp_chat_arrow->set_play_once(false); ui_vp_chat_arrow->set_cull_image(false); ui_vp_chat_arrow->setObjectName("ui_vp_chat_arrow"); @@ -95,17 +94,17 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() ui_vp_message->setReadOnly(true); ui_vp_message->setObjectName("ui_vp_message"); - ui_vp_testimony = new SplashLayer(this, ao_app); + ui_vp_testimony = new SplashLayer(ao_app, this); ui_vp_testimony->set_play_once(false); ui_vp_testimony->setAttribute(Qt::WA_TransparentForMouseEvents); ui_vp_testimony->setObjectName("ui_vp_testimony"); - ui_vp_wtce = new SplashLayer(this, ao_app); + ui_vp_wtce = new SplashLayer(ao_app, this); ui_vp_wtce->set_play_once(true); ui_vp_wtce->continuous = false; ui_vp_wtce->force_continuous = true; ui_vp_wtce->setAttribute(Qt::WA_TransparentForMouseEvents); ui_vp_wtce->setObjectName("ui_vp_wtce"); - ui_vp_objection = new SplashLayer(this, ao_app); + ui_vp_objection = new SplashLayer(ao_app, this); ui_vp_objection->set_play_once(true); ui_vp_objection->continuous = false; ui_vp_objection->force_continuous = true; @@ -124,13 +123,12 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() log_timestamp = Options::getInstance().logTimestampEnabled(); log_timestamp_format = Options::getInstance().logTimestampFormat(); - ui_debug_log = new AOTextArea(this, Options::getInstance().maxLogSize()); + ui_debug_log = new AOTextArea(Options::getInstance().maxLogSize(), this); ui_debug_log->setReadOnly(true); ui_debug_log->setOpenExternalLinks(true); ui_debug_log->hide(); ui_debug_log->setObjectName("ui_debug_log"); - connect(ao_app, &AOApplication::qt_log_message, - this, &Courtroom::debug_message_handler); + connect(ao_app, &AOApplication::qt_log_message, this, &Courtroom::debug_message_handler); ui_server_chatlog = new AOTextArea(this); ui_server_chatlog->setReadOnly(true); @@ -156,7 +154,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() ui_music_list->setUniformRowHeights(true); ui_music_list->setObjectName("ui_music_list"); - ui_music_display = new InterfaceLayer(this, ao_app); + ui_music_display = new InterfaceLayer(ao_app, this); ui_music_display->set_play_once(false); ui_music_display->set_cull_image(false); ui_music_display->transform_mode = Qt::SmoothTransformation; @@ -168,7 +166,8 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() ui_music_name->setAttribute(Qt::WA_TransparentForMouseEvents); ui_music_name->setObjectName("ui_music_name"); - for (int i = 0; i < max_clocks; i++) { + for (int i = 0; i < max_clocks; i++) + { ui_clock[i] = new AOClockLabel(this); ui_clock[i]->setAttribute(Qt::WA_TransparentForMouseEvents); ui_clock[i]->hide(); @@ -189,7 +188,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() ui_ic_chat_message->installEventFilter(ui_ic_chat_message_filter); ui_ic_chat_message->setObjectName("ui_ic_chat_message"); - ui_muted = new AOImage(ui_ic_chat_message, ao_app); + ui_muted = new AOImage(ao_app, ui_ic_chat_message); ui_muted->hide(); ui_muted->setObjectName("ui_muted"); @@ -217,7 +216,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() ui_pos_dropdown->view()->setTextElideMode(Qt::ElideLeft); ui_pos_dropdown->setObjectName("ui_pos_dropdown"); - ui_pos_remove = new AOButton(this, ao_app); + ui_pos_remove = new AOButton(ao_app, this); ui_pos_remove->setObjectName("ui_pos_remove"); ui_iniswap_dropdown = new QComboBox(this); @@ -225,7 +224,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() ui_iniswap_dropdown->view()->setTextElideMode(Qt::ElideLeft); ui_iniswap_dropdown->setObjectName("ui_iniswap_dropdown"); - ui_iniswap_remove = new AOButton(this, ao_app); + ui_iniswap_remove = new AOButton(ao_app, this); ui_iniswap_remove->setObjectName("ui_iniswap_remove"); ui_sfx_dropdown = new QComboBox(this); @@ -233,7 +232,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() ui_sfx_dropdown->view()->setTextElideMode(Qt::ElideLeft); ui_sfx_dropdown->setObjectName("ui_sfx_dropdown"); - ui_sfx_remove = new AOButton(this, ao_app); + ui_sfx_remove = new AOButton(ao_app, this); ui_sfx_remove->setObjectName("ui_sfx_remove"); ui_effects_dropdown = new QComboBox(this); @@ -241,10 +240,10 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() ui_effects_dropdown->setContextMenuPolicy(Qt::CustomContextMenu); ui_effects_dropdown->setObjectName("ui_effects_dropdown"); - ui_defense_bar = new AOImage(this, ao_app); + ui_defense_bar = new AOImage(ao_app, this); ui_defense_bar->setObjectName("ui_defense_bar"); - ui_prosecution_bar = new AOImage(this, ao_app); + ui_prosecution_bar = new AOImage(ao_app, this); ui_prosecution_bar->setObjectName("ui_prosecution_bar"); ui_music_label = new QLabel(this); @@ -256,43 +255,43 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() ui_blip_label = new QLabel(this); ui_blip_label->setObjectName("ui_blip_label"); - ui_hold_it = new AOButton(this, ao_app); + ui_hold_it = new AOButton(ao_app, this); ui_hold_it->setObjectName("ui_hold_it"); - ui_objection = new AOButton(this, ao_app); + ui_objection = new AOButton(ao_app, this); ui_objection->setObjectName("ui_objection"); - ui_take_that = new AOButton(this, ao_app); + ui_take_that = new AOButton(ao_app, this); ui_take_that->setObjectName("ui_take_that"); - ui_ooc_toggle = new AOButton(this, ao_app); + ui_ooc_toggle = new AOButton(ao_app, this); ui_ooc_toggle->setObjectName("ui_ooc_toggle"); - ui_witness_testimony = new AOButton(this, ao_app); + ui_witness_testimony = new AOButton(ao_app, this); ui_witness_testimony->setObjectName("ui_witness_testimony"); - ui_cross_examination = new AOButton(this, ao_app); + ui_cross_examination = new AOButton(ao_app, this); ui_cross_examination->setObjectName("ui_cross_examination"); - ui_guilty = new AOButton(this, ao_app); + ui_guilty = new AOButton(ao_app, this); ui_guilty->setObjectName("ui_guilty"); - ui_not_guilty = new AOButton(this, ao_app); + ui_not_guilty = new AOButton(ao_app, this); ui_not_guilty->setObjectName("ui_not_guilty"); - ui_change_character = new AOButton(this, ao_app); + ui_change_character = new AOButton(ao_app, this); ui_change_character->setObjectName("ui_change_character"); - ui_reload_theme = new AOButton(this, ao_app); + ui_reload_theme = new AOButton(ao_app, this); ui_reload_theme->setObjectName("ui_reload_theme"); - ui_call_mod = new AOButton(this, ao_app); + ui_call_mod = new AOButton(ao_app, this); ui_call_mod->setObjectName("ui_call_mod"); - ui_settings = new AOButton(this, ao_app); + ui_settings = new AOButton(ao_app, this); ui_settings->setObjectName("ui_settings"); - ui_switch_area_music = new AOButton(this, ao_app); + ui_switch_area_music = new AOButton(ao_app, this); ui_switch_area_music->setObjectName("ui_switch_area_music"); ui_pre = new QCheckBox(this); @@ -324,32 +323,32 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() ui_immediate->hide(); ui_immediate->setObjectName("ui_immediate"); - ui_custom_objection = new AOButton(this, ao_app); + ui_custom_objection = new AOButton(ao_app, this); ui_custom_objection->setContextMenuPolicy(Qt::CustomContextMenu); ui_custom_objection->setObjectName("ui_custom_objection"); custom_obj_menu = new QMenu(this); custom_obj_menu->setObjectName("ui_custom_obj_menu"); - ui_realization = new AOButton(this, ao_app); + ui_realization = new AOButton(ao_app, this); ui_realization->setObjectName("ui_realization"); - ui_screenshake = new AOButton(this, ao_app); + ui_screenshake = new AOButton(ao_app, this); ui_screenshake->setObjectName("ui_screenshake"); - ui_mute = new AOButton(this, ao_app); + ui_mute = new AOButton(ao_app, this); ui_mute->setObjectName("ui_mute"); - ui_defense_plus = new AOButton(this, ao_app); + ui_defense_plus = new AOButton(ao_app, this); ui_defense_plus->setObjectName("ui_defense_plus"); - ui_defense_minus = new AOButton(this, ao_app); + ui_defense_minus = new AOButton(ao_app, this); ui_defense_minus->setObjectName("ui_defense_minus"); - ui_prosecution_plus = new AOButton(this, ao_app); + ui_prosecution_plus = new AOButton(ao_app, this); ui_prosecution_plus->setObjectName("ui_prosecution_plus"); - ui_prosecution_minus = new AOButton(this, ao_app); + ui_prosecution_minus = new AOButton(ao_app, this); ui_prosecution_minus->setObjectName("ui_prosecution_minus"); ui_text_color = new QComboBox(this); @@ -392,10 +391,10 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() ui_pair_order_dropdown->addItem(tr("To behind")); ui_pair_order_dropdown->setObjectName("ui_pair_order_dropdown"); - ui_pair_button = new AOButton(this, ao_app); + ui_pair_button = new AOButton(ao_app, this); ui_pair_button->setObjectName("ui_pair_button"); - ui_evidence_button = new AOButton(this, ao_app); + ui_evidence_button = new AOButton(ao_app, this); ui_evidence_button->setContextMenuPolicy(Qt::CustomContextMenu); ui_evidence_button->setObjectName("ui_evidence_button"); @@ -414,152 +413,100 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() connect(ui_vp_player_char, &CharLayer::done, this, &Courtroom::preanim_done); connect(ui_vp_player_char, &CharLayer::shake, this, &Courtroom::do_screenshake); connect(ui_vp_player_char, &CharLayer::flash, this, &Courtroom::do_flash); - connect(ui_vp_player_char, &CharLayer::play_sfx, this, - &Courtroom::play_char_sfx); + connect(ui_vp_player_char, &CharLayer::play_sfx, this, &Courtroom::play_char_sfx); - connect(text_delay_timer, &QTimer::timeout, this, - &Courtroom::start_chat_ticking); + connect(text_delay_timer, &QTimer::timeout, this, &Courtroom::start_chat_ticking); - connect(text_queue_timer, &QTimer::timeout, this, - &Courtroom::chatmessage_dequeue); + connect(text_queue_timer, &QTimer::timeout, this, &Courtroom::chatmessage_dequeue); connect(sfx_delay_timer, &QTimer::timeout, this, &Courtroom::play_sfx); connect(chat_tick_timer, &QTimer::timeout, this, &Courtroom::chat_tick); - connect(ui_pos_dropdown, QOverload<int>::of(&QComboBox::currentIndexChanged), this, - QOverload<int>::of(&Courtroom::on_pos_dropdown_changed)); - connect(ui_pos_dropdown, &QComboBox::editTextChanged, this, - QOverload<QString>::of(&Courtroom::on_pos_dropdown_changed)); - connect(ui_pos_dropdown, &QComboBox::customContextMenuRequested, this, - &Courtroom::on_pos_dropdown_context_menu_requested); + connect(ui_pos_dropdown, QOverload<int>::of(&QComboBox::currentIndexChanged), this, QOverload<int>::of(&Courtroom::on_pos_dropdown_changed)); + connect(ui_pos_dropdown, &QComboBox::editTextChanged, this, QOverload<QString>::of(&Courtroom::on_pos_dropdown_changed)); + connect(ui_pos_dropdown, &QComboBox::customContextMenuRequested, this, &Courtroom::on_pos_dropdown_context_menu_requested); connect(ui_pos_remove, &AOButton::clicked, this, &Courtroom::on_pos_remove_clicked); - connect(ui_iniswap_dropdown, QOverload<int>::of(&QComboBox::currentIndexChanged), this, - &Courtroom::on_iniswap_dropdown_changed); - connect(ui_iniswap_dropdown, &QComboBox::customContextMenuRequested, this, - &Courtroom::on_iniswap_context_menu_requested); - connect(ui_iniswap_remove, &AOButton::clicked, this, - &Courtroom::on_iniswap_remove_clicked); - - connect(ui_sfx_dropdown, QOverload<int>::of(&QComboBox::currentIndexChanged), this, - &Courtroom::on_sfx_dropdown_changed); - connect(ui_sfx_dropdown, &QComboBox::editTextChanged, this, - &Courtroom::on_sfx_dropdown_custom); - connect(ui_sfx_dropdown, &QComboBox::customContextMenuRequested, this, - &Courtroom::on_sfx_context_menu_requested); - connect(ui_sfx_remove, &AOButton::clicked, this, - &Courtroom::on_sfx_remove_clicked); - - connect(ui_effects_dropdown, QOverload<int>::of(&QComboBox::currentIndexChanged), this, - &Courtroom::on_effects_dropdown_changed); - connect(ui_effects_dropdown, &QComboBox::customContextMenuRequested, this, - &Courtroom::on_effects_context_menu_requested); - - connect(ui_music_search, &QLineEdit::returnPressed, this, - &Courtroom::on_music_search_return_pressed); - connect(ui_mute_list, &QListWidget::clicked, this, - &Courtroom::on_mute_list_clicked); - - connect(ui_ic_chat_message, &QLineEdit::returnPressed, this, - &Courtroom::on_chat_return_pressed); - - connect(ui_ooc_chat_message, &QLineEdit::returnPressed, this, - &Courtroom::on_ooc_return_pressed); - - connect(ui_music_list, &QTreeWidget::itemDoubleClicked, - this, &Courtroom::on_music_list_double_clicked); - connect(ui_music_list, &QTreeWidget::customContextMenuRequested, this, - &Courtroom::on_music_list_context_menu_requested); - - connect(ui_area_list, &QTreeWidget::itemDoubleClicked, this, - &Courtroom::on_area_list_double_clicked); + connect(ui_iniswap_dropdown, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &Courtroom::on_iniswap_dropdown_changed); + connect(ui_iniswap_dropdown, &QComboBox::customContextMenuRequested, this, &Courtroom::on_iniswap_context_menu_requested); + connect(ui_iniswap_remove, &AOButton::clicked, this, &Courtroom::on_iniswap_remove_clicked); + + connect(ui_sfx_dropdown, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &Courtroom::on_sfx_dropdown_changed); + connect(ui_sfx_dropdown, &QComboBox::editTextChanged, this, &Courtroom::on_sfx_dropdown_custom); + connect(ui_sfx_dropdown, &QComboBox::customContextMenuRequested, this, &Courtroom::on_sfx_context_menu_requested); + connect(ui_sfx_remove, &AOButton::clicked, this, &Courtroom::on_sfx_remove_clicked); + + connect(ui_effects_dropdown, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &Courtroom::on_effects_dropdown_changed); + connect(ui_effects_dropdown, &QComboBox::customContextMenuRequested, this, &Courtroom::on_effects_context_menu_requested); + + connect(ui_music_search, &QLineEdit::returnPressed, this, &Courtroom::on_music_search_return_pressed); + connect(ui_mute_list, &QListWidget::clicked, this, &Courtroom::on_mute_list_clicked); + + connect(ui_ic_chat_message, &QLineEdit::returnPressed, this, &Courtroom::on_chat_return_pressed); + + connect(ui_ooc_chat_message, &QLineEdit::returnPressed, this, &Courtroom::on_ooc_return_pressed); + + connect(ui_music_list, &QTreeWidget::itemDoubleClicked, this, &Courtroom::on_music_list_double_clicked); + connect(ui_music_list, &QTreeWidget::customContextMenuRequested, this, &Courtroom::on_music_list_context_menu_requested); + + connect(ui_area_list, &QTreeWidget::itemDoubleClicked, this, &Courtroom::on_area_list_double_clicked); connect(ui_hold_it, &AOButton::clicked, this, &Courtroom::on_hold_it_clicked); connect(ui_objection, &AOButton::clicked, this, &Courtroom::on_objection_clicked); connect(ui_take_that, &AOButton::clicked, this, &Courtroom::on_take_that_clicked); - connect(ui_custom_objection, &AOButton::clicked, this, - &Courtroom::on_custom_objection_clicked); - connect(ui_custom_objection, - &AOButton::customContextMenuRequested, this, - &Courtroom::show_custom_objection_menu); + connect(ui_custom_objection, &AOButton::clicked, this, &Courtroom::on_custom_objection_clicked); + connect(ui_custom_objection, &AOButton::customContextMenuRequested, this, &Courtroom::show_custom_objection_menu); - connect(ui_realization, &AOButton::clicked, this, - &Courtroom::on_realization_clicked); - connect(ui_screenshake, &AOButton::clicked, this, - &Courtroom::on_screenshake_clicked); + connect(ui_realization, &AOButton::clicked, this, &Courtroom::on_realization_clicked); + connect(ui_screenshake, &AOButton::clicked, this, &Courtroom::on_screenshake_clicked); connect(ui_mute, &AOButton::clicked, this, &Courtroom::on_mute_clicked); - connect(ui_defense_minus, &AOButton::clicked, this, - &Courtroom::on_defense_minus_clicked); - connect(ui_defense_plus, &AOButton::clicked, this, - &Courtroom::on_defense_plus_clicked); - connect(ui_prosecution_minus, &AOButton::clicked, this, - &Courtroom::on_prosecution_minus_clicked); - connect(ui_prosecution_plus, &AOButton::clicked, this, - &Courtroom::on_prosecution_plus_clicked); - - connect(ui_text_color, QOverload<int>::of(&QComboBox::currentIndexChanged), this, - &Courtroom::on_text_color_changed); - connect(ui_text_color, &QComboBox::customContextMenuRequested, this, - &Courtroom::on_text_color_context_menu_requested); - - connect(ui_music_slider, &QSlider::valueChanged, this, - &Courtroom::on_music_slider_moved); - connect(ui_sfx_slider, &QSlider::valueChanged, this, - &Courtroom::on_sfx_slider_moved); - connect(ui_blip_slider, &QSlider::valueChanged, this, - &Courtroom::on_blip_slider_moved); - - connect(ui_ooc_toggle, &AOButton::clicked, this, - &Courtroom::on_ooc_toggle_clicked); - - connect(ui_music_search, &QLineEdit::textChanged, this, - &Courtroom::on_music_search_edited); - - connect(ui_witness_testimony, &AOButton::clicked, this, - &Courtroom::on_witness_testimony_clicked); - connect(ui_cross_examination, &AOButton::clicked, this, - &Courtroom::on_cross_examination_clicked); + connect(ui_defense_minus, &AOButton::clicked, this, &Courtroom::on_defense_minus_clicked); + connect(ui_defense_plus, &AOButton::clicked, this, &Courtroom::on_defense_plus_clicked); + connect(ui_prosecution_minus, &AOButton::clicked, this, &Courtroom::on_prosecution_minus_clicked); + connect(ui_prosecution_plus, &AOButton::clicked, this, &Courtroom::on_prosecution_plus_clicked); + + connect(ui_text_color, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &Courtroom::on_text_color_changed); + connect(ui_text_color, &QComboBox::customContextMenuRequested, this, &Courtroom::on_text_color_context_menu_requested); + + connect(ui_music_slider, &QSlider::valueChanged, this, &Courtroom::on_music_slider_moved); + connect(ui_sfx_slider, &QSlider::valueChanged, this, &Courtroom::on_sfx_slider_moved); + connect(ui_blip_slider, &QSlider::valueChanged, this, &Courtroom::on_blip_slider_moved); + + connect(ui_ooc_toggle, &AOButton::clicked, this, &Courtroom::on_ooc_toggle_clicked); + + connect(ui_music_search, &QLineEdit::textChanged, this, &Courtroom::on_music_search_edited); + + connect(ui_witness_testimony, &AOButton::clicked, this, &Courtroom::on_witness_testimony_clicked); + connect(ui_cross_examination, &AOButton::clicked, this, &Courtroom::on_cross_examination_clicked); connect(ui_guilty, &AOButton::clicked, this, &Courtroom::on_guilty_clicked); - connect(ui_not_guilty, &AOButton::clicked, this, - &Courtroom::on_not_guilty_clicked); + connect(ui_not_guilty, &AOButton::clicked, this, &Courtroom::on_not_guilty_clicked); - connect(ui_change_character, &AOButton::clicked, this, - &Courtroom::on_change_character_clicked); - connect(ui_reload_theme, &AOButton::clicked, this, - &Courtroom::on_reload_theme_clicked); + connect(ui_change_character, &AOButton::clicked, this, &Courtroom::on_change_character_clicked); + connect(ui_reload_theme, &AOButton::clicked, this, &Courtroom::on_reload_theme_clicked); connect(ui_call_mod, &AOButton::clicked, this, &Courtroom::on_call_mod_clicked); connect(ui_settings, &AOButton::clicked, this, &Courtroom::on_settings_clicked); - connect(ui_switch_area_music, &AOButton::clicked, this, - &Courtroom::on_switch_area_music_clicked); + connect(ui_switch_area_music, &AOButton::clicked, this, &Courtroom::on_switch_area_music_clicked); connect(ui_pre, &AOButton::clicked, this, &Courtroom::on_pre_clicked); connect(ui_flip, &AOButton::clicked, this, &Courtroom::on_flip_clicked); connect(ui_additive, &AOButton::clicked, this, &Courtroom::on_additive_clicked); connect(ui_guard, &AOButton::clicked, this, &Courtroom::on_guard_clicked); - connect(ui_showname_enable, &AOButton::clicked, this, - &Courtroom::on_showname_enable_clicked); + connect(ui_showname_enable, &AOButton::clicked, this, &Courtroom::on_showname_enable_clicked); connect(ui_pair_button, &AOButton::clicked, this, &Courtroom::on_pair_clicked); - connect(ui_pair_list, &QListWidget::clicked, this, - &Courtroom::on_pair_list_clicked); - connect(ui_pair_offset_spinbox, QOverload<int>::of(&QSpinBox::valueChanged), this, - &Courtroom::on_pair_offset_changed); - connect(ui_pair_vert_offset_spinbox, QOverload<int>::of(&QSpinBox::valueChanged), this, - &Courtroom::on_pair_vert_offset_changed); - connect(ui_pair_order_dropdown, QOverload<int>::of(&QComboBox::currentIndexChanged), this, - &Courtroom::on_pair_order_dropdown_changed); - - connect(ui_evidence_button, &AOButton::clicked, this, - &Courtroom::on_evidence_button_clicked); - connect(ui_evidence_button, &QComboBox::customContextMenuRequested, this, - &Courtroom::on_evidence_context_menu_requested); - - connect(qApp, QOverload<Qt::ApplicationState>::of(&QApplication::applicationStateChanged), this, - &Courtroom::on_application_state_changed); + connect(ui_pair_list, &QListWidget::clicked, this, &Courtroom::on_pair_list_clicked); + connect(ui_pair_offset_spinbox, QOverload<int>::of(&QSpinBox::valueChanged), this, &Courtroom::on_pair_offset_changed); + connect(ui_pair_vert_offset_spinbox, QOverload<int>::of(&QSpinBox::valueChanged), this, &Courtroom::on_pair_vert_offset_changed); + connect(ui_pair_order_dropdown, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &Courtroom::on_pair_order_dropdown_changed); + + connect(ui_evidence_button, &AOButton::clicked, this, &Courtroom::on_evidence_button_clicked); + connect(ui_evidence_button, &QComboBox::customContextMenuRequested, this, &Courtroom::on_evidence_context_menu_requested); + + connect(qApp, QOverload<Qt::ApplicationState>::of(&QApplication::applicationStateChanged), this, &Courtroom::on_application_state_changed); connect(ui_vp_evidence_display, &AOEvidenceDisplay::show_evidence_details, this, &Courtroom::show_evidence); @@ -568,11 +515,25 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() set_char_select(); } +Courtroom::~Courtroom() +{ + // save sound settings + Options::getInstance().setMusicVolume(ui_music_slider->value()); + Options::getInstance().setSfxVolume(ui_sfx_slider->value()); + Options::getInstance().setBlipVolume(ui_blip_slider->value()); + + delete music_player; + delete sfx_player; + delete objection_player; + delete blip_player; +} + void Courtroom::on_application_state_changed(Qt::ApplicationState state) { // Unsuppressed suppress_audio = 0; - if (state != Qt::ApplicationActive) { + if (state != Qt::ApplicationActive) + { // Suppressed audio setting suppress_audio = Options::getInstance().defaultSuppressAudio(); } @@ -583,13 +544,18 @@ void Courtroom::update_audio_volume() { float remaining_percent = 1.0f - static_cast<float>(suppress_audio / 100.0f); if (remaining_percent > 1) + { remaining_percent = 1; + } if (remaining_percent < 0) + { remaining_percent = 0; + } music_player->set_volume(ui_music_slider->value() * remaining_percent, 0); // set music // Set the ambience and other misc. music layers - for (int i = 1; i < music_player->m_channelmax; ++i) { + for (int i = 1; i < music_player->CHANNEL_COUNT; ++i) + { music_player->set_volume(ui_sfx_slider->value() * remaining_percent, i); } sfx_player->set_volume(ui_sfx_slider->value() * remaining_percent); @@ -597,18 +563,107 @@ void Courtroom::update_audio_volume() blip_player->set_volume(ui_blip_slider->value() * remaining_percent); } +void Courtroom::append_char(char_type p_char) +{ + char_list.append(p_char); +} + +void Courtroom::append_music(QString f_music) +{ + music_list.append(f_music); +} + +void Courtroom::append_area(QString f_area) +{ + area_list.append(f_area); +} + +void Courtroom::clear_chars() +{ + char_list.clear(); +} + +void Courtroom::clear_music() +{ + music_list.clear(); +} + +void Courtroom::clear_areas() +{ + area_list.clear(); +} + +void Courtroom::fix_last_area() +{ + if (area_list.size() > 0) + { + QString malplaced = area_list.last(); + area_list.removeLast(); + append_music(malplaced); + } +} + +void Courtroom::arup_append(int players, QString status, QString cm, QString locked) +{ + arup_players.append(players); + arup_statuses.append(status); + arup_cms.append(cm); + arup_locks.append(locked); +} + +void Courtroom::arup_clear() +{ + arup_players.clear(); + arup_statuses.clear(); + arup_cms.clear(); + arup_locks.clear(); +} + +void Courtroom::arup_modify(int type, int place, QString value) +{ + if (type == 0) + { + if (arup_players.size() > place) + { + arup_players[place] = value.toInt(); + } + } + else if (type == 1) + { + if (arup_statuses.size() > place) + { + arup_statuses[place] = value; + } + } + else if (type == 2) + { + if (arup_cms.size() > place) + { + arup_cms[place] = value; + } + } + else if (type == 3) + { + if (arup_locks.size() > place) + { + arup_locks[place] = value; + } + } +} + void Courtroom::set_courtroom_size() { QString filename = "courtroom_design.ini"; - pos_size_type f_courtroom = - ao_app->get_element_dimensions("courtroom", filename); + pos_size_type f_courtroom = ao_app->get_element_dimensions("courtroom", filename); - if (f_courtroom.width < 0 || f_courtroom.height < 0) { + if (f_courtroom.width < 0 || f_courtroom.height < 0) + { qWarning() << "did not find courtroom width or height in " << filename; this->setFixedSize(714, 668); } - else { + else + { m_courtroom_width = f_courtroom.width; m_courtroom_height = f_courtroom.height; @@ -624,18 +679,22 @@ void Courtroom::set_mute_list() mute_map.clear(); // maps which characters are muted based on cid, none are muted by default - for (int n_cid = 0; n_cid < char_list.size(); n_cid++) { + for (int n_cid = 0; n_cid < char_list.size(); n_cid++) + { mute_map.insert(n_cid, false); } QStringList sorted_mute_list; for (const char_type &i_char : qAsConst(char_list)) + { sorted_mute_list.append(i_char.name); + } sorted_mute_list.sort(); - for (const QString &i_name : sorted_mute_list) { + for (const QString &i_name : sorted_mute_list) + { // mute_map.insert(i_name, false); ui_mute_list->addItem(i_name); } @@ -646,11 +705,14 @@ void Courtroom::set_pair_list() QStringList sorted_pair_list; for (const char_type &i_char : qAsConst(char_list)) + { sorted_pair_list.append(i_char.name); + } sorted_pair_list.sort(); - for (const QString &i_name : sorted_pair_list) { + for (const QString &i_name : sorted_pair_list) + { ui_pair_list->addItem(i_name); } } @@ -665,14 +727,16 @@ void Courtroom::set_widgets() // If there is a point to it, show all CCCC features. // We also do this this soon so that set_size_and_pos can hide them all later, // if needed. - if (ao_app->cccc_ic_supported) { + if (ao_app->cccc_ic_supported) + { ui_pair_button->show(); ui_immediate->show(); ui_showname_enable->show(); ui_ic_chat_name->show(); ui_ic_chat_name->setEnabled(true); } - else { + else + { ui_pair_button->hide(); ui_immediate->hide(); ui_showname_enable->hide(); @@ -699,16 +763,14 @@ void Courtroom::set_widgets() ui_vp_player_char->combo_resize(ui_viewport->width(), ui_viewport->height()); ui_vp_sideplayer_char->move_and_center(0, 0); - ui_vp_sideplayer_char->combo_resize(ui_viewport->width(), - ui_viewport->height()); + ui_vp_sideplayer_char->combo_resize(ui_viewport->width(), ui_viewport->height()); // the AO2 desk element ui_vp_desk->move_and_center(0, 0); ui_vp_desk->combo_resize(ui_viewport->width(), ui_viewport->height()); ui_vp_evidence_display->move(0, 0); - ui_vp_evidence_display->combo_resize(ui_viewport->width(), - ui_viewport->height()); + ui_vp_evidence_display->combo_resize(ui_viewport->width(), ui_viewport->height()); // layering shenanigans with ui_vp_chatbox prevent us from doing the sensible // thing, which is to parent these to ui_viewport. instead, AOLayer handles @@ -728,26 +790,21 @@ void Courtroom::set_widgets() log_maximum_blocks = Options::getInstance().maxLogSize(); - bool regenerate = log_goes_downwards != Options::getInstance().logDirectionDownwards() || - log_colors != Options::getInstance().colorLogEnabled() || - log_newline != Options::getInstance().logNewline() || - log_margin != Options::getInstance().logMargin() || - log_timestamp != Options::getInstance().logTimestampEnabled() || - log_timestamp_format != Options::getInstance().logTimestampFormat(); + bool regenerate = log_goes_downwards != Options::getInstance().logDirectionDownwards() || log_colors != Options::getInstance().colorLogEnabled() || log_newline != Options::getInstance().logNewline() || log_margin != Options::getInstance().logMargin() || log_timestamp != Options::getInstance().logTimestampEnabled() || log_timestamp_format != Options::getInstance().logTimestampFormat(); log_goes_downwards = Options::getInstance().logDirectionDownwards(); log_colors = Options::getInstance().colorLogEnabled(); log_newline = Options::getInstance().logNewline(); log_margin = Options::getInstance().logMargin(); log_timestamp = Options::getInstance().logTimestampEnabled(); log_timestamp_format = Options::getInstance().logTimestampFormat(); - if (regenerate) { + if (regenerate) + { regenerate_ic_chatlog(); } set_size_and_pos(ui_ic_chatlog, "ic_chatlog"); ui_ic_chatlog->setFrameShape(QFrame::NoFrame); - ui_ic_chatlog->setPlaceholderText(log_goes_downwards ? "▼ " + tr("Log goes down") + " ▼" - : "▲ " + tr("Log goes up") + " ▲"); + ui_ic_chatlog->setPlaceholderText(log_goes_downwards ? "▼ " + tr("Log goes down") + " ▼" : "▲ " + tr("Log goes up") + " ▲"); set_size_and_pos(ui_debug_log, "ms_chatlog"); // Old name, still use it to not break compatibility ui_debug_log->setFrameShape(QFrame::NoFrame); @@ -764,27 +821,23 @@ void Courtroom::set_widgets() set_size_and_pos(ui_pair_offset_spinbox, "pair_offset_spinbox"); ui_pair_offset_spinbox->hide(); - ui_pair_offset_spinbox->setToolTip( - tr("Change the horizontal percentage offset of your character's position " - "from the " - "center of the screen.")); + ui_pair_offset_spinbox->setToolTip(tr("Change the horizontal percentage offset of your character's position " + "from the " + "center of the screen.")); set_size_and_pos(ui_pair_vert_offset_spinbox, "pair_vert_offset_spinbox"); ui_pair_vert_offset_spinbox->hide(); - ui_pair_vert_offset_spinbox->setToolTip( - tr("Change the vertical percentage offset of your character's position " - "from the " - "center of the screen.")); + ui_pair_vert_offset_spinbox->setToolTip(tr("Change the vertical percentage offset of your character's position " + "from the " + "center of the screen.")); ui_pair_order_dropdown->hide(); set_size_and_pos(ui_pair_order_dropdown, "pair_order_dropdown"); - ui_pair_order_dropdown->setToolTip( - tr("Change the order of appearance for your character.")); + ui_pair_order_dropdown->setToolTip(tr("Change the order of appearance for your character.")); set_size_and_pos(ui_pair_button, "pair_button"); ui_pair_button->set_image("pair_button"); - ui_pair_button->setToolTip( - tr("Display the list of characters to pair with.")); + ui_pair_button->setToolTip(tr("Display the list of characters to pair with.")); set_size_and_pos(ui_area_list, "music_list"); ui_area_list->header()->setMinimumSectionSize(ui_area_list->width()); @@ -793,9 +846,13 @@ void Courtroom::set_widgets() ui_music_list->header()->setMinimumSectionSize(ui_music_list->width()); QString music_list_indentation = ao_app->get_design_element("music_list_indent", "courtroom_design.ini"); if (music_list_indentation == "") + { ui_music_list->resetIndentation(); + } else + { ui_music_list->setIndentation(music_list_indentation.toInt()); + } QString music_list_animated = ao_app->get_design_element("music_list_animated", "courtroom_design.ini"); ui_music_list->setAnimated(music_list_animated == "1" || music_list_animated.startsWith("true")); @@ -803,22 +860,22 @@ void Courtroom::set_widgets() set_size_and_pos(ui_music_name, "music_name"); ui_music_display->move(0, 0); - pos_size_type design_ini_result = - ao_app->get_element_dimensions("music_display", "courtroom_design.ini"); + pos_size_type design_ini_result = ao_app->get_element_dimensions("music_display", "courtroom_design.ini"); - if (design_ini_result.width < 0 || design_ini_result.height < 0) { + if (design_ini_result.width < 0 || design_ini_result.height < 0) + { qWarning() << "could not find \"music_display\" in courtroom_design.ini"; ui_music_display->hide(); } - else { + else + { ui_music_display->move(design_ini_result.x, design_ini_result.y); - ui_music_display->combo_resize(design_ini_result.width, - design_ini_result.height); + ui_music_display->combo_resize(design_ini_result.width, design_ini_result.height); } ui_music_display->load_image("music_display", ""); - - for (int i = 0; i < max_clocks; i++) { + for (int i = 0; i < max_clocks; i++) + { set_size_and_pos(ui_clock[i], "clock_" + QString::number(i)); } set_size_and_pos(ui_ic_chat_message, "ao2_ic_chat_message"); @@ -827,14 +884,13 @@ void Courtroom::set_widgets() initialize_chatbox(); ui_vp_sticker->move(ui_viewport->x(), ui_viewport->y()); - ui_vp_sticker->combo_resize(ui_viewport->width(), - ui_viewport->height()); + ui_vp_sticker->combo_resize(ui_viewport->width(), ui_viewport->height()); ui_muted->resize(ui_ic_chat_message->width(), ui_ic_chat_message->height()); ui_muted->set_image("muted"); ui_muted->setToolTip(tr("Oops, you're muted!")); - set_size_and_pos(ui_ooc_chat_message, "ooc_chat_message");; + set_size_and_pos(ui_ooc_chat_message, "ooc_chat_message"); set_size_and_pos(ui_ooc_chat_name, "ooc_chat_name"); @@ -842,49 +898,48 @@ void Courtroom::set_widgets() set_size_and_pos(ui_music_search, "music_search"); set_size_and_pos(ui_emote_dropdown, "emote_dropdown"); - ui_emote_dropdown->setToolTip( - tr("Set your character's emote to play on your next message.")); + ui_emote_dropdown->setToolTip(tr("Set your character's emote to play on your next message.")); set_size_and_pos(ui_pos_dropdown, "pos_dropdown"); ui_pos_dropdown->setEditable(true); ui_pos_dropdown->setInsertPolicy(QComboBox::NoInsert); - ui_pos_dropdown->setToolTip( - tr("Set your character's supplementary background.")); + ui_pos_dropdown->setToolTip(tr("Set your character's supplementary background.")); set_size_and_pos(ui_pos_remove, "pos_remove"); ui_pos_remove->setText("X"); ui_pos_remove->set_image("evidencex"); ui_pos_remove->setToolTip(tr("Reset your character's supplementary background to its default.")); if (current_side == "") + { ui_pos_remove->hide(); + } else + { ui_pos_remove->show(); + } set_size_and_pos(ui_iniswap_dropdown, "iniswap_dropdown"); ui_iniswap_dropdown->setEditable(true); ui_iniswap_dropdown->setInsertPolicy(QComboBox::InsertAtBottom); - ui_iniswap_dropdown->setToolTip( - tr("Set an 'iniswap', or an alternative character folder to refer to " - "from your current character.\n" - "Edit by typing and pressing Enter, [X] to remove. This saves to your " - "base/iniswaps.ini")); + ui_iniswap_dropdown->setToolTip(tr("Set an 'iniswap', or an alternative character folder to refer to " + "from your current character.\n" + "Edit by typing and pressing Enter, [X] to remove. This saves to your " + "base/iniswaps.ini")); set_size_and_pos(ui_iniswap_remove, "iniswap_remove"); ui_iniswap_remove->setText("X"); ui_iniswap_remove->set_image("evidencex"); - ui_iniswap_remove->setToolTip( - tr("Remove the currently selected iniswap from the list and return to " - "the original character folder.")); + ui_iniswap_remove->setToolTip(tr("Remove the currently selected iniswap from the list and return to " + "the original character folder.")); ui_iniswap_remove->hide(); set_size_and_pos(ui_sfx_dropdown, "sfx_dropdown"); ui_sfx_dropdown->setEditable(true); ui_sfx_dropdown->setInsertPolicy(QComboBox::NoInsert); - ui_sfx_dropdown->setToolTip( - tr("Set a sound effect to play on your next 'Preanim'. Leaving it on " - "Default will use the emote-defined sound (if any).\n" - "Edit by typing and pressing Enter, [X] to remove. This saves to your " - "base/characters/<charname>/soundlist.ini")); + ui_sfx_dropdown->setToolTip(tr("Set a sound effect to play on your next 'Preanim'. Leaving it on " + "Default will use the emote-defined sound (if any).\n" + "Edit by typing and pressing Enter, [X] to remove. This saves to your " + "base/characters/<charname>/soundlist.ini")); set_size_and_pos(ui_sfx_remove, "sfx_remove"); ui_sfx_remove->setText("X"); @@ -896,12 +951,11 @@ void Courtroom::set_widgets() set_size_and_pos(ui_effects_dropdown, "effects_dropdown"); ui_effects_dropdown->setInsertPolicy(QComboBox::InsertAtBottom); - ui_effects_dropdown->setToolTip( - tr("Choose an effect to play on your next spoken message.\n" - "The effects are defined in your theme/effects/effects.ini. Your " - "character can define custom effects by\n" - "char.ini [Options] category, effects = 'miscname' where it refers " - "to misc/<miscname>/effects.ini to read the effects.")); + ui_effects_dropdown->setToolTip(tr("Choose an effect to play on your next spoken message.\n" + "The effects are defined in your theme/effects/effects.ini. Your " + "character can define custom effects by\n" + "char.ini [Options] category, effects = 'miscname' where it refers " + "to misc/<miscname>/effects.ini to read the effects.")); // Todo: recode this entire fucking system with these dumbass goddamn ini's // why is everything so specifically coded for all these purposes is ABSTRACT // CODING not a thing now huh what the FUCK why do I gotta do this pleASE FOR @@ -913,8 +967,7 @@ void Courtroom::set_widgets() ui_defense_bar->set_image("defensebar" + QString::number(defense_bar_state)); set_size_and_pos(ui_prosecution_bar, "prosecution_bar"); - ui_prosecution_bar->set_image("prosecutionbar" + - QString::number(prosecution_bar_state)); + ui_prosecution_bar->set_image("prosecutionbar" + QString::number(prosecution_bar_state)); set_size_and_pos(ui_music_label, "music_label"); ui_music_label->setText(tr("Music")); @@ -943,8 +996,7 @@ void Courtroom::set_widgets() set_size_and_pos(ui_ooc_toggle, "ooc_toggle"); ui_ooc_toggle->setText(tr("Server")); - ui_ooc_toggle->setToolTip( - tr("Toggle between server chat and global AO2 chat.")); + ui_ooc_toggle->setToolTip(tr("Toggle between server chat and global AO2 chat.")); set_size_and_pos(ui_witness_testimony, "witness_testimony"); ui_witness_testimony->set_image("witnesstestimony"); @@ -968,29 +1020,26 @@ void Courtroom::set_widgets() set_size_and_pos(ui_change_character, "change_character"); ui_change_character->setText(tr("Change character")); ui_change_character->set_image("change_character"); - ui_change_character->setToolTip( - tr("Bring up the Character Select Screen and change your character.")); + ui_change_character->setToolTip(tr("Bring up the Character Select Screen and change your character.")); set_size_and_pos(ui_reload_theme, "reload_theme"); ui_reload_theme->setText(tr("Reload theme")); ui_reload_theme->set_image("reload_theme"); - ui_reload_theme->setToolTip( - tr("Refresh the theme and update all of the ui elements to match.")); + ui_reload_theme->setToolTip(tr("Refresh the theme and update all of the ui elements to match.")); set_size_and_pos(ui_call_mod, "call_mod"); ui_call_mod->setText(tr("Call mod")); ui_call_mod->set_image("call_mod"); - ui_call_mod->setToolTip( - tr("Request the attention of the current server's moderator.")); + ui_call_mod->setToolTip(tr("Request the attention of the current server's moderator.")); set_size_and_pos(ui_settings, "settings"); ui_settings->setText(tr("Settings")); ui_settings->set_image("courtroom_settings"); - if (ui_settings->icon().isNull()) { - ui_settings->set_image("settings"); // pre-2.10 filename + if (ui_settings->icon().isNull()) + { + ui_settings->set_image("settings"); // pre-2.10 filename } - ui_settings->setToolTip( - tr("Allows you to change various aspects of the client.")); + ui_settings->setToolTip(tr("Allows you to change various aspects of the client.")); set_size_and_pos(ui_switch_area_music, "switch_area_music"); ui_switch_area_music->setText(tr("A/M")); @@ -999,68 +1048,59 @@ void Courtroom::set_widgets() set_size_and_pos(ui_pre, "pre"); ui_pre->setText(tr("Preanim")); - ui_pre->setToolTip( - tr("Play a single-shot animation as defined by the emote when checked.")); + ui_pre->setToolTip(tr("Play a single-shot animation as defined by the emote when checked.")); - ui_immediate->setToolTip( - tr("If preanim is checked, display the input text immediately as the " - "animation plays concurrently.")); + ui_immediate->setToolTip(tr("If preanim is checked, display the input text immediately as the " + "animation plays concurrently.")); - design_ini_result = - ao_app->get_element_dimensions("immediate", "courtroom_design.ini"); + design_ini_result = ao_app->get_element_dimensions("immediate", "courtroom_design.ini"); // If we don't have new-style naming, fall back to the old method - if (design_ini_result.width < 0 || design_ini_result.height < 0) { + if (design_ini_result.width < 0 || design_ini_result.height < 0) + { set_size_and_pos(ui_immediate, "pre_no_interrupt"); truncate_label_text(ui_immediate, "pre_no_interrupt"); } - else {// Adopt the based new method instead + else + { // Adopt the based new method instead set_size_and_pos(ui_immediate, "immediate"); truncate_label_text(ui_immediate, "immediate"); } - set_size_and_pos(ui_flip, "flip"); ui_flip->setToolTip(tr("Mirror your character's emotes when checked.")); set_size_and_pos(ui_additive, "additive"); - ui_additive->setToolTip( - tr("Add text to your last spoken message when checked.")); + ui_additive->setToolTip(tr("Add text to your last spoken message when checked.")); set_size_and_pos(ui_guard, "guard"); - ui_guard->setToolTip( - tr("Do not listen to mod calls when checked, preventing them from " - "playing sounds or focusing attention on the window.")); + ui_guard->setToolTip(tr("Do not listen to mod calls when checked, preventing them from " + "playing sounds or focusing attention on the window.")); set_size_and_pos(ui_showname_enable, "showname_enable"); - ui_showname_enable->setToolTip( - tr("Display customized shownames for all users when checked.")); + ui_showname_enable->setToolTip(tr("Display customized shownames for all users when checked.")); set_size_and_pos(ui_custom_objection, "custom_objection"); ui_custom_objection->setText(tr("Custom Shout!")); ui_custom_objection->set_image("custom"); - ui_custom_objection->setToolTip( - tr("This will display the custom character-defined animation in the " - "viewport as soon as it is pressed.\n" - "To make one, your character's folder must contain " - "custom.[webp/apng/gif/png] and custom.[wav/ogg/opus] sound effect")); + ui_custom_objection->setToolTip(tr("This will display the custom character-defined animation in the " + "viewport as soon as it is pressed.\n" + "To make one, your character's folder must contain " + "custom.[webp/apng/gif/png] and custom.[wav/ogg/opus] sound effect")); set_size_and_pos(ui_realization, "realization"); ui_realization->set_image("realization"); - ui_realization->setToolTip( - tr("Play realization sound and animation in the viewport on the next " - "spoken message when checked.")); + ui_realization->setToolTip(tr("Play realization sound and animation in the viewport on the next " + "spoken message when checked.")); set_size_and_pos(ui_screenshake, "screenshake"); ui_screenshake->set_image("screenshake"); - ui_screenshake->setToolTip( - tr("Shake the screen on next spoken message when checked.")); + ui_screenshake->setToolTip(tr("Shake the screen on next spoken message when checked.")); set_size_and_pos(ui_mute, "mute_button"); ui_mute->setText("Mute"); ui_mute->set_image("mute"); - ui_mute->setToolTip( - tr("Display the list of character folders you wish to mute.")); + ui_mute->setToolTip(tr("Display the list of character folders you wish to mute.")); set_size_and_pos(ui_defense_plus, "defense_plus"); ui_defense_plus->set_image("defplus"); @@ -1079,10 +1119,9 @@ void Courtroom::set_widgets() ui_prosecution_minus->setToolTip(tr("Decrease the health bar.")); set_size_and_pos(ui_text_color, "text_color"); - 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!")); + 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_size_and_pos(ui_music_slider, "music_slider"); @@ -1118,19 +1157,13 @@ void Courtroom::set_widgets() truncate_label_text(ui_sfx_label, "sfx_label"); truncate_label_text(ui_blip_label, "blip_label"); - free_brush = - QBrush(ao_app->get_color("area_free_color", "courtroom_design.ini")); - lfp_brush = - QBrush(ao_app->get_color("area_lfp_color", "courtroom_design.ini")); - casing_brush = - QBrush(ao_app->get_color("area_casing_color", "courtroom_design.ini")); - recess_brush = - QBrush(ao_app->get_color("area_recess_color", "courtroom_design.ini")); + free_brush = QBrush(ao_app->get_color("area_free_color", "courtroom_design.ini")); + lfp_brush = QBrush(ao_app->get_color("area_lfp_color", "courtroom_design.ini")); + casing_brush = QBrush(ao_app->get_color("area_casing_color", "courtroom_design.ini")); + recess_brush = QBrush(ao_app->get_color("area_recess_color", "courtroom_design.ini")); rp_brush = QBrush(ao_app->get_color("area_rp_color", "courtroom_design.ini")); - gaming_brush = - QBrush(ao_app->get_color("area_gaming_color", "courtroom_design.ini")); - locked_brush = - QBrush(ao_app->get_color("area_locked_color", "courtroom_design.ini")); + gaming_brush = QBrush(ao_app->get_color("area_gaming_color", "courtroom_design.ini")); + locked_brush = QBrush(ao_app->get_color("area_locked_color", "courtroom_design.ini")); refresh_evidence(); } @@ -1152,99 +1185,102 @@ void Courtroom::set_fonts(QString p_char) set_font(ui_music_name, "", "music_name", p_char); for (int i = 0; i < max_clocks; i++) + { set_font(ui_clock[i], "", "clock_" + QString::number(i), p_char); + } set_stylesheets(); } -void Courtroom::set_font(QWidget *widget, QString class_name, - QString p_identifier, QString p_char, - QString font_name, int f_pointsize) +void Courtroom::set_font(QWidget *widget, QString class_name, QString p_identifier, QString p_char, QString font_name, int f_pointsize) { QString design_file = "courtroom_fonts.ini"; if (f_pointsize <= 0) - f_pointsize = - ao_app->get_design_element(p_identifier, design_file, ao_app->get_chat(p_char)).toInt() * Options::getInstance().themeScalingFactor(); + { + f_pointsize = ao_app->get_design_element(p_identifier, design_file, ao_app->get_chat(p_char)).toInt() * Options::getInstance().themeScalingFactor(); + } if (font_name == "") - font_name = - ao_app->get_design_element(p_identifier + "_font", design_file, ao_app->get_chat(p_char)); - QString f_color_result = - ao_app->get_design_element(p_identifier + "_color", design_file, ao_app->get_chat(p_char)); + { + font_name = ao_app->get_design_element(p_identifier + "_font", design_file, ao_app->get_chat(p_char)); + } + QString f_color_result = ao_app->get_design_element(p_identifier + "_color", design_file, ao_app->get_chat(p_char)); QColor f_color(0, 0, 0); - if (f_color_result != "") { + if (f_color_result != "") + { QStringList color_list = f_color_result.split(","); - if (color_list.size() >= 3) { + if (color_list.size() >= 3) + { f_color.setRed(color_list.at(0).toInt()); f_color.setGreen(color_list.at(1).toInt()); f_color.setBlue(color_list.at(2).toInt()); } } - bool bold = - ao_app->get_design_element(p_identifier + "_bold", design_file, ao_app->get_chat(p_char)) == - "1"; // is the font bold or not? - bool antialias = ao_app->get_design_element(p_identifier + "_sharp", - design_file, ao_app->get_chat(p_char)) != - "1"; // is the font anti-aliased or not? + bool bold = ao_app->get_design_element(p_identifier + "_bold", design_file, ao_app->get_chat(p_char)) == "1"; // is the font bold or not? + bool antialias = ao_app->get_design_element(p_identifier + "_sharp", design_file, ao_app->get_chat(p_char)) != "1"; // is the font anti-aliased or not? bool outlined = ao_app->get_design_element(p_identifier + "_outlined", design_file, ao_app->get_chat(p_char)) == "1"; QColor outline_color; int outline_width = 1; - if (outlined) { - QString outline_color_result = - ao_app->get_design_element(p_identifier + "_outline_color", design_file, ao_app->get_chat(p_char)); - outline_color = QColor(0,0,0); - if (outline_color_result != "") { - QStringList o_color_list = outline_color_result.split(","); - - if (o_color_list.size() >= 3) { - outline_color.setRed(o_color_list.at(0).toInt()); - outline_color.setGreen(o_color_list.at(1).toInt()); - outline_color.setBlue(o_color_list.at(2).toInt()); - } + if (outlined) + { + QString outline_color_result = ao_app->get_design_element(p_identifier + "_outline_color", design_file, ao_app->get_chat(p_char)); + outline_color = QColor(0, 0, 0); + if (outline_color_result != "") + { + QStringList o_color_list = outline_color_result.split(","); + + if (o_color_list.size() >= 3) + { + outline_color.setRed(o_color_list.at(0).toInt()); + outline_color.setGreen(o_color_list.at(1).toInt()); + outline_color.setBlue(o_color_list.at(2).toInt()); } - outline_width = ao_app->get_design_element(p_identifier + "_outline_width", design_file, ao_app->get_chat(p_char)).toInt() * Options::getInstance().themeScalingFactor(); + } + outline_width = ao_app->get_design_element(p_identifier + "_outline_width", design_file, ao_app->get_chat(p_char)).toInt() * Options::getInstance().themeScalingFactor(); } - this->set_qfont(widget, class_name, - get_qfont(font_name, f_pointsize, antialias), f_color, bold, outlined, outline_color, outline_width); + this->set_qfont(widget, class_name, get_qfont(font_name, f_pointsize, antialias), f_color, bold, outlined, outline_color, outline_width); } QFont Courtroom::get_qfont(QString font_name, int f_pointsize, bool antialias) { QFont font; if (font_name.isEmpty()) + { font_name = "Arial"; + } QFont::StyleStrategy style_strategy = QFont::PreferDefault; if (!antialias) + { style_strategy = QFont::NoAntialias; + } font = QFont(font_name, f_pointsize); font.setStyleHint(QFont::SansSerif, style_strategy); return font; } -void Courtroom::set_qfont(QWidget *widget, QString class_name, QFont font, - QColor f_color, bool bold, bool outlined, QColor outline_color, int outline_width) +void Courtroom::set_qfont(QWidget *widget, QString class_name, QFont font, QColor f_color, bool bold, bool outlined, QColor outline_color, int outline_width) { if (class_name.isEmpty()) + { class_name = widget->metaObject()->className(); + } - if (class_name == "AOChatboxLabel") { // Only shownames can be outlined - ui_vp_showname->setIsOutlined(outlined); - ui_vp_showname->setOutlineColor(outline_color); - ui_vp_showname->setTextColor(f_color); - ui_vp_showname->setOutlineWidth(outline_width); + if (class_name == "AOChatboxLabel") + { // Only shownames can be outlined + ui_vp_showname->setIsOutlined(outlined); + ui_vp_showname->setOutlineColor(outline_color); + ui_vp_showname->setTextColor(f_color); + ui_vp_showname->setOutlineWidth(outline_width); } font.setBold(bold); widget->setFont(font); - QString style_sheet_string = - class_name + " { color: rgba(" + - QString::number(f_color.red()) + ", " + QString::number(f_color.green()) + - ", " + QString::number(f_color.blue()) + ", 255);}"; + QString style_sheet_string = class_name + " { color: rgba(" + QString::number(f_color.red()) + ", " + QString::number(f_color.green()) + ", " + QString::number(f_color.blue()) + ", 255);}"; widget->setStyleSheet(style_sheet_string); } @@ -1253,18 +1289,18 @@ void Courtroom::set_stylesheet(QWidget *widget) QString f_file = "courtroom_stylesheets.css"; QString style_sheet_string = ao_app->get_stylesheet(f_file); if (style_sheet_string != "") + { widget->setStyleSheet(style_sheet_string); + } } void Courtroom::set_stylesheets() { set_stylesheet(this); - this->setStyleSheet( - "QFrame { background-color:transparent; } " - "QAbstractItemView { background-color: transparent; color: black; } " - "QLineEdit { background-color:transparent; }" - + this->styleSheet() - ); + this->setStyleSheet("QFrame { background-color:transparent; } " + "QAbstractItemView { background-color: transparent; color: black; } " + "QLineEdit { background-color:transparent; }" + + this->styleSheet()); } void Courtroom::set_window_title(QString p_title) @@ -1276,14 +1312,15 @@ void Courtroom::set_size_and_pos(QWidget *p_widget, QString p_identifier, QStrin { QString filename = "courtroom_design.ini"; - pos_size_type design_ini_result = - ao_app->get_element_dimensions(p_identifier, filename, p_misc); + pos_size_type design_ini_result = ao_app->get_element_dimensions(p_identifier, filename, p_misc); - if (design_ini_result.width < 0 || design_ini_result.height < 0) { + if (design_ini_result.width < 0 || design_ini_result.height < 0) + { qWarning() << "could not find" << p_identifier << "in" << filename; p_widget->hide(); } - else { + else + { p_widget->move(design_ini_result.x, design_ini_result.y); p_widget->resize(design_ini_result.width, design_ini_result.height); } @@ -1291,7 +1328,8 @@ void Courtroom::set_size_and_pos(QWidget *p_widget, QString p_identifier, QStrin void Courtroom::set_taken(int n_char, bool p_taken) { - if (n_char >= char_list.size()) { + if (n_char >= char_list.size()) + { qWarning() << "set_taken attempted to set an index bigger than char_list size"; return; } @@ -1305,22 +1343,6 @@ void Courtroom::set_taken(int n_char, bool p_taken) char_list.replace(n_char, f_char); } -QPoint Courtroom::get_theme_pos(QString p_identifier) -{ - QString filename = "courtroom_design.ini"; - - pos_size_type design_ini_result = - ao_app->get_element_dimensions(p_identifier, filename); - - if (design_ini_result.width < 0 || design_ini_result.height < 0) { - qWarning() << "could not find" << p_identifier << "in" << filename; - return QPoint(0, 0); - } - else { - return QPoint(design_ini_result.x, design_ini_result.y); - } -} - void Courtroom::done_received() { m_cid = -1; @@ -1363,23 +1385,26 @@ void Courtroom::set_background(QString p_background, bool display) // Populate the dropdown list with all pos that exist on this bg QStringList pos_list = {}; - for (const QString &key : default_pos.keys()) { - if (file_exists(ao_app->get_image_suffix( - ao_app->get_background_path(default_pos[key]))) || // if we have 2.8-style positions, e.g. def.png, wit.webp, hld.apng - file_exists( - ao_app->get_image_suffix(ao_app->get_background_path(key)))) { // if we have pre-2.8-style positions, e.g. defenseempty.png + for (const QString &key : default_pos.keys()) + { + if (file_exists(ao_app->get_image_suffix(ao_app->get_background_path(default_pos[key]))) || // if we have 2.8-style positions, e.g. def.png, wit.webp, hld.apng + file_exists(ao_app->get_image_suffix(ao_app->get_background_path(key)))) + { // if we have pre-2.8-style positions, e.g. defenseempty.png pos_list.append(default_pos[key]); } } - for (const QString &pos : ao_app->read_design_ini("positions", ao_app->get_background_path("design.ini")).split(",")) { - if (file_exists(ao_app->get_image_suffix(ao_app->get_background_path(pos)))) { + for (const QString &pos : ao_app->read_design_ini("positions", ao_app->get_background_path("design.ini")).split(",")) + { + if (file_exists(ao_app->get_image_suffix(ao_app->get_background_path(pos)))) + { pos_list.append(pos); } } set_pos_dropdown(pos_list); - if (display) { + if (display) + { ui_vp_speedlines->hide(); ui_vp_player_char->stop(); @@ -1388,11 +1413,13 @@ void Courtroom::set_background(QString p_background, bool display) ui_vp_message->hide(); ui_vp_chatbox->setVisible(chatbox_always_show); // Show it if chatbox always shows - if (Options::getInstance().characterStickerEnabled() && chatbox_always_show) { + if (Options::getInstance().characterStickerEnabled() && chatbox_always_show) + { ui_vp_sticker->load_image(m_chatmessage[CHAR_NAME]); } // Hide the face sticker - else { + else + { ui_vp_sticker->stop(); } // Stop the chat arrow from animating @@ -1409,20 +1436,24 @@ void Courtroom::set_background(QString p_background, bool display) ui_vp_evidence_display->reset(); QString f_side = current_side; if (current_side == "") + { f_side = ao_app->get_char_side(current_char); + } set_scene(true, f_side); } } void Courtroom::set_side(QString p_side) { - if (p_side.isEmpty() || p_side == ao_app->get_char_side(current_char)) { - ui_pos_remove->hide(); - current_side = ao_app->get_char_side(current_char); + if (p_side.isEmpty() || p_side == ao_app->get_char_side(current_char)) + { + ui_pos_remove->hide(); + current_side = ao_app->get_char_side(current_char); } - else { - ui_pos_remove->show(); - current_side = p_side; + else + { + ui_pos_remove->show(); + current_side = p_side; } set_judge_buttons(); @@ -1430,10 +1461,11 @@ void Courtroom::set_side(QString p_side) // Block the signals to prevent setCurrentIndex from triggering a pos // change ui_pos_dropdown->blockSignals(true); - for (int i = 0; i < ui_pos_dropdown->count(); ++i) { + for (int i = 0; i < ui_pos_dropdown->count(); ++i) + { QString pos = ui_pos_dropdown->itemText(i); - if (pos == current_side) { - + if (pos == current_side) + { // Set the index on dropdown ui element to let you know what pos you're on // right now ui_pos_dropdown->setCurrentIndex(i); @@ -1456,18 +1488,22 @@ void Courtroom::set_pos_dropdown(QStringList pos_dropdowns) ui_pos_dropdown->blockSignals(true); pos_dropdown_list = pos_dropdowns; ui_pos_dropdown->clear(); - for (int n = 0; n < pos_dropdown_list.size(); ++n) { + for (int n = 0; n < pos_dropdown_list.size(); ++n) + { QString pos = pos_dropdown_list.at(n); ui_pos_dropdown->addItem(pos); QPixmap image = QPixmap(ao_app->get_image_suffix(ao_app->get_background_path(ao_app->get_pos_path(pos)))); - if (!image.isNull()) { + if (!image.isNull()) + { image = image.scaledToHeight(ui_pos_dropdown->iconSize().height()); } ui_pos_dropdown->setItemIcon(n, image); } if (current_side != "" && !pos_dropdown_list.contains(current_side)) + { ui_pos_dropdown->setEditText(current_side); + } // Unblock the signals so the element can be used for setting pos again ui_pos_dropdown->blockSignals(false); @@ -1481,19 +1517,26 @@ void Courtroom::update_character(int p_cid, QString char_name, bool reset_emote) QString f_char; - if (m_cid == -1) { + if (m_cid == -1) + { if (Options::getInstance().discordEnabled()) + { ao_app->discord->state_spectate(); + } f_char = ""; } - else { + else + { f_char = char_name; - if (char_name.isEmpty()) { + if (char_name.isEmpty()) + { f_char = char_list.at(m_cid).name; } if (Options::getInstance().discordEnabled()) + { ao_app->discord->state_character(f_char.toStdString()); + } } current_char = f_char; @@ -1503,15 +1546,20 @@ void Courtroom::update_character(int p_cid, QString char_name, bool reset_emote) set_text_color_dropdown(); // If our cid changed or we're being told to reset - if (newchar || reset_emote) { + if (newchar || reset_emote) + { current_emote_page = 0; current_emote = 0; } if (m_cid == -1) + { ui_emotes->hide(); + } else + { ui_emotes->show(); + } refresh_emotes(); set_emote_page(); @@ -1521,28 +1569,34 @@ void Courtroom::update_character(int p_cid, QString char_name, bool reset_emote) set_effects_dropdown(); if (newchar) // Avoid infinite loop of death and suffering + { set_iniswap_dropdown(); + } ui_custom_objection->hide(); if (ao_app->custom_objection_supported) // if setting is enabled { custom_obj_menu->clear(); custom_objections_list.clear(); - if (file_exists(ao_app->get_image_suffix( - ao_app->get_character_path(current_char, "custom")))) { + if (file_exists(ao_app->get_image_suffix(ao_app->get_character_path(current_char, "custom")))) + { ui_custom_objection->show(); QString custom_name = ao_app->read_char_ini(f_char, "custom_name", "Shouts"); QAction *action; if (custom_name != "") + { action = custom_obj_menu->addAction(custom_name); + } else + { action = custom_obj_menu->addAction("Default"); + } custom_obj_menu->setDefaultAction(action); objection_custom = ""; } - QString custom_objection_dir = ao_app->get_real_path( - ao_app->get_character_path(current_char, "custom_objections")); - if (dir_exists(custom_objection_dir)) { + QString custom_objection_dir = ao_app->get_real_path(ao_app->get_character_path(current_char, "custom_objections")); + if (dir_exists(custom_objection_dir)) + { ui_custom_objection->show(); QDir directory(custom_objection_dir); QStringList custom_obj = directory.entryList(QStringList() << "*.png" @@ -1550,32 +1604,38 @@ void Courtroom::update_character(int p_cid, QString char_name, bool reset_emote) << "*.apng" << "*.webp", QDir::Files); - for (const QString &filename : custom_obj) { + for (const QString &filename : custom_obj) + { CustomObjection custom_objection; custom_objection.filename = filename; QString custom_name = ao_app->read_char_ini(f_char, filename.left(filename.lastIndexOf(".")) + "_name", "Shouts"); QAction *action; - if (custom_name != "") { + if (custom_name != "") + { custom_objection.name = custom_name; action = custom_obj_menu->addAction(custom_name); } - else { + else + { custom_objection.name = filename.left(filename.lastIndexOf(".")); action = custom_obj_menu->addAction(custom_objection.name); } - if (custom_obj_menu->defaultAction() == nullptr) { + if (custom_obj_menu->defaultAction() == nullptr) + { custom_obj_menu->setDefaultAction(action); objection_custom = custom_objection.filename; } - custom_objections_list.append(custom_objection); + custom_objections_list.append(custom_objection); } } } - if (m_cid != -1) { + if (m_cid != -1) + { ui_ic_chat_name->setPlaceholderText(char_list.at(m_cid).name); } - else { + else + { ui_ic_chat_name->setPlaceholderText("Spectator"); } ui_char_select_background->hide(); @@ -1589,20 +1649,27 @@ void Courtroom::enter_courtroom() set_evidence_page(); if (ao_app->flipping_supported) + { ui_flip->show(); + } else + { ui_flip->hide(); + } if (ao_app->additive_text_supported) + { ui_additive->show(); + } else + { ui_additive->hide(); + } list_music(); list_areas(); - switch ( - objection_state) // no need to reset these as it was done in set_widgets() + switch (objection_state) // no need to reset these as it was done in set_widgets() { case 1: ui_hold_it->set_image("holdit_selected"); @@ -1647,7 +1714,8 @@ void Courtroom::list_music() int n_listed_songs = 0; QTreeWidgetItem *parent = nullptr; - for (int n_song = 0; n_song < music_list.size(); ++n_song) { + for (int n_song = 0; n_song < music_list.size(); ++n_song) + { QString i_song = music_list.at(n_song); // It's a stop song or a stop category // yes we cannot properly parse a stop song without a stop category cuz otherwise areas break @@ -1657,36 +1725,46 @@ void Courtroom::list_music() // please end my suffering QString temp = i_song; if (i_song == "~stop.mp3" || (temp.remove('=').toLower() == "stop")) - continue; + { + continue; + } QString i_song_listname = i_song.left(i_song.lastIndexOf(".")); - i_song_listname = i_song_listname.right( - i_song_listname.length() - (i_song_listname.lastIndexOf("/") + 1)); + i_song_listname = i_song_listname.right(i_song_listname.length() - (i_song_listname.lastIndexOf("/") + 1)); QTreeWidgetItem *treeItem; - if (i_song_listname != i_song && - parent != nullptr) // not a category, parent exists + if (i_song_listname != i_song && parent != nullptr) // not a category, parent exists + { treeItem = new QTreeWidgetItem(parent); + } else + { treeItem = new QTreeWidgetItem(ui_music_list); + } treeItem->setText(0, i_song_listname); treeItem->setText(1, i_song); QString song_path = ao_app->get_real_path(ao_app->get_music_path(i_song)); if (file_exists(song_path)) + { treeItem->setBackground(0, found_brush); + } else + { treeItem->setBackground(0, missing_brush); + } - if (i_song_listname == - i_song) // Not supposed to be a song to begin with - a category? + if (i_song_listname == i_song) // Not supposed to be a song to begin with - a category? + { parent = treeItem; + } ++n_listed_songs; } ui_music_list->expandAll(); // Needs to somehow remember which categories were // expanded/collapsed if the music list didn't // change since last time - if (ui_music_search->text() != "") { + if (ui_music_search->text() != "") + { on_music_search_edited(ui_music_search->text()); } } @@ -1696,23 +1774,27 @@ void Courtroom::list_areas() { int n_listed_areas = 0; - for (int n_area = 0; n_area < area_list.size(); ++n_area) { - QString i_area = ""; + for (int n_area = 0; n_area < area_list.size(); ++n_area) + { + QString i_area; i_area.append(area_list.at(n_area)); - if (ao_app->arup_supported) { + if (ao_app->arup_supported) + { i_area.append("\n "); i_area.append(arup_statuses.at(n_area)); - if (arup_cms.at(n_area) != "FREE") { + if (arup_cms.at(n_area) != "FREE") + { i_area.append(" | CM: "); i_area.append(arup_cms.at(n_area)); } i_area.append("\n "); - if (arup_players.at(n_area) != -1) { + if (arup_players.at(n_area) != -1) + { i_area.append(QString::number(arup_players.at(n_area))); i_area.append(" users | "); } @@ -1720,93 +1802,95 @@ void Courtroom::list_areas() i_area.append(arup_locks.at(n_area)); } - QTreeWidgetItem *treeItem = ui_area_list->topLevelItem(n_area); - if (treeItem == nullptr) { + if (treeItem == nullptr) + { treeItem = new QTreeWidgetItem(ui_area_list); } treeItem->setText(0, area_list.at(n_area)); treeItem->setText(1, i_area); - if (ao_app->arup_supported) { + if (ao_app->arup_supported) + { // Coloring logic here. treeItem->setBackground(1, free_brush); - if (arup_locks.at(n_area) == "LOCKED") { + if (arup_locks.at(n_area) == "LOCKED") + { treeItem->setBackground(1, locked_brush); } - else { + else + { if (arup_statuses.at(n_area) == "LOOKING-FOR-PLAYERS") + { treeItem->setBackground(1, lfp_brush); + } else if (arup_statuses.at(n_area) == "CASING") + { treeItem->setBackground(1, casing_brush); + } else if (arup_statuses.at(n_area) == "RECESS") + { treeItem->setBackground(1, recess_brush); + } else if (arup_statuses.at(n_area) == "RP") + { treeItem->setBackground(1, rp_brush); + } else if (arup_statuses.at(n_area) == "GAMING") + { treeItem->setBackground(1, gaming_brush); + } } } - else { + else + { treeItem->setBackground(1, free_brush); } ++n_listed_areas; } - while (ui_area_list->topLevelItemCount() > n_listed_areas) { - ui_area_list->takeTopLevelItem(ui_area_list->topLevelItemCount()-1); + while (ui_area_list->topLevelItemCount() > n_listed_areas) + { + ui_area_list->takeTopLevelItem(ui_area_list->topLevelItemCount() - 1); } - if (ui_music_search->text() != "") { + if (ui_music_search->text() != "") + { on_music_search_edited(ui_music_search->text()); } } -void Courtroom::debug_message_handler(QtMsgType type, const QMessageLogContext &context, - const QString &msg) +void Courtroom::debug_message_handler(QtMsgType type, const QMessageLogContext &context, const QString &msg) { Q_UNUSED(context); - const QMap<QtMsgType, QString> colors = { - {QtDebugMsg, "debug"}, - {QtInfoMsg, "info"}, - {QtWarningMsg, "warn"}, - {QtCriticalMsg, "critical"}, - {QtFatalMsg, "fatal"} - }; + const QMap<QtMsgType, QString> colors = {{QtDebugMsg, "debug"}, {QtInfoMsg, "info"}, {QtWarningMsg, "warn"}, {QtCriticalMsg, "critical"}, {QtFatalMsg, "fatal"}}; const QString color_id = QString("debug_log_%1_color").arg(colors.value(type, "info")); - ui_debug_log->append_chatmessage( - colors.value(type, "info"), msg, - QString(), ao_app->get_color(color_id, "courtroom_fonts.ini").name()); -} - -void Courtroom::append_debug_message(QString f_message) -{ - ui_debug_log->append_chatmessage( - QString(), f_message, - ao_app->get_color("debug_log_color", "courtroom_fonts.ini").name()); + ui_debug_log->append_chatmessage(colors.value(type, "info"), msg, QString(), ao_app->get_color(color_id, "courtroom_fonts.ini").name()); } -void Courtroom::append_server_chatmessage(QString p_name, QString p_message, - QString p_color) +void Courtroom::append_server_chatmessage(QString p_name, QString p_message, QString p_color) { QString color = "#000000"; if (p_color == "0") - color = ao_app->get_color("ms_chatlog_sender_color", "courtroom_fonts.ini") - .name(); + { + color = ao_app->get_color("ms_chatlog_sender_color", "courtroom_fonts.ini").name(); + } if (p_color == "1") - color = - ao_app->get_color("server_chatlog_sender_color", "courtroom_fonts.ini") - .name(); - if (!ao_app->auth_packet_supported && p_message == "Logged in as a moderator.") { + { + color = ao_app->get_color("server_chatlog_sender_color", "courtroom_fonts.ini").name(); + } + if (!ao_app->auth_packet_supported && p_message == "Logged in as a moderator.") + { // Emulate successful authentication on_authentication_state_received(1); } ui_server_chatlog->append_chatmessage(p_name, p_message, color); - if (Options::getInstance().logToTextFileEnabled() && !ao_app->log_filename.isEmpty()) { + if (Options::getInstance().logToTextFileEnabled() && !ao_app->log_filename.isEmpty()) + { QString full = "[OOC][" + QDateTime::currentDateTimeUtc().toString() + "] " + p_name + ": " + p_message; ao_app->append_to_file(full, ao_app->log_filename, true); } @@ -1814,27 +1898,46 @@ void Courtroom::append_server_chatmessage(QString p_name, QString p_message, void Courtroom::on_authentication_state_received(int p_state) { - if (p_state >= 1) { + if (p_state >= 1) + { ui_guard->show(); append_server_chatmessage(tr("CLIENT"), tr("You were granted the Disable Modcalls button."), "1"); } - else if (p_state == 0) { + else if (p_state == 0) + { append_server_chatmessage(tr("CLIENT"), tr("Login unsuccessful."), "1"); } - else if (p_state < 0) { + else if (p_state < 0) + { ui_guard->hide(); append_server_chatmessage(tr("CLIENT"), tr("You were logged out."), "1"); } } +Courtroom::JudgeState Courtroom::get_judge_state() +{ + return judge_state; +} + +void Courtroom::set_judge_state(JudgeState new_state) +{ + judge_state = new_state; +} + +void Courtroom::set_judge_buttons() +{ + show_judge_controls(ao_app->get_pos_is_judge(current_side)); +} + void Courtroom::on_chat_return_pressed() { if (is_muted) + { return; + } ui_ic_chat_message->blockSignals(true); - QTimer::singleShot(Options::getInstance().chatRateLimit(), this, - [this] { ui_ic_chat_message->blockSignals(false); }); + QTimer::singleShot(Options::getInstance().chatRateLimit(), this, [this] { ui_ic_chat_message->blockSignals(false); }); // MS# // deskmod# // pre-emote# @@ -1865,24 +1968,38 @@ void Courtroom::on_chat_return_pressed() int f_emote_mod = ao_app->get_emote_mod(current_char, current_emote); if (current_side == "") + { f_side = ao_app->get_char_side(current_char); + } else + { f_side = current_side; + } int f_desk_mod = DESK_SHOW; - if (ao_app->desk_mod_supported) { + if (ao_app->desk_mod_supported) + { f_desk_mod = ao_app->get_desk_mod(current_char, current_emote); - if (!ao_app->expanded_desk_mods_supported) { + if (!ao_app->expanded_desk_mods_supported) + { if (f_desk_mod == DESK_PRE_ONLY_EX || f_desk_mod == DESK_PRE_ONLY) + { f_desk_mod = DESK_HIDE; + } else if (f_desk_mod == DESK_EMOTE_ONLY_EX || f_desk_mod == DESK_EMOTE_ONLY) + { f_desk_mod = DESK_SHOW; + } } if (f_desk_mod == -1 && (f_emote_mod == 5 || f_emote_mod == 6)) // workaround for inis that broke after deprecating "chat" + { f_desk_mod = DESK_HIDE; + } else if (f_desk_mod == -1) + { f_desk_mod = DESK_SHOW; + } } packet_contents.append(QString::number(f_desk_mod)); @@ -1891,55 +2008,67 @@ void Courtroom::on_chat_return_pressed() QString f_sfx = "1"; int f_sfx_delay = get_char_sfx_delay(); -// EMOTE MOD OVERRIDES: + // EMOTE MOD OVERRIDES: // Emote_mod 2 is only used by objection check later, having it in the char.ini does nothing - if (f_emote_mod == 2) { + if (f_emote_mod == 2) + { f_emote_mod = PREANIM; } // No clue what emote_mod 3 is even supposed to be. - if (f_emote_mod == 3) { + if (f_emote_mod == 3) + { f_emote_mod = IDLE; } // Emote_mod 4 seems to be a legacy bugfix that just refers it to emote_mod 5 which is zoom emote - if (f_emote_mod == 4) { + if (f_emote_mod == 4) + { f_emote_mod = ZOOM; } // If we have "pre" on, and immediate is not checked - if (ui_pre->isChecked() && !ui_immediate->isChecked()) { + if (ui_pre->isChecked() && !ui_immediate->isChecked()) + { // Turn idle into preanim - if (f_emote_mod == IDLE) { + if (f_emote_mod == IDLE) + { f_emote_mod = PREANIM; } // Turn zoom into preanim zoom - else if (f_emote_mod == ZOOM && ao_app->prezoom_supported) { + else if (f_emote_mod == ZOOM && ao_app->prezoom_supported) + { f_emote_mod = PREANIM_ZOOM; } // Play the sfx f_sfx = get_char_sfx(); } // If we have "pre" off, or immediate is checked - else { + else + { // Turn preanim into idle - if (f_emote_mod == PREANIM) { + if (f_emote_mod == PREANIM) + { f_emote_mod = IDLE; } // Turn preanim zoom into zoom - else if (f_emote_mod == PREANIM_ZOOM) { + else if (f_emote_mod == PREANIM_ZOOM) + { f_emote_mod = ZOOM; } // Play the sfx if pre is checked - if (ui_pre->isChecked()) { + if (ui_pre->isChecked()) + { f_sfx = get_char_sfx(); } } // Custom sfx override via sound list dropdown. - if (!custom_sfx.isEmpty() || ui_sfx_dropdown->currentIndex() != 0) { + if (!custom_sfx.isEmpty() || ui_sfx_dropdown->currentIndex() != 0) + { f_sfx = get_char_sfx(); // We have a custom sfx but we're on idle emotes. // Turn them into pre so the sound plays if client setting sfx_on_idle is enabled. - if (Options::getInstance().playSelectedSFXOnIdle() && (f_emote_mod == IDLE || f_emote_mod == ZOOM)) { + if (Options::getInstance().playSelectedSFXOnIdle() && (f_emote_mod == IDLE || f_emote_mod == ZOOM)) + { // We turn idle into preanim, but make it not send a pre animation f_pre = ""; // Set sfx delay to 0 so the sfx plays immediately @@ -1967,40 +2096,56 @@ void Courtroom::on_chat_return_pressed() QString f_obj_state; - if ((objection_state == 4 && !ao_app->custom_objection_supported) || - (objection_state < 0)) + if ((objection_state == 4 && !ao_app->custom_objection_supported) || (objection_state < 0)) + { f_obj_state = "0"; - else if (objection_custom != "" && objection_state == 4) { - f_obj_state = QString::number(objection_state) + "&" + - objection_custom; // we add the name of the objection so the - // packet is like: 4&(name of custom obj) + } + else if (objection_custom != "" && objection_state == 4) + { + f_obj_state = QString::number(objection_state) + "&" + objection_custom; // we add the name of the objection so the + // packet is like: 4&(name of custom obj) } else + { f_obj_state = QString::number(objection_state); + } // We're doing an Objection (custom objections not yet supported) if (objection_state == 2 && Options::getInstance().objectionStopMusic()) + { music_stop(true); + } packet_contents.append(f_obj_state); if (is_presenting_evidence) + { // the evidence index is shifted by 1 because 0 is no evidence per legacy // standards besides, older clients crash if we pass -1 packet_contents.append(QString::number(current_evidence + 1)); + } else + { packet_contents.append("0"); + } QString f_flip; - if (ao_app->flipping_supported) { + if (ao_app->flipping_supported) + { if (ui_flip->isChecked()) + { f_flip = "1"; + } else + { f_flip = "0"; + } } else + { f_flip = QString::number(m_cid); + } packet_contents.append(f_flip); @@ -2009,78 +2154,96 @@ void Courtroom::on_chat_return_pressed() QString f_text_color; if (text_color < 0) + { f_text_color = "0"; + } else if (text_color >= max_colors) + { f_text_color = "0"; + } else + { f_text_color = QString::number(text_color); + } packet_contents.append(f_text_color); // If the server we're on supports CCCC stuff, we should use it! - if (ao_app->cccc_ic_supported) { + if (ao_app->cccc_ic_supported) + { // If there is a showname entered, use that -- else, just send an empty // packet-part. - if (!ui_ic_chat_name->text().isEmpty()) { + if (!ui_ic_chat_name->text().isEmpty()) + { packet_contents.append(ui_ic_chat_name->text()); } - else { + else + { packet_contents.append(""); } // Similarly, we send over whom we're paired with, unless we have chosen // ourselves. Or a charid of -1 or lower, through some means. - if (other_charid > -1 && other_charid != m_cid) { + if (other_charid > -1 && other_charid != m_cid) + { QString packet = QString::number(other_charid); if (ao_app->effects_supported) // Only servers with effects enabled will - // support pair reordering + // support pair reordering + { packet += "^" + QString::number(pair_order); + } packet_contents.append(packet); } - else { + else + { packet_contents.append("-1"); } // Send the offset as it's gonna be used regardless - if(ao_app->y_offset_supported) - packet_contents.append(QString::number(char_offset) + "&" + QString::number(char_vert_offset)); + if (ao_app->y_offset_supported) + { + packet_contents.append(QString::number(char_offset) + "&" + QString::number(char_vert_offset)); + } else - packet_contents.append(QString::number(char_offset)); + { + packet_contents.append(QString::number(char_offset)); + } // Finally, we send over if we want our pres to not interrupt. - if (ui_immediate->isChecked() && ui_pre->isChecked()) { + if (ui_immediate->isChecked() && ui_pre->isChecked()) + { packet_contents.append("1"); } - else { + else + { packet_contents.append("0"); } } // If the server we're on supports Looping SFX and Screenshake, use it if the // emote uses it. - if (ao_app->looping_sfx_supported) { - packet_contents.append( - ao_app->get_sfx_looping(current_char, current_emote)); + if (ao_app->looping_sfx_supported) + { + packet_contents.append(ao_app->get_sfx_looping(current_char, current_emote)); packet_contents.append(QString::number(screenshake_state)); QString pre_emote = ao_app->get_pre_emote(current_char, current_emote); QString emote = ao_app->get_emote(current_char, current_emote); QStringList emotes_to_check = {pre_emote, "(b)" + emote, "(a)" + emote}; - QStringList effects_to_check = {"_FrameScreenshake", "_FrameRealization", - "_FrameSFX"}; + QStringList effects_to_check = {"_FrameScreenshake", "_FrameRealization", "_FrameSFX"}; - foreach (QString f_effect, effects_to_check) { + foreach (QString f_effect, effects_to_check) + { QString packet; - foreach (QString f_emote, emotes_to_check) { + foreach (QString f_emote, emotes_to_check) + { packet += f_emote; - if (Options::getInstance().networkedFrameSfxEnabled()) { - QString sfx_frames = - ao_app - ->read_ini_tags( - ao_app->get_character_path(current_char, "char.ini"), - f_emote.append(f_effect)) - .join("|"); + if (Options::getInstance().networkedFrameSfxEnabled()) + { + QString sfx_frames = ao_app->read_ini_tags(ao_app->get_character_path(current_char, "char.ini"), f_emote.append(f_effect)).join("|"); if (sfx_frames != "") + { packet += "|" + sfx_frames; + } } packet += "^"; } @@ -2088,22 +2251,24 @@ void Courtroom::on_chat_return_pressed() } } - if (ao_app->additive_text_supported) { + if (ao_app->additive_text_supported) + { packet_contents.append(ui_additive->isChecked() ? "1" : "0"); } - if (ao_app->effects_supported) { - QString p_effect_folder = - ao_app->read_char_ini(current_char, "effects", "Options"); - QString fx_sound = - ao_app->get_effect_property(effect, current_char, p_effect_folder, "sound"); + if (ao_app->effects_supported) + { + QString p_effect_folder = ao_app->read_char_ini(current_char, "effects", "Options"); + QString fx_sound = ao_app->get_effect_property(effect, current_char, p_effect_folder, "sound"); // Don't overlap the two sfx - if (!ui_pre->isChecked() && (!custom_sfx.isEmpty() || ui_sfx_dropdown->currentIndex() == 1)) { + if (!ui_pre->isChecked() && (!custom_sfx.isEmpty() || ui_sfx_dropdown->currentIndex() == 1)) + { fx_sound = "0"; } packet_contents.append(effect + "|" + p_effect_folder + "|" + fx_sound); - if (!Options::getInstance().clearEffectsDropdownOnPlayEnabled() && !ao_app->get_effect_property(effect, current_char, p_effect_folder, "sticky").startsWith("true")) { + if (!Options::getInstance().clearEffectsDropdownOnPlayEnabled() && !ao_app->get_effect_property(effect, current_char, p_effect_folder, "sticky").startsWith("true")) + { ui_effects_dropdown->blockSignals(true); ui_effects_dropdown->setCurrentIndex(0); ui_effects_dropdown->blockSignals(false); @@ -2111,14 +2276,16 @@ void Courtroom::on_chat_return_pressed() } } - ao_app->send_server_packet(new AOPacket("MS", packet_contents)); + ao_app->send_server_packet(AOPacket("MS", packet_contents)); } void Courtroom::reset_ui() { ui_ic_chat_message->clear(); if (ui_additive->isChecked()) + { ui_ic_chat_message->insert(" "); + } objection_state = 0; realization_state = 0; screenshake_state = 0; @@ -2132,7 +2299,8 @@ void Courtroom::reset_ui() ui_evidence_present->set_image("present"); // If sticky sounds is disabled and we either have SFX on Idle enabled, or our Preanim checkbox is checked - if (!Options::getInstance().clearSoundsDropdownOnPlayEnabled() && (Options::getInstance().playSelectedSFXOnIdle() || ui_pre->isChecked())) { + if (!Options::getInstance().clearSoundsDropdownOnPlayEnabled() && (Options::getInstance().playSelectedSFXOnIdle() || ui_pre->isChecked())) + { // Reset the SFX Dropdown to "Default" ui_sfx_dropdown->setCurrentIndex(0); ui_sfx_remove->hide(); @@ -2140,8 +2308,10 @@ void Courtroom::reset_ui() } // If sticky preanims is disabled if (!Options::getInstance().clearPreOnPlayEnabled()) + { // Turn off our Preanim checkbox ui_pre->setChecked(false); + } } void Courtroom::chatmessage_enqueue(QStringList p_contents) @@ -2150,21 +2320,29 @@ void Courtroom::chatmessage_enqueue(QStringList p_contents) // amount of packages, we'll check if it has at least 15. // That was the original chatmessage_size. if (p_contents.size() < MS_MINIMUM) + { return; + } // Check the validity of the character ID we got int f_char_id = p_contents[CHAR_ID].toInt(); if (f_char_id < -1 || f_char_id >= char_list.size()) + { return; + } // We muted this char, gtfo if (mute_map.value(f_char_id)) + { return; + } // Use null showname if packet does not support 2.6+ extensions QString showname = QString(); if (SHOWNAME < p_contents.size()) + { showname = p_contents[SHOWNAME]; + } // if the char ID matches our client's char ID (most likely, this is our message coming back to us) bool sender = f_char_id == m_cid; @@ -2173,23 +2351,23 @@ void Courtroom::chatmessage_enqueue(QStringList p_contents) LogMode log_mode = IO_ONLY; // User-created blankpost - if (p_contents[MESSAGE].trimmed().isEmpty()) { + if (p_contents[MESSAGE].trimmed().isEmpty()) + { // Turn it into true blankpost p_contents[MESSAGE] = ""; } // If we determine we sent this message - if (sender) { + if (sender) + { // Reset input UI elements, clear input box, etc. reset_ui(); } // If we determine we sent this message, or we have desync enabled - if (sender || Options::getInstance().desynchronisedLogsEnabled()) { + if (sender || Options::getInstance().desynchronisedLogsEnabled()) + { // Initialize operation "message queue ghost" - log_chatmessage(p_contents[MESSAGE], p_contents[CHAR_ID].toInt(), - p_contents[SHOWNAME], p_contents[CHAR_NAME], - p_contents[OBJECTION_MOD], p_contents[EVIDENCE_ID].toInt(), - p_contents[TEXT_COLOR].toInt(), QUEUED, sender || Options::getInstance().desynchronisedLogsEnabled()); + log_chatmessage(p_contents[MESSAGE], p_contents[CHAR_ID].toInt(), p_contents[SHOWNAME], p_contents[CHAR_NAME], p_contents[OBJECTION_MOD], p_contents[EVIDENCE_ID].toInt(), p_contents[TEXT_COLOR].toInt(), QUEUED, sender || Options::getInstance().desynchronisedLogsEnabled()); } bool is_objection = false; @@ -2199,7 +2377,8 @@ void Courtroom::chatmessage_enqueue(QStringList p_contents) int objection_mod = p_contents[OBJECTION_MOD].split("&")[0].toInt(); is_objection = objection_mod >= 1 && objection_mod <= 5; // If this is an objection, nuke the queue - if (is_objection) { + if (is_objection) + { text_queue_timer->stop(); skip_chatmessage_queue(); } @@ -2214,7 +2393,9 @@ void Courtroom::chatmessage_enqueue(QStringList p_contents) bool start_queue = Options::getInstance().textStayTime() <= 0 || (text_state >= 2 && !text_queue_timer->isActive()); // Objections also immediately play the message if (start_queue || is_objection) + { chatmessage_dequeue(); // Process the message instantly + } // Otherwise, since a message is being parsed, chat_tick() should be called which will call dequeue once it's done. } @@ -2222,18 +2403,23 @@ void Courtroom::chatmessage_dequeue() { // Nothing to parse in the queue if (chatmessage_queue.isEmpty()) + { return; + } // Stop the text queue timer if (text_queue_timer->isActive()) + { text_queue_timer->stop(); + } unpack_chatmessage(chatmessage_queue.dequeue()); } void Courtroom::skip_chatmessage_queue() { - while (!chatmessage_queue.isEmpty()) { + while (!chatmessage_queue.isEmpty()) + { QStringList p_contents = chatmessage_queue.dequeue(); // if the char ID matches our client's char ID (most likely, this is our message coming back to us) bool sender = Options::getInstance().desynchronisedLogsEnabled() || p_contents[CHAR_ID].toInt() == m_cid; @@ -2243,17 +2429,19 @@ void Courtroom::skip_chatmessage_queue() void Courtroom::unpack_chatmessage(QStringList p_contents) { - for (int n_string = 0; n_string < MS_MAXIMUM; ++n_string) { + for (int n_string = 0; n_string < MS_MAXIMUM; ++n_string) + { // Note that we have added stuff that vanilla clients and servers simply // won't send. So now, we have to check if the thing we want even exists // amongst the packet's content. We also have to check if the server even // supports CCCC's IC features, or if it's just japing us. Also, don't // forget! A size 15 message will have indices from 0 to 14. - if (n_string < p_contents.size() && - (n_string < MS_MINIMUM || ao_app->cccc_ic_supported)) { + if (n_string < p_contents.size() && (n_string < MS_MINIMUM || ao_app->cccc_ic_supported)) + { m_chatmessage[n_string] = p_contents.at(n_string); } - else { + else + { m_chatmessage[n_string] = ""; } } @@ -2277,145 +2465,173 @@ void Courtroom::unpack_chatmessage(QStringList p_contents) ui_vp_evidence_display->reset(); // This chat msg is not objection so we're not waiting on the objection animation to finish to display the character. if (!handle_objection()) + { handle_ic_message(); + } } void Courtroom::log_chatmessage(QString f_message, int f_char_id, QString f_showname, QString f_char, QString f_objection_mod, int f_evi_id, int f_color, LogMode f_log_mode, bool sender) { // Display name will use the showname QString f_displayname = f_showname; - if (f_char_id != -1) { + if (f_char_id != -1) + { // Grab the char.ini showname f_showname = ao_app->get_showname(char_list.at(f_char_id).name); } // If display name is just whitespace, use the char.ini showname. if (f_displayname.trimmed().isEmpty()) + { f_displayname = f_showname; + } bool ghost = f_log_mode == QUEUED; // Detect if we're trying to log a blankpost - bool blankpost = (f_log_mode != IO_ONLY && // if we're not in I/O only mode, - f_message.isEmpty() && // our current message is a blankpost, - !ic_chatlog_history.isEmpty() && // the chat log isn't empty, - last_ic_message == f_displayname + ":" && // the chat log's last message is a blank post, and - last_ic_message.mid(0, last_ic_message.lastIndexOf(":")) == f_displayname); // the blankpost's showname is the same as ours + bool blankpost = (f_log_mode != IO_ONLY && // if we're not in I/O only mode, + f_message.isEmpty() && // our current message is a blankpost, + !ic_chatlog_history.isEmpty() && // the chat log isn't empty, + last_ic_message == f_displayname + ":" && // the chat log's last message is a blank post, and + last_ic_message.mid(0, last_ic_message.lastIndexOf(":")) == f_displayname); // the blankpost's showname is the same as ours bool selfname = f_char_id == m_cid; - if (log_ic_actions) { + if (log_ic_actions) + { // Check if a custom objection is in use int objection_mod = 0; - QString custom_objection = ""; - if (f_objection_mod.contains("4&")) { + QString custom_objection; + if (f_objection_mod.contains("4&")) + { objection_mod = 4; - custom_objection = f_objection_mod.split( - "4&")[1]; // takes the name of custom objection. + custom_objection = f_objection_mod.split("4&")[1]; // takes the name of custom objection. } - else { + else + { objection_mod = f_objection_mod.toInt(); } - //QString f_custom_theme = ao_app->get_chat(f_char); - if (objection_mod <= 4 && objection_mod >= 1) { + // QString f_custom_theme = ao_app->get_chat(f_char); + if (objection_mod <= 4 && objection_mod >= 1) + { blankpost = false; QString shout_message; - switch (objection_mod) { + switch (objection_mod) + { case 1: shout_message = ao_app->read_char_ini(f_char, "holdit_message", "Shouts"); if (shout_message == "") + { shout_message = tr("HOLD IT!"); + } break; case 2: shout_message = ao_app->read_char_ini(f_char, "objection_message", "Shouts"); if (shout_message == "") + { shout_message = tr("OBJECTION!"); + } break; case 3: shout_message = ao_app->read_char_ini(f_char, "takethat_message", "Shouts"); if (shout_message == "") + { shout_message = tr("TAKE THAT!"); + } break; // case 4 is AO2 only case 4: - if (custom_objection != "") { + if (custom_objection != "") + { shout_message = ao_app->read_char_ini(f_char, custom_objection.split('.')[0] + "_message", "Shouts"); if (shout_message == "") + { shout_message = custom_objection.split('.')[0]; + } } - else { + else + { shout_message = ao_app->read_char_ini(f_char, "custom_message", "Shouts"); if (shout_message == "") + { shout_message = tr("CUSTOM OBJECTION!"); + } } break; } - switch (f_log_mode) { - case IO_ONLY: - log_ic_text(f_char, f_displayname, shout_message, tr("shouts"), 0, selfname); - break; - case DISPLAY_AND_IO: - log_ic_text(f_char, f_displayname, shout_message, tr("shouts")); - append_ic_text(shout_message, f_displayname, tr("shouts"), - 0, selfname, QDateTime::currentDateTime(), false); - break; - case DISPLAY_ONLY: - case QUEUED: - if (!ghost && sender) - pop_ic_ghost(); - append_ic_text(shout_message, f_displayname, tr("shouts"), - 0, selfname, QDateTime::currentDateTime(), ghost); - break; + switch (f_log_mode) + { + case IO_ONLY: + log_ic_text(f_char, f_displayname, shout_message, tr("shouts"), 0, selfname); + break; + case DISPLAY_AND_IO: + log_ic_text(f_char, f_displayname, shout_message, tr("shouts")); + append_ic_text(shout_message, f_displayname, tr("shouts"), 0, selfname, QDateTime::currentDateTime(), false); + break; + case DISPLAY_ONLY: + case QUEUED: + if (!ghost && sender) + { + pop_ic_ghost(); + } + append_ic_text(shout_message, f_displayname, tr("shouts"), 0, selfname, QDateTime::currentDateTime(), ghost); + break; } } // If the evidence ID is in the valid range - if (f_evi_id > 0 && f_evi_id <= local_evidence_list.size()) { + if (f_evi_id > 0 && f_evi_id <= local_evidence_list.size()) + { blankpost = false; // Obtain the evidence name QString f_evi_name = local_evidence_list.at(f_evi_id - 1).name; - switch (f_log_mode) { - case IO_ONLY: - log_ic_text(f_showname, f_displayname, f_evi_name, tr("has presented evidence"), 0, selfname); - break; - case DISPLAY_AND_IO: - log_ic_text(f_showname, f_displayname, f_evi_name, tr("has presented evidence")); - append_ic_text(f_evi_name, f_displayname, tr("has presented evidence"), - 0, selfname, QDateTime::currentDateTime(), false); - break; - case DISPLAY_ONLY: - case QUEUED: - if (!ghost && sender) - pop_ic_ghost(); - append_ic_text(f_evi_name, f_displayname, tr("has presented evidence"), - 0, selfname, QDateTime::currentDateTime(), ghost); - break; + switch (f_log_mode) + { + case IO_ONLY: + log_ic_text(f_showname, f_displayname, f_evi_name, tr("has presented evidence"), 0, selfname); + break; + case DISPLAY_AND_IO: + log_ic_text(f_showname, f_displayname, f_evi_name, tr("has presented evidence")); + append_ic_text(f_evi_name, f_displayname, tr("has presented evidence"), 0, selfname, QDateTime::currentDateTime(), false); + break; + case DISPLAY_ONLY: + case QUEUED: + if (!ghost && sender) + { + pop_ic_ghost(); + } + append_ic_text(f_evi_name, f_displayname, tr("has presented evidence"), 0, selfname, QDateTime::currentDateTime(), ghost); + break; } } } // Do not display anything on a repeated blankpost if it's not a ghost - if (blankpost && !ghost) { + if (blankpost && !ghost) + { // Don't forget to clear the ghost if it's us if (sender) + { pop_ic_ghost(); + } return; } - switch (f_log_mode) { - case IO_ONLY: - log_ic_text(f_showname, f_displayname, f_message, "", f_color, selfname); - break; - case DISPLAY_AND_IO: - log_ic_text(f_showname, f_displayname, f_message, "", f_color, selfname); - append_ic_text(f_message, f_displayname, "", - f_color, selfname, QDateTime::currentDateTime(), false); - break; - case DISPLAY_ONLY: - case QUEUED: - if (!ghost && sender) - pop_ic_ghost(); - append_ic_text(f_message, f_displayname, "", - f_color, selfname, QDateTime::currentDateTime(), ghost); - break; + switch (f_log_mode) + { + case IO_ONLY: + log_ic_text(f_showname, f_displayname, f_message, "", f_color, selfname); + break; + case DISPLAY_AND_IO: + log_ic_text(f_showname, f_displayname, f_message, "", f_color, selfname); + append_ic_text(f_message, f_displayname, "", f_color, selfname, QDateTime::currentDateTime(), false); + break; + case DISPLAY_ONLY: + case QUEUED: + if (!ghost && sender) + { + pop_ic_ghost(); + } + append_ic_text(f_message, f_displayname, "", f_color, selfname, QDateTime::currentDateTime(), ghost); + break; } } @@ -2423,18 +2639,20 @@ bool Courtroom::handle_objection() { // Check if a custom objection is in use int objection_mod = 0; - QString custom_objection = ""; - if (m_chatmessage[OBJECTION_MOD].contains("4&")) { + QString custom_objection; + if (m_chatmessage[OBJECTION_MOD].contains("4&")) + { objection_mod = 4; - custom_objection = m_chatmessage[OBJECTION_MOD].split( - "4&")[1]; // takes the name of custom objection. + custom_objection = m_chatmessage[OBJECTION_MOD].split("4&")[1]; // takes the name of custom objection. } - else { + else + { objection_mod = m_chatmessage[OBJECTION_MOD].toInt(); } // if an objection is used - if (objection_mod <= 4 && objection_mod >= 1) { + if (objection_mod <= 4 && objection_mod >= 1) + { ui_vp_chatbox->setVisible(chatbox_always_show); ui_vp_message->setVisible(chatbox_always_show); ui_vp_chat_arrow->setVisible(chatbox_always_show); @@ -2442,48 +2660,44 @@ bool Courtroom::handle_objection() ui_vp_objection->set_static_duration(shout_static_time); ui_vp_objection->set_max_duration(shout_max_time); QString filename; - switch (objection_mod) { + switch (objection_mod) + { case 1: filename = "holdit_bubble"; - objection_player->play("holdit", m_chatmessage[CHAR_NAME], - ao_app->get_chat(m_chatmessage[CHAR_NAME])); + objection_player->play("holdit", m_chatmessage[CHAR_NAME], ao_app->get_chat(m_chatmessage[CHAR_NAME])); break; case 2: filename = "objection_bubble"; - objection_player->play("objection", m_chatmessage[CHAR_NAME], - ao_app->get_chat(m_chatmessage[CHAR_NAME])); + objection_player->play("objection", m_chatmessage[CHAR_NAME], ao_app->get_chat(m_chatmessage[CHAR_NAME])); break; case 3: filename = "takethat_bubble"; - objection_player->play("takethat", m_chatmessage[CHAR_NAME], - ao_app->get_chat(m_chatmessage[CHAR_NAME])); + objection_player->play("takethat", m_chatmessage[CHAR_NAME], ao_app->get_chat(m_chatmessage[CHAR_NAME])); break; // case 4 is AO2 only case 4: - if (custom_objection != "") { + if (custom_objection != "") + { filename = "custom_objections/" + custom_objection.left(custom_objection.lastIndexOf(".")); - objection_player->play(filename, - m_chatmessage[CHAR_NAME], - ao_app->get_chat(m_chatmessage[CHAR_NAME])); + objection_player->play(filename, m_chatmessage[CHAR_NAME], ao_app->get_chat(m_chatmessage[CHAR_NAME])); } - else { + else + { filename = "custom"; - objection_player->play( - "custom", m_chatmessage[CHAR_NAME], - ao_app->get_chat(m_chatmessage[CHAR_NAME])); + objection_player->play("custom", m_chatmessage[CHAR_NAME], ao_app->get_chat(m_chatmessage[CHAR_NAME])); } break; m_chatmessage[EMOTE_MOD] = QChar(PREANIM); } - ui_vp_objection->load_image( - filename, m_chatmessage[CHAR_NAME], - ao_app->get_chat(m_chatmessage[CHAR_NAME])); + ui_vp_objection->load_image(filename, m_chatmessage[CHAR_NAME], ao_app->get_chat(m_chatmessage[CHAR_NAME])); sfx_player->clear(); // Objection played! Cut all sfx. ui_vp_player_char->set_play_once(true); return true; } if (m_chatmessage[EMOTE] != "") + { display_character(); + } return false; } @@ -2499,25 +2713,27 @@ void Courtroom::display_character() ui_vp_message->hide(); ui_vp_chatbox->setVisible(chatbox_always_show); // Show it if chatbox always shows - if (Options::getInstance().characterStickerEnabled() && chatbox_always_show) { + if (Options::getInstance().characterStickerEnabled() && chatbox_always_show) + { ui_vp_sticker->load_image(m_chatmessage[CHAR_NAME]); } // Hide the face sticker - else { + else + { ui_vp_sticker->stop(); } // Arrange the netstrings of the frame SFX for the character to know about - if (!m_chatmessage[FRAME_SFX].isEmpty() && - Options::getInstance().networkedFrameSfxEnabled()) { + if (!m_chatmessage[FRAME_SFX].isEmpty() && Options::getInstance().networkedFrameSfxEnabled()) + { // ORDER IS IMPORTANT!! - QStringList netstrings = {m_chatmessage[FRAME_SCREENSHAKE], - m_chatmessage[FRAME_REALIZATION], - m_chatmessage[FRAME_SFX]}; - ui_vp_player_char->network_strings = netstrings; + QStringList netstrings = {m_chatmessage[FRAME_SCREENSHAKE], m_chatmessage[FRAME_REALIZATION], m_chatmessage[FRAME_SFX]}; + ui_vp_player_char->set_network_string(netstrings); } else - ui_vp_player_char->network_strings.clear(); + { + ui_vp_player_char->set_network_string(QStringList()); + } // Determine if we should flip the character or not ui_vp_player_char->set_flipped(m_chatmessage[FLIP].toInt() == 1); @@ -2528,13 +2744,15 @@ void Courtroom::display_character() void Courtroom::display_pair_character(QString other_charid, QString other_offset) { // If pair information exists - if (!other_charid.isEmpty()) { + if (!other_charid.isEmpty()) + { // Initialize the "ok" bool check to see if the toInt conversion succeeded bool ok; // Grab the charid of the pair int charid = other_charid.split("^")[0].toInt(&ok); // If the charid is an int and is valid... - if (ok && charid > -1) { + if (ok && charid > -1) + { // Show the pair character ui_vp_sideplayer_char->show(); // Obtain the offsets, splitting it up by & char @@ -2542,28 +2760,29 @@ void Courtroom::display_pair_character(QString other_charid, QString other_offse int offset_x; int offset_y; // If we only got one number... - if (offsets.length() <= 1) { + if (offsets.length() <= 1) + { // That's just the X offset. Make Y offset 0. offset_x = other_offset.toInt(); offset_y = 0; } - else { + else + { // We got two numbers, set x and y offsets! offset_x = offsets[0].toInt(); offset_y = offsets[1].toInt(); } // Move pair character according to the offsets - ui_vp_sideplayer_char->move(ui_viewport->width() * offset_x / 100, - ui_viewport->height() * offset_y / 100); + ui_vp_sideplayer_char->move(ui_viewport->width() * offset_x / 100, ui_viewport->height() * offset_y / 100); // Split the charid according to the ^ to determine if we have "ordering" info QStringList args = other_charid.split("^"); - if (args.size() > - 1) // This ugly workaround is so we don't make an extra packet just - // for this purpose. Rewrite pairing when? + if (args.size() > 1) // This ugly workaround is so we don't make an extra packet just + // for this purpose. Rewrite pairing when? { // Change the order of appearance based on the pair order variable int order = args.at(1).toInt(); - switch (order) { + switch (order) + { case 0: // Our character is in front ui_vp_sideplayer_char->stackUnder(ui_vp_player_char); break; @@ -2576,39 +2795,47 @@ void Courtroom::display_pair_character(QString other_charid, QString other_offse } // Flip the pair character if (ao_app->flipping_supported && m_chatmessage[OTHER_FLIP].toInt() == 1) + { ui_vp_sideplayer_char->set_flipped(true); + } else + { ui_vp_sideplayer_char->set_flipped(false); + } // Play the other pair character's idle animation QString filename = "(a)" + m_chatmessage[OTHER_EMOTE]; ui_vp_sideplayer_char->set_play_once(false); - ui_vp_sideplayer_char->load_image(filename, m_chatmessage[OTHER_NAME], - 0, false); - } + ui_vp_sideplayer_char->load_image(filename, m_chatmessage[OTHER_NAME], 0, false); } + } } void Courtroom::handle_emote_mod(int emote_mod, bool p_immediate) { // Deal with invalid emote modifiers - if (emote_mod != IDLE && emote_mod != PREANIM && emote_mod != ZOOM && emote_mod != PREANIM_ZOOM) { + if (emote_mod != IDLE && emote_mod != PREANIM && emote_mod != ZOOM && emote_mod != PREANIM_ZOOM) + { // If emote mod is 4... - if (emote_mod == 4) { + if (emote_mod == 4) + { emote_mod = PREANIM_ZOOM; // Addresses issue with an old bug that sent the wrong - // emote modifier for zoompre + // emote modifier for zoompre } - else if (emote_mod == 2) { + else if (emote_mod == 2) + { // Addresses the deprecated "objection preanim" emote_mod = PREANIM; } - else { + else + { emote_mod = IDLE; // Reset emote mod to 0 } } // Handle the emote mod - switch (emote_mod) { + switch (emote_mod) + { case PREANIM: case PREANIM_ZOOM: // play preanim that makes the chatbox wait for it to finish. @@ -2635,7 +2862,10 @@ void Courtroom::handle_emote_mod(int emote_mod, bool p_immediate) } } -void Courtroom::objection_done() { handle_ic_message(); } +void Courtroom::objection_done() +{ + handle_ic_message(); +} void Courtroom::handle_ic_message() { @@ -2644,7 +2874,8 @@ void Courtroom::handle_ic_message() int emote_mod = m_chatmessage[EMOTE_MOD].toInt(); bool immediate = m_chatmessage[IMMEDIATE].toInt() == 1; - if (m_chatmessage[EMOTE] != "") { + if (m_chatmessage[EMOTE] != "") + { // Display our own character display_character(); @@ -2653,7 +2884,8 @@ void Courtroom::handle_ic_message() ui_vp_sideplayer_char->move(0, 0); // If the emote_mod is not zooming - if (emote_mod != ZOOM && emote_mod != PREANIM_ZOOM) { + if (emote_mod != ZOOM && emote_mod != PREANIM_ZOOM) + { // Display the pair character display_pair_character(m_chatmessage[OTHER_CHARID], m_chatmessage[OTHER_OFFSET]); } @@ -2675,30 +2907,32 @@ void Courtroom::handle_ic_message() bool is_objection = objection_mod >= 1 && objection_mod <= 5; // If this is an objection, we'll need to interrupt our current message. if (is_objection) + { text_queue_timer->start(objection_threshold); + } } } void Courtroom::do_screenshake() { if (!Options::getInstance().shakeEnabled()) + { return; + } // This way, the animation is reset in such a way that last played screenshake // would return to its "final frame" properly. This properly resets all UI // elements without having to bother keeping track of "origin" positions. // Works great with the chat text being detached from the chat box! - screenshake_animation_group->setCurrentTime( - screenshake_animation_group->duration()); + screenshake_animation_group->setCurrentTime(screenshake_animation_group->duration()); screenshake_animation_group->clear(); - const QList<QWidget *> &affected_list = {ui_vp_background, ui_vp_player_char, - ui_vp_sideplayer_char, ui_vp_chatbox}; + const QList<QWidget *> &affected_list = {ui_vp_background, ui_vp_player_char, ui_vp_sideplayer_char, ui_vp_chatbox}; // I would prefer if this was its own "shake" function to be honest. - for (QWidget *ui_element : affected_list) { - QPropertyAnimation *screenshake_animation = - new QPropertyAnimation(ui_element, "pos", this); + for (QWidget *ui_element : affected_list) + { + QPropertyAnimation *screenshake_animation = new QPropertyAnimation(ui_element, "pos", this); QPoint pos_default = QPoint(ui_element->x(), ui_element->y()); int duration = 300; // How long does the screenshake last @@ -2709,7 +2943,8 @@ void Courtroom::do_screenshake() int max_deviation = 7 * (float(ui_viewport->height()) / 192); int maxframes = 15; // duration / frequency; screenshake_animation->setDuration(duration); - for (int frame = 0; frame < maxframes; frame++) { + for (int frame = 0; frame < maxframes; frame++) + { double fraction = double(frame * frequency) / duration; #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) int rand_x = max_deviation * (2 * (qrand() / (float)RAND_MAX) - 1) + 1; @@ -2731,69 +2966,68 @@ void Courtroom::do_screenshake() void Courtroom::do_flash() { if (!Options::getInstance().effectsEnabled()) + { return; + } QString f_char = m_chatmessage[CHAR_NAME]; QString f_custom_theme = ao_app->get_chat(f_char); do_effect("realization", "", f_char, f_custom_theme); } -void Courtroom::do_effect(QString fx_path, QString fx_sound, QString p_char, - QString p_folder) +void Courtroom::do_effect(QString fx_path, QString fx_sound, QString p_char, QString p_folder) { - if (fx_path == "") { + if (fx_path == "") + { return; } QString effect = ao_app->get_effect(fx_path, p_char, p_folder); - if (effect == "") { + if (effect == "") + { return; } - if (fx_sound != "") { + if (fx_sound != "") + { sfx_player->play(fx_sound); } // Only check if effects are disabled after playing the sound if it exists - if (!Options::getInstance().effectsEnabled()) { + if (!Options::getInstance().effectsEnabled()) + { return; } - ui_vp_effect->transform_mode = ao_app->get_scaling( - ao_app->get_effect_property(fx_path, p_char, p_folder, "scaling")); - ui_vp_effect->stretch = - ao_app->get_effect_property(fx_path, p_char, p_folder, "stretch") - .startsWith("true"); + ui_vp_effect->transform_mode = ao_app->get_scaling(ao_app->get_effect_property(fx_path, p_char, p_folder, "scaling")); + ui_vp_effect->stretch = ao_app->get_effect_property(fx_path, p_char, p_folder, "stretch").startsWith("true"); ui_vp_effect->set_flipped(ao_app->get_effect_property(fx_path, p_char, p_folder, "respect_flip").startsWith("true") && m_chatmessage[FLIP].toInt() == 1); - ui_vp_effect->set_play_once( - false); // The effects themselves dictate whether or not they're looping. - // Static effects will linger. + ui_vp_effect->set_play_once(false); // The effects themselves dictate whether or not they're looping. + // Static effects will linger. - bool looping = - ao_app->get_effect_property(fx_path, p_char, p_folder, "loop") - .startsWith("true"); + bool looping = ao_app->get_effect_property(fx_path, p_char, p_folder, "loop").startsWith("true"); - int max_duration = - ao_app->get_effect_property(fx_path, p_char, p_folder, "max_duration") - .toInt(); + int max_duration = ao_app->get_effect_property(fx_path, p_char, p_folder, "max_duration").toInt(); - bool cull = - ao_app->get_effect_property(fx_path, p_char, p_folder, "cull") - .startsWith("true"); + bool cull = ao_app->get_effect_property(fx_path, p_char, p_folder, "cull").startsWith("true"); // Possible values: "chat", "character", "behind" QString layer = ao_app->get_effect_property(fx_path, p_char, p_folder, "layer").toLower(); - if (layer == "behind"){ + if (layer == "behind") + { ui_vp_effect->setParent(ui_viewport); ui_vp_effect->stackUnder(ui_vp_player_char); } - else if (layer == "character") { + else if (layer == "character") + { ui_vp_effect->setParent(ui_viewport); ui_vp_effect->stackUnder(ui_vp_desk); } - else if (layer == "over") { + else if (layer == "over") + { ui_vp_effect->setParent(ui_viewport); ui_vp_effect->raise(); } - else { // if (layer == "chat") { + else + { // if (layer == "chat") { ui_vp_effect->setParent(this); ui_vp_effect->stackUnder(ui_vp_objection); } @@ -2801,20 +3035,24 @@ void Courtroom::do_effect(QString fx_path, QString fx_sound, QString p_char, int effect_x = 0; int effect_y = 0; // The effect is not parented to viewport, meaning we're overlaying ui elements - if (ui_vp_effect->parentWidget() != ui_viewport) { - //We need to add the viewport as an offset as effects are not bound to it. + if (ui_vp_effect->parentWidget() != ui_viewport) + { + // We need to add the viewport as an offset as effects are not bound to it. effect_x = ui_viewport->x(); effect_y = ui_viewport->y(); } // This effect respects the character offset settings - if (ao_app->get_effect_property(fx_path, p_char, p_folder, "respect_offset") == "true") { + if (ao_app->get_effect_property(fx_path, p_char, p_folder, "respect_offset") == "true") + { QStringList self_offsets = m_chatmessage[SELF_OFFSET].split("&"); int self_offset = self_offsets[0].toInt(); int self_offset_v; - if (self_offsets.length() <= 1) { + if (self_offsets.length() <= 1) + { self_offset_v = 0; } - else { + else + { self_offset_v = self_offsets[1].toInt(); } @@ -2838,21 +3076,23 @@ void Courtroom::play_char_sfx(QString sfx_name) void Courtroom::initialize_chatbox() { - int f_charid = m_chatmessage[CHAR_ID].toInt(); - if (f_charid >= 0 && f_charid < char_list.size() && - (m_chatmessage[SHOWNAME].isEmpty() || !ui_showname_enable->isChecked())) { + if (f_charid >= 0 && f_charid < char_list.size() && (m_chatmessage[SHOWNAME].isEmpty() || !ui_showname_enable->isChecked())) + { QString real_name = char_list.at(f_charid).name; QString f_showname = ao_app->get_showname(real_name); ui_vp_showname->setText(f_showname); } - else { + else + { ui_vp_showname->setText(m_chatmessage[SHOWNAME]); } QString customchar; if (Options::getInstance().customChatboxEnabled()) + { customchar = m_chatmessage[CHAR_NAME]; + } QString p_misc = ao_app->get_chat(customchar); set_size_and_pos(ui_vp_chatbox, "ao2_chatbox", p_misc); @@ -2864,8 +3104,7 @@ void Courtroom::initialize_chatbox() // We detached the text as parent from the chatbox so it doesn't get affected // by the screenshake. - ui_vp_message->move(ui_vp_message->x() + ui_vp_chatbox->x(), - ui_vp_message->y() + ui_vp_chatbox->y()); + ui_vp_message->move(ui_vp_message->x() + ui_vp_chatbox->x(), ui_vp_message->y() + ui_vp_chatbox->y()); ui_vp_message->setTextInteractionFlags(Qt::NoTextInteraction); if (ui_vp_showname->text().trimmed().isEmpty()) // Whitespace showname @@ -2876,31 +3115,32 @@ void Courtroom::initialize_chatbox() { ui_vp_showname->setVisible(true); if (!ui_vp_chatbox->set_image("chat", p_misc)) + { ui_vp_chatbox->set_image("chatbox", p_misc); - + } // Remember to set the showname font before the font metrics check. set_font(ui_vp_showname, "", "showname", customchar); - pos_size_type default_width = ao_app->get_element_dimensions( - "showname", "courtroom_design.ini", p_misc); - int extra_width = - ao_app - ->get_design_element("showname_extra_width", "courtroom_design.ini", - p_misc) - .toInt(); - QString align = ao_app - ->get_design_element("showname_align", - "courtroom_design.ini", p_misc) - .toLower(); + pos_size_type default_width = ao_app->get_element_dimensions("showname", "courtroom_design.ini", p_misc); + int extra_width = ao_app->get_design_element("showname_extra_width", "courtroom_design.ini", p_misc).toInt(); + QString align = ao_app->get_design_element("showname_align", "courtroom_design.ini", p_misc).toLower(); if (align == "right") + { ui_vp_showname->setAlignment(Qt::AlignRight); + } else if (align == "center") + { ui_vp_showname->setAlignment(Qt::AlignHCenter); + } else if (align == "justify") + { ui_vp_showname->setAlignment(Qt::AlignHCenter); + } else + { ui_vp_showname->setAlignment(Qt::AlignLeft); + } QFontMetrics fm(ui_vp_showname->font()); // Gotta support the slow paced ubuntu 18 STUCK IN 5.9.5!! @@ -2909,53 +3149,55 @@ void Courtroom::initialize_chatbox() #else int fm_width = fm.boundingRect((ui_vp_showname->text())).width(); #endif - if (extra_width > 0) { - QString current_path = ui_vp_chatbox->path.left(ui_vp_chatbox->path.lastIndexOf('.')); - if (fm_width > default_width.width && - ui_vp_chatbox->set_image(current_path + - "med")) // This text be big. Let's do some shenanigans. + if (extra_width > 0) + { + QString current_path = ui_vp_chatbox->file_name().left(ui_vp_chatbox->file_name().lastIndexOf('.')); + if (fm_width > default_width.width && ui_vp_chatbox->set_image(current_path + "med")) // This text be big. Let's do some shenanigans. { - ui_vp_showname->resize(default_width.width + extra_width, - ui_vp_showname->height()); - if (fm_width > ui_vp_showname->width() && - ui_vp_chatbox->set_image(current_path + "big")) // Biggest possible size for us. + ui_vp_showname->resize(default_width.width + extra_width, ui_vp_showname->height()); + if (fm_width > ui_vp_showname->width() && ui_vp_chatbox->set_image(current_path + "big")) // Biggest possible size for us. { - ui_vp_showname->resize( - static_cast<int>(default_width.width + (extra_width * 2)), - ui_vp_showname->height()); + ui_vp_showname->resize(static_cast<int>(default_width.width + (extra_width * 2)), ui_vp_showname->height()); } } else + { ui_vp_showname->resize(default_width.width, ui_vp_showname->height()); + } } - else { + else + { ui_vp_showname->resize(default_width.width, ui_vp_showname->height()); } } // This should probably be called only if any change from the last chat // arrow was actually detected. - pos_size_type design_ini_result = ao_app->get_element_dimensions( - "chat_arrow", "courtroom_design.ini", p_misc); - if (design_ini_result.width < 0 || design_ini_result.height < 0) { + pos_size_type design_ini_result = ao_app->get_element_dimensions("chat_arrow", "courtroom_design.ini", p_misc); + if (design_ini_result.width < 0 || design_ini_result.height < 0) + { qWarning() << "could not find \"chat_arrow\" in courtroom_design.ini"; ui_vp_chat_arrow->hide(); } - else { + else + { ui_vp_chat_arrow->move(design_ini_result.x + ui_vp_chatbox->x(), design_ini_result.y + ui_vp_chatbox->y()); - ui_vp_chat_arrow->combo_resize(design_ini_result.width, - design_ini_result.height); + ui_vp_chat_arrow->combo_resize(design_ini_result.width, design_ini_result.height); } QString font_name; QString chatfont = ao_app->get_chat_font(m_chatmessage[CHAR_NAME]); if (chatfont != "") + { font_name = chatfont; + } int f_pointsize = 0; int chatsize = ao_app->get_chat_size(m_chatmessage[CHAR_NAME]); if (chatsize > 0) + { f_pointsize = chatsize; + } set_font(ui_vp_message, "", "message", customchar, font_name, f_pointsize); } @@ -2963,12 +3205,14 @@ void Courtroom::handle_callwords() { // Quickly check through the message for the word_call (callwords) sfx QString f_message = m_chatmessage[MESSAGE]; - //No more file IO on every message. + // No more file IO on every message. QStringList call_words = Options::getInstance().callwords(); // Loop through each word in the call words list - for (const QString &word : qAsConst(call_words)) { + for (const QString &word : qAsConst(call_words)) + { // If our message contains that specific call word - if (f_message.contains(word, Qt::CaseInsensitive)) { + if (f_message.contains(word, Qt::CaseInsensitive)) + { // Play the call word sfx on the modcall_player sound container modcall_player->play(ao_app->get_court_sfx("word_call")); // Make the window flash @@ -2983,15 +3227,14 @@ void Courtroom::display_evidence_image() { QString side = m_chatmessage[SIDE]; int f_evi_id = m_chatmessage[EVIDENCE_ID].toInt(); - if (f_evi_id > 0 && f_evi_id <= local_evidence_list.size()) { + if (f_evi_id > 0 && f_evi_id <= local_evidence_list.size()) + { // shifted by 1 because 0 is no evidence per legacy standards QString f_image = local_evidence_list.at(f_evi_id - 1).image; - //QString f_evi_name = local_evidence_list.at(f_evi_id - 1).name; - // def jud and hlp should display the evidence icon on the RIGHT side - bool is_left_side = !(side == "def" || side == "hlp" || - side == "jud" || side == "jur"); - ui_vp_evidence_display->show_evidence(f_evi_id, f_image, is_left_side, - sfx_player->get_volume()); + // QString f_evi_name = local_evidence_list.at(f_evi_id - 1).name; + // def jud and hlp should display the evidence icon on the RIGHT side + bool is_left_side = !(side == "def" || side == "hlp" || side == "jud" || side == "jur"); + ui_vp_evidence_display->show_evidence(f_evi_id, f_image, is_left_side, sfx_player->get_volume()); } } @@ -3000,7 +3243,8 @@ void Courtroom::handle_ic_speaking() QString side = m_chatmessage[SIDE]; int emote_mod = m_chatmessage[EMOTE_MOD].toInt(); // emote_mod 5 is zoom and emote_mod 6 is zoom w/ preanim. - if (emote_mod == ZOOM || emote_mod == PREANIM_ZOOM) { + if (emote_mod == ZOOM || emote_mod == PREANIM_ZOOM) + { // Hide the desks ui_vp_desk->hide(); @@ -3008,23 +3252,25 @@ void Courtroom::handle_ic_speaking() QString filename; // I still hate this hardcoding. If we're on pos pro, hlp and wit, use prosecution_speedlines. Otherwise, defense_speedlines. if (side == "pro" || side == "hlp" || side == "wit") + { filename = "prosecution_speedlines"; + } else + { filename = "defense_speedlines"; + } // We're zooming, so hide the pair character and ignore pair offsets. This ain't about them. ui_vp_sideplayer_char->hide(); - ui_vp_player_char->move_and_center(0,0); + ui_vp_player_char->move_and_center(0, 0); ui_vp_speedlines->load_image(filename, m_chatmessage[CHAR_NAME], ao_app->get_chat(m_chatmessage[CHAR_NAME])); } // Check if this is a talking color (white text, etc.) - color_is_talking = - color_markdown_talking_list.at(m_chatmessage[TEXT_COLOR].toInt()); + color_is_talking = color_markdown_talking_list.at(m_chatmessage[TEXT_COLOR].toInt()); QString filename; // If color is talking, and our state isn't already talking - if (color_is_talking && text_state == 1 && - anim_state < 2) + if (color_is_talking && text_state == 1 && anim_state < 2) { // Stop the previous animation and play the talking animation ui_vp_player_char->stop(); @@ -3034,8 +3280,7 @@ void Courtroom::handle_ic_speaking() // Set the anim state accordingly anim_state = 2; } - else if (anim_state < 3 && - anim_state != 3) // Set it to idle as we're not on that already + else if (anim_state < 3 && anim_state != 3) // Set it to idle as we're not on that already { // Stop the previous animation and play the idle animation ui_vp_player_char->stop(); @@ -3050,8 +3295,7 @@ void Courtroom::handle_ic_speaking() start_chat_ticking(); } -QString Courtroom::filter_ic_text(QString p_text, bool html, int target_pos, - int default_color) +QString Courtroom::filter_ic_text(QString p_text, bool html, int target_pos, int default_color) { QString p_text_escaped; @@ -3062,35 +3306,44 @@ QString Courtroom::filter_ic_text(QString p_text, bool html, int target_pos, // Text alignment shenanigans. Could make a dropdown for this later, too! QString align; - if (p_text.trimmed().startsWith("~~")) { + if (p_text.trimmed().startsWith("~~")) + { p_text.remove(p_text.indexOf("~~"), 2); - if (target_pos != -1) { + if (target_pos != -1) + { target_pos = qMax(0, target_pos - 2); } align = "center"; } - else if (p_text.trimmed().startsWith("~>")) { + else if (p_text.trimmed().startsWith("~>")) + { p_text.remove(p_text.indexOf("~>"), 2); - if (target_pos != -1) { + if (target_pos != -1) + { target_pos = qMax(0, target_pos - 2); } align = "right"; } - else if (p_text.trimmed().startsWith("<>")) { + else if (p_text.trimmed().startsWith("<>")) + { p_text.remove(p_text.indexOf("<>"), 2); - if (target_pos != -1) { + if (target_pos != -1) + { target_pos = qMax(0, target_pos - 2); } align = "justify"; } // If html is enabled, prepare this text to be all ready for it. - if (html) { + if (html) + { ic_color_stack.push(default_color); QString appendage = "<font color=\"$c" + QString::number(default_color) + "\">"; if (!align.isEmpty()) + { appendage.prepend("<div align=" + align + ">"); + } p_text_escaped.insert(check_pos_escaped, appendage); check_pos_escaped += appendage.size(); @@ -3099,7 +3352,8 @@ QString Courtroom::filter_ic_text(QString p_text, bool html, int target_pos, // Current issue: does not properly escape html stuff. // Solution: probably parse p_text and export into a different string // separately, perform some mumbo jumbo to properly adjust string indexes. - while (check_pos < p_text.size()) { + while (check_pos < p_text.size()) + { QString f_rest = p_text.right(p_text.size() - check_pos); QTextBoundaryFinder tbf(QTextBoundaryFinder::Grapheme, f_rest); QString f_character; @@ -3109,9 +3363,13 @@ QString Courtroom::filter_ic_text(QString p_text, bool html, int target_pos, tbf.toNextBoundary(); if (tbf.position() == -1) + { f_character = f_rest; + } else + { f_character = f_rest.left(tbf.position()); + } // if (f_character == "&") //oh shit it's probably an escaped html // { @@ -3128,7 +3386,8 @@ QString Courtroom::filter_ic_text(QString p_text, bool html, int target_pos, f_char_bytes = f_char_length = f_character.length(); - if (html) { + if (html) + { f_character = f_character.toHtmlEscaped(); f_char_length = f_character.length(); } @@ -3137,43 +3396,50 @@ QString Courtroom::filter_ic_text(QString p_text, bool html, int target_pos, bool is_end = false; bool skip = false; - if (!parse_escape_seq) { - if (f_character == "\\") { + if (!parse_escape_seq) + { + if (f_character == "\\") + { parse_escape_seq = true; skip = true; } // Nothing related to colors here - else if (f_character == "{" || - f_character == - "}") //|| f_character == "@" || f_character == "$") + else if (f_character == "{" || f_character == "}") //|| f_character == "@" || f_character == "$") { skip = true; } // Parse markdown colors - else { - for (int c = 0; c < max_colors; ++c) { + else + { + for (int c = 0; c < max_colors; ++c) + { // Clear the stored optimization information QString markdown_start = color_markdown_start_list.at(c); QString markdown_end = color_markdown_end_list.at(c); - if (html) { + if (html) + { markdown_start = markdown_start.toHtmlEscaped(); markdown_end = markdown_end.toHtmlEscaped(); } bool markdown_remove = color_markdown_remove_list.at(c); if (markdown_start.isEmpty()) // Not defined + { continue; + } - if (markdown_end.isEmpty() || - markdown_end == markdown_start) //"toggle switch" type + if (markdown_end.isEmpty() || markdown_end == markdown_start) //"toggle switch" type { - if (f_character == markdown_start) { - if (html) { - if (!ic_color_stack.empty() && ic_color_stack.top() == c && - default_color != c) { + if (f_character == markdown_start) + { + if (html) + { + if (!ic_color_stack.empty() && ic_color_stack.top() == c && default_color != c) + { ic_color_stack.pop(); // Cease our coloring is_end = true; } - else { + else + { ic_color_stack.push(c); // Begin our coloring } color_update = true; @@ -3182,15 +3448,17 @@ QString Courtroom::filter_ic_text(QString p_text, bool html, int target_pos, break; // Prevent it from looping forward for whatever reason } } - else if (f_character == markdown_start || - (f_character == markdown_end && !ic_color_stack.empty() && - ic_color_stack.top() == c)) { - if (html) { - if (f_character == markdown_end) { + else if (f_character == markdown_start || (f_character == markdown_end && !ic_color_stack.empty() && ic_color_stack.top() == c)) + { + if (html) + { + if (f_character == markdown_end) + { ic_color_stack.pop(); // Cease our coloring is_end = true; } - else if (f_character == markdown_start) { + else if (f_character == markdown_start) + { ic_color_stack.push(c); // Begin our coloring } color_update = true; @@ -3200,20 +3468,22 @@ QString Courtroom::filter_ic_text(QString p_text, bool html, int target_pos, } } // Parse the newest color stack - if (color_update && (target_pos <= -1 || check_pos < target_pos)) { - if (!parse_escape_seq) { + if (color_update && (target_pos <= -1 || check_pos < target_pos)) + { + if (!parse_escape_seq) + { QString appendage = "</font>"; if (!ic_color_stack.empty()) - appendage += - "<font color=\"$c" + QString::number(ic_color_stack.top()) + - "\">"; + { + appendage += "<font color=\"$c" + QString::number(ic_color_stack.top()) + "\">"; + } - if (is_end && !skip) { + if (is_end && !skip) + { p_text_escaped.insert(check_pos_escaped, f_character); // Add that char right now - check_pos_escaped += - f_char_length; // So the closing char is captured too + check_pos_escaped += f_char_length; // So the closing char is captured too skip = true; } p_text_escaped.insert(check_pos_escaped, appendage); @@ -3222,11 +3492,13 @@ QString Courtroom::filter_ic_text(QString p_text, bool html, int target_pos, } } } - else { + else + { if (f_character == "n") // \n, that's a line break son { QString appendage = "<br/>"; - if (!html) { + if (!html) + { // actual newline commented out // appendage = "\n"; // size = 1; //yeah guess what \n is a "single character" @@ -3238,48 +3510,55 @@ QString Courtroom::filter_ic_text(QString p_text, bool html, int target_pos, skip = true; } if (f_character == "s" || f_character == "f" || f_character == "p") // screenshake/flash/pause + { skip = true; + } parse_escape_seq = false; } // Make all chars we're not supposed to see invisible - if (target_pos > -1 && check_pos == target_pos) { - QString appendage = ""; - if (!ic_color_stack.empty()) { + if (target_pos > -1 && check_pos == target_pos) + { + QString appendage; + if (!ic_color_stack.empty()) + { if (!is_end) // Was our last coloring char ending the color stack or nah { // God forgive me for my transgressions but I have refactored this // whole thing about 25 times and having to refactor it again to more // elegantly support this will finally make me go insane. - color_is_talking = - color_markdown_talking_list.at(ic_color_stack.top()); + color_is_talking = color_markdown_talking_list.at(ic_color_stack.top()); } // Clean it up, we're done here while (!ic_color_stack.empty()) + { ic_color_stack.pop(); + } appendage += "</font>"; } - ic_color_stack.push( - -1); // Dummy colorstack push for maximum </font> appendage + ic_color_stack.push(-1); // Dummy colorstack push for maximum </font> appendage appendage += "<font color=\"#00000000\">"; p_text_escaped.insert(check_pos_escaped, appendage); check_pos_escaped += appendage.size(); } - if (!skip) { + if (!skip) + { p_text_escaped.insert(check_pos_escaped, f_character); check_pos_escaped += f_char_length; } check_pos += f_char_bytes; } - if (!ic_color_stack.empty() && html) { + if (!ic_color_stack.empty() && html) + { p_text_escaped.append("</font>"); } - if (html) { + if (html) + { // Example: https://regex101.com/r/oL4nM9/37 - this replaces // excessive/trailing/etc. whitespace with non-breaking space. I WOULD use // white-space: pre; stylesheet tag, but for whataver reason it doesn't work @@ -3287,28 +3566,30 @@ QString Courtroom::filter_ic_text(QString p_text, bool html, int target_pos, // memery to work, please do. p_text_escaped.replace(QRegularExpression("^\\s|(?<=\\s)\\s"), " "); if (!align.isEmpty()) + { p_text_escaped.append("</div>"); + } } return p_text_escaped; } -void Courtroom::log_ic_text(QString p_name, QString p_showname, - QString p_message, QString p_action, int p_color, bool p_selfname) +void Courtroom::log_ic_text(QString p_name, QString p_showname, QString p_message, QString p_action, int p_color, bool p_selfname) { - chatlogpiece log_entry(p_name, p_showname, p_message, p_action, p_color, p_selfname); + ChatLogPiece log_entry(p_name, p_showname, p_message, p_action, p_color, p_selfname); ic_chatlog_history.append(log_entry); if (Options::getInstance().logToTextFileEnabled() && !ao_app->log_filename.isEmpty()) + { ao_app->append_to_file(log_entry.get_full(), ao_app->log_filename, true); + } - while (ic_chatlog_history.size() > log_maximum_blocks && - log_maximum_blocks > 0) { + while (ic_chatlog_history.size() > log_maximum_blocks && log_maximum_blocks > 0) + { ic_chatlog_history.removeFirst(); } } -void Courtroom::append_ic_text(QString p_text, QString p_name, QString p_action, - int color, bool selfname, QDateTime timestamp, bool ghost) +void Courtroom::append_ic_text(QString p_text, QString p_name, QString p_action, int color, bool selfname, QDateTime timestamp, bool ghost) { QColor chatlog_color = ao_app->get_color("ic_chatlog_color", "courtroom_fonts.ini"); QTextCharFormat bold; @@ -3332,47 +3613,49 @@ void Courtroom::append_ic_text(QString p_text, QString p_name, QString p_action, const QTextCursor old_cursor = ui_ic_chatlog->textCursor(); const int old_scrollbar_value = ui_ic_chatlog->verticalScrollBar()->value(); const bool need_newline = !ui_ic_chatlog->document()->isEmpty(); - const int scrollbar_target_value = - log_goes_downwards ? ui_ic_chatlog->verticalScrollBar()->maximum() - : ui_ic_chatlog->verticalScrollBar()->minimum(); + const int scrollbar_target_value = log_goes_downwards ? ui_ic_chatlog->verticalScrollBar()->maximum() : ui_ic_chatlog->verticalScrollBar()->minimum(); - if (ghost) { + if (ghost) + { ghost_blocks++; chatlog_color.setAlpha(128); bold.setForeground(chatlog_color); normal.setForeground(chatlog_color); italics.setForeground(chatlog_color); } - else { + else + { last_ic_message = p_name + ":" + p_text; } - ui_ic_chatlog->moveCursor(log_goes_downwards ? QTextCursor::End - : QTextCursor::Start); + ui_ic_chatlog->moveCursor(log_goes_downwards ? QTextCursor::End : QTextCursor::Start); - if (!ghost && ghost_blocks > 0) { - for (int i = 0; i < ghost_blocks; ++i) { - ui_ic_chatlog->moveCursor(log_goes_downwards ? QTextCursor::PreviousBlock - : QTextCursor::NextBlock); + if (!ghost && ghost_blocks > 0) + { + for (int i = 0; i < ghost_blocks; ++i) + { + ui_ic_chatlog->moveCursor(log_goes_downwards ? QTextCursor::PreviousBlock : QTextCursor::NextBlock); } - ui_ic_chatlog->moveCursor(log_goes_downwards ? QTextCursor::EndOfBlock - : QTextCursor::StartOfBlock); + ui_ic_chatlog->moveCursor(log_goes_downwards ? QTextCursor::EndOfBlock : QTextCursor::StartOfBlock); } // Only prepend with newline if log goes downwards - if (log_goes_downwards && need_newline) { + if (log_goes_downwards && need_newline) + { ui_ic_chatlog->textCursor().insertBlock(format); } - // Timestamp if we're doing that meme - if (log_timestamp) { + if (log_timestamp) + { // Format the timestamp QTextCharFormat format = selfname ? selftimestamp_format : timestamp_format; - if (timestamp.isValid()) { - ui_ic_chatlog->textCursor().insertText( - "[" + timestamp.toString(log_timestamp_format) + "] ", format); - } else { + if (timestamp.isValid()) + { + ui_ic_chatlog->textCursor().insertText("[" + timestamp.toString(log_timestamp_format) + "] ", format); + } + else + { qCritical() << "could not insert invalid timestamp" << timestamp; } } @@ -3381,53 +3664,65 @@ void Courtroom::append_ic_text(QString p_text, QString p_name, QString p_action, QTextCharFormat name_format = selfname ? own_name : other_name; ui_ic_chatlog->textCursor().insertText(p_name, name_format); // Special case for stopping the music - if (p_action == tr("has stopped the music")) { + if (p_action == tr("has stopped the music")) + { ui_ic_chatlog->textCursor().insertText(" " + p_action + ".", normal); } // Make shout text bold - else if (p_action == tr("shouts") && log_ic_actions) { + else if (p_action == tr("shouts") && log_ic_actions) + { ui_ic_chatlog->textCursor().insertText(" " + p_action + " ", normal); - if (log_colors && !ghost) { - ui_ic_chatlog->textCursor().insertHtml( - "<b>" + - filter_ic_text(p_text, true, -1, 0) - .replace( - "$c0", - chatlog_color.name(QColor::HexArgb)) + - "</b>"); + if (log_colors && !ghost) + { + ui_ic_chatlog->textCursor().insertHtml("<b>" + filter_ic_text(p_text, true, -1, 0).replace("$c0", chatlog_color.name(QColor::HexArgb)) + "</b>"); } else + { ui_ic_chatlog->textCursor().insertText(" " + p_text, italics); + } } // If action not blank: - else if (p_action != "" && log_ic_actions) { + else if (p_action != "" && log_ic_actions) + { // Format the action in normal ui_ic_chatlog->textCursor().insertText(" " + p_action, normal); if (log_newline) + { // For some reason, we're forced to use <br> instead of the more sensible // \n. Why? Because \n is treated as a new Block instead of a soft newline // within a paragraph! ui_ic_chatlog->textCursor().insertHtml("<br>"); + } else + { ui_ic_chatlog->textCursor().insertText(": ", normal); + } // Format the result in italics ui_ic_chatlog->textCursor().insertText(p_text + ".", italics); } - else { + else + { if (log_newline) + { // For some reason, we're forced to use <br> instead of the more sensible // \n. Why? Because \n is treated as a new Block instead of a soft newline // within a paragraph! ui_ic_chatlog->textCursor().insertHtml("<br>"); + } else + { ui_ic_chatlog->textCursor().insertText(": ", normal); + } // Format the result according to html - if (log_colors) { + if (log_colors) + { QString p_text_filtered = filter_ic_text(p_text, true, -1, color); p_text_filtered = p_text_filtered.replace("$c0", chatlog_color.name(QColor::HexArgb)); - for (int c = 1; c < max_colors; ++c) { + for (int c = 1; c < max_colors; ++c) + { QColor color_result = default_color_rgb_list.at(c); - if (ghost) { + if (ghost) + { color_result.setAlpha(128); } p_text_filtered = p_text_filtered.replace("$c" + QString::number(c), color_result.name(QColor::HexArgb)); @@ -3435,55 +3730,62 @@ void Courtroom::append_ic_text(QString p_text, QString p_name, QString p_action, ui_ic_chatlog->textCursor().insertHtml(p_text_filtered); } else + { ui_ic_chatlog->textCursor().insertText(filter_ic_text(p_text, false), normal); + } } // Only append with newline if log goes upwards - if (!log_goes_downwards && need_newline) { + if (!log_goes_downwards && need_newline) + { ui_ic_chatlog->textCursor().insertBlock(format); } // If we got too many blocks in the current log, delete some. - while (ui_ic_chatlog->document()->blockCount() > log_maximum_blocks && - log_maximum_blocks > 0) { + while (ui_ic_chatlog->document()->blockCount() > log_maximum_blocks && log_maximum_blocks > 0) + { QTextCursor temp_curs = ui_ic_chatlog->textCursor(); - temp_curs.movePosition(log_goes_downwards ? QTextCursor::Start - : QTextCursor::End); + temp_curs.movePosition(log_goes_downwards ? QTextCursor::Start : QTextCursor::End); temp_curs.select(QTextCursor::BlockUnderCursor); temp_curs.removeSelectedText(); if (log_goes_downwards) + { temp_curs.deleteChar(); + } else + { temp_curs.deletePreviousChar(); + } } // Finally, scroll the scrollbar to the correct position. - if (old_cursor.hasSelection() || - old_scrollbar_value != scrollbar_target_value) { + if (old_cursor.hasSelection() || old_scrollbar_value != scrollbar_target_value) + { // The user has selected text or scrolled away from the bottom: maintain // position. ui_ic_chatlog->setTextCursor(old_cursor); ui_ic_chatlog->verticalScrollBar()->setValue(old_scrollbar_value); } - else { - ui_ic_chatlog->verticalScrollBar()->setValue( - log_goes_downwards ? ui_ic_chatlog->verticalScrollBar()->maximum() : 0); + else + { + ui_ic_chatlog->verticalScrollBar()->setValue(log_goes_downwards ? ui_ic_chatlog->verticalScrollBar()->maximum() : 0); } } void Courtroom::pop_ic_ghost() { QTextCursor ghost = ui_ic_chatlog->textCursor(); - ghost.movePosition(log_goes_downwards ? QTextCursor::End - : QTextCursor::Start); - for (int i = 1; i < ghost_blocks; ++i) { - ghost.movePosition(log_goes_downwards ? QTextCursor::PreviousBlock - : QTextCursor::NextBlock); + ghost.movePosition(log_goes_downwards ? QTextCursor::End : QTextCursor::Start); + for (int i = 1; i < ghost_blocks; ++i) + { + ghost.movePosition(log_goes_downwards ? QTextCursor::PreviousBlock : QTextCursor::NextBlock); } ghost.select(QTextCursor::BlockUnderCursor); ghost.removeSelectedText(); if (ghost_blocks <= 1 && !log_goes_downwards) + { ghost.deleteChar(); + } ghost_blocks--; } @@ -3498,13 +3800,17 @@ void Courtroom::play_preanim(bool immediate) int sfx_delay = m_chatmessage[SFX_DELAY].toInt() * time_mod; sfx_delay_timer->start(sfx_delay); - QString anim_to_find = - ao_app->get_image_suffix(ao_app->get_character_path(f_char, f_preanim)); - if (!file_exists(anim_to_find)) { + QString anim_to_find = ao_app->get_image_suffix(ao_app->get_character_path(f_char, f_preanim)); + if (!file_exists(anim_to_find)) + { if (immediate) + { anim_state = 4; + } else + { anim_state = 1; + } preanim_done(); qWarning() << "could not find preanim" << f_preanim << "for character" << f_char; return; @@ -3513,31 +3819,36 @@ void Courtroom::play_preanim(bool immediate) ui_vp_player_char->set_play_once(true); ui_vp_player_char->load_image(f_preanim, f_char, preanim_duration, true); - switch (m_chatmessage[DESK_MOD].toInt()) { - case DESK_EMOTE_ONLY_EX: - ui_vp_sideplayer_char->hide(); - ui_vp_player_char->move_and_center(0, 0); - [[fallthrough]]; - case DESK_EMOTE_ONLY: - case DESK_HIDE: - set_scene(false, m_chatmessage[SIDE]); - break; + switch (m_chatmessage[DESK_MOD].toInt()) + { + case DESK_EMOTE_ONLY_EX: + ui_vp_sideplayer_char->hide(); + ui_vp_player_char->move_and_center(0, 0); + [[fallthrough]]; + case DESK_EMOTE_ONLY: + case DESK_HIDE: + set_scene(false, m_chatmessage[SIDE]); + break; - case DESK_PRE_ONLY_EX: - case DESK_PRE_ONLY: - case DESK_SHOW: - set_scene(true, m_chatmessage[SIDE]); - break; + case DESK_PRE_ONLY_EX: + case DESK_PRE_ONLY: + case DESK_SHOW: + set_scene(true, m_chatmessage[SIDE]); + break; } - if (immediate) { + if (immediate) + { anim_state = 4; handle_ic_speaking(); } - else { + else + { anim_state = 1; if (stay_time >= 0) + { text_delay_timer->start(stay_time); + } } } @@ -3545,7 +3856,9 @@ void Courtroom::preanim_done() { // Currently, someone's talking over us mid-preanim... if (anim_state != 1 && anim_state != 4 && anim_state != 5) + { return; + } anim_state = 1; handle_ic_speaking(); @@ -3557,77 +3870,94 @@ void Courtroom::start_chat_ticking() // we need to ensure that the text isn't already ticking because this function // can be called by two logic paths if (text_state != 0) + { return; + } // Display the evidence display_evidence_image(); // handle expanded desk mods - switch(m_chatmessage[DESK_MOD].toInt()) { - case DESK_EMOTE_ONLY_EX: - set_self_offset(m_chatmessage[SELF_OFFSET]); - [[fallthrough]]; - case DESK_EMOTE_ONLY: - case DESK_SHOW: - set_scene(true, m_chatmessage[SIDE]); - break; + switch (m_chatmessage[DESK_MOD].toInt()) + { + case DESK_EMOTE_ONLY_EX: + set_self_offset(m_chatmessage[SELF_OFFSET]); + [[fallthrough]]; + case DESK_EMOTE_ONLY: + case DESK_SHOW: + set_scene(true, m_chatmessage[SIDE]); + break; - case DESK_PRE_ONLY_EX: - ui_vp_sideplayer_char->hide(); - ui_vp_player_char->move_and_center(0, 0); - [[fallthrough]]; - case DESK_PRE_ONLY: - case DESK_HIDE: - set_scene(false, m_chatmessage[SIDE]); - break; + case DESK_PRE_ONLY_EX: + ui_vp_sideplayer_char->hide(); + ui_vp_player_char->move_and_center(0, 0); + [[fallthrough]]; + case DESK_PRE_ONLY: + case DESK_HIDE: + set_scene(false, m_chatmessage[SIDE]); + break; } - if (m_chatmessage[EFFECTS] != "") { + if (m_chatmessage[EFFECTS] != "") + { QStringList fx_list = m_chatmessage[EFFECTS].split("|"); QString fx = fx_list[0]; QString fx_sound; QString fx_folder; if (fx_list.length() > 1) + { fx_sound = fx_list[1]; + } - if (fx_list.length() > 2) { + if (fx_list.length() > 2) + { fx_folder = fx_list[1]; fx_sound = fx_list[2]; } this->do_effect(fx, fx_sound, m_chatmessage[CHAR_NAME], fx_folder); } - else if (m_chatmessage[REALIZATION] == "1") { + else if (m_chatmessage[REALIZATION] == "1") + { this->do_flash(); sfx_player->play(ao_app->get_custom_realization(m_chatmessage[CHAR_NAME])); } int emote_mod = m_chatmessage[EMOTE_MOD].toInt(); // text meme bonanza - if ((emote_mod == IDLE || emote_mod == ZOOM) && m_chatmessage[SCREENSHAKE] == "1") { + if ((emote_mod == IDLE || emote_mod == ZOOM) && m_chatmessage[SCREENSHAKE] == "1") + { this->do_screenshake(); } - if (m_chatmessage[MESSAGE].isEmpty()) { + if (m_chatmessage[MESSAGE].isEmpty()) + { // since the message is empty, it's technically done ticking text_state = 2; - if (m_chatmessage[ADDITIVE] == "1") { + if (m_chatmessage[ADDITIVE] == "1") + { // Cool behavior ui_vp_chatbox->show(); ui_vp_message->show(); } - else { + else + { ui_vp_chatbox->setVisible(chatbox_always_show); ui_vp_message->hide(); // Show it if chatbox always shows if (Options::getInstance().characterStickerEnabled() && chatbox_always_show) + { ui_vp_sticker->load_image(m_chatmessage[CHAR_NAME]); + } // Hide the face sticker - else { + else + { ui_vp_sticker->stop(); } } // If we're not already waiting on the next message, start the timer. We could be overriden if there's an objection planned. int delay = Options::getInstance().textStayTime(); if (delay > 0 && !text_queue_timer->isActive()) + { text_queue_timer->start(delay); + } return; } @@ -3635,9 +3965,12 @@ void Courtroom::start_chat_ticking() ui_vp_message->show(); if (Options::getInstance().characterStickerEnabled()) + { ui_vp_sticker->load_image(m_chatmessage[CHAR_NAME]); + } - if (m_chatmessage[ADDITIVE] != "1") { + if (m_chatmessage[ADDITIVE] != "1") + { ui_vp_message->clear(); real_tick_pos = 0; additive_previous = ""; @@ -3656,7 +3989,9 @@ void Courtroom::start_chat_ticking() last_misc = current_misc; current_misc = ao_app->get_chat(m_chatmessage[CHAR_NAME]); if (last_misc != current_misc || char_color_rgb_list.size() < max_colors) + { gen_char_rgb_list(current_misc); + } QString f_blips = ao_app->get_blips(m_chatmessage[CHAR_NAME]); blip_player->set_blips(f_blips); @@ -3679,54 +4014,60 @@ void Courtroom::chat_tick() ui_vp_player_char->set_static_duration(0); QString filename; - if (tick_pos >= f_message.size()) { + if (tick_pos >= f_message.size()) + { text_state = 2; // Check if we're a narrator msg - if (m_chatmessage[EMOTE] != "") { - if (anim_state < 3) { - QStringList c_paths = { - ao_app->get_image_suffix(ao_app->get_character_path(m_chatmessage[CHAR_NAME], "(c)" + m_chatmessage[EMOTE])), - ao_app->get_image_suffix(ao_app->get_character_path(m_chatmessage[CHAR_NAME], "(c)/" + m_chatmessage[EMOTE])) - }; + if (m_chatmessage[EMOTE] != "") + { + if (anim_state < 3) + { + QStringList c_paths = {ao_app->get_image_suffix(ao_app->get_character_path(m_chatmessage[CHAR_NAME], "(c)" + m_chatmessage[EMOTE])), ao_app->get_image_suffix(ao_app->get_character_path(m_chatmessage[CHAR_NAME], "(c)/" + m_chatmessage[EMOTE]))}; // if there is a (c) animation for this emote and we haven't played it already - if (file_exists(ui_vp_player_char->find_image(c_paths)) &&(!c_played)) { + if (file_exists(ui_vp_player_char->find_image(c_paths)) && (!c_played)) + { anim_state = 5; ui_vp_player_char->set_play_once(true); filename = "(c)" + m_chatmessage[EMOTE]; c_played = true; } - else { + else + { anim_state = 3; ui_vp_player_char->set_play_once(false); filename = "(a)" + m_chatmessage[EMOTE]; } - ui_vp_player_char->load_image(filename, m_chatmessage[CHAR_NAME], 0, - false); + ui_vp_player_char->load_image(filename, m_chatmessage[CHAR_NAME], 0, false); } } else // We're a narrator msg + { anim_state = 3; + } QString f_char; QString f_custom_theme; - if (Options::getInstance().customChatboxEnabled()) { + if (Options::getInstance().customChatboxEnabled()) + { f_char = m_chatmessage[CHAR_NAME]; f_custom_theme = ao_app->get_chat(f_char); } ui_vp_chat_arrow->transform_mode = ao_app->get_misc_scaling(f_custom_theme); ui_vp_chat_arrow->load_image("chat_arrow", f_custom_theme); // Chat stopped being processed, indicate that. QString f_message_filtered = filter_ic_text(f_message, true, -1, m_chatmessage[TEXT_COLOR].toInt()); - for (int c = 0; c < max_colors; ++c) { + for (int c = 0; c < max_colors; ++c) + { additive_previous = additive_previous.replace("$c" + QString::number(c), char_color_rgb_list.at(c).name(QColor::HexRgb)); f_message_filtered = f_message_filtered.replace("$c" + QString::number(c), char_color_rgb_list.at(c).name(QColor::HexRgb)); } additive_previous = additive_previous + f_message_filtered; real_tick_pos = ui_vp_message->toPlainText().size(); - // If we're not already waiting on the next message, start the timer. We could be overriden if there's an objection planned. int delay = Options::getInstance().textStayTime(); if (delay > 0 && !text_queue_timer->isActive()) + { text_queue_timer->start(delay); + } // if we have instant objections disabled, and queue is not empty, check if next message after this is an objection. if (!Options::getInstance().objectionSkipQueueEnabled() && chatmessage_queue.size() > 0) @@ -3736,7 +4077,9 @@ void Courtroom::chat_tick() bool is_objection = objection_mod >= 1 && objection_mod <= 5; // If this is an objection, we'll need to interrupt our current message. if (is_objection) + { chatmessage_dequeue(); + } } return; } @@ -3747,9 +4090,12 @@ void Courtroom::chat_tick() QString f_rest = f_message; // Alignment characters - if (tick_pos < 2) { + if (tick_pos < 2) + { if (f_rest.startsWith("~~") || f_rest.startsWith("~>") || f_rest.startsWith("<>")) + { tick_pos += 2; + } } f_rest.remove(0, tick_pos); QTextBoundaryFinder tbf(QTextBoundaryFinder::Grapheme, f_rest); @@ -3760,52 +4106,70 @@ void Courtroom::chat_tick() tbf.toNextBoundary(); if (tbf.position() == -1) + { f_character = f_rest; + } else + { f_character = f_rest.left(tbf.position()); + } f_char_length = f_character.length(); tick_pos += f_char_length; // Escape character. - if (!next_character_is_not_special) { - if (f_character == "\\") { + if (!next_character_is_not_special) + { + if (f_character == "\\") + { next_character_is_not_special = true; formatting_char = true; } // Text speed modifier. - else if (f_character == "{") { + else if (f_character == "{") + { // ++, because it INCREASES delay! current_display_speed++; formatting_char = true; } - else if (f_character == "}") { + else if (f_character == "}") + { current_display_speed--; formatting_char = true; } - else { + else + { // Parse markdown colors - for (int c = 0; c < max_colors; ++c) { + for (int c = 0; c < max_colors; ++c) + { QString markdown_start = color_markdown_start_list.at(c); QString markdown_end = color_markdown_end_list.at(c); bool markdown_remove = color_markdown_remove_list.at(c); if (markdown_start.isEmpty()) + { continue; + } - if (f_character == markdown_start || f_character == markdown_end) { + if (f_character == markdown_start || f_character == markdown_end) + { if (markdown_remove) + { formatting_char = true; + } break; } } } } - else { + else + { if (f_character == "n") + { formatting_char = true; // it's a newline - if (f_character == "s") // Screenshake. + } + if (f_character == "s") // Screenshake. { this->do_screenshake(); formatting_char = true; @@ -3824,30 +4188,42 @@ void Courtroom::chat_tick() // Keep the speed at bay. if (current_display_speed < 0) + { current_display_speed = 0; + } else if (current_display_speed > 6) + { current_display_speed = 6; + } if (msg_delay == 0) + { msg_delay = text_crawl * message_display_mult[current_display_speed]; + } - if ((msg_delay <= 0 && - tick_pos < f_message.size() - 1) || - formatting_char) { + if ((msg_delay <= 0 && tick_pos < f_message.size() - 1) || formatting_char) + { if (f_character == "p") + { chat_tick_timer->start(100); // wait the pause lol + } else + { chat_tick_timer->start(0); // Don't bother rendering anything out as we're // doing the SPEED. (there's latency otherwise) - if (!formatting_char || f_character == "n" || f_character == "f" || - f_character == "s" || f_character == "p") + } + if (!formatting_char || f_character == "n" || f_character == "f" || f_character == "s" || f_character == "p") + { real_tick_pos += f_char_length; // Adjust the tick position for the // scrollbar convenience + } } - else { + else + { // Do the colors, gradual showing, etc. in here QString f_message_filtered = filter_ic_text(f_message, true, tick_pos, m_chatmessage[TEXT_COLOR].toInt()); - for (int c = 0; c < max_colors; ++c) { + for (int c = 0; c < max_colors; ++c) + { additive_previous = additive_previous.replace("$c" + QString::number(c), char_color_rgb_list.at(c).name(QColor::HexRgb)); f_message_filtered = f_message_filtered.replace("$c" + QString::number(c), char_color_rgb_list.at(c).name(QColor::HexRgb)); } @@ -3871,24 +4247,26 @@ void Courtroom::chat_tick() // where ! is the blip sound int b_rate = blip_rate; // Overwhelming blip spam prevention, this method is more consistent than timers - if (msg_delay != 0 && msg_delay <= 25) { + if (msg_delay != 0 && msg_delay <= 25) + { // The default blip speed is 40ms, and if current msg_delay is 25ms, // the formula will result in the blip rate of: // 40/25 = 1.6 = 2 // And if it's faster than that: // 40/10 = 4 - b_rate = - qMax(b_rate, qRound(static_cast<float>(text_crawl) / - msg_delay)); + b_rate = qMax(b_rate, qRound(static_cast<float>(text_crawl) / msg_delay)); } - if ((blip_rate <= 0 && blip_ticker < 1) || (b_rate > 0 && blip_ticker % b_rate == 0)) { + if ((blip_rate <= 0 && blip_ticker < 1) || (b_rate > 0 && blip_ticker % b_rate == 0)) + { // ignoring white space unless blank_blip is enabled. - if (!formatting_char && (f_character != ' ' || blank_blip)) { + if (!formatting_char && (f_character != ' ' || blank_blip)) + { blip_player->blip_tick(); ++blip_ticker; } } - else { + else + { // Don't fully ignore whitespace still, keep ticking until // we reached the need to play a blip sound - we also just // need to wait for a letter to play it on. @@ -3896,35 +4274,32 @@ void Courtroom::chat_tick() } // Punctuation delayer, only kicks in on speed ticks less than }} - if (current_display_speed > 1 && punctuation_chars.contains(f_character)) { + if (current_display_speed > 1 && punctuation_chars.contains(f_character)) + { // Making the user have to wait any longer than 1.5 of the slowest speed // is downright unreasonable int max_delay = text_crawl * message_display_mult[6] * 1.5; msg_delay = qMin(max_delay, msg_delay * punctuation_modifier); } - if (m_chatmessage[EMOTE] != "") { + if (m_chatmessage[EMOTE] != "") + { // If this color is talking - if (color_is_talking && anim_state != 2 && - anim_state < - 4) // Set it to talking as we're not on that already (though we have - // to avoid interrupting a non-interrupted preanim) + if (color_is_talking && anim_state != 2 && anim_state < 4) // Set it to talking as we're not on that already (though we have + // to avoid interrupting a non-interrupted preanim) { ui_vp_player_char->stop(); ui_vp_player_char->set_play_once(false); filename = "(b)" + m_chatmessage[EMOTE]; - ui_vp_player_char->load_image(filename, m_chatmessage[CHAR_NAME], 0, - false); + ui_vp_player_char->load_image(filename, m_chatmessage[CHAR_NAME], 0, false); anim_state = 2; } - else if (!color_is_talking && anim_state < 3 && - anim_state != 3) // Set it to idle as we're not on that already + else if (!color_is_talking && anim_state < 3 && anim_state != 3) // Set it to idle as we're not on that already { ui_vp_player_char->stop(); ui_vp_player_char->set_play_once(false); filename = "(a)" + m_chatmessage[EMOTE]; - ui_vp_player_char->load_image(filename, m_chatmessage[CHAR_NAME], 0, - false); + ui_vp_player_char->load_image(filename, m_chatmessage[CHAR_NAME], 0, false); anim_state = 3; } } @@ -3936,18 +4311,20 @@ void Courtroom::chat_tick() void Courtroom::play_sfx() { QString sfx_name = m_chatmessage[SFX_NAME]; - if (m_chatmessage[SCREENSHAKE] == - "1") // Screenshake dependant on preanim sfx delay meme + if (m_chatmessage[SCREENSHAKE] == "1") // Screenshake dependant on preanim sfx delay meme { this->do_screenshake(); } if (sfx_name == "1") + { return; + } sfx_player->play(sfx_name); if (Options::getInstance().loopingSfx()) - sfx_player->set_looping( - ao_app->get_sfx_looping(current_char, current_emote) == "1"); + { + sfx_player->set_looping(ao_app->get_sfx_looping(current_char, current_emote) == "1"); + } } void Courtroom::set_scene(bool show_desk, const QString f_side) @@ -3956,23 +4333,29 @@ void Courtroom::set_scene(bool show_desk, const QString f_side) ui_vp_desk->load_image(ao_app->get_pos_path(f_side, true)); if (show_desk) + { ui_vp_desk->show(); + } else + { ui_vp_desk->hide(); + } } -void Courtroom::set_self_offset(const QString& p_list) { - QStringList self_offsets = p_list.split("&"); - int self_offset = self_offsets[0].toInt(); - int self_offset_v; - if (self_offsets.length() <= 1) { - self_offset_v = 0; - } - else { - self_offset_v = self_offsets[1].toInt(); - } - ui_vp_player_char->move_and_center(ui_viewport->width() * self_offset / 100, - ui_viewport->height() * self_offset_v / 100); +void Courtroom::set_self_offset(const QString &p_list) +{ + QStringList self_offsets = p_list.split("&"); + int self_offset = self_offsets[0].toInt(); + int self_offset_v; + if (self_offsets.length() <= 1) + { + self_offset_v = 0; + } + else + { + self_offset_v = self_offsets[1].toInt(); + } + ui_vp_player_char->move_and_center(ui_viewport->width() * self_offset / 100, ui_viewport->height() * self_offset_v / 100); } void Courtroom::set_ip_list(QString p_list) @@ -3985,11 +4368,16 @@ void Courtroom::set_ip_list(QString p_list) void Courtroom::set_mute(bool p_muted, int p_cid) { if (p_cid != m_cid && p_cid != -1) + { return; + } if (p_muted) + { ui_muted->show(); - else { + } + else + { ui_muted->hide(); ui_ic_chat_message->setFocus(); } @@ -4001,15 +4389,14 @@ void Courtroom::set_mute(bool p_muted, int p_cid) ui_ic_chat_message->setEnabled(!p_muted); } -void Courtroom::set_ban(int p_cid) +QString Courtroom::get_current_char() { - if (p_cid != m_cid && p_cid != -1) - return; - - call_notice(tr("You have been banned.")); + return current_char; +} - ao_app->construct_lobby(); - ao_app->destruct_courtroom(); +QString Courtroom::get_current_background() +{ + return current_background; } void Courtroom::handle_song(QStringList *p_contents) @@ -4017,11 +4404,13 @@ void Courtroom::handle_song(QStringList *p_contents) QStringList f_contents = *p_contents; if (f_contents.size() < 2) + { return; + } - bool ok; // Used for charID, channel, effect check + bool ok; // Used for charID, channel, effect check bool looping = false; // No loop due to outdated server using serverside looping - int channel = 0; // Channel 0 is 'master music', other for ambient + int channel = 0; // Channel 0 is 'master music', other for ambient int effect_flags = 0; // No effects by default - vanilla functionality QString f_song = f_contents.at(0); @@ -4030,129 +4419,158 @@ void Courtroom::handle_song(QStringList *p_contents) int n_char = f_contents.at(1).toInt(&ok); if (!ok) + { return; + } if (p_contents->length() > 3 && p_contents->at(3) == "1") + { looping = true; + } - if (p_contents->length() > 4) { + if (p_contents->length() > 4) + { // eyyy we want to change this song's CHANNEL huh // let the music player handle it if it's bigger than the channel list channel = p_contents->at(4).toInt(&ok); if (!ok) + { return; + } } - if (p_contents->length() > 5) { + if (p_contents->length() > 5) + { // Flags provided to us by server such as Fade In, Fade Out, Sync Pos etc. effect_flags = p_contents->at(5).toInt(&ok); if (!ok) + { return; + } } - if(!file_exists(ao_app->get_sfx_suffix(ao_app->get_music_path(f_song))) && !f_song.startsWith("http") - && f_song != "~stop.mp3" && !ao_app->asset_url.isEmpty()) { - f_song = (ao_app->asset_url + "sounds/music/" + f_song).toLower(); + if (!file_exists(ao_app->get_sfx_suffix(ao_app->get_music_path(f_song))) && !f_song.startsWith("http") && f_song != "~stop.mp3" && !ao_app->asset_url.isEmpty()) + { + f_song = (ao_app->asset_url + "sounds/music/" + f_song).toLower(); } bool is_stop = (f_song == "~stop.mp3"); - if (n_char >= 0 && n_char < char_list.size()) { + if (n_char >= 0 && n_char < char_list.size()) + { QString str_char = char_list.at(n_char).name; QString str_show = ao_app->get_showname(str_char); - if (p_contents->length() > 2) { - if (p_contents->at(2) != "") { + if (p_contents->length() > 2) + { + if (p_contents->at(2) != "") + { str_show = p_contents->at(2); } } - if (!mute_map.value(n_char)) { + if (!mute_map.value(n_char)) + { bool selfname = n_char == m_cid; - if (is_stop) { + if (is_stop) + { log_ic_text(str_char, str_show, "", tr("has stopped the music"), 0, selfname); append_ic_text("", str_show, tr("has stopped the music"), 0, selfname); } - else { + else + { log_ic_text(str_char, str_show, f_song, tr("has played a song"), 0, selfname); append_ic_text(f_song_clear, str_show, tr("has played a song"), 0, selfname); } } } - if (channel == 0) { + if (channel == 0) + { // Current song UI only displays the song playing, not other channels. // Any other music playing is irrelevant. - if (music_player->music_watcher.isRunning()) { - music_player->music_watcher.cancel(); + if (music_player->music_watcher.isRunning()) + { + music_player->music_watcher.cancel(); } 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)); + 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)); + music_player->music_watcher.setFuture(QtConcurrent::run(&AOMusicPlayer::play, music_player, f_song, channel, looping, effect_flags)); #endif } void Courtroom::update_ui_music_name() { - QString result = music_player->music_watcher.result(); - if (result.isEmpty()) - return; - ui_music_name->setText(result); + QString result = music_player->music_watcher.result(); + if (result.isEmpty()) + { + return; + } + ui_music_name->setText(result); } void Courtroom::handle_wtce(QString p_wtce, int variant) { - //QString sfx_file = "courtroom_sounds.ini"; + // QString sfx_file = "courtroom_sounds.ini"; QString bg_misc = ao_app->read_design_ini("misc", ao_app->get_background_path("design.ini")); QString sfx_name; QString filename; ui_vp_wtce->set_static_duration(wtce_static_time); ui_vp_wtce->set_max_duration(wtce_max_time); // witness testimony - if (p_wtce == "testimony1") { + if (p_wtce == "testimony1") + { // End testimony indicator - if (variant == 1) { + if (variant == 1) + { ui_vp_testimony->kill(); return; } sfx_name = ao_app->get_court_sfx("witness_testimony", bg_misc); - if (sfx_name == "") { + if (sfx_name == "") + { sfx_name = ao_app->get_court_sfx("witnesstestimony", bg_misc); } filename = "witnesstestimony_bubble"; ui_vp_testimony->load_image("testimony", "", bg_misc); } // cross examination - else if (p_wtce == "testimony2") { - sfx_name = ao_app->get_court_sfx("cross_examination", bg_misc); - if (sfx_name == "") { + else if (p_wtce == "testimony2") + { + sfx_name = ao_app->get_court_sfx("cross_examination", bg_misc); + if (sfx_name == "") + { sfx_name = ao_app->get_court_sfx("crossexamination", bg_misc); } filename = "crossexamination_bubble"; ui_vp_testimony->kill(); } - else { + else + { ui_vp_wtce->set_static_duration(verdict_static_time); ui_vp_wtce->set_max_duration(verdict_max_time); // Verdict? - if (p_wtce == "judgeruling") { - if (variant == 0) { + if (p_wtce == "judgeruling") + { + if (variant == 0) + { sfx_name = ao_app->get_court_sfx("not_guilty", bg_misc); - if (sfx_name == "") { + if (sfx_name == "") + { sfx_name = ao_app->get_court_sfx("notguilty", bg_misc); } filename = "notguilty_bubble"; ui_vp_testimony->kill(); } - else if (variant == 1) { + else if (variant == 1) + { sfx_name = ao_app->get_court_sfx("guilty", bg_misc); filename = "guilty_bubble"; ui_vp_testimony->kill(); } } // Completely custom WTCE - else { + else + { sfx_name = p_wtce; filename = p_wtce; } @@ -4165,15 +4583,19 @@ void Courtroom::handle_wtce(QString p_wtce, int variant) void Courtroom::set_hp_bar(int p_bar, int p_state) { if (p_state < 0 || p_state > 10) + { return; + } int prev_state = p_state; - if (p_bar == 1) { + if (p_bar == 1) + { ui_defense_bar->set_image("defensebar" + QString::number(p_state)); prev_state = defense_bar_state; defense_bar_state = p_state; } - else if (p_bar == 2) { + else if (p_bar == 2) + { ui_prosecution_bar->set_image("prosecutionbar" + QString::number(p_state)); prev_state = prosecution_bar_state; prosecution_bar_state = p_state; @@ -4181,62 +4603,66 @@ void Courtroom::set_hp_bar(int p_bar, int p_state) QString sfx_name; QString effect_name; - if (p_state > prev_state) { + if (p_state > prev_state) + { sfx_name = ao_app->get_penalty_value("hp_increased_sfx"); effect_name = ao_app->get_penalty_value("hp_increased_effect").toLower(); } - else if (p_state < prev_state) { + else if (p_state < prev_state) + { sfx_name = ao_app->get_penalty_value("hp_decreased_sfx"); effect_name = ao_app->get_penalty_value("hp_decreased_effect").toLower(); } - else { + else + { return; } - if (effect_name == "screenshake") { + if (effect_name == "screenshake") + { do_screenshake(); } - else if (effect_name == "flash") { + else if (effect_name == "flash") + { do_flash(); } - else { + else + { do_effect(effect_name, "", "", ""); } - if (!sfx_name.isEmpty()) { + if (!sfx_name.isEmpty()) + { sfx_player->play(sfx_name); } } void Courtroom::show_judge_controls(bool visible) { - if (judge_state != POS_DEPENDENT) { + if (judge_state != POS_DEPENDENT) + { visible = judge_state == SHOW_CONTROLS; // Server-side override } - QList<QWidget*> judge_controls = - { - ui_witness_testimony, - ui_cross_examination, - ui_guilty, - ui_not_guilty, - ui_defense_minus, - ui_defense_plus, - ui_prosecution_minus, - ui_prosecution_plus - }; - - for (QWidget* control : judge_controls) { - if (visible) - control->show(); - else - control->hide(); + QList<QWidget *> judge_controls = {ui_witness_testimony, ui_cross_examination, ui_guilty, ui_not_guilty, ui_defense_minus, ui_defense_plus, ui_prosecution_minus, ui_prosecution_plus}; + + for (QWidget *control : judge_controls) + { + if (visible) + { + control->show(); + } + else + { + control->hide(); + } } } void Courtroom::mod_called(QString p_ip) { ui_server_chatlog->append(p_ip); - if (!ui_guard->isChecked()) { + if (!ui_guard->isChecked()) + { modcall_player->play(ao_app->get_court_sfx("mod_call")); ao_app->alert(this); } @@ -4246,32 +4672,36 @@ void Courtroom::on_ooc_return_pressed() { QString ooc_message = ui_ooc_chat_message->text(); - //We ignore it when the server is compatible with 2.8 - //Using an arbitrary 2.8 feature flag certainly won't cause issues someday. - if (ooc_message.startsWith("/pos") & !ao_app->effects_supported) { - if (ooc_message == "/pos jud") { + // We ignore it when the server is compatible with 2.8 + // Using an arbitrary 2.8 feature flag certainly won't cause issues someday. + if (ooc_message.startsWith("/pos") & !ao_app->effects_supported) + { + if (ooc_message == "/pos jud") + { show_judge_controls(true); } - else { + else + { show_judge_controls(false); } } - if (ooc_message.startsWith("/load_case")) { + if (ooc_message.startsWith("/load_case")) + { #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) QStringList command = ooc_message.split(" ", QString::SkipEmptyParts); #else QStringList command = ooc_message.split(" ", Qt::SkipEmptyParts); #endif - QDir casefolder(get_base_path()+"/cases"); - if (!casefolder.exists()) { + QDir casefolder(get_base_path() + "/cases"); + if (!casefolder.exists()) + { QDir::current().mkdir(get_base_path() + casefolder.dirName()); - append_server_chatmessage( - "CLIENT", - tr("You don't have a `base/cases/` folder! It was just made for you, " - "but seeing as it WAS just made for you, it's likely the case " - "file you're looking for can't be found in there."), - "1"); + append_server_chatmessage("CLIENT", + tr("You don't have a `base/cases/` folder! It was just made for you, " + "but seeing as it WAS just made for you, it's likely the case " + "file you're looking for can't be found in there."), + "1"); ui_ooc_chat_message->clear(); return; } @@ -4280,30 +4710,29 @@ void Courtroom::on_ooc_return_pressed() caseslist.removeOne(".."); caseslist.replaceInStrings(".ini", ""); - if (command.size() < 2) { - append_server_chatmessage( - "CLIENT", - tr("You need to give a filename to load (extension not needed)! Make " - "sure that it is in the `base/cases/` folder, and that it is a " - "correctly formatted ini.\nCases you can load: %1") - .arg(caseslist.join(", ")), - "1"); + if (command.size() < 2) + { + append_server_chatmessage("CLIENT", + tr("You need to give a filename to load (extension not needed)! Make " + "sure that it is in the `base/cases/` folder, and that it is a " + "correctly formatted ini.\nCases you can load: %1") + .arg(caseslist.join(", ")), + "1"); ui_ooc_chat_message->clear(); return; } - if (command.size() > 2) { - append_server_chatmessage( - "CLIENT", - tr("Too many arguments to load a case! You only need one filename, " - "without extension."), - "1"); + if (command.size() > 2) + { + append_server_chatmessage("CLIENT", + tr("Too many arguments to load a case! You only need one filename, " + "without extension."), + "1"); ui_ooc_chat_message->clear(); return; } - QSettings casefile(get_base_path() + "/cases/" + command[1] + ".ini", - QSettings::IniFormat); + QSettings casefile(get_base_path() + "/cases/" + command[1] + ".ini", QSettings::IniFormat); QString caseauth = casefile.value("author", "").value<QString>(); QString casedoc = casefile.value("doc", "").value<QString>(); @@ -4311,67 +4740,68 @@ void Courtroom::on_ooc_return_pressed() QString casestatus = casefile.value("status", "").value<QString>(); if (!caseauth.isEmpty()) - append_server_chatmessage(tr("CLIENT"), - tr("Case made by %1.").arg(caseauth), "1"); - if (!casedoc.isEmpty()) { - ao_app->send_server_packet(new AOPacket("CT", {ui_ooc_chat_name->text(), "/doc " + casedoc})); + { + append_server_chatmessage(tr("CLIENT"), tr("Case made by %1.").arg(caseauth), "1"); } - if (!casestatus.isEmpty()) { - ao_app->send_server_packet(new AOPacket("CT", {ui_ooc_chat_name->text(), "/status " + casestatus})); + if (!casedoc.isEmpty()) + { + ao_app->send_server_packet(AOPacket("CT", {ui_ooc_chat_name->text(), "/doc " + casedoc})); + } + if (!casestatus.isEmpty()) + { + ao_app->send_server_packet(AOPacket("CT", {ui_ooc_chat_name->text(), "/status " + casestatus})); } if (!cmdoc.isEmpty()) - append_server_chatmessage( - "CLIENT", tr("Navigate to %1 for the CM doc.").arg(cmdoc), "1"); + { + append_server_chatmessage("CLIENT", tr("Navigate to %1 for the CM doc.").arg(cmdoc), "1"); + } - for (int i = local_evidence_list.size() - 1; i >= 0; i--) { - ao_app->send_server_packet( - new AOPacket("DE", {QString::number(i)})); + for (int i = local_evidence_list.size() - 1; i >= 0; i--) + { + ao_app->send_server_packet(AOPacket("DE", {QString::number(i)})); } // sort the case_evidence numerically QStringList case_evidence = casefile.childGroups(); - std::sort(case_evidence.begin(), case_evidence.end(), - [] (const QString &a, const QString &b) { - return a.toInt() < b.toInt(); - }); + std::sort(case_evidence.begin(), case_evidence.end(), [](const QString &a, const QString &b) { return a.toInt() < b.toInt(); }); // load evidence - foreach (QString evi, case_evidence) { + foreach (QString evi, case_evidence) + { if (evi == "General") + { continue; + } QStringList f_contents; - f_contents.append( - casefile.value(evi + "/name", tr("UNKNOWN")).value<QString>()); - f_contents.append( - casefile.value(evi + "/description", tr("UNKNOWN")).value<QString>()); - f_contents.append( - casefile.value(evi + "/image", "UNKNOWN.png").value<QString>()); + f_contents.append(casefile.value(evi + "/name", tr("UNKNOWN")).value<QString>()); + f_contents.append(casefile.value(evi + "/description", tr("UNKNOWN")).value<QString>()); + f_contents.append(casefile.value(evi + "/image", "UNKNOWN.png").value<QString>()); - ao_app->send_server_packet(new AOPacket("PE", f_contents)); + ao_app->send_server_packet(AOPacket("PE", f_contents)); } - append_server_chatmessage( - "CLIENT", tr("Your case \"%1\" was loaded!").arg(command[1]), "1"); + append_server_chatmessage("CLIENT", tr("Your case \"%1\" was loaded!").arg(command[1]), "1"); ui_ooc_chat_message->clear(); return; } - else if (ooc_message.startsWith("/save_case")) { + else if (ooc_message.startsWith("/save_case")) + { #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) QStringList command = ooc_message.split(" ", QString::SkipEmptyParts); #else QStringList command = ooc_message.split(" ", Qt::SkipEmptyParts); #endif QDir casefolder(get_base_path() + "cases"); - if (!casefolder.exists()) { + if (!casefolder.exists()) + { QDir(get_base_path()).mkdir(casefolder.dirName()); - append_server_chatmessage( - "CLIENT", - tr("You don't have a `base/cases/` folder! It was just made for you, " - "but seeing as it WAS just made for you, it's likely that you " - "somehow deleted it."), - "1"); + append_server_chatmessage("CLIENT", + tr("You don't have a `base/cases/` folder! It was just made for you, " + "but seeing as it WAS just made for you, it's likely that you " + "somehow deleted it."), + "1"); ui_ooc_chat_message->clear(); return; } @@ -4380,37 +4810,35 @@ void Courtroom::on_ooc_return_pressed() caseslist.removeOne(".."); caseslist.replaceInStrings(".ini", ""); - if (command.size() < 3) { - append_server_chatmessage( - "CLIENT", - tr("You need to give a filename to save (extension not needed) and " - "the courtroom status!"), - "1"); + if (command.size() < 3) + { + append_server_chatmessage("CLIENT", + tr("You need to give a filename to save (extension not needed) and " + "the courtroom status!"), + "1"); ui_ooc_chat_message->clear(); return; } - if (command.size() > 3) { - append_server_chatmessage( - "CLIENT", - tr("Too many arguments to save a case! You only need a filename " - "without extension and the courtroom status!"), - "1"); + if (command.size() > 3) + { + append_server_chatmessage("CLIENT", + tr("Too many arguments to save a case! You only need a filename " + "without extension and the courtroom status!"), + "1"); ui_ooc_chat_message->clear(); return; } - QSettings casefile(get_base_path() + "/cases/" + command[1] + ".ini", - QSettings::IniFormat); + QSettings casefile(get_base_path() + "/cases/" + command[1] + ".ini", QSettings::IniFormat); casefile.setValue("author", ui_ooc_chat_name->text()); casefile.setValue("cmdoc", ""); casefile.setValue("doc", ""); casefile.setValue("status", command[2]); casefile.sync(); - for (int i = 0; i < local_evidence_list.size(); i++) { - QString clean_evidence_dsc = local_evidence_list[i].description.replace( - QRegularExpression("<owner = ...>..."), ""); - clean_evidence_dsc = clean_evidence_dsc.replace( - clean_evidence_dsc.lastIndexOf(">"), 1, ""); + for (int i = 0; i < local_evidence_list.size(); i++) + { + QString clean_evidence_dsc = local_evidence_list[i].description.replace(QRegularExpression("<owner = ...>..."), ""); + clean_evidence_dsc = clean_evidence_dsc.replace(clean_evidence_dsc.lastIndexOf(">"), 1, ""); casefile.beginGroup(QString::number(i)); casefile.sync(); casefile.setValue("name", local_evidence_list[i].name); @@ -4419,9 +4847,7 @@ void Courtroom::on_ooc_return_pressed() casefile.endGroup(); } casefile.sync(); - append_server_chatmessage( - "CLIENT", tr("Succesfully saved, edit doc and cmdoc link on the ini!"), - "1"); + append_server_chatmessage("CLIENT", tr("Succesfully saved, edit doc and cmdoc link on the ini!"), "1"); ui_ooc_chat_message->clear(); return; } @@ -4430,10 +4856,12 @@ void Courtroom::on_ooc_return_pressed() packet_contents.append(ui_ooc_chat_name->text()); packet_contents.append(ooc_message); - AOPacket *f_packet = new AOPacket("CT", packet_contents); + AOPacket f_packet("CT", packet_contents); if (server_ooc) + { ao_app->send_server_packet(f_packet); + } ui_ooc_chat_message->clear(); @@ -4442,14 +4870,16 @@ void Courtroom::on_ooc_return_pressed() void Courtroom::on_ooc_toggle_clicked() { - if (server_ooc) { + if (server_ooc) + { ui_debug_log->show(); ui_server_chatlog->hide(); ui_ooc_toggle->setText(tr("Debug")); server_ooc = false; } - else { + else + { ui_debug_log->hide(); ui_server_chatlog->show(); ui_ooc_toggle->setText(tr("Server")); @@ -4462,43 +4892,54 @@ void Courtroom::on_ooc_toggle_clicked() void Courtroom::on_music_search_edited(QString p_text) { // Iterate through all QTreeWidgetItem items - if (!ui_music_list->isHidden()) { + if (!ui_music_list->isHidden()) + { QTreeWidgetItemIterator it(ui_music_list); - while (*it) { + while (*it) + { (*it)->setHidden(p_text != ""); ++it; } last_music_search = p_text; } - if (!ui_area_list->isHidden()) { + if (!ui_area_list->isHidden()) + { QTreeWidgetItemIterator ait(ui_area_list); - while (*ait) { + while (*ait) + { (*ait)->setHidden(p_text != ""); ++ait; } last_area_search = p_text; } - if (p_text != "") { - if (!ui_music_list->isHidden()) { + if (p_text != "") + { + if (!ui_music_list->isHidden()) + { // Search in metadata - QList<QTreeWidgetItem *> clist = ui_music_list->findItems( - ui_music_search->text(), Qt::MatchContains | Qt::MatchRecursive, 1); - foreach (QTreeWidgetItem *item, clist) { + QList<QTreeWidgetItem *> clist = ui_music_list->findItems(ui_music_search->text(), Qt::MatchContains | Qt::MatchRecursive, 1); + foreach (QTreeWidgetItem *item, clist) + { if (item->parent() != nullptr) // So the category shows up too + { item->parent()->setHidden(false); + } item->setHidden(false); } } - if (!ui_area_list->isHidden()) { + if (!ui_area_list->isHidden()) + { // Search in metadata - QList<QTreeWidgetItem *> alist = ui_area_list->findItems( - ui_music_search->text(), Qt::MatchContains | Qt::MatchRecursive, 1); - foreach (QTreeWidgetItem *item, alist) { + QList<QTreeWidgetItem *> alist = ui_area_list->findItems(ui_music_search->text(), Qt::MatchContains | Qt::MatchRecursive, 1); + foreach (QTreeWidgetItem *item, alist) + { if (item->parent() != nullptr) // So the category shows up too + { item->parent()->setHidden(false); + } item->setHidden(false); } } @@ -4507,7 +4948,8 @@ void Courtroom::on_music_search_edited(QString p_text) void Courtroom::on_music_search_return_pressed() { - if (ui_music_search->text() == "") { + if (ui_music_search->text() == "") + { ui_music_list->collapseAll(); } } @@ -4515,7 +4957,9 @@ void Courtroom::on_music_search_return_pressed() void Courtroom::on_pos_dropdown_changed(int p_index) { if (p_index < 0) + { return; + } on_pos_dropdown_changed(ui_pos_dropdown->itemText(p_index)); } @@ -4531,15 +4975,14 @@ void Courtroom::on_pos_dropdown_context_menu_requested(const QPoint &pos) menu->setAttribute(Qt::WA_DeleteOnClose); menu->addSeparator(); - menu->addAction(QString("Open background " + current_background), this, - [=] { + menu->addAction(QString("Open background " + current_background), this, [=] { QString p_path = ao_app->get_real_path(VPath("background/" + current_background + "/")); - if (!dir_exists(p_path)) { - return; + if (!dir_exists(p_path)) + { + return; } QDesktopServices::openUrl(QUrl::fromLocalFile(p_path)); - } - ); + }); menu->popup(ui_iniswap_dropdown->mapToGlobal(pos)); } @@ -4550,18 +4993,24 @@ void Courtroom::on_pos_remove_clicked() show_judge_controls(ao_app->get_pos_is_judge(default_side)); - for (int i = 0; i < ui_pos_dropdown->count(); ++i) { + for (int i = 0; i < ui_pos_dropdown->count(); ++i) + { QString pos = ui_pos_dropdown->itemText(i); - if (pos == default_side) { + if (pos == default_side) + { ui_pos_dropdown->setCurrentIndex(i); break; } } int wit_index = ui_pos_dropdown->findText("wit"); - if (ui_pos_dropdown->currentText() != default_side && wit_index != -1) //i.e. this bg doesn't have our pos + if (ui_pos_dropdown->currentText() != default_side && wit_index != -1) // i.e. this bg doesn't have our pos + { ui_pos_dropdown->setCurrentIndex(wit_index); // fall back to "wit" + } else if (ui_pos_dropdown->currentText() != default_side) // we don't have "wit" either? + { ui_pos_dropdown->setCurrentIndex(0); // as a last resort, choose the first item in the dropdown + } ui_pos_dropdown->blockSignals(false); current_side = ""; ui_pos_remove->hide(); @@ -4572,34 +5021,39 @@ void Courtroom::set_iniswap_dropdown() { ui_iniswap_dropdown->blockSignals(true); ui_iniswap_dropdown->clear(); - if (m_cid == -1) { + if (m_cid == -1) + { ui_iniswap_dropdown->hide(); ui_iniswap_remove->hide(); return; } - 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(VPath("iniswaps.ini")); + 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(VPath("iniswaps.ini")); iniswaps.prepend(char_list.at(m_cid).name); iniswaps.removeDuplicates(); - if (iniswaps.size() <= 0) { + if (iniswaps.size() <= 0) + { ui_iniswap_dropdown->hide(); ui_iniswap_remove->hide(); return; } ui_iniswap_dropdown->show(); - for (int i = 0; i < iniswaps.size(); ++i) { + 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")); + 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) { + if (iniswaps.at(i) == current_char) + { ui_iniswap_dropdown->setCurrentIndex(i); if (i != 0) + { ui_iniswap_remove->show(); + } else + { ui_iniswap_remove->hide(); + } } } ui_iniswap_dropdown->blockSignals(false); @@ -4612,13 +5066,17 @@ void Courtroom::on_iniswap_dropdown_changed(int p_index) QStringList swaplist; QStringList defswaplist = ao_app->get_list_file(ao_app->get_character_path(char_list.at(m_cid).name, "iniswaps.ini")); - for (int i = 0; i < ui_iniswap_dropdown->count(); ++i) { + for (int i = 0; i < ui_iniswap_dropdown->count(); ++i) + { QString entry = ui_iniswap_dropdown->itemText(i); if (!swaplist.contains(entry) && entry != char_list.at(m_cid).name && !defswaplist.contains(entry)) + { swaplist.append(entry); + } } QString p_path = ao_app->get_real_path(VPath("iniswaps.ini")); - if (!file_exists(p_path)) { + if (!file_exists(p_path)) + { p_path = get_base_path() + "iniswaps.ini"; } ao_app->write_to_file(swaplist.join("\n"), p_path); @@ -4626,13 +5084,16 @@ void Courtroom::on_iniswap_dropdown_changed(int p_index) ui_iniswap_dropdown->setCurrentIndex(p_index); ui_iniswap_dropdown->blockSignals(false); update_character(m_cid, iniswap, true); - QString icon_path = ao_app->get_image_suffix(ao_app->get_character_path( - iniswap, "char_icon")); + 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 + { ui_iniswap_remove->hide(); + } } void Courtroom::on_iniswap_context_menu_requested(const QPoint &pos) @@ -4641,33 +5102,33 @@ void Courtroom::on_iniswap_context_menu_requested(const QPoint &pos) menu->setAttribute(Qt::WA_DeleteOnClose); menu->addSeparator(); - if (file_exists(ao_app->get_real_path( - ao_app->get_character_path(current_char, "char.ini")))) - menu->addAction(QString("Edit " + current_char + "/char.ini"), this, - &Courtroom::on_iniswap_edit_requested); - if (ui_iniswap_dropdown->itemText(ui_iniswap_dropdown->currentIndex()) != - char_list.at(m_cid).name) - menu->addAction(QString("Remove " + current_char), this, - &Courtroom::on_iniswap_remove_clicked); + if (file_exists(ao_app->get_real_path(ao_app->get_character_path(current_char, "char.ini")))) + { + menu->addAction(QString("Edit " + current_char + "/char.ini"), this, &Courtroom::on_iniswap_edit_requested); + } + if (ui_iniswap_dropdown->itemText(ui_iniswap_dropdown->currentIndex()) != char_list.at(m_cid).name) + { + menu->addAction(QString("Remove " + current_char), this, &Courtroom::on_iniswap_remove_clicked); + } menu->addSeparator(); - menu->addAction(QString("Open character folder " + current_char), this, - [=] { + menu->addAction(QString("Open character folder " + current_char), this, [=] { QString p_path = ao_app->get_real_path(VPath("characters/" + current_char + "/")); - if (!dir_exists(p_path)) { + if (!dir_exists(p_path)) + { return; } QDesktopServices::openUrl(QUrl::fromLocalFile(p_path)); - } - ); + }); menu->popup(ui_iniswap_dropdown->mapToGlobal(pos)); } void Courtroom::on_iniswap_edit_requested() { QString p_path = ao_app->get_real_path(ao_app->get_character_path(current_char, "char.ini")); - if (!file_exists(p_path)) { + if (!file_exists(p_path)) + { return; } QDesktopServices::openUrl(QUrl::fromLocalFile(p_path)); @@ -4675,14 +5136,16 @@ void Courtroom::on_iniswap_edit_requested() void Courtroom::on_iniswap_remove_clicked() { - if (ui_iniswap_dropdown->count() <= 0) { + if (ui_iniswap_dropdown->count() <= 0) + { ui_iniswap_remove->hide(); // We're not supposed to see it. Do this or the // client will crash return; } QStringList defswaplist = ao_app->get_list_file(ao_app->get_character_path(char_list.at(m_cid).name, "iniswaps.ini")); QString iniswap = ui_iniswap_dropdown->itemText(ui_iniswap_dropdown->currentIndex()); - if (iniswap != char_list.at(m_cid).name && !defswaplist.contains(iniswap)) { + if (iniswap != char_list.at(m_cid).name && !defswaplist.contains(iniswap)) + { ui_iniswap_dropdown->removeItem(ui_iniswap_dropdown->currentIndex()); } on_iniswap_dropdown_changed(0); // Reset back to original @@ -4693,29 +5156,31 @@ void Courtroom::set_sfx_dropdown() { ui_sfx_dropdown->blockSignals(true); ui_sfx_dropdown->clear(); - if (m_cid == -1) { + if (m_cid == -1) + { ui_sfx_dropdown->hide(); ui_sfx_remove->hide(); return; } // Initialzie character sound list first. Will be empty if not found. - sound_list = ao_app->get_list_file( - ao_app->get_character_path(current_char, "soundlist.ini")); + sound_list = ao_app->get_list_file(ao_app->get_character_path(current_char, "soundlist.ini")); // If AO2 sound list is empty, try to find the DRO one. - if (sound_list.isEmpty()) { - sound_list = ao_app->get_list_file( - ao_app->get_character_path(current_char, "sounds.ini")); + if (sound_list.isEmpty()) + { + sound_list = ao_app->get_list_file(ao_app->get_character_path(current_char, "sounds.ini")); } // Append default sound list after the character sound list. sound_list += ao_app->get_list_file(VPath("soundlist.ini")); QStringList display_sounds; - for (const QString &sound : qAsConst(sound_list)) { + for (const QString &sound : qAsConst(sound_list)) + { QStringList unpacked = sound.split("="); QString display = unpacked[0].trimmed(); - if (unpacked.size() > 1) { + if (unpacked.size() > 1) + { display = unpacked[1].trimmed(); } @@ -4735,8 +5200,9 @@ void Courtroom::on_sfx_dropdown_changed(int p_index) { custom_sfx = ""; ui_ic_chat_message->setFocus(); - if (p_index == 0) { - ui_sfx_remove->hide(); + if (p_index == 0) + { + ui_sfx_remove->hide(); } } @@ -4753,29 +5219,32 @@ void Courtroom::on_sfx_context_menu_requested(const QPoint &pos) menu->setAttribute(Qt::WA_DeleteOnClose); menu->addSeparator(); // SFX is not "Nothing" or "Default"? - if (get_char_sfx() != "0" && get_char_sfx() != "1" && get_char_sfx() != "-") { + if (get_char_sfx() != "0" && get_char_sfx() != "1" && get_char_sfx() != "-") + { // Add an option to play the SFX - menu->addAction(QString("Play " + get_char_sfx()), this, &Courtroom::on_sfx_play_clicked);; + menu->addAction(QString("Play " + get_char_sfx()), this, &Courtroom::on_sfx_play_clicked); + } + if (file_exists(ao_app->get_real_path(ao_app->get_character_path(current_char, "soundlist.ini")))) + { + menu->addAction(QString("Edit " + current_char + "/soundlist.ini"), this, &Courtroom::on_sfx_edit_requested); } - if (file_exists(ao_app->get_real_path( - ao_app->get_character_path(current_char, "soundlist.ini")))) - menu->addAction(QString("Edit " + current_char + "/soundlist.ini"), this, - &Courtroom::on_sfx_edit_requested); else - menu->addAction(QString("Edit base soundlist.ini"), this, - &Courtroom::on_sfx_edit_requested); + { + menu->addAction(QString("Edit base soundlist.ini"), this, &Courtroom::on_sfx_edit_requested); + } if (!custom_sfx.isEmpty()) + { menu->addAction(QString("Clear Edit Text"), this, &Courtroom::on_sfx_remove_clicked); + } menu->addSeparator(); - menu->addAction(QString("Open base sounds folder"), this, - [=] { + menu->addAction(QString("Open base sounds folder"), this, [=] { QString p_path = get_base_path() + "sounds/general/"; - if (!dir_exists(p_path)) { + if (!dir_exists(p_path)) + { return; } QDesktopServices::openUrl(QUrl::fromLocalFile(p_path)); - } - ); + }); menu->popup(ui_sfx_dropdown->mapToGlobal(pos)); } @@ -4787,15 +5256,18 @@ void Courtroom::on_sfx_play_clicked() void Courtroom::on_sfx_edit_requested() { QString p_path = ao_app->get_real_path(ao_app->get_character_path(current_char, "soundlist.ini")); - if (!file_exists(p_path)) { + if (!file_exists(p_path)) + { p_path = ao_app->get_real_path(ao_app->get_character_path(current_char, "sounds.ini")); } - if (!file_exists(p_path)) { + if (!file_exists(p_path)) + { p_path = ao_app->get_real_path(VPath("soundlist.ini")); } - if (!file_exists(p_path)) { + if (!file_exists(p_path)) + { p_path = get_base_path() + "soundlist.ini"; } QDesktopServices::openUrl(QUrl::fromLocalFile(p_path)); @@ -4812,14 +5284,16 @@ void Courtroom::set_effects_dropdown() { ui_effects_dropdown->blockSignals(true); ui_effects_dropdown->clear(); - if (m_cid == -1) { + if (m_cid == -1) + { ui_effects_dropdown->hide(); return; } QStringList effectslist; effectslist.append(ao_app->get_effects(current_char)); - if (effectslist.empty()) { + if (effectslist.empty()) + { ui_effects_dropdown->hide(); return; } @@ -4830,7 +5304,8 @@ void Courtroom::set_effects_dropdown() ui_effects_dropdown->addItems(effectslist); // Make the icons - for (int i = 0; i < ui_effects_dropdown->count(); ++i) { + for (int i = 0; i < ui_effects_dropdown->count(); ++i) + { QString iconpath = ao_app->get_effect("icons/" + ui_effects_dropdown->itemText(i), current_char, ""); ui_effects_dropdown->setItemIcon(i, QIcon(iconpath)); } @@ -4842,24 +5317,23 @@ void Courtroom::set_effects_dropdown() void Courtroom::on_effects_context_menu_requested(const QPoint &pos) { QMenu *menu = new QMenu(this); - menu->setAttribute(Qt::WA_DeleteOnClose); + if (!ao_app->read_char_ini(current_char, "effects", "Options").isEmpty()) - menu->addAction( - QString("Open misc/" + - ao_app->read_char_ini(current_char, "effects", "Options") + - " folder"), - this, &Courtroom::on_character_effects_edit_requested); - menu->addAction(QString("Open theme's effects folder"), this, - &Courtroom::on_effects_edit_requested); + { + menu->addAction(QString("Open misc/" + ao_app->read_char_ini(current_char, "effects", "Options") + " folder"), this, &Courtroom::on_character_effects_edit_requested); + } + menu->addAction(QString("Open theme's effects folder"), this, &Courtroom::on_effects_edit_requested); menu->popup(ui_effects_dropdown->mapToGlobal(pos)); } void Courtroom::on_effects_edit_requested() { QString p_path = ao_app->get_real_path(ao_app->get_theme_path("effects/")); - if (!dir_exists(p_path)) { + if (!dir_exists(p_path)) + { p_path = ao_app->get_real_path(ao_app->get_theme_path("effects/", "default")); - if (!dir_exists(p_path)) { + if (!dir_exists(p_path)) + { return; } } @@ -4870,7 +5344,9 @@ void Courtroom::on_character_effects_edit_requested() QString p_effect = ao_app->read_char_ini(current_char, "effects", "Options"); QString p_path = ao_app->get_real_path(VPath("misc/" + p_effect + "/")); if (!dir_exists(p_path)) + { return; + } QDesktopServices::openUrl(QUrl::fromLocalFile(p_path)); } @@ -4883,9 +5359,11 @@ void Courtroom::on_effects_dropdown_changed(int p_index) bool Courtroom::effects_dropdown_find_and_set(QString effect) { - for (int i = 0; i < ui_effects_dropdown->count(); ++i) { + for (int i = 0; i < ui_effects_dropdown->count(); ++i) + { QString entry = ui_effects_dropdown->itemText(i); - if (entry == effect) { + if (entry == effect) + { ui_effects_dropdown->setCurrentIndex(i); return true; } @@ -4896,17 +5374,23 @@ bool Courtroom::effects_dropdown_find_and_set(QString effect) QString Courtroom::get_char_sfx() { if (!custom_sfx.isEmpty()) + { return custom_sfx; + } int index = ui_sfx_dropdown->currentIndex(); - if (index == 0) { // Default + if (index == 0) + { // Default return ao_app->get_sfx_name(current_char, current_emote); } - if (index == 1) { // Nothing + if (index == 1) + { // Nothing return "1"; } - QString sfx = sound_list[index-2].split("=")[0].trimmed(); + QString sfx = sound_list[index - 2].split("=")[0].trimmed(); if (sfx == "") + { return "1"; + } return sfx; } @@ -4922,27 +5406,37 @@ void Courtroom::on_mute_list_clicked(QModelIndex p_index) QString real_char; if (f_char.endsWith(" [x]")) + { real_char = f_char.left(f_char.size() - 4); + } else + { real_char = f_char; + } int f_cid = -1; - for (int n_char = 0; n_char < char_list.size(); n_char++) { + for (int n_char = 0; n_char < char_list.size(); n_char++) + { if (char_list.at(n_char).name == real_char) + { f_cid = n_char; + } } - if (f_cid < 0 || f_cid >= char_list.size()) { + if (f_cid < 0 || f_cid >= char_list.size()) + { qWarning() << "" << real_char << " not present in char_list"; return; } - if (mute_map.value(f_cid)) { + if (mute_map.value(f_cid)) + { mute_map.insert(f_cid, false); f_item->setText(real_char); } - else { + else + { mute_map.insert(f_cid, true); f_item->setText(real_char + " [x]"); } @@ -4955,19 +5449,25 @@ void Courtroom::on_pair_list_clicked(QModelIndex p_index) QString real_char; int f_cid = -1; - if (f_char.endsWith(" [x]")) { + if (f_char.endsWith(" [x]")) + { real_char = f_char.left(f_char.size() - 4); f_item->setText(real_char); } - else { + else + { real_char = f_char; - for (int n_char = 0; n_char < char_list.size(); n_char++) { + for (int n_char = 0; n_char < char_list.size(); n_char++) + { if (char_list.at(n_char).name == real_char) + { f_cid = n_char; + } } } - if (f_cid < -2 || f_cid >= char_list.size()) { + if (f_cid < -2 || f_cid >= char_list.size()) + { qWarning() << "" << real_char << " not present in char_list"; return; } @@ -4978,79 +5478,84 @@ void Courtroom::on_pair_list_clicked(QModelIndex p_index) QStringList sorted_pair_list; for (const char_type &i_char : qAsConst(char_list)) + { sorted_pair_list.append(i_char.name); + } sorted_pair_list.sort(); - for (int i = 0; i < ui_pair_list->count(); i++) { + for (int i = 0; i < ui_pair_list->count(); i++) + { ui_pair_list->item(i)->setText(sorted_pair_list.at(i)); } - if (other_charid != -1) { + if (other_charid != -1) + { f_item->setText(real_char + " [x]"); } } -void Courtroom::on_music_list_double_clicked(QTreeWidgetItem *p_item, - int column) +void Courtroom::on_music_list_double_clicked(QTreeWidgetItem *p_item, int column) { if (is_muted) + { return; + } if (!Options::getInstance().stopMusicOnCategoryEnabled() && p_item->parent() == nullptr) + { return; + } column = 1; // Column 1 is always the metadata (which we want) QString p_song = p_item->text(column); QStringList packet_contents; packet_contents.append(p_song); packet_contents.append(QString::number(m_cid)); - if ((!ui_ic_chat_name->text().isEmpty() && ao_app->cccc_ic_supported) || - ao_app->effects_supported) + if ((!ui_ic_chat_name->text().isEmpty() && ao_app->cccc_ic_supported) || ao_app->effects_supported) + { packet_contents.append(ui_ic_chat_name->text()); + } if (ao_app->effects_supported) + { packet_contents.append(QString::number(music_flags)); - ao_app->send_server_packet(new AOPacket("MC", packet_contents)); + } + ao_app->send_server_packet(AOPacket("MC", packet_contents)); } void Courtroom::on_music_list_context_menu_requested(const QPoint &pos) { QMenu *menu = new QMenu(this); menu->setAttribute(Qt::WA_DeleteOnClose); + menu->addAction(QString(tr("Stop Current Song")), this, &Courtroom::music_stop); menu->addAction(QString(tr("Play Random Song")), this, &Courtroom::music_random); menu->addSeparator(); - menu->addAction(QString(tr("Expand All Categories")), this, - &Courtroom::music_list_expand_all); - menu->addAction(QString(tr("Collapse All Categories")), this, - &Courtroom::music_list_collapse_all); + menu->addAction(QString(tr("Expand All Categories")), this, &Courtroom::music_list_expand_all); + menu->addAction(QString(tr("Collapse All Categories")), this, &Courtroom::music_list_collapse_all); menu->addSeparator(); menu->addAction(new QAction(tr("Fade Out Previous"), this)); menu->actions().back()->setCheckable(true); menu->actions().back()->setChecked(music_flags & FADE_OUT); - connect(menu->actions().back(), &QAction::toggled, this, - &Courtroom::music_fade_out); + connect(menu->actions().back(), &QAction::toggled, this, &Courtroom::music_fade_out); menu->addAction(new QAction(tr("Fade In"), this)); menu->actions().back()->setCheckable(true); menu->actions().back()->setChecked(music_flags & FADE_IN); - connect(menu->actions().back(), &QAction::toggled, this, - &Courtroom::music_fade_in); + connect(menu->actions().back(), &QAction::toggled, this, &Courtroom::music_fade_in); menu->addAction(new QAction(tr("Synchronize"), this)); menu->actions().back()->setCheckable(true); menu->actions().back()->setChecked(music_flags & SYNC_POS); - connect(menu->actions().back(), &QAction::toggled, this, - &Courtroom::music_synchronize); + connect(menu->actions().back(), &QAction::toggled, this, &Courtroom::music_synchronize); menu->addSeparator(); - menu->addAction(QString("Open base music folder"), this, - [=] { + menu->addAction(QString("Open base music folder"), this, [=] { QString p_path = get_base_path() + "sounds/music/"; - if (!dir_exists(p_path)) { + if (!dir_exists(p_path)) + { return; } QDesktopServices::openUrl(QUrl::fromLocalFile(p_path)); - } - ); + }); menu->popup(ui_music_list->mapToGlobal(pos)); } @@ -5058,41 +5563,55 @@ void Courtroom::on_music_list_context_menu_requested(const QPoint &pos) void Courtroom::music_fade_out(bool toggle) { if (toggle) + { music_flags |= FADE_OUT; + } else + { music_flags &= ~FADE_OUT; + } } void Courtroom::music_fade_in(bool toggle) { if (toggle) + { music_flags |= FADE_IN; + } else + { music_flags &= ~FADE_IN; + } } void Courtroom::music_synchronize(bool toggle) { if (toggle) + { music_flags |= SYNC_POS; + } else + { music_flags &= ~SYNC_POS; + } } void Courtroom::music_random() { QList<QTreeWidgetItem *> clist; - QTreeWidgetItemIterator it(ui_music_list, - QTreeWidgetItemIterator::NotHidden | - QTreeWidgetItemIterator::NoChildren); - while (*it) { - if (!(*it)->parent() || (*it)->parent()->isExpanded()) { // add top level songs and songs in expanded categories + QTreeWidgetItemIterator it(ui_music_list, QTreeWidgetItemIterator::NotHidden | QTreeWidgetItemIterator::NoChildren); + while (*it) + { + if (!(*it)->parent() || (*it)->parent()->isExpanded()) + { // add top level songs and songs in expanded categories clist += (*it); } ++it; } if (clist.length() == 0) - return; + { + return; + } #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) on_music_list_double_clicked(clist.at(qrand() % clist.length()), 1); #else @@ -5100,69 +5619,86 @@ void Courtroom::music_random() #endif } -void Courtroom::music_list_expand_all() { ui_music_list->expandAll(); } +void Courtroom::music_list_expand_all() +{ + ui_music_list->expandAll(); +} void Courtroom::music_list_collapse_all() { ui_music_list->collapseAll(); QTreeWidgetItem *current = ui_music_list->selectedItems()[0]; if (current->parent() != nullptr) + { current = current->parent(); + } ui_music_list->setCurrentItem(current); } void Courtroom::music_stop(bool no_effects) { if (is_muted) + { return; + } // Default fake song is a song present in Vanilla content, the ~stop.mp3 QString fake_song = "~stop.mp3"; // If the fake song is not present in the music list - if (!music_list.contains(fake_song)) { - // Loop through our music list - for (const QString &song : qAsConst(music_list)) { - // Pick first song that does not contain a file extension - if (!song.contains('.')) { - // Use it as a fake song as the server we're working with must recognize song categories - fake_song = song; - break; - } + if (!music_list.contains(fake_song)) + { + // Loop through our music list + for (const QString &song : qAsConst(music_list)) + { + // Pick first song that does not contain a file extension + if (!song.contains('.')) + { + // Use it as a fake song as the server we're working with must recognize song categories + fake_song = song; + break; } + } } - QStringList packet_contents; // its music list - packet_contents.append( - fake_song); // this is our fake song, playing it triggers special code + QStringList packet_contents; // its music list + packet_contents.append(fake_song); // this is our fake song, playing it triggers special code packet_contents.append(QString::number(m_cid)); - if ((!ui_ic_chat_name->text().isEmpty() && ao_app->cccc_ic_supported) || - ao_app->effects_supported) + if ((!ui_ic_chat_name->text().isEmpty() && ao_app->cccc_ic_supported) || ao_app->effects_supported) + { packet_contents.append(ui_ic_chat_name->text()); - if (ao_app->effects_supported) { + } + if (ao_app->effects_supported) + { if (no_effects) + { packet_contents.append("0"); + } else + { packet_contents.append(QString::number(music_flags)); + } } - ao_app->send_server_packet(new AOPacket("MC", packet_contents)); + ao_app->send_server_packet(AOPacket("MC", packet_contents)); } void Courtroom::on_area_list_double_clicked(QTreeWidgetItem *p_item, int column) { - column = 0; // The metadata + column = 0; // The metadata Q_UNUSED(column); // so gcc shuts up QString p_area = p_item->text(0); QStringList packet_contents; packet_contents.append(p_area); packet_contents.append(QString::number(m_cid)); - ao_app->send_server_packet(new AOPacket("MC", packet_contents)); + ao_app->send_server_packet(AOPacket("MC", packet_contents)); } void Courtroom::on_hold_it_clicked() { - if (objection_state == 1) { + if (objection_state == 1) + { ui_hold_it->set_image("holdit"); objection_state = 0; } - else { + else + { ui_objection->set_image("objection"); ui_take_that->set_image("takethat"); ui_custom_objection->set_image("custom"); @@ -5176,11 +5712,13 @@ void Courtroom::on_hold_it_clicked() void Courtroom::on_objection_clicked() { - if (objection_state == 2) { + if (objection_state == 2) + { ui_objection->set_image("objection"); objection_state = 0; } - else { + else + { ui_hold_it->set_image("holdit"); ui_take_that->set_image("takethat"); ui_custom_objection->set_image("custom"); @@ -5194,11 +5732,13 @@ void Courtroom::on_objection_clicked() void Courtroom::on_take_that_clicked() { - if (objection_state == 3) { + if (objection_state == 3) + { ui_take_that->set_image("takethat"); objection_state = 0; } - else { + else + { ui_objection->set_image("objection"); ui_hold_it->set_image("holdit"); ui_custom_objection->set_image("custom"); @@ -5212,11 +5752,13 @@ void Courtroom::on_take_that_clicked() void Courtroom::on_custom_objection_clicked() { - if (objection_state == 4) { + if (objection_state == 4) + { ui_custom_objection->set_image("custom"); objection_state = 0; } - else { + else + { ui_objection->set_image("objection"); ui_take_that->set_image("takethat"); ui_hold_it->set_image("holdit"); @@ -5232,16 +5774,22 @@ void Courtroom::show_custom_objection_menu(const QPoint &pos) { QPoint globalPos = ui_custom_objection->mapToGlobal(pos); QAction *selecteditem = custom_obj_menu->exec(globalPos); - if (selecteditem) { + if (selecteditem) + { ui_objection->set_image("objection"); ui_take_that->set_image("takethat"); ui_hold_it->set_image("holdit"); ui_custom_objection->set_image("custom_selected"); if (selecteditem->text() == ao_app->read_char_ini(current_char, "custom_name", "Shouts") || selecteditem->text() == "Default") + { objection_custom = ""; - else { - foreach (CustomObjection custom_objection, custom_objections_list) { - if (custom_objection.name == selecteditem->text()) { + } + else + { + foreach (CustomObjection custom_objection, custom_objections_list) + { + if (custom_objection.name == selecteditem->text()) + { objection_custom = custom_objection.filename; break; } @@ -5254,14 +5802,18 @@ void Courtroom::show_custom_objection_menu(const QPoint &pos) void Courtroom::on_realization_clicked() { - if (realization_state == 0) { + if (realization_state == 0) + { realization_state = 1; if (effects_dropdown_find_and_set("realization")) + { on_effects_dropdown_changed(ui_effects_dropdown->currentIndex()); + } ui_realization->set_image("realization_pressed"); } - else { + else + { realization_state = 0; ui_effects_dropdown->setCurrentIndex(0); on_effects_dropdown_changed(ui_effects_dropdown->currentIndex()); @@ -5273,11 +5825,13 @@ void Courtroom::on_realization_clicked() void Courtroom::on_screenshake_clicked() { - if (screenshake_state == 0) { + if (screenshake_state == 0) + { screenshake_state = 1; ui_screenshake->set_image("screenshake_pressed"); } - else { + else + { screenshake_state = 0; ui_screenshake->set_image("screenshake"); } @@ -5287,7 +5841,8 @@ void Courtroom::on_screenshake_clicked() void Courtroom::on_mute_clicked() { - if (ui_mute_list->isHidden()) { + if (ui_mute_list->isHidden()) + { ui_mute_list->show(); ui_pair_list->hide(); ui_pair_offset_spinbox->hide(); @@ -5296,7 +5851,8 @@ void Courtroom::on_mute_clicked() ui_pair_button->set_image("pair_button"); ui_mute->set_image("mute_pressed"); } - else { + else + { ui_mute_list->hide(); ui_mute->set_image("mute"); } @@ -5304,17 +5860,21 @@ void Courtroom::on_mute_clicked() void Courtroom::on_pair_clicked() { - if (ui_pair_list->isHidden()) { + if (ui_pair_list->isHidden()) + { ui_pair_list->show(); ui_pair_offset_spinbox->show(); - if(ao_app->y_offset_supported) - ui_pair_vert_offset_spinbox->show(); + if (ao_app->y_offset_supported) + { + ui_pair_vert_offset_spinbox->show(); + } ui_pair_order_dropdown->show(); ui_mute_list->hide(); ui_mute->set_image("mute"); ui_pair_button->set_image("pair_button_pressed"); } - else { + else + { ui_pair_list->hide(); ui_pair_offset_spinbox->hide(); ui_pair_vert_offset_spinbox->hide(); @@ -5333,8 +5893,9 @@ void Courtroom::on_defense_minus_clicked() int f_state = defense_bar_state - 1; if (f_state >= 0) - ao_app->send_server_packet( - new AOPacket("HP", {"1", QString::number(f_state)})); + { + ao_app->send_server_packet(AOPacket("HP", {"1", QString::number(f_state)})); + } } void Courtroom::on_defense_plus_clicked() @@ -5342,8 +5903,9 @@ void Courtroom::on_defense_plus_clicked() int f_state = defense_bar_state + 1; if (f_state <= 10) - ao_app->send_server_packet( - new AOPacket("HP", {"1", QString::number(f_state)})); + { + ao_app->send_server_packet(AOPacket("HP", {"1", QString::number(f_state)})); + } } void Courtroom::on_prosecution_minus_clicked() @@ -5351,8 +5913,9 @@ void Courtroom::on_prosecution_minus_clicked() int f_state = prosecution_bar_state - 1; if (f_state >= 0) - ao_app->send_server_packet( - new AOPacket("HP", {"2", QString::number(f_state)})); + { + ao_app->send_server_packet(AOPacket("HP", {"2", QString::number(f_state)})); + } } void Courtroom::on_prosecution_plus_clicked() @@ -5360,23 +5923,24 @@ void Courtroom::on_prosecution_plus_clicked() int f_state = prosecution_bar_state + 1; if (f_state <= 10) - ao_app->send_server_packet( - new AOPacket("HP", {"2", QString::number(f_state)})); + { + ao_app->send_server_packet(AOPacket("HP", {"2", QString::number(f_state)})); + } } void Courtroom::on_text_color_context_menu_requested(const QPoint &pos) { QMenu *menu = new QMenu(this); + menu->setAttribute(Qt::WA_DeleteOnClose); - menu->addAction(QString("Open currently used chat_config.ini"), this, - [=] { + menu->addAction(QString("Open currently used chat_config.ini"), this, [=] { QString p_path = ao_app->get_asset("chat_config.ini", Options::getInstance().theme(), Options::getInstance().subTheme(), ao_app->default_theme, ao_app->get_chat(current_char)); - if (!file_exists(p_path)) { - return; + if (!file_exists(p_path)) + { + return; } QDesktopServices::openUrl(QUrl::fromLocalFile(p_path)); - } - ); + }); menu->popup(ui_text_color->mapToGlobal(pos)); } @@ -5396,27 +5960,22 @@ 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 - for (int c = 0; c < max_colors; ++c) { - QColor color = - ao_app->get_chat_color("c" + QString::number(c), ao_app->get_chat(current_char)); + for (int c = 0; c < max_colors; ++c) + { + QColor color = ao_app->get_chat_color("c" + QString::number(c), ao_app->get_chat(current_char)); color_rgb_list.append(color); - color_markdown_start_list.append(ao_app->get_chat_markup( - "c" + QString::number(c) + "_start", ao_app->get_chat(current_char))); - color_markdown_end_list.append(ao_app->get_chat_markup( - "c" + QString::number(c) + "_end", ao_app->get_chat(current_char))); - color_markdown_remove_list.append( - ao_app->get_chat_markup("c" + QString::number(c) + "_remove", - ao_app->get_chat(current_char)) == "1"); - color_markdown_talking_list.append( - ao_app->get_chat_markup("c" + QString::number(c) + "_talking", - ao_app->get_chat(current_char)) != "0"); - - QString color_name = ao_app->get_chat_markup( - "c" + QString::number(c) + "_name", ao_app->get_chat(current_char)); + color_markdown_start_list.append(ao_app->get_chat_markup("c" + QString::number(c) + "_start", ao_app->get_chat(current_char))); + color_markdown_end_list.append(ao_app->get_chat_markup("c" + QString::number(c) + "_end", ao_app->get_chat(current_char))); + color_markdown_remove_list.append(ao_app->get_chat_markup("c" + QString::number(c) + "_remove", ao_app->get_chat(current_char)) == "1"); + color_markdown_talking_list.append(ao_app->get_chat_markup("c" + QString::number(c) + "_talking", ao_app->get_chat(current_char)) != "0"); + + QString color_name = ao_app->get_chat_markup("c" + QString::number(c) + "_name", ao_app->get_chat(current_char)); if (color_name.isEmpty()) // Not defined { if (c > 0) + { continue; + } color_name = tr("Default"); } ui_text_color->addItem(color_name); @@ -5425,15 +5984,18 @@ void Courtroom::set_text_color_dropdown() ui_text_color->setItemIcon(ui_text_color->count() - 1, pixmap); color_row_to_number.append(c); } - for (int c = 0; c < max_colors; ++c) { + for (int c = 0; c < max_colors; ++c) + { QColor color = ao_app->get_chat_color("c" + QString::number(c), ""); default_color_rgb_list.append(color); } } -void Courtroom::gen_char_rgb_list(QString p_misc) { +void Courtroom::gen_char_rgb_list(QString p_misc) +{ char_color_rgb_list.clear(); - for (int c = 0; c < max_colors; ++c) { + for (int c = 0; c < max_colors; ++c) + { QColor color = ao_app->get_chat_color("c" + QString::number(c), p_misc); char_color_rgb_list.append(color); } @@ -5445,14 +6007,17 @@ void Courtroom::on_text_color_changed(int p_color) { int c = color_row_to_number.at(p_color); QString markdown_start = color_markdown_start_list.at(c); - if (markdown_start.isEmpty()) { + if (markdown_start.isEmpty()) + { qWarning() << "Color list dropdown selected a non-existent markdown " - "start character"; + "start character"; return; } QString markdown_end = color_markdown_end_list.at(c); if (markdown_end.isEmpty()) + { markdown_end = markdown_start; + } int start = ui_ic_chat_message->selectionStart(); #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) int end = ui_ic_chat_message->selectionEnd() + 1; @@ -5467,11 +6032,16 @@ void Courtroom::on_text_color_changed(int p_color) // ui_ic_chat_message->end(false); ui_text_color->setCurrentIndex(0); } - else { + else + { if (p_color != -1 && p_color < color_row_to_number.size()) + { text_color = color_row_to_number.at(p_color); + } else + { text_color = 0; + } } ui_ic_chat_message->setFocus(); } @@ -5486,7 +6056,8 @@ void Courtroom::on_sfx_slider_moved(int p_value) { sfx_player->set_volume(p_value); // Set the ambience and other misc. music layers - for (int i = 1; i < music_player->m_channelmax; ++i) { + for (int i = 1; i < music_player->CHANNEL_COUNT; ++i) + { music_player->set_volume(p_value, i); } objection_player->set_volume(p_value); @@ -5499,9 +6070,15 @@ void Courtroom::on_blip_slider_moved(int p_value) ui_ic_chat_message->setFocus(); } -void Courtroom::on_log_limit_changed(int value) { log_maximum_blocks = value; } +void Courtroom::on_log_limit_changed(int value) +{ + log_maximum_blocks = value; +} -void Courtroom::on_pair_offset_changed(int value) { char_offset = value; } +void Courtroom::on_pair_offset_changed(int value) +{ + char_offset = value; +} void Courtroom::on_pair_vert_offset_changed(int value) { @@ -5511,9 +6088,11 @@ void Courtroom::on_pair_vert_offset_changed(int value) void Courtroom::on_witness_testimony_clicked() { if (is_muted) + { return; + } - ao_app->send_server_packet(new AOPacket("RT", {"testimony1"})); + ao_app->send_server_packet(AOPacket("RT", {"testimony1"})); ui_ic_chat_message->setFocus(); } @@ -5521,9 +6100,11 @@ void Courtroom::on_witness_testimony_clicked() void Courtroom::on_cross_examination_clicked() { if (is_muted) + { return; + } - ao_app->send_server_packet(new AOPacket("RT", {"testimony2"})); + ao_app->send_server_packet(AOPacket("RT", {"testimony2"})); ui_ic_chat_message->setFocus(); } @@ -5531,9 +6112,11 @@ void Courtroom::on_cross_examination_clicked() void Courtroom::on_not_guilty_clicked() { if (is_muted) + { return; + } - ao_app->send_server_packet(new AOPacket("RT", {"judgeruling", "0"})); + ao_app->send_server_packet(AOPacket("RT", {"judgeruling", "0"})); ui_ic_chat_message->setFocus(); } @@ -5541,9 +6124,11 @@ void Courtroom::on_not_guilty_clicked() void Courtroom::on_guilty_clicked() { if (is_muted) + { return; + } - ao_app->send_server_packet(new AOPacket("RT", {"judgeruling", "1"})); + ao_app->send_server_packet(AOPacket("RT", {"judgeruling", "1"})); ui_ic_chat_message->setFocus(); } @@ -5588,11 +6173,15 @@ void Courtroom::on_char_select_right_clicked() set_char_select_page(); } -void Courtroom::on_spectator_clicked() { char_clicked(-1); } +void Courtroom::on_spectator_clicked() +{ + char_clicked(-1); +} void Courtroom::on_call_mod_clicked() { - if (ao_app->modcall_reason_supported) { + if (ao_app->modcall_reason_supported) + { QMessageBox errorBox; QInputDialog input; @@ -5602,14 +6191,18 @@ void Courtroom::on_call_mod_clicked() auto code = input.exec(); if (code != QDialog::Accepted) + { return; + } QString text = input.textValue(); - if (text.isEmpty()) { + if (text.isEmpty()) + { errorBox.critical(nullptr, tr("Error"), tr("You must provide a reason.")); return; } - else if (text.length() > 256) { + else if (text.length() > 256) + { errorBox.critical(nullptr, tr("Error"), tr("The message is too long.")); return; } @@ -5617,24 +6210,35 @@ void Courtroom::on_call_mod_clicked() QStringList mod_reason; mod_reason.append(text); - ao_app->send_server_packet(new AOPacket("ZZ", mod_reason)); + ao_app->send_server_packet(AOPacket("ZZ", mod_reason)); } - else { - ao_app->send_server_packet(new AOPacket("ZZ")); + else + { + ao_app->send_server_packet(AOPacket("ZZ")); } ui_ic_chat_message->setFocus(); } -void Courtroom::on_settings_clicked() { ao_app->call_settings_menu(); } +void Courtroom::on_settings_clicked() +{ + ao_app->call_settings_menu(); +} -void Courtroom::on_pre_clicked() { ui_ic_chat_message->setFocus(); } +void Courtroom::on_pre_clicked() +{ + ui_ic_chat_message->setFocus(); +} -void Courtroom::on_flip_clicked() { ui_ic_chat_message->setFocus(); } +void Courtroom::on_flip_clicked() +{ + ui_ic_chat_message->setFocus(); +} void Courtroom::on_additive_clicked() { - if (ui_additive->isChecked()) { + if (ui_additive->isChecked()) + { ui_ic_chat_message->home(false); // move cursor to the start of the message ui_ic_chat_message->insert(" "); // preface the message by whitespace ui_ic_chat_message->end(false); // move cursor to the end of the message @@ -5643,7 +6247,10 @@ void Courtroom::on_additive_clicked() ui_ic_chat_message->setFocus(); } -void Courtroom::on_guard_clicked() { ui_ic_chat_message->setFocus(); } +void Courtroom::on_guard_clicked() +{ + ui_ic_chat_message->setFocus(); +} void Courtroom::on_showname_enable_clicked() { @@ -5655,24 +6262,23 @@ void Courtroom::regenerate_ic_chatlog() { ui_ic_chatlog->clear(); last_ic_message = ""; - foreach (chatlogpiece item, ic_chatlog_history) { - QString message = item.get_message(); - QString name = ui_showname_enable->isChecked() ? item.get_showname() - : item.get_name(); - append_ic_text(message, - name, - item.get_action(), item.get_chat_color(), - item.get_selfname(), item.get_datetime().toLocalTime()); + foreach (ChatLogPiece item, ic_chatlog_history) + { + QString message = item.message; + QString name = ui_showname_enable->isChecked() ? item.showname : item.name; + append_ic_text(message, name, item.action, item.color, item.selfname, item.datetime.toLocalTime()); } } void Courtroom::on_evidence_button_clicked() { - if (ui_evidence->isHidden()) { + if (ui_evidence->isHidden()) + { ui_evidence->show(); ui_evidence_overlay->hide(); } - else { + else + { ui_evidence->hide(); } } @@ -5680,61 +6286,55 @@ void Courtroom::on_evidence_button_clicked() void Courtroom::on_evidence_context_menu_requested(const QPoint &pos) { QMenu *menu = new QMenu(this); - menu->addAction(QString("Open base evidence folder"), this, - [=] { + menu->setAttribute(Qt::WA_DeleteOnClose, true); + menu->addAction(QString("Open base evidence folder"), this, [=] { QString p_path = get_base_path() + "evidence/"; - if (!dir_exists(p_path)) { + if (!dir_exists(p_path)) + { return; } QDesktopServices::openUrl(QUrl::fromLocalFile(p_path)); - } - ); + }); menu->popup(ui_evidence_button->mapToGlobal(pos)); } void Courtroom::on_switch_area_music_clicked() { - if (ui_area_list->isHidden()) { + if (ui_area_list->isHidden()) + { ui_area_list->show(); ui_music_list->hide(); last_music_search = ui_music_search->text(); ui_music_search->setText(last_area_search); } - else { + else + { ui_area_list->hide(); ui_music_list->show(); last_area_search = ui_music_search->text(); ui_music_search->setText(last_music_search); } on_music_search_edited(ui_music_search->text()); - } void Courtroom::ping_server() { ping_timer.start(); is_pinging = true; - ao_app->send_server_packet( - new AOPacket("CH", {QString::number(m_cid)})); + ao_app->send_server_packet(AOPacket("CH", {QString::number(m_cid)})); } qint64 Courtroom::pong() { if (!is_pinging) + { return -1; + } is_pinging = false; return ping_timer.elapsed(); } -void Courtroom::start_clock(int id) -{ - if (id >= 0 && id < max_clocks && ui_clock[id] != nullptr) - { - ui_clock[id]->start(); - } -} - void Courtroom::start_clock(int id, qint64 msecs) { if (id >= 0 && id < max_clocks && ui_clock[id] != nullptr) @@ -5755,10 +6355,13 @@ void Courtroom::set_clock(int id, qint64 msecs) void Courtroom::skip_clocks(qint64 msecs) { // Loop through all the timers - for (int i = 0; i < max_clocks; i++) { + for (int i = 0; i < max_clocks; i++) + { // Only skip time on active clocks if (ui_clock[i]->active()) + { ui_clock[i]->skip(msecs); + } } } @@ -5789,25 +6392,22 @@ void Courtroom::set_clock_visibility(int id, bool visible) void Courtroom::truncate_label_text(QWidget *p_widget, QString p_identifier) { QString filename = "courtroom_design.ini"; - pos_size_type design_ini_result = - ao_app->get_element_dimensions(p_identifier, filename); + pos_size_type design_ini_result = ao_app->get_element_dimensions(p_identifier, filename); // Get the width of the element as defined by the current theme // Cast to make sure we're working with one of the two supported widget types QLabel *p_label = qobject_cast<QLabel *>(p_widget); QCheckBox *p_checkbox = qobject_cast<QCheckBox *>(p_widget); - if (p_checkbox == nullptr && - p_label == - nullptr) { // i.e. the given p_widget isn't a QLabel or a QCheckBox + if (p_checkbox == nullptr && p_label == nullptr) + { // i.e. the given p_widget isn't a QLabel or a QCheckBox qWarning() << "Tried to truncate an unsupported widget:" << p_identifier; return; } // translate the text for the widget we're working with so we truncate the right string - QString label_text_tr = - QCoreApplication::translate(p_widget->metaObject()->className(), "%1") - .arg((p_label != nullptr ? p_label->text() : p_checkbox->text())); - if (label_text_tr.endsWith("…") || label_text_tr.endsWith("…")) { + QString label_text_tr = QCoreApplication::translate(p_widget->metaObject()->className(), "%1").arg((p_label != nullptr ? p_label->text() : p_checkbox->text())); + if (label_text_tr.endsWith("…") || label_text_tr.endsWith("…")) + { qInfo() << "Truncation aborted for label text" << label_text_tr << ", label text was already truncated!"; return; } @@ -5815,54 +6415,43 @@ void Courtroom::truncate_label_text(QWidget *p_widget, QString p_identifier) int checkbox_width = AOApplication::style()->pixelMetric(QStyle::PM_IndicatorWidth) + AOApplication::style()->pixelMetric(QStyle::PM_CheckBoxLabelSpacing); int label_theme_width = (p_label != nullptr ? design_ini_result.width : (design_ini_result.width - checkbox_width)); - int label_px_width = - p_widget->fontMetrics().boundingRect(label_text_tr).width(); // pixel width of our translated text - if (!p_widget->toolTip().startsWith(label_text_tr)) // don't want to append this multiple times + int label_px_width = p_widget->fontMetrics().boundingRect(label_text_tr).width(); // pixel width of our translated text + if (!p_widget->toolTip().startsWith(label_text_tr)) // don't want to append this multiple times + { p_widget->setToolTip(label_text_tr + "\n" + p_widget->toolTip()); + } // we can't do much with a 0-width widget, and there's no need to truncate if // the theme gives us enough space - if (label_theme_width <= 0 || label_px_width < label_theme_width) { - qDebug().nospace() << "Truncation aborted for label text " << label_text_tr - << ", either theme width <= 0 or label width < theme width."; + if (label_theme_width <= 0 || label_px_width < label_theme_width) + { + qDebug().nospace() << "Truncation aborted for label text " << label_text_tr << ", either theme width <= 0 or label width < theme width."; return; } QString truncated_label = label_text_tr; int truncated_px_width = label_px_width; - while (truncated_px_width > label_theme_width && truncated_label != "…") { + while (truncated_px_width > label_theme_width && truncated_label != "…") + { truncated_label.chop(2); truncated_label.append("…"); - truncated_px_width = - p_widget->fontMetrics().boundingRect(truncated_label).width(); + truncated_px_width = p_widget->fontMetrics().boundingRect(truncated_label).width(); } - if (truncated_label == "…") { + if (truncated_label == "…") + { // Safeguard against edge case where label text is shorter in px than '…', // causing an infinite loop. Additionally, having just an ellipse for a // label looks strange, so we don't set the new label. - qWarning() << "Potential infinite loop prevented: Label text " - << label_text_tr - << "truncated to '…', so truncation was aborted."; + qWarning() << "Potential infinite loop prevented: Label text " << label_text_tr << "truncated to '…', so truncation was aborted."; return; } if (p_label != nullptr) + { p_label->setText(truncated_label); + } else if (p_checkbox != nullptr) + { p_checkbox->setText(truncated_label); - qDebug().nospace() << "Truncated label text from " << label_text_tr << " (" - << label_px_width << "px) to " << truncated_label << " (" - << truncated_px_width << "px)"; -} - -Courtroom::~Courtroom() -{ - //save sound settings - Options::getInstance().setMusicVolume(ui_music_slider->value()); - Options::getInstance().setSfxVolume(ui_sfx_slider->value()); - Options::getInstance().setBlipVolume(ui_blip_slider->value()); - - delete music_player; - delete sfx_player; - delete objection_player; - delete blip_player; + } + qDebug().nospace() << "Truncated label text from " << label_text_tr << " (" << label_px_width << "px) to " << truncated_label << " (" << truncated_px_width << "px)"; } |