From 18fa359b481893bf2ef71cfbb676efbd9601204b Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Sat, 24 May 2014 06:42:10 -0700
Subject: Rework the Export dialog

The UI design looked too tight in my screen.
The explanation texts were a bit inconsistent (and in one case simply
wrong).
The explanation for the initial selection wasn't shown.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qt-ui/divelogexportdialog.cpp | 16 ++++++++++-----
 qt-ui/divelogexportdialog.h   |  1 +
 qt-ui/divelogexportdialog.ui  | 48 +++++++++++++++++++++----------------------
 3 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/qt-ui/divelogexportdialog.cpp b/qt-ui/divelogexportdialog.cpp
index 94b9c9fc9..cc59b2e6d 100644
--- a/qt-ui/divelogexportdialog.cpp
+++ b/qt-ui/divelogexportdialog.cpp
@@ -15,6 +15,7 @@ DiveLogExportDialog::DiveLogExportDialog(QWidget *parent) : QDialog(parent),
 	ui(new Ui::DiveLogExportDialog)
 {
 	ui->setupUi(this);
+	showExplanation();
 	QShortcut *quit = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q), this);
 	connect(quit, SIGNAL(activated()), parent, SLOT(close()));
 	QShortcut *close = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), this);
@@ -26,19 +27,24 @@ DiveLogExportDialog::~DiveLogExportDialog()
 	delete ui;
 }
 
-void DiveLogExportDialog::on_exportGroup_buttonClicked(QAbstractButton *button)
+void DiveLogExportDialog::showExplanation()
 {
 	if (ui->exportUDDF->isChecked()) {
-		ui->description->setText("UDDF is a generic format that enables communication among many dive computers and computer programs");
+		ui->description->setText("Generic format that is used for data exchange between a variety of diving related programs.");
 	} else if (ui->exportCSV->isChecked()) {
-		ui->description->setText("CSV format, that includes the most critical information of the dive profile.");
+		ui->description->setText("Comma separated values that include the most relevant information of the dive profile.");
 	} else if (ui->exportDivelogs->isChecked()) {
-		ui->description->setText("Subsurface XML format. This is the native format used by Subsurface.");
+		ui->description->setText("Send the dive data to Divelogs.de website.");
 	} else if (ui->exportWorldMap->isChecked()) {
-		ui->description->setText("Export the currently open dive logbook locations in HTML format and draw these on a world map.");
+		ui->description->setText("HTML export of the dive locations, visualized on a world map.");
 	}
 }
 
+void DiveLogExportDialog::on_exportGroup_buttonClicked(QAbstractButton *button)
+{
+	showExplanation();
+}
+
 void DiveLogExportDialog::on_buttonBox_accepted()
 {
 	QFileInfo fi(system_default_filename());
diff --git a/qt-ui/divelogexportdialog.h b/qt-ui/divelogexportdialog.h
index 8020b481c..92510a7aa 100644
--- a/qt-ui/divelogexportdialog.h
+++ b/qt-ui/divelogexportdialog.h
@@ -22,6 +22,7 @@ slots:
 
 private:
 	Ui::DiveLogExportDialog *ui;
+	void showExplanation();
 };
 
 #endif // DIVELOGEXPORTDIALOG_H
diff --git a/qt-ui/divelogexportdialog.ui b/qt-ui/divelogexportdialog.ui
index e5dc77083..c937308e1 100644
--- a/qt-ui/divelogexportdialog.ui
+++ b/qt-ui/divelogexportdialog.ui
@@ -59,10 +59,10 @@
   <widget class="QGroupBox" name="exportFormat">
    <property name="geometry">
     <rect>
-     <x>30</x>
-     <y>100</y>
-     <width>120</width>
-     <height>141</height>
+     <x>20</x>
+     <y>70</y>
+     <width>161</width>
+     <height>171</height>
     </rect>
    </property>
    <property name="title">
@@ -71,8 +71,8 @@
    <widget class="QRadioButton" name="exportUDDF">
     <property name="geometry">
      <rect>
-      <x>0</x>
-      <y>20</y>
+      <x>10</x>
+      <y>30</y>
       <width>110</width>
       <height>24</height>
      </rect>
@@ -90,14 +90,14 @@
    <widget class="QRadioButton" name="exportDivelogs">
     <property name="geometry">
      <rect>
-      <x>0</x>
-      <y>50</y>
-      <width>110</width>
+      <x>10</x>
+      <y>60</y>
+      <width>131</width>
       <height>24</height>
      </rect>
     </property>
     <property name="text">
-     <string>divelogs</string>
+     <string>divelogs.de</string>
     </property>
     <attribute name="buttonGroup">
      <string notr="true">exportGroup</string>
@@ -106,8 +106,8 @@
    <widget class="QRadioButton" name="exportCSV">
     <property name="geometry">
      <rect>
-      <x>0</x>
-      <y>80</y>
+      <x>10</x>
+      <y>90</y>
       <width>110</width>
       <height>24</height>
      </rect>
@@ -122,8 +122,8 @@
    <widget class="QRadioButton" name="exportWorldMap">
     <property name="geometry">
      <rect>
-      <x>0</x>
-      <y>110</y>
+      <x>10</x>
+      <y>120</y>
       <width>110</width>
       <height>24</height>
      </rect>
@@ -140,9 +140,9 @@
    <property name="geometry">
     <rect>
      <x>190</x>
-     <y>100</y>
-     <width>151</width>
-     <height>80</height>
+     <y>70</y>
+     <width>191</width>
+     <height>141</height>
     </rect>
    </property>
    <property name="title">
@@ -155,8 +155,8 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>20</y>
-      <width>131</width>
+      <y>30</y>
+      <width>151</width>
       <height>24</height>
      </rect>
     </property>
@@ -171,7 +171,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>50</y>
+      <y>60</y>
       <width>110</width>
       <height>24</height>
      </rect>
@@ -197,10 +197,10 @@
   <widget class="QLabel" name="description">
    <property name="geometry">
     <rect>
-     <x>40</x>
-     <y>270</y>
-     <width>271</width>
-     <height>71</height>
+     <x>30</x>
+     <y>260</y>
+     <width>341</width>
+     <height>91</height>
     </rect>
    </property>
    <property name="text">
-- 
cgit v1.2.3-70-g09d2