From 26851be53600483a4a35f14d7096ce85a64af97d Mon Sep 17 00:00:00 2001
From: Pyraqq <46277816+Pyraqq@users.noreply.github.com>
Date: Thu, 23 Dec 2021 23:53:26 +0100
Subject: Add version to window title (#613)

Also updated the translation files for missing strings and updated the Polish translation.
---
 src/packet_distribution.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/packet_distribution.cpp')

diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp
index bcbc6671..7d2eafc4 100644
--- a/src/packet_distribution.cpp
+++ b/src/packet_distribution.cpp
@@ -268,7 +268,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
 
     courtroom_loaded = false;
 
-    window_title = tr("Attorney Online 2");
+    window_title = tr("Attorney Online %1").arg(applicationVersion());
     int selected_server = w_lobby->get_selected_server();
 
     QString server_address = "", server_name = "";
-- 
cgit 


From 2eed786c776ba31e464e5929a6a0299a19897192 Mon Sep 17 00:00:00 2001
From: oldmud0 <oldmud0@users.noreply.github.com>
Date: Thu, 23 Dec 2021 17:29:17 -0600
Subject: Split logging option into text and demo

Apparently, people don't like logging demos because it takes up too
much space. It's possible to enable NTFS compression for demo files
(or the entire demos folder), though.
---
 src/packet_distribution.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/packet_distribution.cpp')

diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp
index bcbc6671..066ed63c 100644
--- a/src/packet_distribution.cpp
+++ b/src/packet_distribution.cpp
@@ -107,7 +107,7 @@ end:
 
 void AOApplication::append_to_demofile(QString packet_string)
 {
-    if (get_auto_logging_enabled() && !log_filename.isEmpty())
+    if (get_demo_logging_enabled() && !log_filename.isEmpty())
     {
         QString path = log_filename.left(log_filename.size()).replace(".log", ".demo");
         if (!demo_timer.isValid())
@@ -304,7 +304,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
 
     // Remove any characters not accepted in folder names for the server_name
     // here
-    if (AOApplication::get_auto_logging_enabled() && server_name != "Demo playback") {
+    if (AOApplication::get_demo_logging_enabled() && server_name != "Demo playback") {
       this->log_filename = QDateTime::currentDateTime().toUTC().toString(
           "'logs/" + server_name.remove(QRegExp("[\\\\/:*?\"<>|\']")) +
           "/'yyyy-MM-dd hh-mm-ss t'.log'");
-- 
cgit 


From ecfe6f2542d73e9559b75a502f6eebffe63a76cf Mon Sep 17 00:00:00 2001
From: oldmud0 <oldmud0@users.noreply.github.com>
Date: Sat, 25 Dec 2021 19:17:27 -0600
Subject: Change master chat in courtroom to debug log

Since the MS chat has been disabled for quite some time now (and we aren't planning on bringing it back since Discord, Guilded etc. have better chat features), I decided to go ahead and change the pane into a debug log to keep it useful and avoid creating a gaping hole in themes.

Though, maybe it is worth removing the whole switcher and keeping the debug log hidden away where it can't scare people.
---
 src/packet_distribution.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/packet_distribution.cpp')

diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp
index 15906080..bc7ae826 100644
--- a/src/packet_distribution.cpp
+++ b/src/packet_distribution.cpp
@@ -29,7 +29,7 @@ void AOApplication::ms_packet_received(AOPacket *p_packet)
       QStringList sub_contents = i_string.split("&");
 
       if (sub_contents.size() < 4) {
-        qDebug() << "W: malformed packet";
+        qWarning() << "malformed packet";
         continue;
       }
 
@@ -63,7 +63,8 @@ void AOApplication::ms_packet_received(AOPacket *p_packet)
       w_lobby->append_chatmessage(f_name, f_message);
     }
     if (courtroom_constructed && courtroom_loaded) {
-      w_courtroom->append_ms_chatmessage(f_name, f_message);
+      w_courtroom->append_server_chatmessage(tr("[Global] %1").arg(f_name),
+                                             f_message, "0");
     }
   }
   else if (header == "AO2CHECK") {
@@ -453,7 +454,8 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
       goto end;
 
     if (lobby_constructed)
-      w_courtroom->append_ms_chatmessage("", w_lobby->get_chatlog());
+      w_courtroom->append_server_chatmessage(tr("[Global log]"),
+                                             w_lobby->get_chatlog(), "0");
 
     w_courtroom->character_loading_finished();
     w_courtroom->done_received();
-- 
cgit