Merge pull request #473 from AttorneyOnline/fix/everything

Fix change character lag, bg resizing and repos weirdness, inconsistent behavior, sticker setting etc.

Author: oldmud0

include/aoapplication.h

@@ -228,6 +228,9 @@ class AOApplication : public QApplication {
   // 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();

include/aooptionsdialog.h

@@ -108,6 +108,9 @@ class AOOptionsDialog : public QDialog {
   QLabel *ui_customchat_lbl;
   QCheckBox *ui_customchat_cb;
 
+  QLabel *ui_sticker_lbl;
+  QCheckBox *ui_sticker_cb;
+
   QLabel *ui_continuous_lbl;
   QCheckBox *ui_continuous_cb;
 

include/courtroom.h

@@ -121,6 +121,9 @@ class Courtroom : public QMainWindow {
 
   void character_loading_finished();
 
+  //
+  void set_courtroom_size();
+
   // sets position of widgets based on theme ini files
   void set_widgets();
 
@@ -140,18 +143,15 @@ class Courtroom : public QMainWindow {
   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 @@ class Courtroom : public QMainWindow {
   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 @@ class Courtroom : public QMainWindow {
   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);

include/lobby.h

@@ -17,6 +17,7 @@
 
 #include <QDebug>
 #include <QScrollBar>
+#include <QHeaderView>
 
 class AOApplication;
 
@@ -32,7 +33,7 @@ class Lobby : public QMainWindow {
   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);

src/aolayer.cpp

@@ -240,12 +240,11 @@ void InterfaceLayer::load_image(QString p_filename, QString p_miscname)
 
 void StickerLayer::load_image(QString p_charname)
 {
-  QString p_miscname = ao_app->get_chat(p_charname);
+  QString p_miscname;
+  if (ao_app->is_customchat_enabled())
+    p_miscname = ao_app->get_chat(p_charname);
   transform_mode = ao_app->get_misc_scaling(p_miscname);
   QString final_image = ao_app->get_image("sticker/" + p_charname, ao_app->current_theme, ao_app->get_subtheme(), ao_app->default_theme, p_miscname);
-  if (!file_exists((final_image)))
-      final_image = ao_app->get_image_suffix(
-                  ao_app->get_character_path(p_charname, "showname")), // Scuffed DRO way
   start_playback(final_image);
 }
 
@@ -261,6 +260,7 @@ void CharLayer::start_playback(QString p_image)
 
 void AOLayer::start_playback(QString p_image)
 {
+  this->show();
 
   if (!ao_app->is_continuous_enabled()) {
     continuous = false;
@@ -322,7 +322,6 @@ void AOLayer::start_playback(QString p_image)
   int f_delay = m_reader.nextImageDelay();
 
   this->set_frame(f_pixmap);
-  this->show();
   if (max_frames > 1) {
     movie_frames.append(f_pixmap);
     movie_delays.append(f_delay);
@@ -450,6 +449,10 @@ void CharLayer::load_network_effects()
 
 void CharLayer::play_frame_effect(int p_frame)
 {
+  if (p_frame >= movie_effects.size()) {
+    qDebug() << "W: Attempted to play a frame effect bigger than the size of movie_effects";
+    return;
+  }
   if (p_frame < max_frames) {
     foreach (QString effect, movie_effects[p_frame]) {
       if (effect == "shake") {

src/aooptionsdialog.cpp

@@ -485,6 +485,19 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app)
 
   ui_gameplay_form->setWidget(row, QFormLayout::FieldRole, ui_customchat_cb);
 
+  row += 1;
+  ui_sticker_lbl = new QLabel(ui_form_layout_widget);
+  ui_sticker_lbl->setText(tr("Stickers:"));
+  ui_sticker_lbl->setToolTip(
+      tr("Turn this on to allow characters to define their own "
+         "stickers (unique images that show up over the chatbox - like avatars or shownames)."));
+
+  ui_gameplay_form->setWidget(row, QFormLayout::LabelRole, ui_sticker_lbl);
+
+  ui_sticker_cb = new QCheckBox(ui_form_layout_widget);
+
+  ui_gameplay_form->setWidget(row, QFormLayout::FieldRole, ui_sticker_cb);
+
   row += 1;
   ui_continuous_lbl = new QLabel(ui_form_layout_widget);
   ui_continuous_lbl->setText(tr("Continuous Playback:"));
@@ -691,8 +704,7 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app)
   ui_objectmusic_lbl = new QLabel(ui_audio_widget);
   ui_objectmusic_lbl->setText(tr("Kill Music On Objection:"));
   ui_objectmusic_lbl->setToolTip(
-      tr("If true, AO2 will stop the music for you when you or someone else "
-         "does 'Objection!'."));
+      tr("If true, AO2 will ask the server to stop music when you use 'Objection!' "));
 
   ui_audio_layout->setWidget(row, QFormLayout::LabelRole, ui_objectmusic_lbl);
 
@@ -909,6 +921,7 @@ void AOOptionsDialog::update_values() {
   ui_stickyeffects_cb->setChecked(ao_app->is_stickyeffects_enabled());
   ui_stickypres_cb->setChecked(ao_app->is_stickypres_enabled());
   ui_customchat_cb->setChecked(ao_app->is_customchat_enabled());
+  ui_sticker_cb->setChecked(ao_app->is_sticker_enabled());
   ui_continuous_cb->setChecked(ao_app->is_continuous_enabled());
   ui_category_stop_cb->setChecked(ao_app->is_category_stop_enabled());
   ui_blank_blips_cb->setChecked(ao_app->get_blank_blip());

src/charselect.cpp

@@ -177,7 +177,8 @@ void Courtroom::char_clicked(int n_char)
   }
   else {
     update_character(n_char);
-    set_widgets(); // so we don't erroneously keep the charselect's fixedSize
+    enter_courtroom();
+    set_courtroom_size();
   }
 
   if (n_char != -1)