1 files changed, 21 insertions, 32 deletions

diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index ad52c7d7f..80da754a2 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -35,7 +35,7 @@
 #include "diveplanner.h"
 #include "about.h"
 #include "printdialog.h"
-#include "csvimportdialog.h"
+#include "divelogimportdialog.h"
 
 static MainWindow* instance = 0;
 
@@ -167,15 +167,6 @@ void MainWindow::on_actionClose_triggered()
 	clear_events();
 }
 
-void MainWindow::on_actionImport_triggered()
-{
-	QStringList fileNames = QFileDialog::getOpenFileNames(this, tr("Import Files"), lastUsedDir(), filter());
-	if (!fileNames.size())
-		return; // no selection
-	updateLastUsedDir(QFileInfo(fileNames.at(0)).dir().path());
-	importFiles(fileNames);
-}
-
 QString MainWindow::lastUsedDir()
 {
 	QSettings settings;
@@ -493,27 +484,11 @@ void MainWindow::on_actionAboutSubsurface_triggered()
 void MainWindow::on_actionUserManual_triggered()
 {
 	if(!helpView){
-		helpView = new QWebView();
-		helpView->page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
-		connect(helpView, SIGNAL(linkClicked(QUrl)), this, SLOT(linkClickedSlot(QUrl)));
-	}
-	QString searchPath = getSubsurfaceDataPath("Documentation");
-	if (searchPath != "") {
-		QUrl url(searchPath.append("/user-manual.html"));
-		helpView->setWindowTitle(tr("User Manual"));
-		helpView->setWindowIcon(QIcon(":/subsurface-icon"));
-		helpView->setUrl(url);
-	} else {
-		helpView->setHtml(tr("Cannot find the Subsurface manual"));
+		helpView = new UserManual();
 	}
 	helpView->show();
 }
 
-void MainWindow::linkClickedSlot(QUrl url)
-{
-	QDesktopServices::openUrl(url);
-}
-
 QString MainWindow::filter()
 {
 	QString f;
@@ -864,12 +839,26 @@ void MainWindow::loadFiles(const QStringList fileNames)
 	ui.actionAutoGroup->setChecked(autogroup);
 }
 
-void MainWindow::on_actionImportCSV_triggered()
+void MainWindow::on_actionImportDiveLog_triggered()
 {
-	CSVImportDialog *csvImport = new CSVImportDialog();
-	csvImport->show();
-	process_dives(TRUE, FALSE);
-	refreshDisplay();
+	QStringList fileNames = QFileDialog::getOpenFileNames(this, tr("Open Dive Log File"), lastUsedDir(), tr("Dive Log Files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML Files (*.xml);;UDDF/UDCF Files(*.uddf *.udcf);;JDiveLog Files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)"));
+
+	if (fileNames.isEmpty())
+		return;
+	updateLastUsedDir(QFileInfo(fileNames[0]).dir().path());
+
+	QStringList logFiles = fileNames.filter( QRegExp("^.*\\.(?!csv)", Qt::CaseInsensitive) ) ;
+	QStringList csvFiles = fileNames.filter(".csv", Qt::CaseInsensitive);
+	if (logFiles.size()) {
+		importFiles(logFiles);
+	}
+
+	if (csvFiles.size()) {
+		DiveLogImportDialog *diveLogImport = new DiveLogImportDialog(&csvFiles);
+		diveLogImport->show();
+		process_dives(TRUE, FALSE);
+		refreshDisplay();
+	}
 }
 
 void MainWindow::editCurrentDive()