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: activate qPrefDisplay in SettingsObjectWrapper

Browse source 
add the prepared class qPrefDisplay to SettingsObjectWrapper and thereby making it active.

As a consequence of the uniform naming standard desktop-widgets/preferences_defaults.cpp and
tests/testpreferences.cpp have been updated.

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-07-04 21:45:48 +02:00
parent d7fed0bcb7
commit da61c1714f
7 changed files with 26 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tests/testpreferences.cpp
View file

@ -445,22 +445,22 @@ void TestPreferences::testPreferences()
TEST(general->pscrRatio(), 1);
TEST(general->useDefaultFile(), false);
auto display = pref->display_settings;
display->setDivelistFont("comic");
display->setFontSize(10.0);
display->setDisplayInvalidDives(true);
auto display = qPrefDisplay::instance();
display->set_divelist_font("comic");
display->set_font_size(10.0);
display->set_display_invalid_dives(true);
TEST(display->divelistFont(),QStringLiteral("comic"));
TEST(display->fontSize(), 10.0);
TEST(display->displayInvalidDives(), true);
TEST(display->divelist_font(),QStringLiteral("comic"));
TEST(display->font_size(), 10.0);
TEST(display->display_invalid_dives(), true);
display->setDivelistFont("helvetica");
display->setFontSize(14.0);
display->setDisplayInvalidDives(false);
display->set_divelist_font("helvetica");
display->set_font_size(14.0);
display->set_display_invalid_dives(false);
TEST(display->divelistFont(),QStringLiteral("helvetica"));
TEST(display->fontSize(), 14.0);
TEST(display->displayInvalidDives(), false);
TEST(display->divelist_font(),QStringLiteral("helvetica"));
TEST(display->font_size(), 14.0);
TEST(display->display_invalid_dives(), false);
auto language = pref->language_settings;
language->setLangLocale ("en_US");