Plug the Cancel action on the Dive Planner Table and start the 'ok' code.

Plug the cancel action on the dive planner ( before that, only by
hitting the 'ESC' button things worked, so now you can also click
on the Cancel box that's on the right of the planner profile window.

Also, the beginning of the 'ok' code is also at place.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>

1 files changed, 23 insertions, 13 deletions

diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp
index 5d0299c88..f2e3c9462 100644
--- a/qt-ui/diveplanner.cpp
+++ b/qt-ui/diveplanner.cpp
@@ -317,7 +317,7 @@ void DivePlannerGraphics::keyEscAction()
 		scene()->clearSelection();
 		return;
 	}
-	cancelPlan();
+	plannerModel->cancelPlan();
 }
 
 qreal DivePlannerGraphics::fromPercent(qreal percent, Qt::Orientation orientation)
@@ -327,18 +327,6 @@ qreal DivePlannerGraphics::fromPercent(qreal percent, Qt::Orientation orientatio
 	return result;
 }
 
-void DivePlannerGraphics::cancelPlan()
-{
-	if (handles.size()){
-		if (QMessageBox::warning(mainWindow(), tr("Save the Plan?"),
-			tr("You have a working plan, \n are you sure that you wanna cancel it?"),
-				QMessageBox::Ok | QMessageBox::Cancel) != QMessageBox::Ok){
-				return;
-			}
-	}
-	mainWindow()->showProfile();
-}
-
 void DivePlannerGraphics::increaseDepth()
 {
 	if (depthLine->maximum() + 10 > MAX_DEEPNESS)
@@ -857,6 +845,12 @@ DivePlannerWidget::DivePlannerWidget(QWidget* parent, Qt::WindowFlags f): QWidge
 	connect(ui->highGF, SIGNAL(textChanged(QString)), this, SLOT(gfhighChanged(QString)));
 	connect(ui->lastStop, SIGNAL(toggled(bool)), this, SLOT(lastStopChanged(bool)));
 
+	// Creating the plan
+	connect(ui->buttonBox, SIGNAL(accepted()), plannerModel, SLOT(createPlan()));
+	connect(ui->buttonBox, SIGNAL(rejected()), plannerModel, SLOT(cancelPlan()));
+	connect(plannerModel, SIGNAL(planCreated()), mainWindow(), SLOT(showProfile()));
+	connect(plannerModel, SIGNAL(planCanceled()), mainWindow(), SLOT(showProfile()));
+
 	/* set defaults. */
 	ui->startTime->setTime( QTime(1, 0) );
 	ui->ATMPressure->setText( "1013" );
@@ -1111,3 +1105,19 @@ struct diveplan DivePlannerPointsModel::getDiveplan()
 {
 	return diveplan;
 }
+
+void DivePlannerPointsModel::cancelPlan()
+{
+	if(rowCount()){
+		if (QMessageBox::warning(mainWindow(), tr("Save the Plan?"),
+			tr("You have a working plan, \n are you sure that you wanna cancel it?"),
+				QMessageBox::Ok | QMessageBox::Cancel) != QMessageBox::Ok){
+				return;
+			}
+	}
+
+	beginRemoveRows(QModelIndex(), 0, rowCount()-1);
+	divepoints.clear();
+	endRemoveRows();
+	emit planCanceled();
+}