Merge pull request #246 from AttorneyOnline/2.8

Merges 2.8.5, which is a patch release for 2.8 with no substantially new features.

This commit is release-ready.

1 files changed, 33 insertions, 6 deletions

diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp
index 39754f39..8247fd86 100644
--- a/src/text_file_functions.cpp
+++ b/src/text_file_functions.cpp
@@ -53,6 +53,26 @@ bool AOApplication::get_log_goes_downwards()
   return result.startsWith("true");
 }
 
+bool AOApplication::get_log_newline()
+{
+  QString result =
+      configini->value("log_newline", "false").value<QString>();
+  return result.startsWith("true");
+}
+
+int AOApplication::get_log_margin()
+{
+  int result = configini->value("log_margin", 0).toInt();
+  return result;
+}
+
+bool AOApplication::get_log_timestamp()
+{
+  QString result =
+      configini->value("log_timestamp", "false").value<QString>();
+  return result.startsWith("true");
+}
+
 bool AOApplication::get_showname_enabled_by_default()
 {
   QString result =
@@ -435,7 +455,8 @@ QString AOApplication::get_tagged_stylesheet(QString target_tag, QString p_file)
 
 QString AOApplication::get_chat_markdown(QString p_identifier, QString p_chat)
 {
-  QString design_ini_path = get_base_path() + "misc/" + p_chat + "/config.ini";
+  QString design_ini_path =
+      get_base_path() + "misc/" + get_chat(p_chat) + "/config.ini";
   QString default_path = get_base_path() + "misc/default/config.ini";
   QString f_result = read_design_ini(p_identifier, design_ini_path);
 
@@ -449,9 +470,10 @@ QColor AOApplication::get_chat_color(QString p_identifier, QString p_chat)
 {
   QColor return_color(255, 255, 255);
 
-  QString design_ini_path = get_base_path() + "misc/" + p_chat + "/config.ini";
+  QString design_ini_path =
+      get_base_path() + "misc/" + get_chat(p_chat) + "/config.ini";
   QString default_path = get_base_path() + "misc/default/config.ini";
-  QString f_result = read_design_ini("c" + p_identifier, design_ini_path);
+  QString f_result = read_design_ini(p_identifier, design_ini_path);
 
   if (f_result == "") {
     f_result = read_design_ini(p_identifier, default_path);
@@ -908,6 +930,11 @@ QString AOApplication::get_effect_sound(QString fx_name, QString p_char)
       f_result = read_design_ini(fx_name, default_path);
     }
   }
+
+  if (fx_name == "realization") {
+    f_result = get_custom_realization(p_char);
+  }
+
   return f_result;
 }
 
@@ -1051,7 +1078,7 @@ QString AOApplication::get_casing_can_host_cases()
 }
 bool AOApplication::get_auto_logging_enabled()
 {
-    QString result =
-        configini->value("automatic_logging_enabled", "true").value<QString>();
-    return result.startsWith("true");
+  QString result =
+      configini->value("automatic_logging_enabled", "true").value<QString>();
+  return result.startsWith("true");
 }