Code Cleanup: Buttons on Graphical Planner

Removed a bunch of non-used graphics buttons,
since the new widget now contains everything
needed for the creation / cancelation of the
dive plan.

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

2 files changed, 4 insertions, 17 deletions

diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp
index 5e79f0b89..5a8f7d62d 100644
--- a/qt-ui/diveplanner.cpp
+++ b/qt-ui/diveplanner.cpp
@@ -114,13 +114,7 @@ DivePlannerGraphics::DivePlannerGraphics(QWidget* parent): QGraphicsView(parent)
 	ADDBTN(plusTime,  ":plus",   ""  , 95, 5, tr("Increase minimum time by 10m"), increaseTime());
 	ADDBTN(lessDepth, ":minimum",""  , 2,  5, tr("Decreases maximum depth by 10m"), decreaseDepth());
 	ADDBTN(lessTime,  ":minimum",""  , 92, 95, tr("Decreases minimum time by 10m"), decreaseTime());
-	ADDBTN(okBtn, "", tr("Ok"), 1, 95, "", okClicked());
-	ADDBTN(cancelBtn, "", tr("Cancel"), 0,0, "", cancelClicked());
 #undef ADDBTN
-
-	cancelBtn->setPos(okBtn->pos().x() + okBtn->boundingRect().width()
-		+ fromPercent(2, Qt::Horizontal),  fromPercent(95, Qt::Vertical));
-
 	minMinutes = TIME_INITIAL_MAX;
 
 	QAction *action = NULL;
@@ -265,7 +259,7 @@ void DivePlannerGraphics::keyEscAction()
 		return;
 	}
 
-	cancelClicked();
+	cancelPlan();
 }
 
 qreal DivePlannerGraphics::fromPercent(qreal percent, Qt::Orientation orientation)
@@ -275,7 +269,7 @@ qreal DivePlannerGraphics::fromPercent(qreal percent, Qt::Orientation orientatio
 	return result;
 }
 
-void DivePlannerGraphics::cancelClicked()
+void DivePlannerGraphics::cancelPlan()
 {
 	if (handles.size()){
 		if (QMessageBox::warning(mainWindow(), tr("Save the Plan?"),
@@ -287,11 +281,6 @@ void DivePlannerGraphics::cancelClicked()
 	mainWindow()->showProfile();
 }
 
-void DivePlannerGraphics::okClicked()
-{
-	// todo.
-}
-
 void DivePlannerGraphics::increaseDepth()
 {
 	if (depthLine->maximum() + 10 > MAX_DEEPNESS)
diff --git a/qt-ui/diveplanner.h b/qt-ui/diveplanner.h
index fa3f83766..03e4d2bbe 100644
--- a/qt-ui/diveplanner.h
+++ b/qt-ui/diveplanner.h
@@ -92,8 +92,8 @@ private slots:
 	void increaseDepth();
 	void decreaseTime();
 	void decreaseDepth();;
-	void okClicked();
-	void cancelClicked();
+
+	void cancelPlan();
 	void prepareSelectGas();
 	void selectGas(const QModelIndex& index);
 
@@ -142,8 +142,6 @@ private:
 	Button *plusDepth; // adds 10 meters to the depth ruler.
 	Button *lessTime;  // remove 10 minutes to the time ruler.
 	Button *lessDepth; // remove 10 meters to the depth ruler.
-	Button *okBtn;     // accepts, and creates a new dive based on the plan.
-	Button *cancelBtn; // rejects, and clears the dive plan.
 
 	int minMinutes; // this holds the minimum duration of the dive.
 	int dpMaxTime; // this is the time of the dive calculated by the deco.