From 23feba7e5a1396110d543a676e018bcbdfa50d39 Mon Sep 17 00:00:00 2001 From: Mike Skec Date: Sat, 27 Feb 2021 09:23:59 +1100 Subject: Adds emoji toggle preference. --- src/dialogs/settingsdialog.cpp | 28 +++++++++++++++++++ src/dialogs/settingsdialog.hpp | 3 ++ src/dialogs/settingsdialog.ui | 63 +++++++++++++++++++++++++++++++++--------- 3 files changed, 81 insertions(+), 13 deletions(-) (limited to 'src/dialogs') diff --git a/src/dialogs/settingsdialog.cpp b/src/dialogs/settingsdialog.cpp index e9c0e45..4bd0f8c 100644 --- a/src/dialogs/settingsdialog.cpp +++ b/src/dialogs/settingsdialog.cpp @@ -301,6 +301,24 @@ void SettingsDialog::setOptions(const GenericSettings &options) this->ui->urlbarhl_none->setChecked(true); } + if (kristall::EMOJIS_SUPPORTED && this->current_options.emojis_enabled) + { + this->ui->emojis_on->setChecked(true); + } + else + { + this->ui->emojis_off->setChecked(true); + + // Grey out emoji options on unsupported emoji builds + if (!kristall::EMOJIS_SUPPORTED) + { + this->ui->emojis_on->setEnabled(false); + this->ui->emojis_off->setEnabled(false); + this->ui->emojis_label->setToolTip( + this->ui->emojis_label->toolTip() + " (not supported in this build)"); + } + } + if(this->current_options.fancy_quotes) { this->ui->fancyquotes_on->setChecked(true); } else { @@ -831,6 +849,16 @@ void SettingsDialog::on_urlbarhl_none_clicked() this->current_options.fancy_urlbar = false; } +void SettingsDialog::on_emojis_on_clicked() +{ + this->current_options.emojis_enabled = true; +} + +void SettingsDialog::on_emojis_off_clicked() +{ + this->current_options.emojis_enabled = false; +} + void SettingsDialog::on_fancyquotes_on_clicked() { this->current_options.fancy_quotes = true; diff --git a/src/dialogs/settingsdialog.hpp b/src/dialogs/settingsdialog.hpp index adeb004..114396e 100644 --- a/src/dialogs/settingsdialog.hpp +++ b/src/dialogs/settingsdialog.hpp @@ -149,6 +149,9 @@ private slots: void on_fancyquotes_on_clicked(); void on_fancyquotes_off_clicked(); + void on_emojis_on_clicked(); + void on_emojis_off_clicked(); + void on_redirection_mode_currentIndexChanged(int index); void on_max_redirects_valueChanged(int arg1); diff --git a/src/dialogs/settingsdialog.ui b/src/dialogs/settingsdialog.ui index cccb3f5..04db3e2 100644 --- a/src/dialogs/settingsdialog.ui +++ b/src/dialogs/settingsdialog.ui @@ -373,37 +373,71 @@ + + + Render emojis + + + Whether to render emojis in a page. + + + + + + + + + On + + + emojisBtnGroup + + + + + + + Off + + + emojisBtnGroup + + + + + + Max. Number of Redirections - + 5 - + Redirection Handling - + - + Network Timeout - + ms @@ -416,14 +450,14 @@ - + Additional toolbar buttons - + @@ -455,7 +489,7 @@ - + Total cache size limit @@ -465,7 +499,7 @@ - + KiB @@ -479,7 +513,7 @@ - + Cached item size threshold @@ -489,7 +523,7 @@ - + KiB @@ -503,7 +537,7 @@ - + Cached item life @@ -513,7 +547,7 @@ - + @@ -1503,6 +1537,8 @@ urlbarhl_none fancyquotes_on fancyquotes_off + emojis_on + emojis_off max_redirects redirection_mode network_timeout @@ -1598,5 +1634,6 @@ + -- cgit v1.2.3