diff --git a/desktop-widgets/CMakeLists.txt b/desktop-widgets/CMakeLists.txt index 82ca26aa6..55b37b338 100644 --- a/desktop-widgets/CMakeLists.txt +++ b/desktop-widgets/CMakeLists.txt @@ -51,7 +51,6 @@ set (SUBSURFACE_UI tripselectiodialog.ui urldialog.ui webservices.ui - tab-widgets/maintab.ui tab-widgets/TabDiveNotes.ui tab-widgets/TabDiveStatistics.ui tab-widgets/TabDiveInformation.ui diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp index 3df2218bb..0eb7adc89 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -32,22 +32,20 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent), lastTabSelectedDive(0), lastTabSelectedDiveTrip(0) { - ui.setupUi(this); - extraWidgets << new TabDiveNotes(this); - ui.tabWidget->addTab(extraWidgets.last(), tr("Notes")); + addTab(extraWidgets.last(), tr("Notes")); extraWidgets << new TabDiveEquipment(this); - ui.tabWidget->addTab(extraWidgets.last(), tr("Equipment")); + addTab(extraWidgets.last(), tr("Equipment")); extraWidgets << new TabDiveInformation(this); - ui.tabWidget->addTab(extraWidgets.last(), tr("Information")); + addTab(extraWidgets.last(), tr("Information")); extraWidgets << new TabDiveStatistics(this); - ui.tabWidget->addTab(extraWidgets.last(), tr("Summary")); + addTab(extraWidgets.last(), tr("Summary")); extraWidgets << new TabDivePhotos(this); - ui.tabWidget->addTab(extraWidgets.last(), tr("Media")); + addTab(extraWidgets.last(), tr("Media")); extraWidgets << new TabDiveExtraInfo(this); - ui.tabWidget->addTab(extraWidgets.last(), tr("Extra Info")); + addTab(extraWidgets.last(), tr("Extra Info")); extraWidgets << new TabDiveSite(this); - ui.tabWidget->addTab(extraWidgets.last(), tr("Dive sites")); + addTab(extraWidgets.last(), tr("Dive sites")); // make sure we know if this is a light or dark mode isDark = paletteIsDark(palette()); @@ -125,24 +123,24 @@ void MainTab::updateDiveInfo() // 1) this disrupts the user-experience and // 2) the filter is reset, potentially erasing the current trip under our feet. // TODO: Don't hard code tab location! - bool onDiveSiteTab = ui.tabWidget->currentIndex() == 6; + bool onDiveSiteTab = currentIndex() == 6; if (single_selected_trip()) { // Remember the tab selected for last dive but only if we're not on the dive site tab if (lastSelectedDive && !onDiveSiteTab) - lastTabSelectedDive = ui.tabWidget->currentIndex(); - ui.tabWidget->setTabText(0, tr("Trip notes")); + lastTabSelectedDive = currentIndex(); + setTabText(0, tr("Trip notes")); // Recover the tab selected for last dive trip but only if we're not on the dive site tab if (lastSelectedDive && !onDiveSiteTab) - ui.tabWidget->setCurrentIndex(lastTabSelectedDiveTrip); + setCurrentIndex(lastTabSelectedDiveTrip); lastSelectedDive = false; } else { // Remember the tab selected for last dive trip but only if we're not on the dive site tab if (!lastSelectedDive && !onDiveSiteTab) - lastTabSelectedDiveTrip = ui.tabWidget->currentIndex(); - ui.tabWidget->setTabText(0, tr("Notes")); + lastTabSelectedDiveTrip = currentIndex(); + setTabText(0, tr("Notes")); // Recover the tab selected for last dive but only if we're not on the dive site tab if (!lastSelectedDive && !onDiveSiteTab) - ui.tabWidget->setCurrentIndex(lastTabSelectedDive); + setCurrentIndex(lastTabSelectedDive); lastSelectedDive = true; } } else { diff --git a/desktop-widgets/tab-widgets/maintab.h b/desktop-widgets/tab-widgets/maintab.h index 95fe00c76..871e20711 100644 --- a/desktop-widgets/tab-widgets/maintab.h +++ b/desktop-widgets/tab-widgets/maintab.h @@ -10,7 +10,6 @@ #include -#include "ui_maintab.h" #include "core/dive.h" #include "core/subsurface-qt/divelistnotifier.h" @@ -29,7 +28,6 @@ slots: void escDetected(); void colorsChanged(); private: - Ui::MainTab ui; bool lastSelectedDive; int lastTabSelectedDive; int lastTabSelectedDiveTrip; diff --git a/desktop-widgets/tab-widgets/maintab.ui b/desktop-widgets/tab-widgets/maintab.ui deleted file mode 100644 index f020a4668..000000000 --- a/desktop-widgets/tab-widgets/maintab.ui +++ /dev/null @@ -1,30 +0,0 @@ - - - MainTab - - - - 0 - 0 - 555 - 848 - - - - Form - - - - - - 0 - - - - - - - - - -