From 88fdf1b138afaead559456d1734eae88b4778f83 Mon Sep 17 00:00:00 2001 From: Miika Turkia Date: Tue, 7 Jan 2014 22:01:28 +0200 Subject: Show import dialog only when needed for CSV config We do not need any import dialog when importing normal XML based divelogs. With this they are imported directly after file selection dialog. However, when CSV files are detected in the import list, the configuration dialog is displayed and applied for them. (CSV files are detected by file extension.) Signed-off-by: Miika Turkia Signed-off-by: Dirk Hohndel --- qt-ui/divelogimportdialog.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'qt-ui/divelogimportdialog.h') diff --git a/qt-ui/divelogimportdialog.h b/qt-ui/divelogimportdialog.h index 9ecf32410..d8cedab6a 100644 --- a/qt-ui/divelogimportdialog.h +++ b/qt-ui/divelogimportdialog.h @@ -15,24 +15,20 @@ class DiveLogImportDialog : public QDialog Q_OBJECT public: - explicit DiveLogImportDialog(QWidget *parent = 0); + explicit DiveLogImportDialog(QStringList *fn, QWidget *parent = 0); ~DiveLogImportDialog(); private slots: void on_buttonBox_accepted(); - void on_CSVFileSelector_clicked(); void on_knownImports_currentIndexChanged(int index); - void on_CSVFile_textEdited(); void unknownImports(int); void unknownImports(bool); - void on_DiveLogFileSelector_clicked(); - void on_DiveLogFile_editingFinished(); - private: void unknownImports(); bool selector; + QStringList fileNames; Ui::DiveLogImportDialog *ui; struct CSVAppConfig { -- cgit v1.2.3-70-g09d2