4 files changed, 18 insertions, 14 deletions
diff --git a/include/aoapplication.h b/include/aoapplication.h
index cd9f736..2dc8649 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -228,6 +228,9 @@ public:
   // for settings.
   bool is_customchat_enabled();
 
+  // Returns the value of characer sticker (avatar) setting
+  bool is_sticker_enabled();
+
   // Returns the value of whether continuous playback should be used
   // from the config.ini.
   bool is_continuous_enabled();
diff --git a/include/aooptionsdialog.h b/include/aooptionsdialog.h
index 31f3d66..e88ce54 100644
--- a/include/aooptionsdialog.h
+++ b/include/aooptionsdialog.h
@@ -108,6 +108,9 @@ private:
   QLabel *ui_customchat_lbl;
   QCheckBox *ui_customchat_cb;
 
+  QLabel *ui_sticker_lbl;
+  QCheckBox *ui_sticker_cb;
+
   QLabel *ui_continuous_lbl;
   QCheckBox *ui_continuous_cb;
 
diff --git a/include/courtroom.h b/include/courtroom.h
index eb1aa7b..6a64deb 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -121,6 +121,9 @@ public:
 
   void character_loading_finished();
 
+  //
+  void set_courtroom_size();
+
   // sets position of widgets based on theme ini files
   void set_widgets();
 
@@ -140,18 +143,15 @@ public:
   void set_fonts(QString p_char = "");
 
   // sets dropdown menu stylesheet
-  void set_dropdown(QWidget *widget);
+  void set_stylesheet(QWidget *widget);
 
   // helper funciton that call above function on the relevant widgets
-  void set_dropdowns();
+  void set_stylesheets();
 
   void set_window_title(QString p_title);
 
-  // reads theme inis and sets size and pos based on the identifier
-  void set_size_and_pos(QWidget *p_widget, QString p_identifier);
-
-  // reads theme and char inis and sets size and pos based on the identifier
-  void set_size_and_pos(QWidget *p_widget, QString p_identifier, QString p_char);
+  // reads theme and sets size and pos based on the identifier (using p_misc if provided)
+  void set_size_and_pos(QWidget *p_widget, QString p_identifier, QString p_misc="");
 
   // reads theme inis and returns the size and pos as defined by it
   QPoint get_theme_pos(QString p_identifier);
@@ -165,7 +165,7 @@ public:
   void set_background(QString p_background, bool display = false);
 
   // sets the local character pos/side to use.
-  void set_side(QString p_side, bool block_signals=true);
+  void set_side(QString p_side);
 
   // sets the pos dropdown
   void set_pos_dropdown(QStringList pos_dropdowns);
@@ -576,10 +576,6 @@ private:
   int evidence_rows = 3;
   int max_evidence_on_page = 18;
 
-  // is set to true if the bg folder contains defensedesk.png,
-  // prosecutiondesk.png and stand.png
-  bool is_ao2_bg = false;
-
   // whether the ooc chat is server or master chat, true is server
   bool server_ooc = true;
 
@@ -826,7 +822,7 @@ private slots:
   void music_random();
   void music_list_expand_all();
   void music_list_collapse_all();
-  void music_stop();
+  void music_stop(bool no_effects = false);
   void on_area_list_double_clicked(QTreeWidgetItem *p_item, int column);
 
   void select_emote(int p_id);
@@ -838,6 +834,7 @@ private slots:
 
   void on_emote_dropdown_changed(int p_index);
   void on_pos_dropdown_changed(int p_index);
+  void on_pos_dropdown_changed(QString p_text);
   void on_pos_remove_clicked();
 
   void on_iniswap_dropdown_changed(int p_index);
diff --git a/include/lobby.h b/include/lobby.h
index 4278534..0f066ab 100644
--- a/include/lobby.h
+++ b/include/lobby.h
@@ -17,6 +17,7 @@
 
 #include <QDebug>
 #include <QScrollBar>
+#include <QHeaderView>
 
 class AOApplication;
 
@@ -32,7 +33,7 @@ public:
   void append_chatmessage(QString f_name, QString f_message);
   void append_error(QString f_message);
   void set_player_count(int players_online, int max_players);
-  void set_stylesheet(QWidget *widget, QString target_tag);
+  void set_stylesheet(QWidget *widget);
   void set_stylesheets();
   void set_fonts();
   void set_font(QWidget *widget, QString p_identifier);