Merge branch 'master' into music_list_update

1 files changed, 8 insertions, 0 deletions

diff --git a/include/aooptionsdialog.h b/include/aooptionsdialog.h
index 934d257..233d079 100644
--- a/include/aooptionsdialog.h
+++ b/include/aooptionsdialog.h
@@ -61,6 +61,8 @@ private:
     QLineEdit *ui_ms_textbox;
     QLabel *ui_discord_lbl;
     QCheckBox *ui_discord_cb;
+    QLabel *ui_epilepsy_lbl;
+    QCheckBox *ui_epilepsy_cb;
     QLabel *ui_language_label;
     QComboBox *ui_language_combobox;
 
@@ -88,6 +90,10 @@ private:
     QLabel *ui_bliprate_lbl;
     QCheckBox *ui_blank_blips_cb;
     QLabel *ui_blank_blips_lbl;
+    QLabel *ui_loopsfx_lbl;
+    QCheckBox *ui_loopsfx_cb;
+    QLabel *ui_objectmusic_lbl;
+    QCheckBox *ui_objectmusic_cb;
     QDialogButtonBox *ui_settings_buttons;
 
     QWidget *ui_casing_tab;
@@ -108,6 +114,8 @@ private:
     QCheckBox *ui_casing_steno_cb;
     QLabel *ui_casing_cm_lbl;
     QCheckBox *ui_casing_cm_cb;
+    QLabel *ui_casing_wit_lbl;
+    QCheckBox *ui_casing_wit_cb;
     QLabel *ui_casing_cm_cases_lbl;
     QLineEdit *ui_casing_cm_cases_textbox;