From 2f86cbdc3690aa0e5ef8e321f4d5dbb10bf640cc Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Tue, 4 Apr 2017 19:50:46 +0200 Subject: Clean up some widgets Simplify logic of handling the Message that this dive is being modified. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- desktop-widgets/tab-widgets/maintab.cpp | 17 +- desktop-widgets/tab-widgets/maintab.ui | 1117 +++++++++++++++---------------- 2 files changed, 544 insertions(+), 590 deletions(-) (limited to 'desktop-widgets/tab-widgets') diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp index 0b712c8fb..28e17e66e 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -46,13 +46,13 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent), ui.setupUi(this); extraWidgets << new TabDiveExtraInfo(this); - addTab(extraWidgets.last(), "Extra Info"); + ui.tabWidget->addTab(extraWidgets.last(), "Extra Info"); extraWidgets << new TabDiveInformation(this); - addTab(extraWidgets.last(), "Information"); + ui.tabWidget->addTab(extraWidgets.last(), "Information"); extraWidgets << new TabDiveStatistics(this); - addTab(extraWidgets.last(), "Statistics"); + ui.tabWidget->addTab(extraWidgets.last(), "Statistics"); extraWidgets << new TabDivePhotos(this); - addTab(extraWidgets.last(), "Photos"); + ui.tabWidget->addTab(extraWidgets.last(), "Photos"); ui.dateEdit->setDisplayFormat(prefs.date_format); @@ -121,7 +121,6 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent), ui.suit->setCompleter(completers.suit); ui.tagWidget->setCompleter(completers.tags); ui.diveNotesMessage->hide(); - ui.diveEquipmentMessage->hide(); ui.depth->hide(); ui.depthLabel->hide(); ui.duration->hide(); @@ -261,14 +260,12 @@ void MainTab::addDiveStarted() void MainTab::addMessageAction(QAction *action) { - ui.diveEquipmentMessage->addAction(action); ui.diveNotesMessage->addAction(action); } void MainTab::hideMessage() { ui.diveNotesMessage->animatedHide(); - ui.diveEquipmentMessage->animatedHide(); updateTextLabels(false); } @@ -276,17 +273,13 @@ void MainTab::closeMessage() { hideMessage(); ui.diveNotesMessage->setCloseButtonVisible(false); - ui.diveEquipmentMessage->setCloseButtonVisible(false); -} + } void MainTab::displayMessage(QString str) { ui.diveNotesMessage->setCloseButtonVisible(false); - ui.diveEquipmentMessage->setCloseButtonVisible(false); ui.diveNotesMessage->setText(str); ui.diveNotesMessage->animatedShow(); - ui.diveEquipmentMessage->setText(str); - ui.diveEquipmentMessage->animatedShow(); updateTextLabels(); } diff --git a/desktop-widgets/tab-widgets/maintab.ui b/desktop-widgets/tab-widgets/maintab.ui index e1e29d052..ab77740f0 100644 --- a/desktop-widgets/tab-widgets/maintab.ui +++ b/desktop-widgets/tab-widgets/maintab.ui @@ -1,576 +1,525 @@ MainTab - + 0 0 - 463 - 815 + 555 + 848 - - 1 + + Form - - - Notes - - - General notes about the current selection - - - - 5 - - - 5 - - - 5 - - - 5 - - - 0 - - - - - - - - QFrame::NoFrame - - - QFrame::Plain - - - true - - - - - 0 - 0 - 445 - 726 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - 5 + + + + + + + + 0 + + + + Notes + + + + + + QFrame::NoFrame + + + QFrame::Plain + + + true + + + + + 0 + 0 + 523 + 739 + - - 5 - - - 8 - - - 0 - - - - - Duration - - - - - - - Date - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - Time - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - Air temp. - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - Water temp. - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - true - - - Qt::UTC - - - - - - - - 0 - 0 - - - - Qt::UTC - - - - - - - false - - - - - - - false - - - - - - - Depth - - - - - - - - - - - - - - - 0 - - - 5 - - - 5 - - - - - - - Location - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - - - - Qt::RichText - - - - - - - - - 2 - - - - - - - - Edit dive site - - - ... - - - - :/geocode:/geocode - - - - - - - - - - - - - - - - - 5 - - - 5 - - - 5 - - - 0 - - - - - Divemaster - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - Buddy - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - false - - - - - - - false - - - - - - - - - 5 - - - 5 - - - 5 - - - 0 - - - - - - 0 - 0 - - - - Rating - - - - - - - - 0 - 0 - - - - Visibility - - - - - - - Suit - - - - - - - - 0 - 0 - - - - Qt::StrongFocus - - - - - - - - 0 - 0 - - - - Qt::StrongFocus - - - - - - - - 0 - 0 - - - - false - - - - - - - - - 5 - - - 0 - - - - - - - - Tags - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - Dive mode - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - QPlainTextEdit::NoWrap - - - - - - - - - 0 - - - - - Notes - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - 0 - - - - - false - - - - - - + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 5 + + + 5 + + + 8 + + + 0 + + + + + Duration + + + + + + + Date + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + Time + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + Air temp. + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + Water temp. + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + true + + + Qt::UTC + + + + + + + + 0 + 0 + + + + Qt::UTC + + + + + + + false + + + + + + + false + + + + + + + Depth + + + + + + + + + + + + + + + 0 + + + 5 + + + 5 + + + + + + + Location + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + + + + Qt::RichText + + + + + + + - 0 + 2 - - 0 + + + + + + + Edit dive site + + + ... + + + + :/geocode:/geocode + + + + + + + + + + + + + + + + + 5 + + + 5 + + + 5 + + + 0 + + + + + Divemaster - - 0 + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - 0 + + + + + + Buddy + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + false + + + + + + + false - + + + + + + + + 5 + + + 5 + + + 5 + + + 0 + + + + + + 0 + 0 + + + + Rating + + + + + + + + 0 + 0 + + + + Visibility + + + + + + + Suit + + + + + + + + 0 + 0 + + + + Qt::StrongFocus + + + + + + + + 0 + 0 + + + + Qt::StrongFocus + + + + + + + + 0 + 0 + + + + false + + + + + + + + + 5 + + + 0 + + + + + + + + Tags + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + Dive mode + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Qt::ScrollBarAlwaysOff + + + Qt::ScrollBarAlwaysOff + + + QPlainTextEdit::NoWrap + + + + + + + + + 0 + + + + + Notes + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + 0 + + + + false + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + - - - - - - - - + + + + + + + + - - - - - - Equipment - - - Used equipment in the current selection - - - - 5 - - - 5 - - - 5 - - - 5 - - - - - - - - QFrame::NoFrame - - - QFrame::Plain - - - true - - - - - 0 - 0 - 445 - 720 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 2 - - - - - - 0 - + + + Equipment + + + + + + QFrame::NoFrame + + + QFrame::Plain + + + true + + + + + 0 + 0 + 523 + 739 + + + 0 @@ -583,24 +532,48 @@ 0 - - - - Qt::Vertical - - - + + 2 + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Vertical + + + + + + - - - + + + - - - + + + @@ -638,18 +611,6 @@
desktop-widgets/locationinformation.h
 - - dateEdit - timeEdit - airtemp - watertemp - divemaster - buddy - rating - visibility - suit - notes - -- cgit v1.2.3-70-g09d2