Merge pull request #473 from AttorneyOnline/fix/everything

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

1 files changed, 15 insertions, 2 deletions

diff --git a/src/aooptionsdialog.cpp b/src/aooptionsdialog.cpp
index dfd8555d..9ca0865f 100644
--- a/src/aooptionsdialog.cpp
+++ b/src/aooptionsdialog.cpp
@@ -486,6 +486,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:"));
   ui_continuous_lbl->setToolTip(
@@ -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());