From 4e86dd3a5221ca37545cba9950a712f938367113 Mon Sep 17 00:00:00 2001 From: willemferguson Date: Thu, 28 Nov 2019 12:35:39 +0200 Subject: Desktop: enable additional environmental star widgets Implement the UI features related to the additonal star widgets. Create the additonal star widgets and connect them to the preferences settings. By default only the current and visibility widgets are shown. In this case the current widget is on the left hand side of the tab. If the additional widgets are enabled the horizontal order of the widegts are changed to reflect attributes roughly from the start of the dive on the left to those towards the end of the dive on the right. Signed-off-by: willemferguson Signed-off-by: Dirk Hohndel --- desktop-widgets/tab-widgets/TabDiveInformation.cpp | 20 +++ desktop-widgets/tab-widgets/TabDiveInformation.h | 1 + desktop-widgets/tab-widgets/TabDiveInformation.ui | 196 +++++++++++++++++++++ 3 files changed, 217 insertions(+) (limited to 'desktop-widgets/tab-widgets') diff --git a/desktop-widgets/tab-widgets/TabDiveInformation.cpp b/desktop-widgets/tab-widgets/TabDiveInformation.cpp index 34aa159e6..a00913086 100644 --- a/desktop-widgets/tab-widgets/TabDiveInformation.cpp +++ b/desktop-widgets/tab-widgets/TabDiveInformation.cpp @@ -36,6 +36,12 @@ TabDiveInformation::TabDiveInformation(QWidget *parent) : TabBase(parent), ui(ne ui->gasHeadingLabel->setStyleSheet(CSS_SET_HEADING_BLUE); ui->environmentHeadingLabel->setStyleSheet(CSS_SET_HEADING_BLUE); ui->groupBox_visibility->setStyleSheet(CSSSetSmallLabel); + ui->groupBox_current->setStyleSheet(CSSSetSmallLabel); + ui->groupBox_wavesize->setStyleSheet(CSSSetSmallLabel); + ui->groupBox_surge->setStyleSheet(CSSSetSmallLabel); + ui->groupBox_chill->setStyleSheet(CSSSetSmallLabel); + if (!prefs.extraEnvironmentalDefault) // if extraEnvironmental preference is turned off + showCurrentWidget(false, 0); // Show current star widget at lefthand side QAction *action = new QAction(tr("OK"), this); connect(action, &QAction::triggered, this, &TabDiveInformation::closeWarning); ui->multiDiveWarningMessage->addAction(action); @@ -160,6 +166,16 @@ void TabDiveInformation::updateSalinity() } } +void TabDiveInformation::showCurrentWidget(bool show, int position) +{ + ui->groupBox_wavesize->setVisible(show); + ui->groupBox_surge->setVisible(show); + ui->groupBox_chill->setVisible(show); + int layoutPosition = ui->diveInfoScrollAreaLayout->indexOf(ui->groupBox_current); + ui->diveInfoScrollAreaLayout->takeAt(layoutPosition); + ui->diveInfoScrollAreaLayout->addWidget(ui->groupBox_current, 6, position, 1, 1); +} + void TabDiveInformation::updateData() { if (!current_dive) { @@ -176,6 +192,10 @@ void TabDiveInformation::updateData() updateMode(current_dive); updateSalinity(); ui->visibility->setCurrentStars(current_dive->visibility); + if (prefs.extraEnvironmentalDefault) + showCurrentWidget(true, 2); // Show current star widget at 3rd position + else + showCurrentWidget(false, 0); // Show current star widget at lefthand side } // This function gets called if a field gets updated by an undo command. diff --git a/desktop-widgets/tab-widgets/TabDiveInformation.h b/desktop-widgets/tab-widgets/TabDiveInformation.h index 96b2896e9..51ec2381a 100644 --- a/desktop-widgets/tab-widgets/TabDiveInformation.h +++ b/desktop-widgets/tab-widgets/TabDiveInformation.h @@ -34,6 +34,7 @@ private: void updateMode(struct dive *d); void divesEdited(int); void closeWarning(); + void showCurrentWidget(bool show, int position); }; #endif diff --git a/desktop-widgets/tab-widgets/TabDiveInformation.ui b/desktop-widgets/tab-widgets/TabDiveInformation.ui index 82f78ee4a..5a81d7395 100644 --- a/desktop-widgets/tab-widgets/TabDiveInformation.ui +++ b/desktop-widgets/tab-widgets/TabDiveInformation.ui @@ -499,6 +499,55 @@ + + + + Surface waves + + + Qt::AlignHCenter + + + + 0 + 0 + + + + + 0 + + + + + Qt::StrongFocus + + + + 0 + 0 + + + + + + + + Large + + + + + + + Small + + + + + + + @@ -548,6 +597,153 @@ + + + + Current + + + Qt::AlignHCenter + + + + 0 + 0 + + + + + 0 + + + + + + 0 + 0 + + + + Qt::StrongFocus + + + + + + + Strong + + + + + + + Weak + + + + + + + + + + + Surge + + + Qt::AlignHCenter + + + + 0 + 0 + + + + + 0 + + + + + + 0 + 0 + + + + Qt::StrongFocus + + + + + + + Strong + + + + + + + Weak + + + + + + + + + + + Chill + + + Qt::AlignHCenter + + + + 0 + 0 + + + + + 0 + + + + + + 0 + 0 + + + + Qt::StrongFocus + + + + + + + Freezing + + + + + + + Comfy + + + + + + + -- cgit v1.2.3-70-g09d2