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

Remove all the no longer necessary code that aborts read of first V2 file

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2015-06-16 12:52:39 -07:00
parent bd11988f74
commit ccc9d80015
9 changed files with 4 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

3
qt-ui/divelogimportdialog.cpp
View file

@ -574,7 +574,6 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
void DiveLogImportDialog::on_buttonBox_accepted()
{
imported_via_xslt = true;
QStringList r = resultModel->result();
if (ui->knownImports->currentText() != "Manual import") {
for (int i = 0; i < fileNames.size(); ++i) {
@ -594,7 +593,6 @@ void DiveLogImportDialog::on_buttonBox_accepted()
ui->CSVUnits->currentIndex(),
delta.toUtf8().data()
) < 0) {
imported_via_xslt = false;
return;
}
// Seabear CSV stores NDL and TTS in Minutes, not seconds
@ -670,7 +668,6 @@ void DiveLogImportDialog::on_buttonBox_accepted()
}
process_dives(true, false);
MainWindow::instance()->refreshDisplay();
imported_via_xslt = false;
}
TagDragDelegate::TagDragDelegate(QObject *parent) : QStyledItemDelegate(parent)

5
qt-ui/maintab.cpp
View file

@ -237,11 +237,6 @@ void MainTab::enableGeoLookupEdition()
{
ui.waitingSpinner->stop();
ui.addDiveSite->show();
// if we showed an informational text about loading the files, hide it, but don't
// hide the message area if it contains other warnings
if (MainWindow::instance()->getNotificationWidget()->getNotificationText() ==
tr("Please Wait, Importing your files..."))
MainWindow::instance()->getNotificationWidget()->hideNotification();
}
void MainTab::disableGeoLookupEdition()

26
qt-ui/mainwindow.cpp
View file

@ -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));
}
}

1
qt-ui/mainwindow.h
View file

@ -92,7 +92,6 @@ public:
void printPlan();
void checkSurvey(QSettings *s);
void setApplicationState(const QByteArray& state);
void showV2Dialog();
QUndoStack *undoStack;
NotificationWidget *getNotificationWidget();
void enableDisableCloudActions();