summaryrefslogtreecommitdiffstats
path: root/qt-ui/mainwindow.cpp
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-06-16 12:52:39 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-06-16 14:41:56 -0700
commitccc9d800153ad11d8a2b54dc75fe8aefb5650dd3 (patch)
tree31a3638cd0885515709ab2aa55a3499746a1d2a8 /qt-ui/mainwindow.cpp
parentbd11988f74d2fcc7873df691e06a1279d7fd3228 (diff)
downloadsubsurface-ccc9d800153ad11d8a2b54dc75fe8aefb5650dd3.tar.gz
Remove all the no longer necessary code that aborts read of first V2 file
This was a poorly implemented hack when we executed the reverse geo lookup in the main thread and opening a V2 file could take a very long time. We need to do the "Welcome" message quite differently. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/mainwindow.cpp')
-rw-r--r--qt-ui/mainwindow.cpp26
1 files changed, 0 insertions, 26 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 16a58b321..5621269b3 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -1495,24 +1495,6 @@ void MainWindow::importTxtFiles(const QStringList fileNames)
refreshDisplay();
}
-void MainWindow::showV2Dialog()
-{
- // here we need to ask the user if / how they want to do the reverse geo coding
- //
- // since the reverse geo coding now happens in its own thread the warning isn't needed
- // anymore, but I'll leave this function / the logic to call it around because we are likely
- // too have to add questions about how the user wants to do the reverse geo coding...
- //
-#if 0
- QMessageBox d(QMessageBox::Information,
- tr("Welcom to Subsurface %1").arg(subsurface_version()),
- tr("Importing data files from earlier versions of Subsurface can take a significant amount of time"),
- QMessageBox::Ok,
- this);
- d.exec();
-#endif
-}
-
void MainWindow::loadFiles(const QStringList fileNames)
{
bool showWarning = false;
@@ -1537,14 +1519,6 @@ void MainWindow::loadFiles(const QStringList fileNames)
getNotificationWidget()->showNotification(warning , KMessageWidget::Information);
}
} else {
- if (!v2_question_shown && abort_read_of_old_file) {
- v2_question_shown = true;
- abort_read_of_old_file = false;
- showV2Dialog();
- getNotificationWidget()->showNotification(tr("Please Wait, Importing your files..."), KMessageWidget::Information);
- i--; // so we re-try this file
- continue;
- }
failedParses.append(fileNames.at(i));
}
}