diff options
| author | Crystalwarrior <varsash@gmail.com> | 2021-04-23 16:12:35 +0300 |
|---|---|---|
| committer | Crystalwarrior <varsash@gmail.com> | 2021-04-23 16:12:35 +0300 |
| commit | de4115e20ab800e7ebd639cd37de6df0cd7c72f9 (patch) | |
| tree | ca681bc94843767afdec4a0c21af8e294e8a707e /include | |
| parent | 43340e88695b2adc7b8fc8141540178727fd8869 (diff) | |
| parent | 5fca08537b6f2c6c581156c4dc07bc9ba61b17ef (diff) | |
Merge branch 'master' into crystalwarrior/demo-reload
Diffstat (limited to 'include')
| -rw-r--r-- | include/aoimage.h | 4 | ||||
| -rw-r--r-- | include/aolayer.h | 1 | ||||
| -rw-r--r-- | include/courtroom.h | 3 | ||||
| -rw-r--r-- | include/demoserver.h | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/include/aoimage.h b/include/aoimage.h index 70ff1fc0..b75eee19 100644 --- a/include/aoimage.h +++ b/include/aoimage.h @@ -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 @@ public: QString path; + bool is_static = false; + bool set_image(QString p_image, QString p_misc = ""); void set_size_and_pos(QString identifier); }; diff --git a/include/aolayer.h b/include/aolayer.h index 1984b77e..f42642cd 100644 --- a/include/aolayer.h +++ b/include/aolayer.h @@ -52,6 +52,7 @@ public: 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); diff --git a/include/courtroom.h b/include/courtroom.h index 9e0ae584..9da465ab 100644 --- a/include/courtroom.h +++ b/include/courtroom.h @@ -235,7 +235,7 @@ public: 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 @@ private: QVector<AOCharButton *> ui_char_button_list; QVector<AOCharButton *> ui_char_button_list_filtered; - AOImage *ui_selector; AOButton *ui_back_to_lobby; diff --git a/include/demoserver.h b/include/demoserver.h index 0d4f0e47..e5d5712f 100644 --- a/include/demoserver.h +++ b/include/demoserver.h @@ -10,6 +10,7 @@ #include <QTcpSocket> #include <QTimer> #include <QFileDialog> +#include <QMessageBox> class DemoServer : public QObject { |