diff options
| author |  Miika Turkia <miika.turkia@gmail.com> | 2016-12-31 09:56:08 +0200 |
|---|---|---|
| committer | Miika Turkia <miika.turkia@gmail.com> | 2016-12-31 09:56:08 +0200 |
| commit | 876605458156190f845cc931bff756690f34b8ff (patch) | |
| tree | 3ee999d3ddbd6781ee83b379a1d6db3f5162be67 | |
| parent | 25ce819a9ac62384dcb6a19704a57b35ef06a94c (diff) | |
| download | subsurface-876605458156190f845cc931bff756690f34b8ff.tar.gz | |
Hooking up av1.xslt for log import
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
| -rw-r--r-- | core/parse-xml.c | 1 | ||||
| -rw-r--r-- | desktop-widgets/divelogimportdialog.cpp | 5 | ||||
| -rw-r--r-- | desktop-widgets/divelogimportdialog.h | 2 | ||||
| -rw-r--r-- | subsurface.qrc | 1 |
4 files changed, 7 insertions, 2 deletions
diff --git a/core/parse-xml.c b/core/parse-xml.c index aa2e7125f..44cfece57 100644 --- a/core/parse-xml.c +++ b/core/parse-xml.c @@ -3738,6 +3738,7 @@ static struct xslt_files { { "SubsurfaceCSV", "subsurfacecsv.xslt", NULL }, { "manualcsv", "manualcsv2xml.xslt", NULL }, { "logbook", "DiveLog.xslt", NULL }, + { "AV1", "av1.xslt", NULL }, { NULL, } }; diff --git a/desktop-widgets/divelogimportdialog.cpp b/desktop-widgets/divelogimportdialog.cpp index c65f89982..2c87c1188 100644 --- a/desktop-widgets/divelogimportdialog.cpp +++ b/desktop-widgets/divelogimportdialog.cpp @@ -23,6 +23,7 @@ const DiveLogImportDialog::CSVAppConfig DiveLogImportDialog::CSVApps[CSVAPPS] = { "SensusCSV", 9, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, "," }, { "Seabear CSV", 0, 1, 5, -1, -1, -1, -1, -1, 2, 3, 4, 6, -1, ";" }, { "SubsurfaceCSV", -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, "Tab" }, + { "AV1", 0, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, " " }, { NULL, SILENCE_WARNING } }; @@ -34,7 +35,8 @@ enum Known { XP5, SENSUS, SEABEAR, - SUBSURFACE + SUBSURFACE, + AV1 }; ColumnNameProvider::ColumnNameProvider(QObject *parent) : QAbstractListModel(parent) @@ -348,6 +350,7 @@ DiveLogImportDialog::DiveLogImportDialog(QStringList fn, QWidget *parent) : QDia specialCSV << SENSUS; specialCSV << SUBSURFACE; specialCSV << DL7; + specialCSV << AV1; for (int i = 0; !CSVApps[i].name.isNull(); ++i) ui->knownImports->addItem(CSVApps[i].name); diff --git a/desktop-widgets/divelogimportdialog.h b/desktop-widgets/divelogimportdialog.h index 8c752844d..734cc7df3 100644 --- a/desktop-widgets/divelogimportdialog.h +++ b/desktop-widgets/divelogimportdialog.h @@ -118,7 +118,7 @@ private: QString separator; }; -#define CSVAPPS 9 +#define CSVAPPS 10 static const CSVAppConfig CSVApps[CSVAPPS]; }; diff --git a/subsurface.qrc b/subsurface.qrc index dc73ad454..1a48bfc79 100644 --- a/subsurface.qrc +++ b/subsurface.qrc @@ -46,6 +46,7 @@ <file>xslt/manualcsv2xml.xslt</file> <file>xslt/shearwater.xslt</file> <file>xslt/DiveLog.xslt</file> + <file>xslt/av1.xslt</file> <file alias="icon_lung">icons/gas.png</file> <file alias="icon_mod">icons/mod.png</file> <file alias="icon_he">icons/he.png</file> |