From fff253e8cfe500482a3fc2b6b59a2b20677f19ff Mon Sep 17 00:00:00 2001
From: Stefan Fuchs <sfuchs@gmx.de>
Date: Sun, 30 Apr 2017 20:31:56 +0200
Subject: Picture feature: Improve UI and translation of shift image times
 dialog

For the list of pictures with inappropriate date/time not fitting with
the dive time use a QTextEdit in read only mode with scroll bars
enabled instead of a QLabel.
Also update and translate some strings used there.

Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
---
 desktop-widgets/shiftimagetimes.ui | 12 +++++++++---
 desktop-widgets/simplewidgets.cpp  |  9 +++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/desktop-widgets/shiftimagetimes.ui b/desktop-widgets/shiftimagetimes.ui
index 0478a62b4..be09c23c1 100644
--- a/desktop-widgets/shiftimagetimes.ui
+++ b/desktop-widgets/shiftimagetimes.ui
@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>693</width>
-    <height>606</height>
+    <height>600</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -139,11 +139,17 @@ Not all images have timestamps in the range between
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="invalidLabel">
+       <widget class="QTextEdit" name="invalidFilesText">
         <property name="styleSheet">
          <string notr="true">color: red; </string>
         </property>
-        <property name="text">
+        <property name="lineWrapMode">
+         <enum>QTextEdit::NoWrap</enum>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+        <property name="text" stdset="0">
          <string/>
         </property>
        </widget>
diff --git a/desktop-widgets/simplewidgets.cpp b/desktop-widgets/simplewidgets.cpp
index 331426318..8caa1b9dd 100644
--- a/desktop-widgets/simplewidgets.cpp
+++ b/desktop-widgets/simplewidgets.cpp
@@ -380,9 +380,10 @@ void ShiftImageTimesDialog::updateInvalid()
 	timestamp_t timestamp;
 	bool allValid = true;
 	ui.warningLabel->hide();
-	ui.invalidLabel->hide();
+	ui.invalidFilesText->hide();
 	QDateTime time = QDateTime::fromTime_t(displayed_dive.when, Qt::UTC);
-	ui.invalidLabel->setText("Dive:" + time.toString() + "\n");
+	ui.invalidFilesText->setPlainText(tr("Dive date/time") + ": " + time.toString() + "\n");
+	ui.invalidFilesText->append(tr("Files with inappropriate date/time") + ":");
 
 	Q_FOREACH (const QString &fileName, fileNames) {
 		if (picture_check_valid(fileName.toUtf8().data(), m_amount))
@@ -391,13 +392,13 @@ void ShiftImageTimesDialog::updateInvalid()
 		// We've found invalid image
 		timestamp = picture_get_timestamp(fileName.toUtf8().data());
 		time.setTime_t(timestamp + m_amount);
-		ui.invalidLabel->setText(ui.invalidLabel->text() + fileName + " " + time.toString() + "\n");
+		ui.invalidFilesText->append(fileName + " " + time.toString());
 		allValid = false;
 	}
 
 	if (!allValid){
 		ui.warningLabel->show();
-		ui.invalidLabel->show();
+		ui.invalidFilesText->show();
 	}
 }
 
-- 
cgit v1.2.3-70-g09d2