mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: remove Animations from SettingsObjectWrapper and activate qPrefAnimations

Browse source 
remove Animations from SettingsObjectWrapper and reference qPrefAnimations
update files using SettingsObjectWrapper/Animations to user qPrefAnimations

this activated qPrefAnimations

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-07-12 10:25:28 +02:00
parent 3a314c3dec
commit d4e76dac9e
3 changed files with 5 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

23
core/subsurface-qt/SettingsObjectWrapper.cpp
View file

@ -2054,27 +2054,6 @@ void LanguageSettingsObjectWrapper::setDateFormatOverride(bool value)
emit dateFormatOverrideChanged(value); emit dateFormatOverrideChanged(value);
} }
AnimationsSettingsObjectWrapper::AnimationsSettingsObjectWrapper(QObject* parent):
QObject(parent)
{
}
int AnimationsSettingsObjectWrapper::animationSpeed() const
{
return prefs.animation_speed;
}
void AnimationsSettingsObjectWrapper::setAnimationSpeed(int value)
{
if (value == prefs.animation_speed)
return;
QSettings s;
s.beginGroup(group);
s.setValue("animation_speed", value);
prefs.animation_speed = value;
emit animationSpeedChanged(value);
}
LocationServiceSettingsObjectWrapper::LocationServiceSettingsObjectWrapper(QObject* parent): LocationServiceSettingsObjectWrapper::LocationServiceSettingsObjectWrapper(QObject* parent):
QObject(parent) QObject(parent)
@ -2127,7 +2106,7 @@ QObject(parent),
general_settings(new GeneralSettingsObjectWrapper(this)), general_settings(new GeneralSettingsObjectWrapper(this)),
display_settings(new qPrefDisplay(this)), display_settings(new qPrefDisplay(this)),
language_settings(new LanguageSettingsObjectWrapper(this)), language_settings(new LanguageSettingsObjectWrapper(this)),
animation_settings(new AnimationsSettingsObjectWrapper(this)), animation_settings(new qPrefAnimations(this)),
location_settings(new LocationServiceSettingsObjectWrapper(this)), location_settings(new LocationServiceSettingsObjectWrapper(this)),
update_manager_settings(new UpdateManagerSettings(this)), update_manager_settings(new UpdateManagerSettings(this)),
dive_computer_settings(new DiveComputerSettings(this)) dive_computer_settings(new DiveComputerSettings(this))

21
core/subsurface-qt/SettingsObjectWrapper.h
View file

@ -640,23 +640,6 @@ private:
const QString group = QStringLiteral("Language"); const QString group = QStringLiteral("Language");
}; };
class AnimationsSettingsObjectWrapper : public QObject {
Q_OBJECT
Q_PROPERTY(int animation_speed READ animationSpeed WRITE setAnimationSpeed NOTIFY animationSpeedChanged)
public:
AnimationsSettingsObjectWrapper(QObject *parent);
int animationSpeed() const;
public slots:
void setAnimationSpeed(int value);
signals:
void animationSpeedChanged(int value);
private:
const QString group = QStringLiteral("Animations");
};
class LocationServiceSettingsObjectWrapper : public QObject { class LocationServiceSettingsObjectWrapper : public QObject {
Q_OBJECT Q_OBJECT
Q_PROPERTY(int time_threshold READ timeThreshold WRITE setTimeThreshold NOTIFY timeThresholdChanged) Q_PROPERTY(int time_threshold READ timeThreshold WRITE setTimeThreshold NOTIFY timeThresholdChanged)
@ -690,7 +673,7 @@ class SettingsObjectWrapper : public QObject {
Q_PROPERTY(GeneralSettingsObjectWrapper* general MEMBER general_settings CONSTANT) Q_PROPERTY(GeneralSettingsObjectWrapper* general MEMBER general_settings CONSTANT)
Q_PROPERTY(qPrefDisplay* display MEMBER display_settings CONSTANT) Q_PROPERTY(qPrefDisplay* display MEMBER display_settings CONSTANT)
Q_PROPERTY(LanguageSettingsObjectWrapper* language MEMBER language_settings CONSTANT) Q_PROPERTY(LanguageSettingsObjectWrapper* language MEMBER language_settings CONSTANT)
Q_PROPERTY(AnimationsSettingsObjectWrapper* animation MEMBER animation_settings CONSTANT) Q_PROPERTY(qPrefAnimations* animation MEMBER animation_settings CONSTANT)
Q_PROPERTY(LocationServiceSettingsObjectWrapper* Location MEMBER location_settings CONSTANT) Q_PROPERTY(LocationServiceSettingsObjectWrapper* Location MEMBER location_settings CONSTANT)
Q_PROPERTY(UpdateManagerSettings* update MEMBER update_manager_settings CONSTANT) Q_PROPERTY(UpdateManagerSettings* update MEMBER update_manager_settings CONSTANT)
@ -709,7 +692,7 @@ public:
GeneralSettingsObjectWrapper *general_settings; GeneralSettingsObjectWrapper *general_settings;
qPrefDisplay *display_settings; qPrefDisplay *display_settings;
LanguageSettingsObjectWrapper *language_settings; LanguageSettingsObjectWrapper *language_settings;
AnimationsSettingsObjectWrapper *animation_settings; qPrefAnimations *animation_settings;
LocationServiceSettingsObjectWrapper *location_settings; LocationServiceSettingsObjectWrapper *location_settings;
UpdateManagerSettings *update_manager_settings; UpdateManagerSettings *update_manager_settings;
DiveComputerSettings *dive_computer_settings; DiveComputerSettings *dive_computer_settings;

4
desktop-widgets/preferences/preferences_defaults.cpp
View file

@ -93,6 +93,6 @@ void PreferencesDefaults::syncSettings()
display->set_font_size(ui->fontsize->value()); display->set_font_size(ui->fontsize->value());
display->set_display_invalid_dives(ui->displayinvalid->isChecked()); display->set_display_invalid_dives(ui->displayinvalid->isChecked());
auto animation = SettingsObjectWrapper::instance()->animation_settings; auto animation = qPrefAnimations::instance();
animation->setAnimationSpeed(ui->velocitySlider->value()); animation->set_animation_speed(ui->velocitySlider->value());
} }