Merge branch 'master' into crystalwarrior/demo-reload

Author: Crystalwarrior

base/themes

@@ -11,7 +11,7 @@
 
 class AOImage : public QLabel {
 public:
-  AOImage(QWidget *parent, AOApplication *p_ao_app);
+  AOImage(QWidget *parent, AOApplication *p_ao_app, bool make_static = false);
   ~AOImage();
 
   QWidget *m_parent;
@@ -20,6 +20,8 @@ class AOImage : public QLabel {
 
   QString path;
 
+  bool is_static = false;
+
   bool set_image(QString p_image, QString p_misc = "");
   void set_size_and_pos(QString identifier);
 };

include/aoimage.h

@@ -52,6 +52,7 @@ class AOLayer : public QLabel {
   bool force_continuous = false;
   Qt::TransformationMode transform_mode = Qt::FastTransformation; // transformation mode to use for this image
   bool stretch = false; // Should we stretch/squash this image to fill the screen?
+  bool masked = true; // Set a mask to the dimensions of the widget?
 
   // Set the movie's image to provided paths, preparing for playback.
   void start_playback(QString p_image);

include/aolayer.h

@@ -235,7 +235,7 @@ class Courtroom : public QMainWindow {
     DISPLAY_AND_IO
   };
   // Log the message contents and information such as evidence presenting etc. into the log file, the IC log, or both.
-  void log_chatmessage(QString f_message, int f_char_id, QString f_showname = "", int f_color = 0, LogMode f_log_mode=IO_ONLY);
+  void log_chatmessage(QString f_message, int f_char_id, QString f_showname = "", QString f_char = "", QString f_objection_mod = "", int f_evi_id = 0, int f_color = 0, LogMode f_log_mode=IO_ONLY);
 
   // Log the message contents and information such as evidence presenting etc. into the IC logs
   void handle_callwords();
@@ -755,7 +755,6 @@ class Courtroom : public QMainWindow {
 
   QVector<AOCharButton *> ui_char_button_list;
   QVector<AOCharButton *> ui_char_button_list_filtered;
-  AOImage *ui_selector;
 
   AOButton *ui_back_to_lobby;
 

include/courtroom.h

@@ -10,6 +10,7 @@
 #include <QTcpSocket>
 #include <QTimer>
 #include <QFileDialog>
+#include <QMessageBox>
 
 class DemoServer : public QObject
 {

include/demoserver.h

@@ -15,19 +15,19 @@ AOCharButton::AOCharButton(QWidget *parent, AOApplication *p_ao_app, int x_pos,
   this->resize(60, 60);
   this->move(x_pos, y_pos);
 
-  ui_taken = new AOImage(this, ao_app);
+  ui_taken = new AOImage(this, ao_app, true);
   ui_taken->resize(60, 60);
   ui_taken->set_image("char_taken");
   ui_taken->setAttribute(Qt::WA_TransparentForMouseEvents);
   ui_taken->hide();
 
-  ui_passworded = new AOImage(this, ao_app);
+  ui_passworded = new AOImage(this, ao_app, true);
   ui_passworded->resize(60, 60);
   ui_passworded->set_image("char_passworded");
   ui_passworded->setAttribute(Qt::WA_TransparentForMouseEvents);
   ui_passworded->hide();
 
-  ui_selector = new AOImage(parent, ao_app);
+  ui_selector = new AOImage(parent, ao_app, true);
   ui_selector->resize(62, 62);
   ui_selector->move(x_pos - 1, y_pos - 1);
   ui_selector->set_image("char_selector");

src/aocharbutton.cpp

@@ -9,14 +9,14 @@ AOEvidenceButton::AOEvidenceButton(QWidget *p_parent, AOApplication *p_ao_app,
   ao_app = p_ao_app;
   m_parent = p_parent;
 
-  ui_selected = new AOImage(this, ao_app);
+  ui_selected = new AOImage(this, ao_app, true);
   ui_selected->resize(p_w, p_h);
   //  ui_selected->move(p_x, p_y);
   ui_selected->set_image("evidence_selected");
   ui_selected->setAttribute(Qt::WA_TransparentForMouseEvents);
   ui_selected->hide();
 
-  ui_selector = new AOImage(this, ao_app);
+  ui_selector = new AOImage(this, ao_app, true);
   ui_selector->resize(p_w, p_h);
   //  ui_selector->move(p_x - 1, p_y - 1);
   ui_selector->set_image("evidence_selector");

src/aoevidencebutton.cpp

@@ -4,26 +4,30 @@
 
 #include <QBitmap>
 
-AOImage::AOImage(QWidget *parent, AOApplication *p_ao_app) : QLabel(parent)
+AOImage::AOImage(QWidget *parent, AOApplication *p_ao_app, bool make_static) : QLabel(parent)
 {
   m_parent = parent;
   ao_app = p_ao_app;
-  movie = new QMovie();
-  connect(movie, &QMovie::frameChanged, [=]{
-    QPixmap f_pixmap = movie->currentPixmap();
-    f_pixmap =
-        f_pixmap.scaled(this->size(), Qt::IgnoreAspectRatio);
-    this->setPixmap(f_pixmap);
-    this->setMask(f_pixmap.mask());
-  });
+  is_static = make_static;
+  if (!is_static) // Only create the QMovie if we're non-static
+  {
+    movie = new QMovie(this);
+    connect(movie, &QMovie::frameChanged, [=]{
+      QPixmap f_pixmap = movie->currentPixmap();
+      f_pixmap =
+          f_pixmap.scaled(this->size(), Qt::IgnoreAspectRatio);
+      this->setPixmap(f_pixmap);
+      this->setMask(f_pixmap.mask());
+    });
+  }
 }
 
 AOImage::~AOImage() {}
 
 bool AOImage::set_image(QString p_path, QString p_misc)
 {
   // Check if the user wants animated themes
-  if (ao_app->get_animated_theme())
+  if (!is_static && ao_app->get_animated_theme())
     // We want an animated image
     p_path = ao_app->get_image(p_path, ao_app->current_theme, ao_app->get_subtheme(), ao_app->default_theme, p_misc);
   else
@@ -35,12 +39,14 @@ bool AOImage::set_image(QString p_path, QString p_misc)
     return false;
   }
   path = p_path;
-  movie->stop();
-  movie->setFileName(path);
-  if (ao_app->get_animated_theme() && movie->frameCount() > 1) {
-    movie->start();
+  if (!is_static) {
+    movie->stop();
+    movie->setFileName(path);
+    if (ao_app->get_animated_theme() && movie->frameCount() > 1) {
+      movie->start();
+    }
   }
-  else {
+  if (is_static || !ao_app->get_animated_theme() || movie->frameCount() <= 1) {
     QPixmap f_pixmap(path);
 
     f_pixmap =

src/aoimage.cpp

@@ -98,9 +98,10 @@ void AOLayer::center_pixmap(QPixmap f_pixmap) {
       x + (f_w - f_pixmap.width()) / 2,
       y + (f_h - f_pixmap.height())); // Always center horizontally, always put
                                       // at the bottom vertically
-  this->setMask(
-      QRegion((f_pixmap.width() - f_w) / 2, (f_pixmap.height() - f_h) / 2, f_w,
-              f_h)); // make sure we don't escape the area we've been given
+  if (masked)
+      this->setMask(
+          QRegion((f_pixmap.width() - f_w) / 2, (f_pixmap.height() - f_h) / 2, f_w,
+                  f_h)); // make sure we don't escape the area we've been given
 }
 
 void AOLayer::combo_resize(int w, int h)
@@ -196,20 +197,20 @@ void CharLayer::load_image(QString p_filename, QString p_charname,
            << " continuous: " << continuous;
 #endif
   QStringList pathlist = {
-      ao_app->get_image_suffix(ao_app->get_character_path(
-          p_charname, prefix + current_emote)), // Default path
-      ao_app->get_image_suffix(ao_app->get_character_path(
+      ao_app->get_character_path(
+          p_charname, prefix + current_emote), // Default path
+      ao_app->get_character_path(
           p_charname,
-          prefix + "/" + current_emote)), // Path check if it's categorized
+          prefix + "/" + current_emote), // Path check if it's categorized
                                           // into a folder
-      ao_app->get_image_suffix(ao_app->get_character_path(
+      ao_app->get_character_path(
           p_charname,
-          current_emote)), // Just use the non-prefixed image, animated or not
-      ao_app->get_image_suffix(
-          ao_app->get_theme_path("placeholder")), // Theme placeholder path
-      ao_app->get_image_suffix(ao_app->get_theme_path(
-          "placeholder", ao_app->default_theme))}; // Default theme placeholder path
-  start_playback(find_image(pathlist));
+          current_emote), // Just use the non-prefixed image, animated or not
+      current_emote, // The path by itself after the above fail
+      ao_app->get_theme_path("placeholder"), // Theme placeholder path
+      ao_app->get_theme_path(
+          "placeholder", ao_app->default_theme)}; // Default theme placeholder path
+  start_playback(ao_app->get_image_path(pathlist));
 }
 
 void SplashLayer::load_image(QString p_filename, QString p_charname,

src/aolayer.cpp

@@ -21,10 +21,6 @@ void Courtroom::construct_char_select()
 
   ui_char_buttons = new QWidget(ui_char_select_background);
 
-  ui_selector = new AOImage(ui_char_select_background, ao_app);
-  ui_selector->setAttribute(Qt::WA_TransparentForMouseEvents);
-  ui_selector->resize(62, 62);
-
   ui_back_to_lobby = new AOButton(ui_char_select_background, ao_app);
 
   ui_char_password = new QLineEdit(ui_char_select_background);