Merge branch 'master' into pr/104

2 files changed, 14 insertions, 0 deletions

diff --git a/include/aoapplication.h b/include/aoapplication.h
index e4f2ee68..03aa01a1 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -58,6 +58,8 @@ public:
   void construct_courtroom();
   void destruct_courtroom();
 
+  bool is_music_track(QString trackname);
+
   void ms_packet_received(AOPacket *p_packet);
   void server_packet_received(AOPacket *p_packet);
 
diff --git a/include/courtroom.h b/include/courtroom.h
index 951a5a33..ec0fa5c4 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -212,6 +212,9 @@ public:
   void append_ms_chatmessage(QString f_name, QString f_message);
   void append_server_chatmessage(QString p_name, QString p_message, QString p_colour);
 
+  //check whether or not current theme has images for buttons with fallback text
+  void detect_fallback_text();
+
   //these functions handle chatmessages sequentially.
   //The process itself is very convoluted and merits separate documentation
   //But the general idea is objection animation->pre animation->talking->idle
@@ -415,6 +418,15 @@ private:
   //is set to true if the bg folder contains defensedesk.png, prosecutiondesk.png and stand.png
   bool is_ao2_bg = false;
 
+  // whether or not to use text for buttons instead of images, true is text
+  bool change_char_fallback = true;
+  bool reload_theme_fallback = true;
+  bool settings_fallback = true;
+  bool call_mod_fallback = true;
+  bool casing_fallback = true;
+  bool amswap_fallback = true;
+  bool ooc_toggle_fallback = true;
+
   //whether the ooc chat is server or master chat, true is server
   bool server_ooc = true;