Change all instances of "colour" to "color" for consistency's sake

Overhaul inline colors system to properly support additive text and further expansion
Add two new colors - Gray and Blank, the latter being used for IC parsing.
Instead of adding text symbol by symbol, reveal more of the already-rendered text instead so that it properly anticipates words that need to be on the newline.
Changed the append_ic function slightly so it appends ": " to text only after it's no longer needed.
Made gray color less inconsistent with everything else

1 files changed, 33 insertions, 35 deletions

diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp
index 06caf291..91782a86 100644
--- a/src/text_file_functions.cpp
+++ b/src/text_file_functions.cpp
@@ -436,42 +436,40 @@ QColor AOApplication::get_chat_color(QString p_identifier, QString p_chat)
 {
   QColor return_color(255, 255, 255);
 
-  if (p_identifier == "_inline_grey")
-  {
-    return_color = QColor(187, 187, 187);
-  }
-  else
-  {
-    switch (p_identifier.toInt()) {
-      case 1:
-        return_color = QColor(0, 255, 0);
-        break;
-      case 2:
-        return_color = QColor(255, 0, 0);
-        break;
-      case 3:
-        return_color = QColor(255, 165, 0);
-        break;
-      case 4:
-        return_color = QColor(45, 150, 255);
-        break;
-      case 5:
-        return_color = QColor(255, 255, 0);
-        break;
-      case 7:
-        return_color = QColor(255, 192, 203);
-        break;
-      case 8:
-        return_color = QColor(0, 255, 255);
-        break;
-      case 0:
-      case 6: // 6 is rainbow.
-      default:
-        return_color = QColor(255, 255, 255);
-        break;
-    }
+  switch (p_identifier.toInt()) {
+    case WHITE:
+    case GREEN:
+      return_color = QColor(0, 255, 0);
+      break;
+    case RED:
+      return_color = QColor(255, 0, 0);
+      break;
+    case ORANGE:
+      return_color = QColor(255, 165, 0);
+      break;
+    case BLUE:
+      return_color = QColor(45, 150, 255);
+      break;
+    case YELLOW:
+      return_color = QColor(255, 255, 0);
+      break;
+    case RAINBOW: // 6 is rainbow.
+    case PINK:
+      return_color = QColor(255, 192, 203);
+      break;
+    case CYAN:
+      return_color = QColor(0, 255, 255);
+      break;
+    case GRAY:
+      return_color = QColor(187, 187, 187);
+      break;
+    case BLANK:
+      return_color = QColor(0, 0, 0, 0);
+      break;
+    default:
+      return_color = QColor(255, 255, 255);
+      break;
   }
-
   p_identifier = p_identifier.prepend("c");
   QString design_ini_path = get_base_path() + "misc/" + p_chat + "/config.ini";
   QString default_path = get_base_path() + "misc/default/config.ini";