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

revert preference settings for title color

Browse source 
Because of subsequent changes there is no clean way to just revert the changes
introduced in commit 8b36cf1051 ("desktop: offer different colors for info tab
titles"), so this manually removes the parts we don't need anymore.

This also restores a tooltip value that was inadvertantly removed in that
commit.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-11-04 14:29:48 -08:00
parent 6201ac34b4
commit be3190db8a
7 changed files with 7 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

24
core/settings/qPrefDisplay.cpp
View file

@ -55,7 +55,6 @@ void qPrefDisplay::loadSync(bool doSync)
disk_mobile_scale(doSync);
disk_display_invalid_dives(doSync);
disk_show_developer(doSync);
disk_headerstyle_color(doSync);
if (!doSync) {
load_tooltip_position();
load_theme();
@ -177,29 +176,6 @@ void qPrefDisplay::setCorrectFont()
prefs.display_invalid_dives = qPrefPrivate::propValue(keyFromGroupAndName(group, "displayinvalid"), default_prefs.display_invalid_dives).toBool();
}
void qPrefDisplay::set_headerstyle_color(enum headerstyle_color_values value)
{
if (value != prefs.headerstyle_color) {
prefs.headerstyle_color = value;
disk_headerstyle_color(true);
emit instance()->headerstyle_colorChanged(value);
}
}
void qPrefDisplay::disk_headerstyle_color(bool doSync)
{
static enum headerstyle_color_values current_state;
if (doSync) {
if (current_state != prefs.headerstyle_color) {
current_state = prefs.headerstyle_color;
qPrefPrivate::propSetValue(keyFromGroupAndName(group, "headerstyle_color"), prefs.headerstyle_color, default_prefs.headerstyle_color);
}
} else {
prefs.headerstyle_color = (enum headerstyle_color_values)qPrefPrivate::propValue(keyFromGroupAndName(group, "headerstyle_color"), default_prefs.headerstyle_color).toInt();
current_state = prefs.headerstyle_color;
}
}
HANDLE_PROP_QSTRING(Display, "FileDialog/LastDir", lastDir);
HANDLE_PROP_QSTRING(Display, "Theme/currentTheme", theme);