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

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

@ -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));
}

73
desktop-widgets/preferences/preferences_defaults.ui
View file

@ -120,77 +120,6 @@
</item>
<item>
<widget class="QGroupBox" name="groupBox_headerstyle">
<property name="title">
<string>Header text colors</string>
</property>
<layout class="QVBoxLayout" name="headerModeLayout_4">
<property name="margin">
<number>5</number>
</property>
<item>
<widget class="QLabel" name="label_help_header">
<property name="toolTip">
<string extracomment="Help info header"/>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="text">
<string>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.</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="darkmodeLayout_5">
<item>
<widget class="QRadioButton" name="mediumblue_text">
<property name="text">
<string>Medium Blue</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="lightblue_text">
<property name="text">
<string>Light Blue</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="black_text">
<property name="text">
<string>Black</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>195</height>
</size>
</property>
</spacer>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
@ -203,10 +132,8 @@
</property>
</spacer>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>

1
desktop-widgets/tab-widgets/TabDiveInformation.cpp
View file

@ -49,6 +49,7 @@ TabDiveInformation::TabDiveInformation(QWidget *parent) : TabBase(parent), ui(ne
updateWaterTypeWidget();
QPixmap warning (":salinity-warning-icon");
ui->salinityOverWrittenIcon->setPixmap(warning);
ui->salinityOverWrittenIcon->setToolTip("Water type differs from that of dc");
ui->salinityOverWrittenIcon->setToolTipDuration(2500);
ui->salinityOverWrittenIcon->setVisible(false);
}

3
desktop-widgets/tab-widgets/maintab.cpp
View file

@ -34,7 +34,6 @@
#include "TabDiveStatistics.h"
#include "TabDiveSite.h"
#include "TabDiveComputer.h"
#include "core/settings/qPrefDisplay.h"
#include <QCompleter>
#include <QScrollBar>
@ -102,7 +101,7 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
// Alas, this is not the case. When the user switches to system-format, the preferences sends the according
// signal. However, the correct date and time format is set by the preferences dialog later. This should be fixed.
connect(PreferencesDialog::instance(), &PreferencesDialog::settingsChanged, this, &MainTab::updateDateTimeFields);
connect(qPrefDisplay::instance(), &qPrefDisplay::headerstyle_colorChanged, this, &MainTab::colorsChanged);
QAction *action = new QAction(tr("Apply changes"), this);
connect(action, SIGNAL(triggered(bool)), this, SLOT(acceptChanges()));
ui.diveNotesMessage->addAction(action);