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

Merge branch 'joshua-gsoc' of git://github.com/thiagomacieira/subsurface into josh

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

Conflicts:
	subsurface.pro
This commit is contained in:
Dirk Hohndel 2014-08-18 20:25:06 -05:00
commit 150676ce3d
15 changed files with 3198 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
qt-ui/mainwindow.cpp
View file

@ -41,6 +41,7 @@
#include "worldmap-save.h"
#include "updatemanager.h"
#include "planner.h"
#include "configuredivecomputerdialog.h"
#ifndef NO_PRINTING
#include <QPrintDialog>
#include "printdialog.h"
@ -1298,6 +1299,12 @@ void MainWindow::on_actionExport_triggered()
diveLogExport.exec();
}
void MainWindow::on_actionConfigure_Dive_Computer_triggered()
{
ConfigureDiveComputerDialog *dcConfig = new ConfigureDiveComputerDialog(this);
dcConfig->show();
}
void MainWindow::setEnabledToolbar(bool arg1)
{
QList<QToolButton*> toolBar;