From 3565aad630864ecdbe53fdaa501ea708555b3c7c Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@unit193.net>
Date: Sun, 30 Apr 2023 18:30:36 -0400
Subject: New upstream version 3.4.4+dfsg.

---
 Plugins/CsvImport/CsvImportOptions.ui | 63 +++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 25 deletions(-)

(limited to 'Plugins/CsvImport/CsvImportOptions.ui')

diff --git a/Plugins/CsvImport/CsvImportOptions.ui b/Plugins/CsvImport/CsvImportOptions.ui
index f0f2728..1ed0f49 100644
--- a/Plugins/CsvImport/CsvImportOptions.ui
+++ b/Plugins/CsvImport/CsvImportOptions.ui
@@ -7,13 +7,26 @@
     <x>0</x>
     <y>0</y>
     <width>365</width>
-    <height>106</height>
+    <height>128</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="3">
+    <widget class="QCheckBox" name="firstRowAsColumnsCheck">
+     <property name="toolTip">
+      <string>&lt;p&gt;Enable this if the first data line in your CSV file represents column names. You don't want column names to be imported into the table as a regular data.&lt;/p&gt;</string>
+     </property>
+     <property name="text">
+      <string>First line represents CSV column names</string>
+     </property>
+     <property name="cfg" stdset="0">
+      <string notr="true">CsvImport.FirstRowAsColumns</string>
+     </property>
+    </widget>
+   </item>
    <item row="1" column="1">
     <widget class="QComboBox" name="separatorCombo">
      <property name="cfg" stdset="0">
@@ -46,23 +59,33 @@
      </item>
     </widget>
    </item>
-   <item row="0" column="0" colspan="3">
-    <widget class="QCheckBox" name="firstRowAsColumnsCheck">
+   <item row="1" column="0">
+    <widget class="QLabel" name="separatorLabel">
+     <property name="text">
+      <string>Column separator:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QCheckBox" name="nullCheck">
      <property name="toolTip">
-      <string>&lt;p&gt;Enable this if the first data line in your CSV file represents column names. You don't want column names to be imported into the table as a regular data.&lt;/p&gt;</string>
+      <string>If enabled, then text value provided on the right will be interpreted as NULL</string>
      </property>
      <property name="text">
-      <string>First line represents CSV column names</string>
+      <string>NULL values:</string>
      </property>
      <property name="cfg" stdset="0">
-      <string notr="true">CsvImport.FirstRowAsColumns</string>
+      <string notr="true">CsvImport.NullValues</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="separatorLabel">
-     <property name="text">
-      <string>Field separator:</string>
+   <item row="2" column="1" colspan="2">
+    <widget class="QLineEdit" name="nullEdit">
+     <property name="toolTip">
+      <string>If your CSV data contains null values, define how are they represented in the CSV.</string>
+     </property>
+     <property name="cfg" stdset="0">
+      <string notr="true">CsvImport.NullValueString</string>
      </property>
     </widget>
    </item>
@@ -79,26 +102,16 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0">
-    <widget class="QCheckBox" name="nullCheck">
+   <item row="3" column="0" colspan="3">
+    <widget class="QCheckBox" name="quotationMarkCheck">
      <property name="toolTip">
-      <string>If enabled, then text value provided on the right will be interpreted as NULL</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled, the &amp;quot; character will be interpreted as standard CSV value quotation mark, causing the string to be treated as single value until the next (ending) &amp;quot; character. If disabled, the &amp;quot; will be treated as any other character. Usually you want this to be enabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
-      <string>NULL values:</string>
+      <string>Interpret &quot; as a value quotation mark</string>
      </property>
      <property name="cfg" stdset="0">
-      <string notr="true">CsvImport.NullValues</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1" colspan="2">
-    <widget class="QLineEdit" name="nullEdit">
-     <property name="toolTip">
-      <string>If your CSV data contains null values, define how are they represented in the CSV.</string>
-     </property>
-     <property name="cfg" stdset="0">
-      <string notr="true">CsvImport.NullValueString</string>
+      <string notr="true">CsvImport.QuotationMark</string>
      </property>
     </widget>
    </item>
-- 
cgit v1.2.3