From b5f581eb5b336273c3e7976ac8f7c438fe454bb4 Mon Sep 17 00:00:00 2001
From: Crystalwarrior <varsash@gmail.com>
Date: Wed, 17 Feb 2021 15:15:40 +0300
Subject: [PATCH] Revert bad "fix" of the sound names for WTCE
 courtroom_sounds.ini Make pos dropdown ui editable for a custom pos Keep
 track of the custom pos index On switching from the custom pos, remove the
 entry at that index Fix regression causing the "sort by name" lobby server
 list header disappearing Expose column 0 for the # in the lobby server list
 header ("too ugly" just use lobby_stylesheets.css and pretty it up)

---
 include/courtroom.h |  1 +
 src/courtroom.cpp   | 36 ++++++++++++++++++++++++++++++++----
 src/lobby.cpp       |  4 ++--
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/include/courtroom.h b/include/courtroom.h
index 69dd58e..d1395e1 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -581,6 +581,7 @@ private:
 
   QString current_background = "default";
   QString current_side = "";
+  int temp_side_index = -1;
 
   QBrush free_brush;
   QBrush lfp_brush;
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 183bcba..c98d663 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -727,6 +727,7 @@ void Courtroom::set_widgets()
       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->setToolTip(
       tr("Set your character's supplementary background."));
 
@@ -1317,9 +1318,19 @@ void Courtroom::set_side(QString p_side, bool block_signals)
         ui_pos_dropdown->blockSignals(false);
 
       // alright we dun, jobs done here boyos
-      break;
+      return;
     }
   }
+  // We will only get there if we failed the last step
+  if (block_signals)
+    ui_pos_dropdown->blockSignals(true);
+  if (temp_side_index > -1)
+    ui_pos_dropdown->removeItem(temp_side_index);
+  ui_pos_dropdown->addItem(f_side);
+  temp_side_index = ui_pos_dropdown->count()-1;
+  ui_pos_dropdown->setCurrentIndex(temp_side_index);
+  if (block_signals)
+    ui_pos_dropdown->blockSignals(false);
 }
 
 void Courtroom::set_pos_dropdown(QStringList pos_dropdowns)
@@ -1327,8 +1338,14 @@ void Courtroom::set_pos_dropdown(QStringList pos_dropdowns)
   // Block the signals to prevent setCurrentIndex from triggering a pos change
   ui_pos_dropdown->blockSignals(true);
   pos_dropdown_list = pos_dropdowns;
+  temp_side_index = -1;
   ui_pos_dropdown->clear();
   ui_pos_dropdown->addItems(pos_dropdown_list);
+  // Custom pos
+  if (current_side != "" && !pos_dropdown_list.contains(current_side)) {
+    ui_pos_dropdown->addItem(current_side);
+    temp_side_index = ui_pos_dropdown->count() - 1;
+  }
   // Unblock the signals so the element can be used for setting pos again
   ui_pos_dropdown->blockSignals(false);
   set_side(current_side);
@@ -3758,13 +3775,13 @@ void Courtroom::handle_wtce(QString p_wtce, int variant)
       ui_vp_testimony->kill();
       return;
     }
-    sfx_name = ao_app->get_court_sfx("witnesstestimony", bg_misc);
+    sfx_name = ao_app->get_court_sfx("witness_testimony", bg_misc);
     filename = "witnesstestimony";
     ui_vp_testimony->load_image("testimony", "", bg_misc);
   }
   // cross examination
   else if (p_wtce == "testimony2") {
-    sfx_name = ao_app->get_court_sfx("crossexamination", bg_misc);
+    sfx_name = ao_app->get_court_sfx("cross_examination", bg_misc);
     filename = "crossexamination";
     ui_vp_testimony->kill();
   }
@@ -3774,7 +3791,7 @@ void Courtroom::handle_wtce(QString p_wtce, int variant)
     // Verdict?
     if (p_wtce == "judgeruling") {
       if (variant == 0) {
-        sfx_name = ao_app->get_court_sfx("notguilty", bg_misc);
+        sfx_name = ao_app->get_court_sfx("not_guilty", bg_misc);
         filename = "notguilty";
         ui_vp_testimony->kill();
       }
@@ -4282,10 +4299,19 @@ void Courtroom::on_pos_dropdown_changed(int p_index)
   // YEAH SENDING LIKE 20 PACKETS IF THE USER SCROLLS THROUGH, GREAT IDEA
   // how about this instead
   set_side(f_pos);
+  if (temp_side_index > -1 && p_index == temp_side_index) {
+    ui_pos_dropdown->removeItem(temp_side_index);
+    temp_side_index = -1;
+  }
 }
 
 void Courtroom::on_pos_remove_clicked()
 {
+  if (temp_side_index > -1) {
+    ui_pos_dropdown->removeItem(temp_side_index);
+    temp_side_index = -1;
+  }
+
   QString default_side = ao_app->get_char_side(current_char);
 
   for (int i = 0; i < ui_pos_dropdown->count(); ++i) {
@@ -4296,10 +4322,12 @@ void Courtroom::on_pos_remove_clicked()
     }
   }
   int wit_index = ui_pos_dropdown->findText("wit");
+  ui_pos_dropdown->blockSignals(true);
   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();
   ui_ic_chat_message->setFocus();
diff --git a/src/lobby.cpp b/src/lobby.cpp
index 314874e..2397c70 100644
--- a/src/lobby.cpp
+++ b/src/lobby.cpp
@@ -28,8 +28,8 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow()
 
   ui_server_list = new QTreeWidget(this);
   ui_server_list->setHeaderLabels({"#", "Name"}); //, "Players"});
-  ui_server_list->hideColumn(0);
-  ui_server_list->setHeaderHidden(true);
+//  ui_server_list->hideColumn(0);
+//  ui_server_list->setHeaderHidden(true);
 
   ui_server_search = new QLineEdit(this);
   ui_server_search->setFrame(false);