From 33fa8bdf9614685c2a7f37d24a09d642ff164f98 Mon Sep 17 00:00:00 2001
From: Gehad elrobey <gehadelrobey@gmail.com>
Date: Tue, 24 Jun 2014 16:01:50 +0300
Subject: HTML: user export options ask for numbering

Ask if you want the exporter to rearrange the dive numbers starting from
1 or use the existing numbers in subsurface. one may need to have the
dives exported in the same number to reference them easier.

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qt-ui/divelogexportdialog.cpp | 4 ++--
 qt-ui/divelogexportdialog.ui  | 4 ++--
 theme/list_lib.js             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/qt-ui/divelogexportdialog.cpp b/qt-ui/divelogexportdialog.cpp
index 82e3aaf74..285071ceb 100644
--- a/qt-ui/divelogexportdialog.cpp
+++ b/qt-ui/divelogexportdialog.cpp
@@ -114,8 +114,8 @@ void DiveLogExportDialog::exportHTMLsettings(const QString &filename)
 	QFile file(filename);
 	file.open(QIODevice::WriteOnly | QIODevice::Text);
 	QTextStream out(&file);
-	out << "settings = {\"fontSize\":\"" << fontSize << "\",\"fontFamily\":\"" << fontFamily << "\",\"listOnly\":\""<<
-	ui->exportListOnly->isChecked() << "\",}";
+	out << "settings = {\"fontSize\":\"" << fontSize << "\",\"fontFamily\":\"" << fontFamily << "\",\"listOnly\":\""
+	    << ui->exportListOnly->isChecked() << "\",\"subsurfaceNumbers\":\"" << ui->exportSubsurfaceNumber->isChecked() << "\",}";
 	file.close();
 }
 
diff --git a/qt-ui/divelogexportdialog.ui b/qt-ui/divelogexportdialog.ui
index 610ee53e9..202a7b4db 100644
--- a/qt-ui/divelogexportdialog.ui
+++ b/qt-ui/divelogexportdialog.ui
@@ -185,9 +185,9 @@
          </property>
          <layout class="QGridLayout" name="gridLayout_3">
           <item row="0" column="0">
-           <widget class="QCheckBox" name="checkBox">
+           <widget class="QCheckBox" name="exportSubsurfaceNumber">
             <property name="text">
-             <string>Order dives from 0</string>
+             <string>Subsurface Numbers</string>
             </property>
            </widget>
           </item>
diff --git a/theme/list_lib.js b/theme/list_lib.js
index a6f1fcb71..bf5ad014a 100644
--- a/theme/list_lib.js
+++ b/theme/list_lib.js
@@ -170,7 +170,7 @@ function unexpand(ul){
 //////////////////////////////////////
 
 function getlimited (dive) {
-    return '<div style="height:20px"><div class="item">'+dive.subsurface_number+'</div>'+
+	return '<div style="height:20px"><div class="item">'+(settings.subsurfaceNumbers==='0'?dive.number:dive.subsurface_number)+'</div>'+
 	'<div class="item">'+dive.date+'</div>'+
 	'<div class="item">'+dive.time+'</div>'+
 	'<div class="item_large">'+dive.location+'</div>'+
-- 
cgit v1.2.3-70-g09d2