aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCerapter <cerap@protonmail.com>2018-07-28 00:14:57 +0200
committerCerapter <cerap@protonmail.com>2018-07-28 00:14:57 +0200
commit1b70d4d6dbc5090fde105ade1db57ed668d5e520 (patch)
tree714064f8799138708e368a208fd409855364ee38
parent366389c6bc8c3bd52303e791e42966a1ef6455b0 (diff)
In-game log limit changer + enabling other full text colours.
-rw-r--r--courtroom.cpp22
-rw-r--r--courtroom.h6
2 files changed, 26 insertions, 2 deletions
diff --git a/courtroom.cpp b/courtroom.cpp
index fda29cec..55a17846 100644
--- a/courtroom.cpp
+++ b/courtroom.cpp
@@ -140,6 +140,8 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
ui_sfx_label = new QLabel(this);
ui_blip_label = new QLabel(this);
+ ui_log_limit_label = new QLabel(this);
+
ui_hold_it = new AOButton(this, ao_app);
ui_objection = new AOButton(this, ao_app);
ui_take_that = new AOButton(this, ao_app);
@@ -179,8 +181,8 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
ui_text_color->addItem("Blue");
ui_text_color->addItem("Yellow");
ui_text_color->addItem("Rainbow");
- //ui_text_color->addItem("Pink");
- //ui_text_color->addItem("Purple");
+ ui_text_color->addItem("Pink");
+ ui_text_color->addItem("Purple");
ui_music_slider = new QSlider(Qt::Horizontal, this);
ui_music_slider->setRange(0, 100);
@@ -194,6 +196,10 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
ui_blip_slider->setRange(0, 100);
ui_blip_slider->setValue(ao_app->get_default_blip());
+ ui_log_limit_spinbox = new QSpinBox(this);
+ ui_log_limit_spinbox->setRange(0, 10000);
+ ui_log_limit_spinbox->setValue(ao_app->get_max_log_size());
+
ui_evidence_button = new AOButton(this, ao_app);
construct_evidence();
@@ -249,6 +255,8 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
connect(ui_sfx_slider, SIGNAL(valueChanged(int)), this, SLOT(on_sfx_slider_moved(int)));
connect(ui_blip_slider, SIGNAL(valueChanged(int)), this, SLOT(on_blip_slider_moved(int)));
+ connect(ui_log_limit_spinbox, SIGNAL(valueChanged(int)), this, SLOT(on_log_limit_changed(int)));
+
connect(ui_ooc_toggle, SIGNAL(clicked()), this, SLOT(on_ooc_toggle_clicked()));
connect(ui_music_search, SIGNAL(textChanged(QString)), this, SLOT(on_music_search_edited(QString)));
@@ -438,6 +446,9 @@ void Courtroom::set_widgets()
set_size_and_pos(ui_blip_label, "blip_label");
ui_blip_label->setText("Blips");
+ set_size_and_pos(ui_log_limit_label, "log_limit_label");
+ ui_log_limit_label->setText("Log limit");
+
set_size_and_pos(ui_hold_it, "hold_it");
ui_hold_it->set_image("holdit.png");
set_size_and_pos(ui_objection, "objection");
@@ -496,6 +507,8 @@ void Courtroom::set_widgets()
set_size_and_pos(ui_sfx_slider, "sfx_slider");
set_size_and_pos(ui_blip_slider, "blip_slider");
+ set_size_and_pos(ui_log_limit_spinbox, "log_limit_spinbox");
+
set_size_and_pos(ui_evidence_button, "evidence_button");
ui_evidence_button->set_image("evidencebutton.png");
@@ -2288,6 +2301,11 @@ void Courtroom::on_blip_slider_moved(int p_value)
ui_ic_chat_message->setFocus();
}
+void Courtroom::on_log_limit_changed(int value)
+{
+ ui_ic_chatlog->document()->setMaximumBlockCount(value);
+}
+
void Courtroom::on_witness_testimony_clicked()
{
if (is_muted)
diff --git a/courtroom.h b/courtroom.h
index 35171b47..590de3d0 100644
--- a/courtroom.h
+++ b/courtroom.h
@@ -31,6 +31,7 @@
#include <QSignalMapper>
#include <QMap>
#include <QTextBrowser>
+#include <QSpinBox>
#include <stack>
@@ -369,6 +370,9 @@ private:
AOImage *ui_muted;
+ QSpinBox *ui_log_limit_spinbox;
+ QLabel *ui_log_limit_label;
+
AOButton *ui_evidence_button;
AOImage *ui_evidence;
AOLineEdit *ui_evidence_name;
@@ -482,6 +486,8 @@ private slots:
void on_sfx_slider_moved(int p_value);
void on_blip_slider_moved(int p_value);
+ void on_log_limit_changed(int value);
+
void on_ooc_toggle_clicked();
void on_witness_testimony_clicked();