From 6138bb107b5ab4d882e9ceb75e1394c2b8ec82a3 Mon Sep 17 00:00:00 2001 From: Crystalwarrior Date: Wed, 15 Jan 2020 16:42:44 +0300 Subject: Separate screenshake options button from effects options button Add a color logging option button Update version to 2.8.2 --- include/aoapplication.h | 14 +++++++++++--- include/aooptionsdialog.h | 9 +++++++-- 2 files changed, 18 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/aoapplication.h b/include/aoapplication.h index fe1a5b7..0ab6831 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -172,14 +172,22 @@ public: // from the config.ini. bool is_discord_enabled(); - // Returns the value of whether shaking and flashing should be enabled. + // Returns the value of whether shaking should be enabled. // from the config.ini. - bool is_shake_flash_enabled(); + bool is_shake_enabled(); + + // Returns the value of whether effects should be enabled. + // from the config.ini. + bool is_effects_enabled(); // Returns the value of whether frame-specific effects defined in char.ini should be sent/received over the network. // from the config.ini. bool is_frame_network_enabled(); + // Returns the value of whether colored ic log should be a thing. + // from the config.ini. + bool is_colorlog_enabled(); + // Returns the value of the maximum amount of lines the IC chatlog // may contain, from config.ini. int get_max_log_size(); @@ -396,7 +404,7 @@ public: private: const int RELEASE = 2; const int MAJOR_VERSION = 8; - const int MINOR_VERSION = 1; + const int MINOR_VERSION = 2; QString current_theme = "default"; diff --git a/include/aooptionsdialog.h b/include/aooptionsdialog.h index 5198410..9e34e65 100644 --- a/include/aooptionsdialog.h +++ b/include/aooptionsdialog.h @@ -65,11 +65,16 @@ private: QLabel *ui_language_label; QComboBox *ui_language_combobox; - QLabel *ui_epilepsy_lbl; - QCheckBox *ui_epilepsy_cb; + QLabel *ui_shake_lbl; + QCheckBox *ui_shake_cb; + QLabel *ui_effects_lbl; + QCheckBox *ui_effects_cb; QLabel *ui_framenetwork_lbl; QCheckBox *ui_framenetwork_cb; + QLabel *ui_colorlog_lbl; + QCheckBox *ui_colorlog_cb; + QWidget *ui_callwords_tab; QWidget *ui_callwords_widget; QVBoxLayout *ui_callwords_layout; -- cgit