Merge branch '119_divecomputerManagement' of github.com:tcanabrava/subsurface

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-06-17 11:12:10 -07:00
commit f465230263
11 changed files with 242 additions and 6 deletions

View file

@ -29,6 +29,7 @@
#include "downloadfromdivecomputer.h"
#include "preferences.h"
#include "subsurfacewebservices.h"
#include "divecomputermanagementdialog.h"
static MainWindow* instance = 0;
@ -204,7 +205,8 @@ void MainWindow::on_actionDownloadWeb_triggered()
void MainWindow::on_actionEditDeviceNames_triggered()
{
qDebug("actionEditDeviceNames");
DiveComputerManagementDialog::instance()->update();
DiveComputerManagementDialog::instance()->show();
}
void MainWindow::on_actionAddDive_triggered()