From b682d69e494acdbf5fc97a81109faa667ad1918f Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sun, 13 Jun 2021 22:16:41 -0500 Subject: Use new HTTP-based master server client --- src/aooptionsdialog.cpp | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'src/aooptionsdialog.cpp') diff --git a/src/aooptionsdialog.cpp b/src/aooptionsdialog.cpp index 1db0dec..f3ca768 100644 --- a/src/aooptionsdialog.cpp +++ b/src/aooptionsdialog.cpp @@ -3,6 +3,7 @@ #include "courtroom.h" #include "lobby.h" #include "bass.h" +#include "networkmanager.h" AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint) @@ -902,7 +903,23 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) ui_casing_layout->setWidget(row, QFormLayout::FieldRole, ui_log_cb); + // privacy policy. + ui_privacy_tab = new QWidget(this); + ui_settings_tabs->addTab(ui_privacy_tab, tr("Privacy")); + + ui_privacy_layout = new QVBoxLayout(ui_privacy_tab); + ui_privacy_layout->setContentsMargins(0, 0, 0, 0); + + ui_privacy_policy = new QTextBrowser(ui_privacy_tab); + QSizePolicy privacySizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); + ui_privacy_policy->setSizePolicy(privacySizePolicy); + ui_privacy_policy->setPlainText(tr("Getting privacy policy...")); + ui_privacy_layout->addWidget(ui_privacy_policy); + update_values(); + // When we're done, we should continue the updates! setUpdatesEnabled(true); } @@ -976,6 +993,18 @@ void AOOptionsDialog::update_values() { ui_blips_volume_spinbox->setValue(ao_app->get_default_blip()); ui_bliprate_spinbox->setValue(ao_app->read_blip_rate()); ui_default_showname_textbox->setText(ao_app->get_default_showname()); + + ao_app->net_manager->request_document(MSDocumentType::PrivacyPolicy, [this](QString document) { + if (document.isEmpty()) + document = tr("Couldn't get the privacy policy."); + bool isHtml = document.startsWith("", Qt::CaseInsensitive); + if (isHtml) { + ui_privacy_policy->setHtml(document); + } else { + ui_privacy_policy->setMarkdown(document); + } + }); } void AOOptionsDialog::save_pressed() -- cgit From f1107aeac51658a0525d4231b2f1f39131acbcb5 Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sat, 18 Dec 2021 20:29:55 -0600 Subject: Finish out feature - Add periodic timer for heartbeat - Add option to settings for opting out from heartbeat/player metrics - Change base URL to permanent URL --- src/aooptionsdialog.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'src/aooptionsdialog.cpp') diff --git a/src/aooptionsdialog.cpp b/src/aooptionsdialog.cpp index f3ca768..eb0a3b5 100644 --- a/src/aooptionsdialog.cpp +++ b/src/aooptionsdialog.cpp @@ -908,7 +908,16 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) ui_settings_tabs->addTab(ui_privacy_tab, tr("Privacy")); ui_privacy_layout = new QVBoxLayout(ui_privacy_tab); - ui_privacy_layout->setContentsMargins(0, 0, 0, 0); + + ui_privacy_optout_cb = new QCheckBox(ui_privacy_tab); + ui_privacy_optout_cb->setText(tr("Do not include me in public player counts")); + ui_privacy_layout->addWidget(ui_privacy_optout_cb); + + ui_privacy_separator = new QFrame(ui_privacy_tab); + ui_privacy_separator->setObjectName(QString::fromUtf8("line")); + ui_privacy_separator->setFrameShape(QFrame::HLine); + ui_privacy_separator->setFrameShadow(QFrame::Sunken); + ui_privacy_layout->addWidget(ui_privacy_separator); ui_privacy_policy = new QTextBrowser(ui_privacy_tab); QSizePolicy privacySizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); @@ -993,6 +1002,7 @@ void AOOptionsDialog::update_values() { ui_blips_volume_spinbox->setValue(ao_app->get_default_blip()); ui_bliprate_spinbox->setValue(ao_app->read_blip_rate()); ui_default_showname_textbox->setText(ao_app->get_default_showname()); + ui_privacy_optout_cb->setChecked(ao_app->get_player_count_optout()); ao_app->net_manager->request_document(MSDocumentType::PrivacyPolicy, [this](QString document) { if (document.isEmpty()) @@ -1079,11 +1089,11 @@ void AOOptionsDialog::save_pressed() configini->setValue("casing_can_host_cases", ui_casing_cm_cases_textbox->text()); + configini->setValue("player_count_optout", ui_privacy_optout_cb->isChecked()); + if (audioChanged) ao_app->initBASS(); - callwordsini->close(); - // We most probably pressed "Restore defaults" at some point. Since we're saving our settings, remove the temporary file. if (QFile::exists(ao_app->get_base_path() + "config.temp")) QFile::remove(ao_app->get_base_path() + "config.temp"); -- cgit From 133b3b58d976b8b923c2611b2b1177e25450147c Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sat, 18 Dec 2021 21:40:11 -0600 Subject: Remove markdown thing --- src/aooptionsdialog.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/aooptionsdialog.cpp') diff --git a/src/aooptionsdialog.cpp b/src/aooptionsdialog.cpp index eb0a3b5..03c7334 100644 --- a/src/aooptionsdialog.cpp +++ b/src/aooptionsdialog.cpp @@ -1005,15 +1005,10 @@ void AOOptionsDialog::update_values() { ui_privacy_optout_cb->setChecked(ao_app->get_player_count_optout()); ao_app->net_manager->request_document(MSDocumentType::PrivacyPolicy, [this](QString document) { - if (document.isEmpty()) + if (document.isEmpty()) { document = tr("Couldn't get the privacy policy."); - bool isHtml = document.startsWith("", Qt::CaseInsensitive); - if (isHtml) { - ui_privacy_policy->setHtml(document); - } else { - ui_privacy_policy->setMarkdown(document); } + ui_privacy_policy->setHtml(document); }); } -- cgit From ecfb791e483234308b1edacb87e499860a63e510 Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sat, 18 Dec 2021 22:41:45 -0600 Subject: Roll back unintended changes --- src/aooptionsdialog.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/aooptionsdialog.cpp') diff --git a/src/aooptionsdialog.cpp b/src/aooptionsdialog.cpp index 54a11e1..7413db3 100644 --- a/src/aooptionsdialog.cpp +++ b/src/aooptionsdialog.cpp @@ -1255,12 +1255,12 @@ void AOOptionsDialog::save_pressed() mountPaths.append(ui_mount_list->item(i)->text()); configini->setValue("mount_paths", mountPaths); - if (asset_cache_dirty) - ao_app->invalidate_lookup_cache(); - if (audioChanged) ao_app->initBASS(); + if (asset_cache_dirty) + ao_app->invalidate_lookup_cache(); + // We most probably pressed "Restore defaults" at some point. Since we're saving our settings, remove the temporary file. if (QFile::exists(ao_app->get_base_path() + "config.temp")) QFile::remove(ao_app->get_base_path() + "config.temp"); -- cgit From 5d79a83fb5a0f322271e5e3d6c37a8782d42a61a Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Thu, 30 Dec 2021 21:26:28 -0600 Subject: Prevent old/bad "backup MS" values from preventing connection --- src/aooptionsdialog.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/aooptionsdialog.cpp') diff --git a/src/aooptionsdialog.cpp b/src/aooptionsdialog.cpp index 5fd80b7..589bc92 100644 --- a/src/aooptionsdialog.cpp +++ b/src/aooptionsdialog.cpp @@ -382,10 +382,9 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) row += 1; ui_ms_lbl = new QLabel(ui_form_layout_widget); - ui_ms_lbl->setText(tr("Backup MS:")); + ui_ms_lbl->setText(tr("Alternate Server List:")); ui_ms_lbl->setToolTip( - tr("If the built-in server lookups fail, the game will try the " - "address given here and use it as a backup master server address.")); + tr("Overrides the base URL to retrieve server information from.")); ui_gameplay_form->setWidget(row, QFormLayout::LabelRole, ui_ms_lbl); -- cgit