Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #541 from AttorneyOnline/feature/default-scaling-option

Browse Source 
Add setting for default scaling method
This commit is contained in:
oldmud0 2021-04-25 00:38:42 -05:00 committed by GitHub
commit 2379c5aaff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/aoapplication.h
View File

@ -490,6 +490,9 @@ public:
// Get if the theme is animated
bool get_animated_theme();
// Get the default scaling method
QString get_default_scaling();
// Currently defined subtheme
QString subtheme;

2
include/aooptionsdialog.h
View File

@ -85,6 +85,8 @@ private:
QCheckBox *ui_discord_cb;
QLabel *ui_language_label;
QComboBox *ui_language_combobox;
QLabel *ui_scaling_label;
QComboBox *ui_scaling_combobox;
QLabel *ui_shake_lbl;
QCheckBox *ui_shake_cb;

18
src/aooptionsdialog.cpp
View File

@ -381,6 +381,20 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app)
ui_gameplay_form->setWidget(row, QFormLayout::FieldRole,
ui_language_combobox);
row += 1;
ui_scaling_label = new QLabel(ui_form_layout_widget);
ui_scaling_label->setText(tr("Scaling:"));
ui_scaling_label->setToolTip(
tr("Sets the default scaling method, if there is not one already defined "
"specifically for the character."));
ui_gameplay_form->setWidget(row, QFormLayout::LabelRole, ui_scaling_label);
ui_scaling_combobox = new QComboBox(ui_form_layout_widget);
// Corresponds with Qt::TransformationMode enum. Please don't change the order.
ui_scaling_combobox->addItem(tr("Pixel"), "fast");
ui_scaling_combobox->addItem(tr("Smooth"), "smooth");
ui_gameplay_form->setWidget(row, QFormLayout::FieldRole, ui_scaling_combobox);
row += 1;
ui_shake_lbl = new QLabel(ui_form_layout_widget);
ui_shake_lbl->setText(tr("Allow Screenshake:"));
@ -896,6 +910,9 @@ void AOOptionsDialog::update_values() {
break;
}
}
Qt::TransformationMode scaling = ao_app->get_scaling(ao_app->get_default_scaling());
ui_scaling_combobox->setCurrentIndex(scaling);
// Let's fill the callwords text edit with the already present callwords.
ui_callwords_textbox->document()->clear();
foreach (QString callword, ao_app->get_call_words()) {
@ -973,6 +990,7 @@ void AOOptionsDialog::save_pressed()
configini->setValue("master", ui_ms_textbox->text());
configini->setValue("discord", ui_discord_cb->isChecked());
configini->setValue("language", ui_language_combobox->currentText().left(2));
configini->setValue("default_scaling", ui_scaling_combobox->currentData());
configini->setValue("shake", ui_shake_cb->isChecked());
configini->setValue("effects", ui_effects_cb->isChecked());
configini->setValue("framenetwork", ui_framenetwork_cb->isChecked());

8
src/text_file_functions.cpp
View File

@ -290,6 +290,9 @@ QString AOApplication::read_design_ini(QString p_identifier,
Qt::TransformationMode AOApplication::get_scaling(QString p_scaling)
{
if (p_scaling.isEmpty())
p_scaling = get_default_scaling();
if (p_scaling == "smooth")
return Qt::SmoothTransformation;
return Qt::FastTransformation;
@ -1085,3 +1088,8 @@ bool AOApplication::get_animated_theme()
configini->value("animated_theme", "true").value<QString>();
return result.startsWith("true");
}
QString AOApplication::get_default_scaling()
{
return configini->value("default_scaling", "fast").value<QString>();
}