summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--desktop-widgets/divelogexportdialog.cpp2
-rw-r--r--desktop-widgets/downloadfromdivecomputer.cpp6
-rw-r--r--desktop-widgets/locationinformation.cpp4
-rw-r--r--desktop-widgets/mainwindow.cpp274
-rw-r--r--desktop-widgets/mainwindow.h12
-rw-r--r--desktop-widgets/mapwidget.cpp4
-rw-r--r--desktop-widgets/modeldelegates.cpp6
-rw-r--r--desktop-widgets/plugins/facebook/facebookconnectwidget.cpp2
-rw-r--r--desktop-widgets/printer.cpp2
-rw-r--r--desktop-widgets/simplewidgets.cpp4
-rw-r--r--desktop-widgets/tab-widgets/TabDivePhotos.cpp4
-rw-r--r--desktop-widgets/tab-widgets/maintab.cpp52
-rw-r--r--desktop-widgets/tagwidget.cpp4
-rw-r--r--qt-models/filtermodels.cpp2
14 files changed, 176 insertions, 202 deletions
diff --git a/desktop-widgets/divelogexportdialog.cpp b/desktop-widgets/divelogexportdialog.cpp
index 46e121d6c..747dc5258 100644
--- a/desktop-widgets/divelogexportdialog.cpp
+++ b/desktop-widgets/divelogexportdialog.cpp
@@ -275,7 +275,7 @@ void DiveLogExportDialog::export_TeX(const char *filename, const bool selected_o
if (selected_only && !dive->selected)
continue;
- ProfileWidget2 *profile = MainWindow::instance()->graphics();
+ ProfileWidget2 *profile = MainWindow::instance()->graphics;
profile->plotDive(dive, true);
profile->setToolTipVisibile(false);
QPixmap pix = QPixmap::grabWidget(profile);
diff --git a/desktop-widgets/downloadfromdivecomputer.cpp b/desktop-widgets/downloadfromdivecomputer.cpp
index df43dbdcb..1b88431ee 100644
--- a/desktop-widgets/downloadfromdivecomputer.cpp
+++ b/desktop-widgets/downloadfromdivecomputer.cpp
@@ -527,7 +527,7 @@ void DownloadFromDCWidget::on_ok_clicked()
delete_dive_from_table(&downloadTable, j);
}
- MainWindow::instance()->dive_list()->unselectDives();
+ MainWindow::instance()->dive_list->unselectDives();
if (downloadTable.nr > 0) {
// remember the last downloaded dive (on most dive computers this will be the chronologically
@@ -542,8 +542,8 @@ void DownloadFromDCWidget::on_ok_clicked()
int idx = get_idx_by_uniq_id(uniqId);
// this shouldn't be necessary - but there are reports that somehow existing dives stay selected
// (but not visible as selected)
- MainWindow::instance()->dive_list()->unselectDives();
- MainWindow::instance()->dive_list()->selectDive(idx, true);
+ MainWindow::instance()->dive_list->unselectDives();
+ MainWindow::instance()->dive_list->selectDive(idx, true);
}
if (ostcFirmwareCheck && currentState == DONE) {
diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp
index 3d96a8611..320b248b8 100644
--- a/desktop-widgets/locationinformation.cpp
+++ b/desktop-widgets/locationinformation.cpp
@@ -255,7 +255,7 @@ void LocationInformationWidget::resetState()
{
modified = false;
resetPallete();
- MainWindow::instance()->dive_list()->setEnabled(true);
+ MainWindow::instance()->dive_list->setEnabled(true);
MainWindow::instance()->setEnabledToolbar(true);
ui.diveSiteMessage->setText(tr("Dive site management"));
MapWidget::instance()->endGetDiveCoordinates();
@@ -267,7 +267,7 @@ void LocationInformationWidget::resetState()
void LocationInformationWidget::enableEdition()
{
- MainWindow::instance()->dive_list()->setEnabled(false);
+ MainWindow::instance()->dive_list->setEnabled(false);
MainWindow::instance()->setEnabledToolbar(false);
ui.diveSiteMessage->setText(tr("You are editing a dive site"));
}
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index 34924e25a..a753aec4a 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -137,14 +137,14 @@ MainWindow::MainWindow() : QMainWindow(),
// widgets will change on the mainwindow.
// for the "default" mode
- MainTab *mainTab = new MainTab();
- DiveListView *diveListView = new DiveListView();
- ProfileWidget2 *profileWidget = new ProfileWidget2();
+ information = new MainTab(this);
+ dive_list = new DiveListView(this);
+ graphics = new ProfileWidget2(this);
MapWidget *mapWidget = MapWidget::instance();
- PlannerSettingsWidget *plannerSettings = new PlannerSettingsWidget();
- DivePlannerWidget *plannerWidget = new DivePlannerWidget();
- PlannerDetails *plannerDetails = new PlannerDetails();
+ divePlannerSettingsWidget = new PlannerSettingsWidget(this);
+ divePlannerWidget = new DivePlannerWidget(this);
+ plannerDetails = new PlannerDetails(this);
// what is a sane order for those icons? we should have the ones the user is
// most likely to want towards the top so they are always visible
@@ -170,7 +170,7 @@ MainWindow::MainWindow() : QMainWindow(),
profLayout->setMargin(0);
profLayout->setContentsMargins(0,0,0,0);
profLayout->addWidget(toolBar);
- profLayout->addWidget(profileWidget);
+ profLayout->addWidget(graphics);
profileContainer->setLayout(profLayout);
diveSiteEdit = new LocationInformationWidget(this);
@@ -178,7 +178,7 @@ MainWindow::MainWindow() : QMainWindow(),
this, &MainWindow::setDefaultState);
connect(diveSiteEdit, SIGNAL(endEditDiveSite()), this, SLOT(refreshDisplay()));
connect(diveSiteEdit, &LocationInformationWidget::endEditDiveSite,
- mainTab, &MainTab::refreshDisplayedDiveSite);
+ information, &MainTab::refreshDisplayedDiveSite);
std::pair<QByteArray, QVariant> enabled = std::make_pair("enabled", QVariant(true));
std::pair<QByteArray, QVariant> disabled = std::make_pair("enabled", QVariant(false));
@@ -187,12 +187,12 @@ MainWindow::MainWindow() : QMainWindow(),
enabledList.push_back(enabled);
disabledList.push_back(disabled);
- registerApplicationState("Default", mainTab, profileContainer, diveListView, mapWidget );
- registerApplicationState("AddDive", mainTab, profileContainer, diveListView, mapWidget );
- registerApplicationState("EditDive", mainTab, profileContainer, diveListView, mapWidget );
- registerApplicationState("PlanDive", plannerWidget, profileContainer, plannerSettings, plannerDetails );
- registerApplicationState("EditPlannedDive", plannerWidget, profileContainer, diveListView, mapWidget );
- registerApplicationState("EditDiveSite", diveSiteEdit, profileContainer, diveListView, mapWidget);
+ registerApplicationState("Default", information, profileContainer, dive_list, mapWidget );
+ registerApplicationState("AddDive", information, profileContainer, dive_list, mapWidget );
+ registerApplicationState("EditDive", information, profileContainer, dive_list, mapWidget );
+ registerApplicationState("PlanDive", divePlannerWidget, profileContainer, divePlannerSettingsWidget, plannerDetails );
+ registerApplicationState("EditPlannedDive", divePlannerWidget, profileContainer, dive_list, mapWidget );
+ registerApplicationState("EditDiveSite", diveSiteEdit, profileContainer, dive_list, mapWidget);
setStateProperties("Default", enabledList, enabledList, enabledList,enabledList);
setStateProperties("AddDive", enabledList, enabledList, enabledList,enabledList);
@@ -211,11 +211,11 @@ MainWindow::MainWindow() : QMainWindow(),
}
connect(&diveListNotifier, &DiveListNotifier::selectionChanged, this, &MainWindow::selectionChanged);
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), this, SLOT(readSettings()));
- connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), diveListView, SLOT(update()));
- connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), diveListView, SLOT(reloadHeaderActions()));
- connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), information(), SLOT(updateDiveInfo()));
- connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), divePlannerWidget(), SLOT(settingsChanged()));
- connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), divePlannerSettingsWidget(), SLOT(settingsChanged()));
+ connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), dive_list, SLOT(update()));
+ connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), dive_list, SLOT(reloadHeaderActions()));
+ connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), information, 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++) {
actionsRecent[i] = new QAction(this);
@@ -224,14 +224,14 @@ MainWindow::MainWindow() : QMainWindow(),
connect(actionsRecent[i], SIGNAL(triggered(bool)), this, SLOT(recentFileTriggered(bool)));
}
ui.menuFile->insertSeparator(ui.actionQuit);
- connect(information(), SIGNAL(addDiveFinished()), graphics(), SLOT(setProfileState()));
- connect(information(), SIGNAL(dateTimeChanged()), graphics(), SLOT(dateTimeChanged()));
+ connect(information, SIGNAL(addDiveFinished()), graphics, SLOT(setProfileState()));
+ connect(information, SIGNAL(dateTimeChanged()), graphics, SLOT(dateTimeChanged()));
connect(DivePlannerPointsModel::instance(), SIGNAL(planCreated()), this, SLOT(planCreated()));
connect(DivePlannerPointsModel::instance(), SIGNAL(planCanceled()), this, SLOT(planCanceled()));
connect(DivePlannerPointsModel::instance(), SIGNAL(variationsComputed(QString)), this, SLOT(updateVariations(QString)));
- connect(plannerDetails->printPlan(), SIGNAL(pressed()), divePlannerWidget(), SLOT(printDecoPlan()));
+ connect(plannerDetails->printPlan(), SIGNAL(pressed()), divePlannerWidget, SLOT(printDecoPlan()));
connect(this, SIGNAL(startDiveSiteEdit()), this, SLOT(on_actionDiveSiteEdit_triggered()));
- connect(information(), &MainTab::diveSiteChanged, mapWidget, &MapWidget::centerOnSelectedDiveSite);
+ connect(information, &MainTab::diveSiteChanged, mapWidget, &MapWidget::centerOnSelectedDiveSite);
connect(this, &MainWindow::showError, ui.mainErrorMessage, &NotificationWidget::showError, Qt::AutoConnection);
connect(&windowTitleUpdate, &WindowTitleUpdate::updateTitle, this, &MainWindow::setAutomaticTitle);
@@ -242,17 +242,17 @@ MainWindow::MainWindow() : QMainWindow(),
enableDisableCloudActions();
ui.mainErrorMessage->hide();
- graphics()->setEmptyState();
+ graphics->setEmptyState();
initialUiSetup();
readSettings();
- diveListView->reload(DiveTripModel::TREE);
- diveListView->reloadHeaderActions();
- diveListView->setFocus();
+ dive_list->reload(DiveTripModel::TREE);
+ dive_list->reloadHeaderActions();
+ dive_list->setFocus();
MapWidget::instance()->reload();
- diveListView->expand(dive_list()->model()->index(0, 0));
- diveListView->scrollTo(dive_list()->model()->index(0, 0), QAbstractItemView::PositionAtCenter);
- divePlannerWidget()->settingsChanged();
- divePlannerSettingsWidget()->settingsChanged();
+ dive_list->expand(dive_list->model()->index(0, 0));
+ dive_list->scrollTo(dive_list->model()->index(0, 0), QAbstractItemView::PositionAtCenter);
+ divePlannerWidget->settingsChanged();
+ divePlannerSettingsWidget->settingsChanged();
#ifdef NO_USERMANUAL
ui.menuHelp->removeAction(ui.actionUserManual);
#endif
@@ -317,34 +317,34 @@ MainWindow::MainWindow() : QMainWindow(),
connect(ui.profPn2, &QAction::triggered, pp_gas, &qPrefPartialPressureGas::set_pn2);
connect(ui.profPO2, &QAction::triggered, pp_gas, &qPrefPartialPressureGas::set_po2);
- connect(tec, &qPrefTechnicalDetails::calcalltissuesChanged , graphics(), &ProfileWidget2::actionRequestedReplot);
- connect(tec, &qPrefTechnicalDetails::calcceilingChanged , graphics(), &ProfileWidget2::actionRequestedReplot);
- connect(tec, &qPrefTechnicalDetails::dcceilingChanged , graphics(), &ProfileWidget2::actionRequestedReplot);
- connect(tec, &qPrefTechnicalDetails::eadChanged , graphics(), &ProfileWidget2::actionRequestedReplot);
- connect(tec, &qPrefTechnicalDetails::calcceiling3mChanged , graphics(), &ProfileWidget2::actionRequestedReplot);
- connect(tec, &qPrefTechnicalDetails::modChanged , graphics(), &ProfileWidget2::actionRequestedReplot);
- connect(tec, &qPrefTechnicalDetails::calcndlttsChanged , graphics(), &ProfileWidget2::actionRequestedReplot);
- connect(tec, &qPrefTechnicalDetails::hrgraphChanged , graphics(), &ProfileWidget2::actionRequestedReplot);
- connect(tec, &qPrefTechnicalDetails::rulergraphChanged , graphics(), &ProfileWidget2::actionRequestedReplot);
- connect(tec, &qPrefTechnicalDetails::show_sacChanged , graphics(), &ProfileWidget2::actionRequestedReplot);
- connect(tec, &qPrefTechnicalDetails::zoomed_plotChanged , graphics(), &ProfileWidget2::actionRequestedReplot);
- connect(tec, &qPrefTechnicalDetails::show_pictures_in_profileChanged , graphics(), &ProfileWidget2::actionRequestedReplot);
- connect(tec, &qPrefTechnicalDetails::tankbarChanged , graphics(), &ProfileWidget2::actionRequestedReplot);
- connect(tec, &qPrefTechnicalDetails::percentagegraphChanged , graphics(), &ProfileWidget2::actionRequestedReplot);
-
- connect(pp_gas, &qPrefPartialPressureGas::pheChanged, graphics(), &ProfileWidget2::actionRequestedReplot);
- connect(pp_gas, &qPrefPartialPressureGas::pn2Changed, graphics(), &ProfileWidget2::actionRequestedReplot);
- connect(pp_gas, &qPrefPartialPressureGas::po2Changed, graphics(), &ProfileWidget2::actionRequestedReplot);
+ connect(tec, &qPrefTechnicalDetails::calcalltissuesChanged , graphics, &ProfileWidget2::actionRequestedReplot);
+ connect(tec, &qPrefTechnicalDetails::calcceilingChanged , graphics, &ProfileWidget2::actionRequestedReplot);
+ connect(tec, &qPrefTechnicalDetails::dcceilingChanged , graphics, &ProfileWidget2::actionRequestedReplot);
+ connect(tec, &qPrefTechnicalDetails::eadChanged , graphics, &ProfileWidget2::actionRequestedReplot);
+ connect(tec, &qPrefTechnicalDetails::calcceiling3mChanged , graphics, &ProfileWidget2::actionRequestedReplot);
+ connect(tec, &qPrefTechnicalDetails::modChanged , graphics, &ProfileWidget2::actionRequestedReplot);
+ connect(tec, &qPrefTechnicalDetails::calcndlttsChanged , graphics, &ProfileWidget2::actionRequestedReplot);
+ connect(tec, &qPrefTechnicalDetails::hrgraphChanged , graphics, &ProfileWidget2::actionRequestedReplot);
+ connect(tec, &qPrefTechnicalDetails::rulergraphChanged , graphics, &ProfileWidget2::actionRequestedReplot);
+ connect(tec, &qPrefTechnicalDetails::show_sacChanged , graphics, &ProfileWidget2::actionRequestedReplot);
+ connect(tec, &qPrefTechnicalDetails::zoomed_plotChanged , graphics, &ProfileWidget2::actionRequestedReplot);
+ connect(tec, &qPrefTechnicalDetails::show_pictures_in_profileChanged , graphics, &ProfileWidget2::actionRequestedReplot);
+ connect(tec, &qPrefTechnicalDetails::tankbarChanged , graphics, &ProfileWidget2::actionRequestedReplot);
+ connect(tec, &qPrefTechnicalDetails::percentagegraphChanged , graphics, &ProfileWidget2::actionRequestedReplot);
+
+ connect(pp_gas, &qPrefPartialPressureGas::pheChanged, graphics, &ProfileWidget2::actionRequestedReplot);
+ connect(pp_gas, &qPrefPartialPressureGas::pn2Changed, graphics, &ProfileWidget2::actionRequestedReplot);
+ connect(pp_gas, &qPrefPartialPressureGas::po2Changed, graphics, &ProfileWidget2::actionRequestedReplot);
// now let's set up some connections
- connect(graphics(), &ProfileWidget2::enableToolbar ,this, &MainWindow::setEnabledToolbar);
- connect(graphics(), &ProfileWidget2::disableShortcuts, this, &MainWindow::disableShortcuts);
- connect(graphics(), &ProfileWidget2::enableShortcuts, this, &MainWindow::enableShortcuts);
- connect(graphics(), &ProfileWidget2::refreshDisplay, this, &MainWindow::refreshDisplay);
- connect(graphics(), &ProfileWidget2::editCurrentDive, this, &MainWindow::editCurrentDive);
- connect(graphics(), &ProfileWidget2::updateDiveInfo, information(), &MainTab::updateDiveInfo);
+ connect(graphics, &ProfileWidget2::enableToolbar ,this, &MainWindow::setEnabledToolbar);
+ connect(graphics, &ProfileWidget2::disableShortcuts, this, &MainWindow::disableShortcuts);
+ connect(graphics, &ProfileWidget2::enableShortcuts, this, &MainWindow::enableShortcuts);
+ connect(graphics, &ProfileWidget2::refreshDisplay, this, &MainWindow::refreshDisplay);
+ connect(graphics, &ProfileWidget2::editCurrentDive, this, &MainWindow::editCurrentDive);
+ connect(graphics, &ProfileWidget2::updateDiveInfo, information, &MainTab::updateDiveInfo);
- connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), graphics(), SLOT(settingsChanged()));
+ connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), graphics, SLOT(settingsChanged()));
ui.profCalcAllTissues->setChecked(qPrefTechnicalDetails::calcalltissues());
ui.profCalcCeiling->setChecked(qPrefTechnicalDetails::calcceiling());
@@ -385,7 +385,7 @@ void MainWindow::setupSocialNetworkMenu()
connections = new QMenu(tr("Connect to"));
FacebookPlugin *facebookPlugin = new FacebookPlugin();
QAction *toggle_connection = new QAction(this);
- QObject *obj = qobject_cast<QObject*>(facebookPlugin);
+ QObject *obj = facebookPlugin;
toggle_connection->setText(facebookPlugin->socialNetworkName());
toggle_connection->setIcon(QIcon(facebookPlugin->socialNetworkIcon()));
toggle_connection->setData(QVariant::fromValue(obj));
@@ -457,16 +457,9 @@ void MainWindow::enableDisableCloudActions()
ui.actionCloudstoragesave->setEnabled(prefs.cloud_verification_status == qPrefCloudStorage::CS_VERIFIED);
}
-PlannerDetails *MainWindow::plannerDetails() const {
- return qobject_cast<PlannerDetails*>(applicationState["PlanDive"].bottomRight);
-}
-PlannerSettingsWidget *MainWindow::divePlannerSettingsWidget() {
- return qobject_cast<PlannerSettingsWidget*>(applicationState["PlanDive"].bottomLeft);
-}
-
void MainWindow::setDefaultState() {
setApplicationState("Default");
- if (information()->getEditMode() != MainTab::NONE) {
+ if (information->getEditMode() != MainTab::NONE) {
ui.bottomLeft->currentWidget()->setEnabled(false);
}
}
@@ -479,22 +472,22 @@ MainWindow *MainWindow::instance()
// This gets called after one or more dives were added, edited or downloaded for a dive computer
void MainWindow::refreshDisplay(bool doRecreateDiveList)
{
- information()->reload();
+ information->reload();
TankInfoModel::instance()->update();
MapWidget::instance()->reload();
if (doRecreateDiveList)
recreateDiveList();
setApplicationState("Default");
- dive_list()->setEnabled(true);
- dive_list()->setFocus();
+ dive_list->setEnabled(true);
+ dive_list->setFocus();
WSInfoModel::instance()->updateInfo();
ui.actionAutoGroup->setChecked(autogroup);
}
void MainWindow::recreateDiveList()
{
- dive_list()->reload(DiveTripModel::CURRENT);
+ dive_list->reload(DiveTripModel::CURRENT);
TagFilterModel::instance()->repopulate();
BuddyFilterModel::instance()->repopulate();
LocationFilterModel::instance()->repopulate();
@@ -530,12 +523,12 @@ void MainWindow::configureToolbar() {
void MainWindow::selectionChanged()
{
if (!current_dive) {
- information()->clearTabs();
- information()->updateDiveInfo(true);
- graphics()->setEmptyState();
+ information->clearTabs();
+ information->updateDiveInfo(true);
+ graphics->setEmptyState();
} else {
- graphics()->plotDive(nullptr, false, true);
- information()->updateDiveInfo();
+ graphics->plotDive(nullptr, false, true);
+ information->updateDiveInfo();
configureToolbar();
MapWidget::instance()->reload();
}
@@ -646,8 +639,8 @@ void MainWindow::on_actionCloudstoragesave_triggered()
if (verbose)
qDebug() << "Saving cloud storage to:" << filename;
- if (information()->isEditing())
- information()->acceptChanges();
+ if (information->isEditing())
+ information->acceptChanges();
showProgressBar();
int error = save_dives(qPrintable(filename));
@@ -668,7 +661,7 @@ void MainWindow::on_actionCloudOnline_triggered()
// Refuse to go online if there is an edit in progress
if (!isOffline &&
(DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING ||
- information()->isEditing())) {
+ information->isEditing())) {
QMessageBox::warning(this, tr("Warning"), tr("Please save or cancel the current dive edit before going online"));
// We didn't switch to online, therefore uncheck the checkbox
ui.actionCloudOnline->setChecked(false);
@@ -699,17 +692,12 @@ void MainWindow::on_actionCloudOnline_triggered()
updateCloudOnlineStatus();
}
-ProfileWidget2 *MainWindow::graphics() const
-{
- return qobject_cast<ProfileWidget2*>(applicationState["Default"].topRight->layout()->itemAt(1)->widget());
-}
-
void MainWindow::cleanUpEmpty()
{
- information()->clearTabs();
- information()->updateDiveInfo(true);
- graphics()->setEmptyState();
- dive_list()->reload(DiveTripModel::TREE);
+ information->clearTabs();
+ information->updateDiveInfo(true);
+ graphics->setEmptyState();
+ dive_list->reload(DiveTripModel::TREE);
MapWidget::instance()->reload();
if (!existing_filename)
setTitle();
@@ -719,7 +707,7 @@ void MainWindow::cleanUpEmpty()
bool MainWindow::okToClose(QString message)
{
if (DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING ||
- information()->isEditing() ) {
+ information->isEditing() ) {
QMessageBox::warning(this, tr("Warning"), message);
return false;
}
@@ -731,7 +719,7 @@ bool MainWindow::okToClose(QString message)
void MainWindow::closeCurrentFile()
{
- graphics()->setEmptyState();
+ graphics->setEmptyState();
/* free the dives and trips */
clear_git_id();
clear_dive_file_data();
@@ -804,7 +792,7 @@ void MainWindow::enableShortcuts()
void MainWindow::showProfile()
{
enableShortcuts();
- graphics()->setProfileState();
+ graphics->setProfileState();
setApplicationState("Default");
}
@@ -821,9 +809,9 @@ void MainWindow::on_actionPreferences_triggered()
void MainWindow::on_actionQuit_triggered()
{
- if (information()->isEditing()) {
- information()->rejectChanges();
- if (information()->isEditing())
+ if (information->isEditing()) {
+ information->rejectChanges();
+ if (information->isEditing())
// didn't discard the edits
return;
}
@@ -864,7 +852,7 @@ bool MainWindow::plannerStateClean()
return false;
if (DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING ||
- information()->isEditing()) {
+ information->isEditing()) {
QMessageBox::warning(this, tr("Warning"), tr("Please save or cancel the current dive edit before trying to add a dive."));
return false;
}
@@ -875,7 +863,7 @@ void MainWindow::refreshProfile()
{
showProfile();
configureToolbar();
- graphics()->replot(current_dive);
+ graphics->replot(current_dive);
DivePictureModel::instance()->updateDivePictures();
}
@@ -892,13 +880,13 @@ void MainWindow::planCreated()
// make sure our UI is in a consistent state
showProfile();
setApplicationState("Default");
- dive_list()->setEnabled(true);
- dive_list()->setFocus();
+ dive_list->setEnabled(true);
+ dive_list->setFocus();
}
void MainWindow::setPlanNotes()
{
- plannerDetails()->divePlanOutput()->setHtml(displayed_dive.notes);
+ plannerDetails->divePlanOutput()->setHtml(displayed_dive.notes);
}
void MainWindow::updateVariations(QString variations)
@@ -906,13 +894,13 @@ void MainWindow::updateVariations(QString variations)
QString notes = QString(displayed_dive.notes);
free(displayed_dive.notes);
displayed_dive.notes = copy_qstring(notes.replace("VARIATIONS", variations));
- plannerDetails()->divePlanOutput()->setHtml(displayed_dive.notes);
+ plannerDetails->divePlanOutput()->setHtml(displayed_dive.notes);
}
void MainWindow::printPlan()
{
#ifndef NO_PRINTING
- QString diveplan = plannerDetails()->divePlanOutput()->toHtml();
+ QString diveplan = plannerDetails->divePlanOutput()->toHtml();
QString withDisclaimer = QString("<img height=50 src=\":subsurface-icon\"> ") + diveplan + QString(disclaimer);
QPrinter printer;
@@ -935,7 +923,7 @@ void MainWindow::printPlan()
painter.setRenderHint(QPainter::Antialiasing);
painter.setRenderHint(QPainter::SmoothPixmapTransform);
- ProfileWidget2 *profile = graphics();
+ ProfileWidget2 *profile = graphics;
QSize origSize = profile->size();
profile->resize(renderSize.toSize());
profile->setPrintMode(true);
@@ -949,9 +937,9 @@ void MainWindow::printPlan()
QString profileImage = QString("<img src=\"data:image/png;base64,") + byteArray.toBase64() + "\"/><br><br>";
withDisclaimer = profileImage + withDisclaimer;
- plannerDetails()->divePlanOutput()->setHtml(withDisclaimer);
- plannerDetails()->divePlanOutput()->print(&printer);
- plannerDetails()->divePlanOutput()->setHtml(displayed_dive.notes);
+ plannerDetails->divePlanOutput()->setHtml(withDisclaimer);
+ plannerDetails->divePlanOutput()->print(&printer);
+ plannerDetails->divePlanOutput()->setHtml(displayed_dive.notes);
#endif
}
@@ -982,15 +970,15 @@ void MainWindow::on_actionReplanDive_triggered()
DivePlannerPointsModel::instance()->clear();
DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::PLAN);
- graphics()->setPlanState();
- graphics()->clearHandlers();
+ graphics->setPlanState();
+ graphics->clearHandlers();
setApplicationState("PlanDive");
- divePlannerWidget()->setReplanButton(true);
- divePlannerWidget()->setupStartTime(QDateTime::fromMSecsSinceEpoch(1000 * current_dive->when, Qt::UTC));
+ divePlannerWidget->setReplanButton(true);
+ divePlannerWidget->setupStartTime(QDateTime::fromMSecsSinceEpoch(1000 * current_dive->when, Qt::UTC));
if (current_dive->surface_pressure.mbar)
- divePlannerWidget()->setSurfacePressure(current_dive->surface_pressure.mbar);
+ divePlannerWidget->setSurfacePressure(current_dive->surface_pressure.mbar);
if (current_dive->salinity)
- divePlannerWidget()->setSalinity(current_dive->salinity);
+ divePlannerWidget->setSalinity(current_dive->salinity);
DivePlannerPointsModel::instance()->loadFromDive(current_dive);
reset_cylinders(&displayed_dive, true);
CylindersModel::instance()->updateDive();
@@ -1005,7 +993,7 @@ void MainWindow::on_actionDivePlanner_triggered()
DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::PLAN);
setApplicationState("PlanDive");
- graphics()->setPlanState();
+ graphics->setPlanState();
// create a simple starting dive, using the first gas from the just copied cylinders
setupForAddAndPlan("planned dive"); // don't translate, stored in XML file
@@ -1013,16 +1001,12 @@ void MainWindow::on_actionDivePlanner_triggered()
DivePlannerPointsModel::instance()->createSimpleDive();
// plan the dive in the same mode as the currently selected one
if (current_dive) {
- divePlannerSettingsWidget()->setDiveMode(current_dive->dc.divemode);
+ divePlannerSettingsWidget->setDiveMode(current_dive->dc.divemode);
if (current_dive->salinity)
- divePlannerWidget()->setSalinity(current_dive->salinity);
+ divePlannerWidget->setSalinity(current_dive->salinity);
}
DivePictureModel::instance()->updateDivePictures();
- divePlannerWidget()->setReplanButton(false);
-}
-
-DivePlannerWidget* MainWindow::divePlannerWidget() {
- return qobject_cast<DivePlannerWidget*>(applicationState["PlanDive"].topLeft);
+ divePlannerWidget->setReplanButton(false);
}
void MainWindow::on_actionAddDive_triggered()
@@ -1030,9 +1014,9 @@ void MainWindow::on_actionAddDive_triggered()
if (!plannerStateClean())
return;
- if (dive_list()->selectedTrips().count() >= 1) {
- dive_list()->rememberSelection();
- dive_list()->clearSelection();
+ if (dive_list->selectedTrips().count() >= 1) {
+ dive_list->rememberSelection();
+ dive_list->clearSelection();
}
setApplicationState("AddDive");
@@ -1042,19 +1026,19 @@ void MainWindow::on_actionAddDive_triggered()
setupForAddAndPlan("manually added dive"); // don't translate, stored in the XML file
// now show the mostly empty main tab
- information()->updateDiveInfo();
+ information->updateDiveInfo();
- information()->addDiveStarted();
+ information->addDiveStarted();
- graphics()->setAddState();
+ graphics->setAddState();
DivePlannerPointsModel::instance()->createSimpleDive();
configureToolbar();
- graphics()->plotDive(nullptr, false, true);
+ graphics->plotDive(nullptr, false, true);
fixup_dc_duration(&displayed_dive.dc);
displayed_dive.duration = displayed_dive.dc.duration;
// now that we have the correct depth and duration, update the dive info
- information()->updateDepthDuration();
+ information->updateDepthDuration();
}
void MainWindow::on_actionRenumber_triggered()
@@ -1255,8 +1239,8 @@ void MainWindow::on_actionPreviousDC_triggered()
unsigned nrdc = number_of_computers(current_dive);
dc_number = (dc_number + nrdc - 1) % nrdc;
configureToolbar();
- graphics()->plotDive(nullptr, false, true);
- information()->updateDiveInfo();
+ graphics->plotDive(nullptr, false, true);
+ information->updateDiveInfo();
}
void MainWindow::on_actionNextDC_triggered()
@@ -1264,8 +1248,8 @@ void MainWindow::on_actionNextDC_triggered()
unsigned nrdc = number_of_computers(current_dive);
dc_number = (dc_number + 1) % nrdc;
configureToolbar();
- graphics()->plotDive(nullptr, false, true);
- information()->updateDiveInfo();
+ graphics->plotDive(nullptr, false, true);
+ information->updateDiveInfo();
}
void MainWindow::on_actionFullScreen_triggered(bool checked)
@@ -1496,7 +1480,7 @@ void MainWindow::writeSettings()
void MainWindow::closeEvent(QCloseEvent *event)
{
if (DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING ||
- information()->isEditing()) {
+ information->isEditing()) {
on_actionQuit_triggered();
event->ignore();
return;
@@ -1511,16 +1495,6 @@ void MainWindow::closeEvent(QCloseEvent *event)
QApplication::closeAllWindows();
}
-DiveListView *MainWindow::dive_list()
-{
- return qobject_cast<DiveListView*>(applicationState["Default"].bottomLeft);
-}
-
-MainTab *MainWindow::information()
-{
- return qobject_cast<MainTab*>(applicationState["Default"].topLeft);
-}
-
void MainWindow::loadRecentFiles()
{
recentFiles.clear();
@@ -1639,8 +1613,8 @@ int MainWindow::file_save_as(void)
if (filename.isNull() || filename.isEmpty())
return report_error("No filename to save into");
- if (information()->isEditing())
- information()->acceptChanges();
+ if (information->isEditing())
+ information->acceptChanges();
if (save_dives(qPrintable(filename)))
return -1;
@@ -1663,8 +1637,8 @@ int MainWindow::file_save(void)
if (is_cloud && !saveToCloudOK())
return -1;
- if (information()->isEditing())
- information()->acceptChanges();
+ if (information->isEditing())
+ information->acceptChanges();
current_default = prefs.default_filename;
if (strcmp(existing_filename, current_default) == 0) {
@@ -1827,7 +1801,7 @@ void MainWindow::editCurrentDive()
if (!current_dive)
return;
- if (information()->isEditing() || DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING) {
+ if (information->isEditing() || DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING) {
QMessageBox::warning(this, tr("Warning"), tr("Please, first finish the current edition before trying to do another."));
return;
}
@@ -1838,18 +1812,18 @@ void MainWindow::editCurrentDive()
disableShortcuts();
if (defaultDC == "manually added dive") {
DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::ADD);
- graphics()->setAddState();
+ graphics->setAddState();
setApplicationState("EditDive");
DivePlannerPointsModel::instance()->loadFromDive(d);
- information()->enableEdition(MainTab::MANUALLY_ADDED_DIVE);
+ information->enableEdition(MainTab::MANUALLY_ADDED_DIVE);
} else if (defaultDC == "planned dive") {
DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::PLAN);
setApplicationState("EditPlannedDive");
DivePlannerPointsModel::instance()->loadFromDive(d);
- information()->enableEdition(MainTab::MANUALLY_ADDED_DIVE);
+ information->enableEdition(MainTab::MANUALLY_ADDED_DIVE);
} else {
setApplicationState("EditDive");
- information()->enableEdition();
+ information->enableEdition();
}
}
@@ -1891,7 +1865,7 @@ void MainWindow::on_paste_triggered()
{
// take the data in our copyPasteDive and apply it to selected dives
selective_copy_dive(&copyPasteDive, &displayed_dive, what, false);
- information()->showAndTriggerEditSelective(what);
+ information->showAndTriggerEditSelective(what);
}
void MainWindow::on_actionFilterTags_triggered()
diff --git a/desktop-widgets/mainwindow.h b/desktop-widgets/mainwindow.h
index 6833c5531..1bb674e40 100644
--- a/desktop-widgets/mainwindow.h
+++ b/desktop-widgets/mainwindow.h
@@ -59,14 +59,10 @@ public:
MainWindow();
~MainWindow();
static MainWindow *instance();
- MainTab *information();
void loadRecentFiles();
void updateRecentFiles();
void updateRecentFilesMenu();
void addRecentFile(const QString &file, bool update);
- DiveListView *dive_list();
- DivePlannerWidget *divePlannerWidget();
- PlannerSettingsWidget *divePlannerSettingsWidget();
LocationInformationWidget *locationInformationWidget();
void setTitle();
@@ -74,8 +70,6 @@ public:
void importFiles(const QStringList importFiles);
void cleanUpEmpty();
void setToolButtonsEnabled(bool enabled);
- ProfileWidget2 *graphics() const;
- PlannerDetails *plannerDetails() const;
void printPlan();
void checkSurvey();
void setApplicationState(const QByteArray& state);
@@ -87,6 +81,12 @@ public:
void enterEditState();
void exitEditState();
+ MainTab *information;
+ PlannerDetails *plannerDetails;
+ PlannerSettingsWidget *divePlannerSettingsWidget;
+ ProfileWidget2 *graphics;
+ DivePlannerWidget *divePlannerWidget;
+ DiveListView *dive_list;
private
slots:
/* file menu action */
diff --git a/desktop-widgets/mapwidget.cpp b/desktop-widgets/mapwidget.cpp
index 471e924a6..d1048e87f 100644
--- a/desktop-widgets/mapwidget.cpp
+++ b/desktop-widgets/mapwidget.cpp
@@ -103,9 +103,9 @@ void MapWidget::selectedDivesChanged(QList<int> list)
{
CHECK_IS_READY_RETURN_VOID();
skipReload = true;
- MainWindow::instance()->dive_list()->unselectDives();
+ MainWindow::instance()->dive_list->unselectDives();
if (!list.empty())
- MainWindow::instance()->dive_list()->selectDives(list);
+ MainWindow::instance()->dive_list->selectDives(list);
skipReload = false;
}
diff --git a/desktop-widgets/modeldelegates.cpp b/desktop-widgets/modeldelegates.cpp
index 74a11adaf..7b9bd8952 100644
--- a/desktop-widgets/modeldelegates.cpp
+++ b/desktop-widgets/modeldelegates.cpp
@@ -263,10 +263,10 @@ TankInfoDelegate::TankInfoDelegate(QObject *parent) : ComboBoxDelegate(TankInfoM
void TankInfoDelegate::reenableReplot(QWidget*, QAbstractItemDelegate::EndEditHint)
{
- MainWindow::instance()->graphics()->setReplot(true);
+ MainWindow::instance()->graphics->setReplot(true);
// FIXME: We need to replot after a cylinder is selected but the replot below overwrites
// the newly selected cylinder.
- // MainWindow::instance()->graphics()->replot();
+ // MainWindow::instance()->graphics->replot();
}
void TankInfoDelegate::revertModelData(QWidget*, QAbstractItemDelegate::EndEditHint hint)
@@ -290,7 +290,7 @@ QWidget *TankInfoDelegate::createEditor(QWidget *parent, const QStyleOptionViewI
currCylinderData.type = copy_string(cyl->type.description);
currCylinderData.pressure = cyl->type.workingpressure.mbar;
currCylinderData.size = cyl->type.size.mliter;
- MainWindow::instance()->graphics()->setReplot(false);
+ MainWindow::instance()->graphics->setReplot(false);
return delegate;
}
diff --git a/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp b/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp
index 37410d2d6..8669bb6cb 100644
--- a/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp
+++ b/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp
@@ -197,7 +197,7 @@ void FacebookManager::userIdReceived()
QPixmap FacebookManager::grabProfilePixmap()
{
qCDebug(lcFacebook) << "Grabbing Dive Profile pixmap";
- ProfileWidget2 *profile = MainWindow::instance()->graphics();
+ ProfileWidget2 *profile = MainWindow::instance()->graphics;
QSize size = fbInfo.profileSize == FacebookInfo::SMALL ? QSize(800,600) :
fbInfo.profileSize == FacebookInfo::MEDIUM ? QSize(1024,760) :
diff --git a/desktop-widgets/printer.cpp b/desktop-widgets/printer.cpp
index 780dce2ba..3676a65fb 100644
--- a/desktop-widgets/printer.cpp
+++ b/desktop-widgets/printer.cpp
@@ -134,7 +134,7 @@ void Printer::flowRender()
void Printer::render(int Pages = 0)
{
// keep original preferences
- QPointer<ProfileWidget2> profile = MainWindow::instance()->graphics();
+ QPointer<ProfileWidget2> profile = MainWindow::instance()->graphics;
int profileFrameStyle = profile->frameStyle();
int animationOriginal = qPrefDisplay::animation_speed();
double fontScale = profile->getFontPrintScale();
diff --git a/desktop-widgets/simplewidgets.cpp b/desktop-widgets/simplewidgets.cpp
index 6d15da475..367975832 100644
--- a/desktop-widgets/simplewidgets.cpp
+++ b/desktop-widgets/simplewidgets.cpp
@@ -159,7 +159,7 @@ void RenumberDialog::renumberOnlySelected(bool selected)
void RenumberDialog::buttonClicked(QAbstractButton *button)
{
if (ui.buttonBox->buttonRole(button) == QDialogButtonBox::AcceptRole) {
- MainWindow::instance()->dive_list()->rememberSelection();
+ MainWindow::instance()->dive_list->rememberSelection();
// we remember a list from dive uuid to a new number
QVector<QPair<dive *, int>> renumberedDives;
int i;
@@ -205,7 +205,7 @@ void SetpointDialog::buttonClicked(QAbstractButton *button)
invalidate_dive_cache(current_dive);
}
mark_divelist_changed(true);
- MainWindow::instance()->graphics()->replot();
+ MainWindow::instance()->graphics->replot();
}
SetpointDialog::SetpointDialog(QWidget *parent) : QDialog(parent),
diff --git a/desktop-widgets/tab-widgets/TabDivePhotos.cpp b/desktop-widgets/tab-widgets/TabDivePhotos.cpp
index 5148926ec..7ddcc81d7 100644
--- a/desktop-widgets/tab-widgets/TabDivePhotos.cpp
+++ b/desktop-widgets/tab-widgets/TabDivePhotos.cpp
@@ -109,12 +109,12 @@ void TabDivePhotos::recalculateSelectedThumbnails()
//TODO: This looks overly wrong. We shouldn't call MainWindow to retrieve the DiveList to add Images.
void TabDivePhotos::addPhotosFromFile()
{
- MainWindow::instance()->dive_list()->loadImages();
+ MainWindow::instance()->dive_list->loadImages();
}
void TabDivePhotos::addPhotosFromURL()
{
- MainWindow::instance()->dive_list()->loadWebImages();
+ MainWindow::instance()->dive_list->loadWebImages();
}
void TabDivePhotos::removeAllPhotos()
diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp
index 32f390a7d..ec769be80 100644
--- a/desktop-widgets/tab-widgets/maintab.cpp
+++ b/desktop-widgets/tab-widgets/maintab.cpp
@@ -293,7 +293,7 @@ void MainTab::updateTextLabels(bool showUnits)
void MainTab::enableEdition(EditMode newEditMode)
{
const bool isTripEdit = MainWindow::instance() &&
- MainWindow::instance()->dive_list()->selectedTrips().count() == 1;
+ MainWindow::instance()->dive_list->selectedTrips().count() == 1;
if (((newEditMode == DIVE || newEditMode == NONE) && current_dive == NULL) || editMode != NONE)
return;
@@ -317,7 +317,7 @@ void MainTab::enableEdition(EditMode newEditMode)
}
ui.editDiveSiteButton->setEnabled(false);
- MainWindow::instance()->dive_list()->setEnabled(false);
+ MainWindow::instance()->dive_list->setEnabled(false);
MainWindow::instance()->setEnabledToolbar(false);
MainWindow::instance()->enterEditState();
ui.tabWidget->setTabEnabled(2, false);
@@ -384,7 +384,7 @@ void MainTab::updateDiveInfo(bool clear)
ui.location->refreshDiveSiteCache();
EditMode rememberEM = editMode;
// don't execute this while adding / planning a dive
- if (editMode == ADD || editMode == MANUALLY_ADDED_DIVE || MainWindow::instance()->graphics()->isPlanner())
+ if (editMode == ADD || editMode == MANUALLY_ADDED_DIVE || MainWindow::instance()->graphics->isPlanner())
return;
if (!isEnabled() && !clear )
setEnabled(true);
@@ -430,7 +430,7 @@ void MainTab::updateDiveInfo(bool clear)
localTime.setTimeSpec(Qt::UTC);
ui.dateEdit->setDate(localTime.date());
ui.timeEdit->setTime(localTime.time());
- if (MainWindow::instance() && MainWindow::instance()->dive_list()->selectedTrips().count() == 1) {
+ if (MainWindow::instance() && MainWindow::instance()->dive_list->selectedTrips().count() == 1) {
// Remember the tab selected for last dive
if (lastSelectedDive)
lastTabSelectedDive = ui.tabWidget->currentIndex();
@@ -442,7 +442,7 @@ void MainTab::updateDiveInfo(bool clear)
if (lastSelectedDive)
ui.tabWidget->setCurrentIndex(lastTabSelectedDiveTrip);
lastSelectedDive = false;
- currentTrip = *MainWindow::instance()->dive_list()->selectedTrips().begin();
+ currentTrip = *MainWindow::instance()->dive_list->selectedTrips().begin();
// only use trip relevant fields
ui.divemaster->setVisible(false);
ui.DivemasterLabel->setVisible(false);
@@ -763,11 +763,11 @@ void MainTab::acceptChanges()
ui.editDiveSiteButton->setEnabled(!ui.location->text().isEmpty());
emit addDiveFinished();
DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::NOTHING);
- MainWindow::instance()->dive_list()->setFocus();
+ MainWindow::instance()->dive_list->setFocus();
resetPallete();
displayed_dive.divetrip = nullptr; // Should not be necessary, just in case!
return;
- } else if (MainWindow::instance() && MainWindow::instance()->dive_list()->selectedTrips().count() == 1) {
+ } else if (MainWindow::instance() && MainWindow::instance()->dive_list->selectedTrips().count() == 1) {
/* now figure out if things have changed */
if (displayedTrip.notes && !same_string(displayedTrip.notes, currentTrip->notes)) {
currentTrip->notes = copy_string(displayedTrip.notes);
@@ -932,27 +932,27 @@ void MainTab::acceptChanges()
mark_divelist_changed(true);
DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::NOTHING);
}
- int scrolledBy = MainWindow::instance()->dive_list()->verticalScrollBar()->sliderPosition();
+ int scrolledBy = MainWindow::instance()->dive_list->verticalScrollBar()->sliderPosition();
resetPallete();
if (editMode == MANUALLY_ADDED_DIVE) {
- MainWindow::instance()->dive_list()->reload(DiveTripModel::CURRENT, true);
+ MainWindow::instance()->dive_list->reload(DiveTripModel::CURRENT, true);
int newDiveNr = get_divenr(get_dive_by_uniq_id(addedId));
- MainWindow::instance()->dive_list()->unselectDives();
- MainWindow::instance()->dive_list()->selectDive(newDiveNr, true);
+ MainWindow::instance()->dive_list->unselectDives();
+ MainWindow::instance()->dive_list->selectDive(newDiveNr, true);
editMode = NONE;
MainWindow::instance()->refreshDisplay();
- MainWindow::instance()->graphics()->replot();
+ MainWindow::instance()->graphics->replot();
} else {
editMode = NONE;
if (do_replot)
- MainWindow::instance()->graphics()->replot();
- MainWindow::instance()->dive_list()->rememberSelection();
+ MainWindow::instance()->graphics->replot();
+ MainWindow::instance()->dive_list->rememberSelection();
MainWindow::instance()->refreshDisplay();
- MainWindow::instance()->dive_list()->restoreSelection();
+ MainWindow::instance()->dive_list->restoreSelection();
}
DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::NOTHING);
- MainWindow::instance()->dive_list()->verticalScrollBar()->setSliderPosition(scrolledBy);
- MainWindow::instance()->dive_list()->setFocus();
+ MainWindow::instance()->dive_list->verticalScrollBar()->setSliderPosition(scrolledBy);
+ MainWindow::instance()->dive_list->setFocus();
MainWindow::instance()->exitEditState();
cylindersModel->changed = false;
weightModel->changed = false;
@@ -1003,7 +1003,7 @@ void MainTab::rejectChanges()
// no harm done to call cancelPlan even if we were not in ADD or PLAN mode...
DivePlannerPointsModel::instance()->cancelPlan();
if(lastMode == ADD)
- MainWindow::instance()->dive_list()->restoreSelection();
+ MainWindow::instance()->dive_list->restoreSelection();
// now make sure that the correct dive is displayed
if (current_dive)
@@ -1019,7 +1019,7 @@ void MainTab::rejectChanges()
// let's get the correct location back in view
MapWidget::instance()->centerOnDiveSite(get_dive_site_by_uuid(displayed_dive.dive_site_uuid));
// show the profile and dive info
- MainWindow::instance()->graphics()->replot();
+ MainWindow::instance()->graphics->replot();
MainWindow::instance()->setEnabledToolbar(true);
MainWindow::instance()->exitEditState();
cylindersModel->changed = false;
@@ -1079,7 +1079,7 @@ void MainTab::on_duration_textChanged(const QString &text)
if (editMode == IGNORE || acceptingEdit == true)
return;
// parse this
- MainWindow::instance()->graphics()->setReplot(false);
+ MainWindow::instance()->graphics->setReplot(false);
if (!isEditing())
enableEdition();
displayed_dive.dc.duration.seconds = parseDurationToSeconds(text);
@@ -1088,8 +1088,8 @@ void MainTab::on_duration_textChanged(const QString &text)
displayed_dive.dc.samples = 0;
DivePlannerPointsModel::instance()->loadFromDive(&displayed_dive);
markChangedWidget(ui.duration);
- MainWindow::instance()->graphics()->setReplot(true);
- MainWindow::instance()->graphics()->plotDive();
+ MainWindow::instance()->graphics->setReplot(true);
+ MainWindow::instance()->graphics->plotDive();
}
@@ -1098,7 +1098,7 @@ void MainTab::on_depth_textChanged(const QString &text)
if (editMode == IGNORE || acceptingEdit == true)
return;
// don't replot until we set things up the way we want them
- MainWindow::instance()->graphics()->setReplot(false);
+ MainWindow::instance()->graphics->setReplot(false);
if (!isEditing())
enableEdition();
displayed_dive.dc.maxdepth.mm = parseLengthToMm(text);
@@ -1107,8 +1107,8 @@ void MainTab::on_depth_textChanged(const QString &text)
displayed_dive.dc.samples = 0;
DivePlannerPointsModel::instance()->loadFromDive(&displayed_dive);
markChangedWidget(ui.depth);
- MainWindow::instance()->graphics()->setReplot(true);
- MainWindow::instance()->graphics()->plotDive();
+ MainWindow::instance()->graphics->setReplot(true);
+ MainWindow::instance()->graphics->plotDive();
}
void MainTab::on_airtemp_textChanged(const QString &text)
@@ -1127,7 +1127,7 @@ void MainTab::divetype_Changed(int index)
displayed_dc->divemode = (enum divemode_t) index;
update_setpoint_events(&displayed_dive, displayed_dc);
markChangedWidget(ui.DiveType);
- MainWindow::instance()->graphics()->recalcCeiling();
+ MainWindow::instance()->graphics->recalcCeiling();
}
void MainTab::on_watertemp_textChanged(const QString &text)
diff --git a/desktop-widgets/tagwidget.cpp b/desktop-widgets/tagwidget.cpp
index 61277109a..02e6db00f 100644
--- a/desktop-widgets/tagwidget.cpp
+++ b/desktop-widgets/tagwidget.cpp
@@ -92,7 +92,7 @@ void TagWidget::reparse()
* Do not show the completer when not in edit mode - basically
* this returns when we are accepting or discarding the changes.
*/
- if (MainWindow::instance()->information()->isEditing() == false) {
+ if (MainWindow::instance()->information->isEditing() == false) {
return;
}
@@ -186,7 +186,7 @@ void TagWidget::keyPressEvent(QKeyEvent *e)
}
}
if (e->key() == Qt::Key_Tab && lastFinishedTag) { // if we already end in comma, go to next/prev field
- MainWindow::instance()->information()->nextInputField(e); // by sending the key event to the MainTab widget
+ MainWindow::instance()->information->nextInputField(e); // by sending the key event to the MainTab widget
} else if (e->key() == Qt::Key_Tab || e->key() == Qt::Key_Return) { // otherwise let's pretend this is a comma instead
QKeyEvent fakeEvent(e->type(), Qt::Key_Comma, e->modifiers(), QString(","));
keyPressEvent(&fakeEvent);
diff --git a/qt-models/filtermodels.cpp b/qt-models/filtermodels.cpp
index c8ed16274..3ecb99b74 100644
--- a/qt-models/filtermodels.cpp
+++ b/qt-models/filtermodels.cpp
@@ -644,7 +644,7 @@ void MultiFilterSortModel::myInvalidate()
#if !defined(SUBSURFACE_MOBILE)
int i;
struct dive *d;
- DiveListView *dlv = MainWindow::instance()->dive_list();
+ DiveListView *dlv = MainWindow::instance()->dive_list;
divesDisplayed = 0;
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-27 04:19:38 +0000