diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2018-01-10 13:55:29 +0100 |
|---|---|---|
| committer | Jan Mulder <jlmulder@xs4all.nl> | 2018-01-10 21:28:02 +0100 |
| commit | 34bc4fc0af953723fd42c4ffc0b0a8bf1cf68b22 (patch) | |
| tree | 8023534c8b2f6e2c9f92c3bafd82d49011e1052f /profile-widget/profilewidget2.cpp | |
| parent | 9c01315d31e71c857a7a5ef34db6da7343b030ac (diff) | |
| download | subsurface-34bc4fc0af953723fd42c4ffc0b0a8bf1cf68b22.tar.gz | |
Pictures tied to profile are not supported on mobile
Move divepicturemodel.cpp to the desktop only category and deal
with the (limited) fallout. We, currently, do not support dive
pictures tied to the profile on mobile, so there is no use
including this code.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
Diffstat (limited to 'profile-widget/profilewidget2.cpp')
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 8cfdeadf7..97e69fb82 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -764,8 +764,8 @@ void ProfileWidget2::plotDive(struct dive *d, bool force) DivePlannerPointsModel *model = DivePlannerPointsModel::instance(); model->deleteTemporaryPlan(); } -#endif plotPictures(); +#endif // OK, how long did this take us? Anything above the second is way too long, // so if we are calculation TTS / NDL then let's force that off. @@ -1081,9 +1081,11 @@ void ProfileWidget2::setProfileState() return; disconnectTemporaryConnections(); +#ifndef SUBSURFACE_MOBILE connect(DivePictureModel::instance(), SIGNAL(dataChanged(QModelIndex, QModelIndex)), this, SLOT(plotPictures())); connect(DivePictureModel::instance(), SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(plotPictures())); connect(DivePictureModel::instance(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SLOT(plotPictures())); +#endif /* show the same stuff that the profile shows. */ emit enableShortcuts(); @@ -1950,7 +1952,6 @@ void ProfileWidget2::keyEscAction() if (plannerModel->isPlanner()) plannerModel->cancelPlan(); } -#endif void ProfileWidget2::plotPictures() { @@ -1990,6 +1991,7 @@ void ProfileWidget2::plotPictures() pictures.push_back(item); } } +#endif void ProfileWidget2::dropEvent(QDropEvent *event) { @@ -2011,7 +2013,9 @@ void ProfileWidget2::dropEvent(QDropEvent *event) } } copy_dive(current_dive, &displayed_dive); +#ifndef SUBSURFACE_MOBILE DivePictureModel::instance()->updateDivePictures(); +#endif if (event->source() == this) { |