From f690b8e90d7144466bb24b94d3c130e20e18ab0b Mon Sep 17 00:00:00 2001
From: willemferguson <willemferguson@zoology.up.ac.za>
Date: Sat, 18 Apr 2020 15:43:24 +0200
Subject: Reorganise and reword divelog export panel

Perform slight reorganisation and rewording of the divelog export
panel. Specifically the wording is changed and expanded to make clear
the 2 types of export of profile data. All the CSV export options are
grouped together. With respect to profile export to CSV format, it is
made clear that one option concerns export of dive computer-related
profile data, whereas the other option involves export of computed
dive profile data from the Dive Profile panel.

Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za>
---
 desktop-widgets/divelogexportdialog.cpp |  4 ++--
 desktop-widgets/divelogexportdialog.ui  | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'desktop-widgets')

diff --git a/desktop-widgets/divelogexportdialog.cpp b/desktop-widgets/divelogexportdialog.cpp
index cfccf07f2..6ff0f54bf 100644
--- a/desktop-widgets/divelogexportdialog.cpp
+++ b/desktop-widgets/divelogexportdialog.cpp
@@ -84,7 +84,7 @@ void DiveLogExportDialog::showExplanation()
 	if (ui->exportUDDF->isChecked()) {
 		ui->description->setText(tr("Generic format that is used for data exchange between a variety of diving related programs."));
 	} else if (ui->exportCSV->isChecked()) {
-		ui->description->setText(tr("Comma separated values describing the dive profile."));
+		ui->description->setText(tr("Comma separated values describing the dive profile as downloaded from dive computer."));
 	} else if (ui->exportCSVDetails->isChecked()) {
 		ui->description->setText(tr("Comma separated values of the dive information. This includes most of the dive details but no profile information."));
 	} else if (ui->exportDivelogs->isChecked()) {
@@ -106,7 +106,7 @@ void DiveLogExportDialog::showExplanation()
 	} else if (ui->exportProfile->isChecked()) {
 		ui->description->setText(tr("Write the profile image as PNG file."));
 	} else if (ui->exportProfileData->isChecked()) {
-		ui->description->setText(tr("Write profile data to a CSV file."));
+		ui->description->setText(tr("Write the computed Profile Panel data to a CSV file."));
 	}
 }
 
diff --git a/desktop-widgets/divelogexportdialog.ui b/desktop-widgets/divelogexportdialog.ui
index 3b15f348e..d5ea9c0f2 100644
--- a/desktop-widgets/divelogexportdialog.ui
+++ b/desktop-widgets/divelogexportdialog.ui
@@ -254,10 +254,20 @@
             </attribute>
            </widget>
           </item>
+          <item>
+           <widget class="QRadioButton" name="exportCSVDetails">
+            <property name="text">
+             <string>CSV summary dive details</string>
+            </property>
+            <attribute name="buttonGroup">
+             <string notr="true">exportGroup</string>
+            </attribute>
+           </widget>
+          </item>
           <item>
            <widget class="QRadioButton" name="exportCSV">
             <property name="text">
-             <string>CSV dive profile</string>
+             <string>CSV Dive computer dive profile</string>
             </property>
             <attribute name="buttonGroup">
              <string notr="true">exportGroup</string>
@@ -265,9 +275,9 @@
            </widget>
           </item>
           <item>
-           <widget class="QRadioButton" name="exportCSVDetails">
+           <widget class="QRadioButton" name="exportProfileData">
             <property name="text">
-             <string>CSV dive details</string>
+             <string>CSV Computed Profile Panel data</string>
             </property>
             <attribute name="buttonGroup">
              <string notr="true">exportGroup</string>
@@ -324,16 +334,6 @@
             </attribute>
            </widget>
           </item>
-          <item>
-           <widget class="QRadioButton" name="exportProfileData">
-            <property name="text">
-             <string>Profile Data CSV</string>
-            </property>
-            <attribute name="buttonGroup">
-             <string notr="true">exportGroup</string>
-            </attribute>
-           </widget>
-          </item>
          </layout>
         </widget>
        </item>
-- 
cgit v1.2.3-70-g09d2