From be3190db8a14fc51d88c65f5359b9b7787acd2a7 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 4 Nov 2020 14:29:48 -0800 Subject: revert preference settings for title color 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 --- .../preferences/preferences_defaults.cpp | 3 - .../preferences/preferences_defaults.ui | 73 ---------------------- 2 files changed, 76 deletions(-) (limited to 'desktop-widgets/preferences') diff --git a/desktop-widgets/preferences/preferences_defaults.cpp b/desktop-widgets/preferences/preferences_defaults.cpp index 3fba8e1b8..ca1b51acb 100644 --- a/desktop-widgets/preferences/preferences_defaults.cpp +++ b/desktop-widgets/preferences/preferences_defaults.cpp @@ -24,7 +24,6 @@ PreferencesDefaults::~PreferencesDefaults() void PreferencesDefaults::refreshSettings() { - prefs.headerstyle_color == BLACK ? ui->black_text->setChecked(true) : (prefs.headerstyle_color == LIGHTBLUE ? ui->lightblue_text->setChecked(true) : ui->mediumblue_text->setChecked(true)); ui->font->setCurrentFont(qPrefDisplay::divelist_font()); ui->fontsize->setValue(qPrefDisplay::font_size()); ui->velocitySlider->setValue(qPrefDisplay::animation_speed()); @@ -36,6 +35,4 @@ void PreferencesDefaults::syncSettings() qPrefDisplay::set_divelist_font(ui->font->currentFont().toString()); qPrefDisplay::set_font_size(ui->fontsize->value()); qPrefDisplay::set_animation_speed(ui->velocitySlider->value()); - qPrefDisplay::set_headerstyle_color(ui->black_text->isChecked() ? BLACK : (ui->lightblue_text->isChecked() ? LIGHTBLUE : MEDIUMBLUE)); - } diff --git a/desktop-widgets/preferences/preferences_defaults.ui b/desktop-widgets/preferences/preferences_defaults.ui index b6104b256..030bb77d6 100644 --- a/desktop-widgets/preferences/preferences_defaults.ui +++ b/desktop-widgets/preferences/preferences_defaults.ui @@ -120,77 +120,6 @@ - - - Header text colors - - - - 5 - - - - - - - - - true - - - Depending on the display mode, sometimes the blue text used in headers in the various information panes is not clearly visible. Select a color that fits the current theme of your computer. For dark mode, select either Light Blue or Black (rendered white using a dark theme). The default is Medium Blue. - - - - - - - - - - - Medium Blue - - - - - - - - Light Blue - - - - - - - - Black - - - - - - - - - - - - - - - Qt::Vertical - - - - 0 - 195 - - - - - Qt::Vertical @@ -203,10 +132,8 @@ - - -- cgit v1.2.3-70-g09d2