mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Tomaz Canabrava 2013-09-16 11:38:41 -03:00
parent 4e06c52f68
commit bfe1ea0cb2
3 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
qt-ui/diveplanner.cpp
View file

@ -317,7 +317,7 @@ void DivePlannerGraphics::keyEscAction()
scene()->clearSelection(); scene()->clearSelection();
return; return;
} }
cancelPlan(); plannerModel->cancelPlan();
} }
qreal DivePlannerGraphics::fromPercent(qreal percent, Qt::Orientation orientation) qreal DivePlannerGraphics::fromPercent(qreal percent, Qt::Orientation orientation)
@ -327,18 +327,6 @@ qreal DivePlannerGraphics::fromPercent(qreal percent, Qt::Orientation orientatio
return result; 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() void DivePlannerGraphics::increaseDepth()
{ {
if (depthLine->maximum() + 10 > MAX_DEEPNESS) 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->highGF, SIGNAL(textChanged(QString)), this, SLOT(gfhighChanged(QString)));
connect(ui->lastStop, SIGNAL(toggled(bool)), this, SLOT(lastStopChanged(bool))); 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. */ /* set defaults. */
ui->startTime->setTime( QTime(1, 0) ); ui->startTime->setTime( QTime(1, 0) );
ui->ATMPressure->setText( "1013" ); ui->ATMPressure->setText( "1013" );
@ -1111,3 +1105,19 @@ struct diveplan DivePlannerPointsModel::getDiveplan()
{ {
return diveplan; 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();
}

6
qt-ui/diveplanner.h
View file

@ -50,6 +50,11 @@ public slots:
void setLastStop6m(bool value); void setLastStop6m(bool value);
void createPlan(); void createPlan();
void remove(const QModelIndex& index); void remove(const QModelIndex& index);
void cancelPlan();
signals:
void planCreated();
void planCanceled();
private: private:
explicit DivePlannerPointsModel(QObject* parent = 0); explicit DivePlannerPointsModel(QObject* parent = 0);
@ -135,7 +140,6 @@ private slots:
void decreaseTime(); void decreaseTime();
void decreaseDepth();; void decreaseDepth();;
void createDecoStops(); void createDecoStops();
void cancelPlan();
void prepareSelectGas(); void prepareSelectGas();
void selectGas(const QModelIndex& index); void selectGas(const QModelIndex& index);
void pointInserted(const QModelIndex&, int start, int end); void pointInserted(const QModelIndex&, int start, int end);

2
qt-ui/mainwindow.cpp
View file

@ -45,6 +45,7 @@ MainWindow* mainWindow()
MainWindow::MainWindow() : ui(new Ui::MainWindow()), helpView(0) MainWindow::MainWindow() : ui(new Ui::MainWindow()), helpView(0)
{ {
instance = this;
ui->setupUi(this); ui->setupUi(this);
setWindowIcon(QIcon(":subsurface-icon")); setWindowIcon(QIcon(":subsurface-icon"));
connect(ui->ListWidget, SIGNAL(currentDiveChanged(int)), this, SLOT(current_dive_changed(int))); connect(ui->ListWidget, SIGNAL(currentDiveChanged(int)), this, SLOT(current_dive_changed(int)));
@ -59,7 +60,6 @@ MainWindow::MainWindow() : ui(new Ui::MainWindow()), helpView(0)
ui->ListWidget->reloadHeaderActions(); ui->ListWidget->reloadHeaderActions();
ui->ListWidget->setFocus(); ui->ListWidget->setFocus();
ui->globe->reload(); ui->globe->reload();
instance = this;
} }
// this gets called after we download dives from a divecomputer // this gets called after we download dives from a divecomputer