mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
preferences: create global settingsChanged signal
So far, the PreferencesDialog emitted a settingsChanged signal. This meant that models that listened to that signal had to conditionally compile out the code for mobile or the connection had to be made in MainWindow. Instead, introduce a global signal that does this and move the connects to the listeners to remove inter-dependencies. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
parent
8bbd778c28
commit
2d7be7a0e3
16 changed files with 36 additions and 49 deletions
|
@ -83,6 +83,9 @@ signals:
|
||||||
// The core structures were completely reset. Repopulate all models.
|
// The core structures were completely reset. Repopulate all models.
|
||||||
void dataReset();
|
void dataReset();
|
||||||
|
|
||||||
|
// The settings changed. Repopulate / rerender unit-dependent data, etc.
|
||||||
|
void settingsChanged();
|
||||||
|
|
||||||
// Note that there are no signals for trips being added and created
|
// Note that there are no signals for trips being added and created
|
||||||
// because these events never happen without a dive being added, removed or moved.
|
// because these events never happen without a dive being added, removed or moved.
|
||||||
// The dives are always sorted according to the dives_less_than() function of the core.
|
// The dives are always sorted according to the dives_less_than() function of the core.
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
#include "desktop-widgets/modeldelegates.h"
|
#include "desktop-widgets/modeldelegates.h"
|
||||||
#include "desktop-widgets/mainwindow.h"
|
#include "desktop-widgets/mainwindow.h"
|
||||||
#include "core/selection.h"
|
#include "core/selection.h"
|
||||||
|
#include "core/subsurface-qt/divelistnotifier.h"
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <QSettings>
|
#include <QSettings>
|
||||||
#include <QKeyEvent>
|
#include <QKeyEvent>
|
||||||
|
@ -39,6 +40,7 @@ DiveListView::DiveListView(QWidget *parent) : QTreeView(parent),
|
||||||
setModel(m);
|
setModel(m);
|
||||||
connect(m, &MultiFilterSortModel::selectionChanged, this, &DiveListView::diveSelectionChanged);
|
connect(m, &MultiFilterSortModel::selectionChanged, this, &DiveListView::diveSelectionChanged);
|
||||||
connect(m, &MultiFilterSortModel::currentDiveChanged, this, &DiveListView::currentDiveChanged);
|
connect(m, &MultiFilterSortModel::currentDiveChanged, this, &DiveListView::currentDiveChanged);
|
||||||
|
connect(&diveListNotifier, &DiveListNotifier::settingsChanged, this, &DiveListView::settingsChanged);
|
||||||
|
|
||||||
setSortingEnabled(true);
|
setSortingEnabled(true);
|
||||||
setContextMenuPolicy(Qt::DefaultContextMenu);
|
setContextMenuPolicy(Qt::DefaultContextMenu);
|
||||||
|
@ -348,6 +350,12 @@ void DiveListView::reload()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DiveListView::settingsChanged()
|
||||||
|
{
|
||||||
|
update();
|
||||||
|
reloadHeaderActions();
|
||||||
|
}
|
||||||
|
|
||||||
void DiveListView::reloadHeaderActions()
|
void DiveListView::reloadHeaderActions()
|
||||||
{
|
{
|
||||||
// Populate the context menu of the headers that will show
|
// Populate the context menu of the headers that will show
|
||||||
|
|
|
@ -33,6 +33,7 @@ signals:
|
||||||
void divesSelected();
|
void divesSelected();
|
||||||
public
|
public
|
||||||
slots:
|
slots:
|
||||||
|
void settingsChanged();
|
||||||
void reloadHeaderActions();
|
void reloadHeaderActions();
|
||||||
private
|
private
|
||||||
slots:
|
slots:
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
#include "core/qthelper.h"
|
#include "core/qthelper.h"
|
||||||
#include "core/units.h"
|
#include "core/units.h"
|
||||||
#include "core/settings/qPrefDivePlanner.h"
|
#include "core/settings/qPrefDivePlanner.h"
|
||||||
|
#include "core/subsurface-qt/divelistnotifier.h"
|
||||||
#include "core/gettextfromc.h"
|
#include "core/gettextfromc.h"
|
||||||
#include "backend-shared/plannershared.h"
|
#include "backend-shared/plannershared.h"
|
||||||
|
|
||||||
|
@ -175,6 +176,8 @@ DivePlannerWidget::DivePlannerWidget(QWidget *parent) : QWidget(parent, QFlag(0)
|
||||||
ui.tableWidget->view()->setItemDelegateForColumn(DivePlannerPointsModel::DURATION, new SpinBoxDelegate(0, 6000, 1, this));
|
ui.tableWidget->view()->setItemDelegateForColumn(DivePlannerPointsModel::DURATION, new SpinBoxDelegate(0, 6000, 1, this));
|
||||||
ui.tableWidget->view()->setItemDelegateForColumn(DivePlannerPointsModel::CCSETPOINT, new DoubleSpinBoxDelegate(0, 2, 0.1, this));
|
ui.tableWidget->view()->setItemDelegateForColumn(DivePlannerPointsModel::CCSETPOINT, new DoubleSpinBoxDelegate(0, 2, 0.1, this));
|
||||||
|
|
||||||
|
connect(&diveListNotifier, &DiveListNotifier::settingsChanged, this, &DivePlannerWidget::settingsChanged);
|
||||||
|
|
||||||
/* set defaults. */
|
/* set defaults. */
|
||||||
ui.ATMPressure->setValue(1013);
|
ui.ATMPressure->setValue(1013);
|
||||||
ui.atmHeight->setValue(0);
|
ui.atmHeight->setValue(0);
|
||||||
|
@ -506,6 +509,7 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent) : QWidget(parent,
|
||||||
connect(ui.bestmixEND, QOverload<int>::of(&QSpinBox::valueChanged), &PlannerShared::set_bestmixend);
|
connect(ui.bestmixEND, QOverload<int>::of(&QSpinBox::valueChanged), &PlannerShared::set_bestmixend);
|
||||||
connect(ui.bottomSAC, QOverload<double>::of(&QDoubleSpinBox::valueChanged), &PlannerShared::set_bottomsac);
|
connect(ui.bottomSAC, QOverload<double>::of(&QDoubleSpinBox::valueChanged), &PlannerShared::set_bottomsac);
|
||||||
connect(ui.decoStopSAC, QOverload<double>::of(&QDoubleSpinBox::valueChanged), &PlannerShared::set_decosac);
|
connect(ui.decoStopSAC, QOverload<double>::of(&QDoubleSpinBox::valueChanged), &PlannerShared::set_decosac);
|
||||||
|
connect(&diveListNotifier, &DiveListNotifier::settingsChanged, this, &PlannerSettingsWidget::settingsChanged);
|
||||||
|
|
||||||
settingsChanged();
|
settingsChanged();
|
||||||
ui.gflow->setValue(prefs.gflow);
|
ui.gflow->setValue(prefs.gflow);
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#include "filterconstraintwidget.h"
|
#include "filterconstraintwidget.h"
|
||||||
#include "starwidget.h"
|
#include "starwidget.h"
|
||||||
#include "core/pref.h"
|
#include "core/pref.h"
|
||||||
#include "desktop-widgets/preferences/preferencesdialog.h"
|
#include "core/subsurface-qt/divelistnotifier.h"
|
||||||
#include "qt-models/cleanertablemodel.h" // for trashIcon()
|
#include "qt-models/cleanertablemodel.h" // for trashIcon()
|
||||||
#include "qt-models/filterconstraintmodel.h"
|
#include "qt-models/filterconstraintmodel.h"
|
||||||
|
|
||||||
|
@ -225,7 +225,7 @@ FilterConstraintWidget::FilterConstraintWidget(FilterConstraintModel *modelIn, c
|
||||||
rangeLayout->addStretch();
|
rangeLayout->addStretch();
|
||||||
|
|
||||||
// Update the widget if the settings changed to reflect new units.
|
// Update the widget if the settings changed to reflect new units.
|
||||||
connect(PreferencesDialog::instance(), &PreferencesDialog::settingsChanged, this, &FilterConstraintWidget::update);
|
connect(&diveListNotifier, &DiveListNotifier::settingsChanged, this, &FilterConstraintWidget::update);
|
||||||
|
|
||||||
addToLayout();
|
addToLayout();
|
||||||
update();
|
update();
|
||||||
|
|
|
@ -189,13 +189,7 @@ MainWindow::MainWindow() : QMainWindow(),
|
||||||
QIcon::setThemeName("subsurface");
|
QIcon::setThemeName("subsurface");
|
||||||
}
|
}
|
||||||
connect(diveList, &DiveListView::divesSelected, this, &MainWindow::selectionChanged);
|
connect(diveList, &DiveListView::divesSelected, this, &MainWindow::selectionChanged);
|
||||||
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), this, SLOT(readSettings()));
|
connect(&diveListNotifier, &DiveListNotifier::settingsChanged, this, &MainWindow::readSettings);
|
||||||
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), diveList, SLOT(update()));
|
|
||||||
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), diveList, SLOT(reloadHeaderActions()));
|
|
||||||
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), mainTab.get(), SLOT(updateDiveInfo()));
|
|
||||||
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), divePlannerWidget, SLOT(settingsChanged()));
|
|
||||||
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), divePlannerSettingsWidget, SLOT(settingsChanged()));
|
|
||||||
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), TankInfoModel::instance(), SLOT(update()));
|
|
||||||
for (int i = 0; i < NUM_RECENT_FILES; i++) {
|
for (int i = 0; i < NUM_RECENT_FILES; i++) {
|
||||||
actionsRecent[i] = new QAction(this);
|
actionsRecent[i] = new QAction(this);
|
||||||
actionsRecent[i]->setData(i);
|
actionsRecent[i]->setData(i);
|
||||||
|
@ -324,7 +318,7 @@ MainWindow::MainWindow() : QMainWindow(),
|
||||||
connect(graphics, &ProfileWidget2::editCurrentDive, this, &MainWindow::editCurrentDive);
|
connect(graphics, &ProfileWidget2::editCurrentDive, this, &MainWindow::editCurrentDive);
|
||||||
connect(graphics, &ProfileWidget2::updateDiveInfo, mainTab.get(), &MainTab::updateDiveInfo);
|
connect(graphics, &ProfileWidget2::updateDiveInfo, mainTab.get(), &MainTab::updateDiveInfo);
|
||||||
|
|
||||||
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), graphics, SLOT(settingsChanged()));
|
connect(&diveListNotifier, &DiveListNotifier::settingsChanged, graphics, &ProfileWidget2::settingsChanged);
|
||||||
|
|
||||||
ui.profCalcAllTissues->setChecked(qPrefTechnicalDetails::calcalltissues());
|
ui.profCalcAllTissues->setChecked(qPrefTechnicalDetails::calcalltissues());
|
||||||
ui.profCalcCeiling->setChecked(qPrefTechnicalDetails::calcceiling());
|
ui.profCalcCeiling->setChecked(qPrefTechnicalDetails::calcceiling());
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
#include "preferences_reset.h"
|
#include "preferences_reset.h"
|
||||||
|
|
||||||
#include "core/qthelper.h"
|
#include "core/qthelper.h"
|
||||||
|
#include "core/subsurface-qt/divelistnotifier.h"
|
||||||
|
|
||||||
#include <QVBoxLayout>
|
#include <QVBoxLayout>
|
||||||
#include <QHBoxLayout>
|
#include <QHBoxLayout>
|
||||||
|
@ -25,7 +26,7 @@
|
||||||
#include <QAbstractButton>
|
#include <QAbstractButton>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
PreferencesDialog* PreferencesDialog::instance()
|
PreferencesDialog *PreferencesDialog::instance()
|
||||||
{
|
{
|
||||||
static PreferencesDialog *self = new PreferencesDialog();
|
static PreferencesDialog *self = new PreferencesDialog();
|
||||||
return self;
|
return self;
|
||||||
|
@ -130,10 +131,10 @@ void PreferencesDialog::refreshPages()
|
||||||
void PreferencesDialog::applyRequested(bool closeIt)
|
void PreferencesDialog::applyRequested(bool closeIt)
|
||||||
{
|
{
|
||||||
Q_FOREACH(AbstractPreferencesWidget *page, pages) {
|
Q_FOREACH(AbstractPreferencesWidget *page, pages) {
|
||||||
connect(page, &AbstractPreferencesWidget::settingsChanged, this, &PreferencesDialog::settingsChanged, Qt::UniqueConnection);
|
connect(page, &AbstractPreferencesWidget::settingsChanged, &diveListNotifier, &DiveListNotifier::settingsChanged, Qt::UniqueConnection);
|
||||||
page->syncSettings();
|
page->syncSettings();
|
||||||
}
|
}
|
||||||
emit settingsChanged();
|
emit diveListNotifier.settingsChanged();
|
||||||
if (closeIt)
|
if (closeIt)
|
||||||
accept();
|
accept();
|
||||||
}
|
}
|
||||||
|
@ -152,6 +153,6 @@ void PreferencesDialog::defaultsRequested()
|
||||||
Q_FOREACH(AbstractPreferencesWidget *page, pages) {
|
Q_FOREACH(AbstractPreferencesWidget *page, pages) {
|
||||||
page->refreshSettings();
|
page->refreshSettings();
|
||||||
}
|
}
|
||||||
emit settingsChanged();
|
emit diveListNotifier.settingsChanged();
|
||||||
accept();
|
accept();
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,8 +19,6 @@ public:
|
||||||
void addPreferencePage(AbstractPreferencesWidget *page);
|
void addPreferencePage(AbstractPreferencesWidget *page);
|
||||||
void refreshPages();
|
void refreshPages();
|
||||||
void defaultsRequested();
|
void defaultsRequested();
|
||||||
signals:
|
|
||||||
void settingsChanged();
|
|
||||||
private:
|
private:
|
||||||
PreferencesDialog();
|
PreferencesDialog();
|
||||||
void cancelRequested();
|
void cancelRequested();
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
#include "desktop-widgets/tab-widgets/maintab.h"
|
#include "desktop-widgets/tab-widgets/maintab.h"
|
||||||
#include "desktop-widgets/mainwindow.h"
|
#include "desktop-widgets/mainwindow.h"
|
||||||
#include "desktop-widgets/mapwidget.h"
|
#include "desktop-widgets/mapwidget.h"
|
||||||
#include "desktop-widgets/preferences/preferencesdialog.h"
|
|
||||||
#include "core/qthelper.h"
|
#include "core/qthelper.h"
|
||||||
#include "core/trip.h"
|
#include "core/trip.h"
|
||||||
#include "qt-models/diveplannermodel.h"
|
#include "qt-models/diveplannermodel.h"
|
||||||
|
@ -91,6 +90,7 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
|
||||||
connect(&diveListNotifier, &DiveListNotifier::tripChanged, this, &MainTab::tripChanged);
|
connect(&diveListNotifier, &DiveListNotifier::tripChanged, this, &MainTab::tripChanged);
|
||||||
connect(&diveListNotifier, &DiveListNotifier::diveSiteChanged, this, &MainTab::diveSiteEdited);
|
connect(&diveListNotifier, &DiveListNotifier::diveSiteChanged, this, &MainTab::diveSiteEdited);
|
||||||
connect(&diveListNotifier, &DiveListNotifier::commandExecuted, this, &MainTab::closeWarning);
|
connect(&diveListNotifier, &DiveListNotifier::commandExecuted, this, &MainTab::closeWarning);
|
||||||
|
connect(&diveListNotifier, &DiveListNotifier::settingsChanged, this, &MainTab::updateDiveInfo);
|
||||||
|
|
||||||
connect(ui.editDiveSiteButton, &QToolButton::clicked, MainWindow::instance(), &MainWindow::startDiveSiteEdit);
|
connect(ui.editDiveSiteButton, &QToolButton::clicked, MainWindow::instance(), &MainWindow::startDiveSiteEdit);
|
||||||
connect(ui.location, &DiveLocationLineEdit::entered, MapWidget::instance(), &MapWidget::centerOnIndex);
|
connect(ui.location, &DiveLocationLineEdit::entered, MapWidget::instance(), &MapWidget::centerOnIndex);
|
||||||
|
@ -100,7 +100,7 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
|
||||||
// One might think that we could listen to the precise property-changed signals of the preferences system.
|
// One might think that we could listen to the precise property-changed signals of the preferences system.
|
||||||
// Alas, this is not the case. When the user switches to system-format, the preferences sends the according
|
// 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.
|
// 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(&diveListNotifier, &DiveListNotifier::settingsChanged, this, &MainTab::updateDateTimeFields);
|
||||||
|
|
||||||
QAction *action = new QAction(tr("Apply changes"), this);
|
QAction *action = new QAction(tr("Apply changes"), this);
|
||||||
connect(action, SIGNAL(triggered(bool)), this, SLOT(acceptChanges()));
|
connect(action, SIGNAL(triggered(bool)), this, SLOT(acceptChanges()));
|
||||||
|
|
|
@ -3,9 +3,7 @@
|
||||||
#include "profile-widget/divetextitem.h"
|
#include "profile-widget/divetextitem.h"
|
||||||
#include "core/qthelper.h"
|
#include "core/qthelper.h"
|
||||||
#include "core/subsurface-string.h"
|
#include "core/subsurface-string.h"
|
||||||
#ifndef SUBSURFACE_MOBILE
|
#include "core/subsurface-qt/divelistnotifier.h"
|
||||||
#include "desktop-widgets/preferences/preferencesdialog.h"
|
|
||||||
#endif
|
|
||||||
#include "qt-models/diveplotdatamodel.h"
|
#include "qt-models/diveplotdatamodel.h"
|
||||||
#include "profile-widget/animationfunctions.h"
|
#include "profile-widget/animationfunctions.h"
|
||||||
#include "profile-widget/divelineitem.h"
|
#include "profile-widget/divelineitem.h"
|
||||||
|
@ -365,9 +363,7 @@ QColor DepthAxis::colorForValue(double)
|
||||||
|
|
||||||
DepthAxis::DepthAxis(ProfileWidget2 *widget) : DiveCartesianAxis(widget)
|
DepthAxis::DepthAxis(ProfileWidget2 *widget) : DiveCartesianAxis(widget)
|
||||||
{
|
{
|
||||||
#ifndef SUBSURFACE_MOBILE
|
connect(&diveListNotifier, &DiveListNotifier::settingsChanged, this, &DepthAxis::settingsChanged);
|
||||||
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
|
|
||||||
#endif
|
|
||||||
changed = true;
|
changed = true;
|
||||||
settingsChanged();
|
settingsChanged();
|
||||||
}
|
}
|
||||||
|
@ -422,9 +418,7 @@ PartialGasPressureAxis::PartialGasPressureAxis(ProfileWidget2 *widget) :
|
||||||
DiveCartesianAxis(widget),
|
DiveCartesianAxis(widget),
|
||||||
model(NULL)
|
model(NULL)
|
||||||
{
|
{
|
||||||
#ifndef SUBSURFACE_MOBILE
|
connect(&diveListNotifier, &DiveListNotifier::settingsChanged, this, &PartialGasPressureAxis::settingsChanged);
|
||||||
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void PartialGasPressureAxis::setModel(DivePlotDataModel *m)
|
void PartialGasPressureAxis::setModel(DivePlotDataModel *m)
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
#include "core/pref.h"
|
#include "core/pref.h"
|
||||||
#include "core/qthelper.h"
|
#include "core/qthelper.h"
|
||||||
#include "core/settings/qPrefDisplay.h"
|
#include "core/settings/qPrefDisplay.h"
|
||||||
|
#include "core/subsurface-qt/divelistnotifier.h"
|
||||||
#ifndef SUBSURFACE_MOBILE
|
#ifndef SUBSURFACE_MOBILE
|
||||||
#include "desktop-widgets/preferences/preferencesdialog.h"
|
|
||||||
#include "core/dive.h" // for displayed_dive
|
#include "core/dive.h" // for displayed_dive
|
||||||
#include "commands/command.h"
|
#include "commands/command.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -50,9 +50,7 @@ DivePictureItem::DivePictureItem(QGraphicsItem *parent): DivePixmapItem(parent),
|
||||||
setFlag(ItemIgnoresTransformations);
|
setFlag(ItemIgnoresTransformations);
|
||||||
setAcceptHoverEvents(true);
|
setAcceptHoverEvents(true);
|
||||||
setScale(0.2);
|
setScale(0.2);
|
||||||
#ifndef SUBSURFACE_MOBILE
|
connect(&diveListNotifier, &DiveListNotifier::settingsChanged, this, &DivePictureItem::settingsChanged);
|
||||||
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
canvas->setPen(Qt::NoPen);
|
canvas->setPen(Qt::NoPen);
|
||||||
canvas->setBrush(QColor(Qt::white));
|
canvas->setBrush(QColor(Qt::white));
|
||||||
|
|
|
@ -5,22 +5,18 @@
|
||||||
#include "profile-widget/divetextitem.h"
|
#include "profile-widget/divetextitem.h"
|
||||||
#include "profile-widget/animationfunctions.h"
|
#include "profile-widget/animationfunctions.h"
|
||||||
#include "core/profile.h"
|
#include "core/profile.h"
|
||||||
#ifndef SUBSURFACE_MOBILE
|
|
||||||
#include "desktop-widgets/preferences/preferencesdialog.h"
|
|
||||||
#endif
|
|
||||||
#include "qt-models/diveplannermodel.h"
|
#include "qt-models/diveplannermodel.h"
|
||||||
#include "core/qthelper.h"
|
#include "core/qthelper.h"
|
||||||
#include "core/settings/qPrefTechnicalDetails.h"
|
#include "core/settings/qPrefTechnicalDetails.h"
|
||||||
#include "core/settings/qPrefLog.h"
|
#include "core/settings/qPrefLog.h"
|
||||||
|
#include "core/subsurface-qt/divelistnotifier.h"
|
||||||
#include "libdivecomputer/parser.h"
|
#include "libdivecomputer/parser.h"
|
||||||
#include "profile-widget/profilewidget2.h"
|
#include "profile-widget/profilewidget2.h"
|
||||||
|
|
||||||
AbstractProfilePolygonItem::AbstractProfilePolygonItem() : QObject(), QGraphicsPolygonItem(), hAxis(NULL), vAxis(NULL), dataModel(NULL), hDataColumn(-1), vDataColumn(-1)
|
AbstractProfilePolygonItem::AbstractProfilePolygonItem() : QObject(), QGraphicsPolygonItem(), hAxis(NULL), vAxis(NULL), dataModel(NULL), hDataColumn(-1), vDataColumn(-1)
|
||||||
{
|
{
|
||||||
setCacheMode(DeviceCoordinateCache);
|
setCacheMode(DeviceCoordinateCache);
|
||||||
#ifndef SUBSURFACE_MOBILE
|
connect(&diveListNotifier, &DiveListNotifier::settingsChanged, this, &AbstractProfilePolygonItem::settingsChanged);
|
||||||
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void AbstractProfilePolygonItem::settingsChanged()
|
void AbstractProfilePolygonItem::settingsChanged()
|
||||||
|
|
|
@ -31,8 +31,8 @@
|
||||||
#include "core/qthelper.h"
|
#include "core/qthelper.h"
|
||||||
#include "core/gettextfromc.h"
|
#include "core/gettextfromc.h"
|
||||||
#include "core/imagedownloader.h"
|
#include "core/imagedownloader.h"
|
||||||
#include "core/subsurface-qt/divelistnotifier.h"
|
|
||||||
#endif
|
#endif
|
||||||
|
#include "core/subsurface-qt/divelistnotifier.h"
|
||||||
|
|
||||||
#include <libdivecomputer/parser.h>
|
#include <libdivecomputer/parser.h>
|
||||||
#include <QScrollBar>
|
#include <QScrollBar>
|
||||||
|
@ -47,9 +47,6 @@
|
||||||
#ifndef QT_NO_DEBUG
|
#ifndef QT_NO_DEBUG
|
||||||
#include <QTableView>
|
#include <QTableView>
|
||||||
#endif
|
#endif
|
||||||
#ifndef SUBSURFACE_MOBILE
|
|
||||||
#include "desktop-widgets/preferences/preferencesdialog.h"
|
|
||||||
#endif
|
|
||||||
#include <QtWidgets>
|
#include <QtWidgets>
|
||||||
|
|
||||||
#define PP_GRAPHS_ENABLED (prefs.pp_graphs.po2 || prefs.pp_graphs.pn2 || prefs.pp_graphs.phe)
|
#define PP_GRAPHS_ENABLED (prefs.pp_graphs.po2 || prefs.pp_graphs.pn2 || prefs.pp_graphs.phe)
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
// SPDX-License-Identifier: GPL-2.0
|
// SPDX-License-Identifier: GPL-2.0
|
||||||
#include "profile-widget/ruleritem.h"
|
#include "profile-widget/ruleritem.h"
|
||||||
#ifndef SUBSURFACE_MOBILE
|
|
||||||
#include "desktop-widgets/preferences/preferencesdialog.h"
|
|
||||||
#endif
|
|
||||||
#include "profile-widget/profilewidget2.h"
|
#include "profile-widget/profilewidget2.h"
|
||||||
#include "core/display.h"
|
#include "core/display.h"
|
||||||
#include "core/settings/qPrefTechnicalDetails.h"
|
#include "core/settings/qPrefTechnicalDetails.h"
|
||||||
|
|
|
@ -87,6 +87,7 @@ TankInfoModel::TankInfoModel()
|
||||||
{
|
{
|
||||||
setHeaderDataStrings(QStringList() << tr("Description") << tr("ml") << tr("bar"));
|
setHeaderDataStrings(QStringList() << tr("Description") << tr("ml") << tr("bar"));
|
||||||
connect(&diveListNotifier, &DiveListNotifier::dataReset, this, &TankInfoModel::update);
|
connect(&diveListNotifier, &DiveListNotifier::dataReset, this, &TankInfoModel::update);
|
||||||
|
connect(&diveListNotifier, &DiveListNotifier::settingsChanged, this, &TankInfoModel::update);
|
||||||
update();
|
update();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
#include "core/color.h"
|
|
||||||
#include "core/downloadfromdcthread.h" // for fill_computer_list
|
#include "core/downloadfromdcthread.h" // for fill_computer_list
|
||||||
#include "core/errorhelper.h"
|
#include "core/errorhelper.h"
|
||||||
#include "core/parse.h"
|
#include "core/parse.h"
|
||||||
|
@ -15,11 +14,7 @@
|
||||||
#include "core/subsurfacestartup.h"
|
#include "core/subsurfacestartup.h"
|
||||||
#include "core/settings/qPref.h"
|
#include "core/settings/qPref.h"
|
||||||
#include "core/tag.h"
|
#include "core/tag.h"
|
||||||
#include "desktop-widgets/diveplanner.h"
|
|
||||||
#include "desktop-widgets/mainwindow.h"
|
#include "desktop-widgets/mainwindow.h"
|
||||||
#include "desktop-widgets/preferences/preferencesdialog.h"
|
|
||||||
#include "desktop-widgets/tab-widgets/maintab.h"
|
|
||||||
#include "profile-widget/profilewidget2.h"
|
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QLoggingCategory>
|
#include <QLoggingCategory>
|
||||||
|
|
Loading…
Add table
Reference in a new issue