mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Planner: don't allow the user to remove the last point

Browse source 
This causes all kinds of assumptions to go wrong - and it makes no sense.
Move the point to where you want it or cancel the plan.

Fixes #623

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-07-15 03:29:43 -07:00
parent 133e104393
commit dff92f188a
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
qt-ui/diveplanner.cpp
View file

@ -206,9 +206,12 @@ void DiveHandler::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
connect(action, SIGNAL(triggered(bool)), this, SLOT(changeGas())); connect(action, SIGNAL(triggered(bool)), this, SLOT(changeGas()));
m.addAction(action); m.addAction(action);
} }
m.addSeparator(); // don't allow removing the last point
m.addAction(QObject::tr("Remove this point"), this, SLOT(selfRemove())); if (DivePlannerPointsModel::instance()->rowCount() > 1) {
m.exec(event->screenPos()); m.addSeparator();
m.addAction(QObject::tr("Remove this point"), this, SLOT(selfRemove()));
m.exec(event->screenPos());
}
} }
void DiveHandler::selfRemove() void DiveHandler::selfRemove()
@ -530,7 +533,8 @@ QVariant DivePlannerPointsModel::data(const QModelIndex &index, int role) const
} else if (role == Qt::DecorationRole) { } else if (role == Qt::DecorationRole) {
switch (index.column()) { switch (index.column()) {
case REMOVE: case REMOVE:
return p.entered ? QIcon(":trash") : QVariant(); if (rowCount() > 1)
return p.entered ? QIcon(":trash") : QVariant();
} }
} else if (role == Qt::FontRole) { } else if (role == Qt::FontRole) {
if (divepoints.at(index.row()).entered) { if (divepoints.at(index.row()).entered) {
@ -872,7 +876,7 @@ divedatapoint DivePlannerPointsModel::at(int row)
void DivePlannerPointsModel::remove(const QModelIndex &index) void DivePlannerPointsModel::remove(const QModelIndex &index)
{ {
if (index.column() != REMOVE) if (index.column() != REMOVE || rowCount() == 1)
return; return;
divedatapoint dp = at(index.row()); divedatapoint dp = at(index.row());