Imported Upstream version 3.1.0upstream/3.1.0

11 files changed, 90 insertions, 87 deletions

diff --git a/Plugins/HtmlExport/HtmlExport_de.ts b/Plugins/HtmlExport/HtmlExport_de.ts
index f5463cd..c741e0e 100644
--- a/Plugins/HtmlExport/HtmlExport_de.ts
+++ b/Plugins/HtmlExport/HtmlExport_de.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="de_DE">
+<TS version="2.0" language="de_DE">
 <context>
     <name>HtmlExport</name>
     <message>
@@ -77,47 +77,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="377"/>
+        <location filename="htmlexport.cpp" line="380"/>
         <source>Trigger: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="383"/>
+        <location filename="htmlexport.cpp" line="386"/>
         <source>Activated:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="391"/>
+        <location filename="htmlexport.cpp" line="394"/>
         <source>Action:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="398"/>
+        <location filename="htmlexport.cpp" line="401"/>
         <source>On view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="400"/>
+        <location filename="htmlexport.cpp" line="403"/>
         <source>On table:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="411"/>
+        <location filename="htmlexport.cpp" line="414"/>
         <source>Activate condition:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="418"/>
+        <location filename="htmlexport.cpp" line="421"/>
         <source>Code executed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="452"/>
+        <location filename="htmlexport.cpp" line="455"/>
         <source>View: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="477"/>
+        <location filename="htmlexport.cpp" line="480"/>
         <source>Document generated by SQLiteStudio v%1 on %2</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Plugins/HtmlExport/HtmlExport_es.ts b/Plugins/HtmlExport/HtmlExport_es.ts
index 5f3a331..0a75f4e 100644
--- a/Plugins/HtmlExport/HtmlExport_es.ts
+++ b/Plugins/HtmlExport/HtmlExport_es.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="es_ES">
+<TS version="2.0" language="es_ES">
 <context>
     <name>HtmlExport</name>
     <message>
@@ -77,47 +77,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="377"/>
+        <location filename="htmlexport.cpp" line="380"/>
         <source>Trigger: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="383"/>
+        <location filename="htmlexport.cpp" line="386"/>
         <source>Activated:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="391"/>
+        <location filename="htmlexport.cpp" line="394"/>
         <source>Action:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="398"/>
+        <location filename="htmlexport.cpp" line="401"/>
         <source>On view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="400"/>
+        <location filename="htmlexport.cpp" line="403"/>
         <source>On table:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="411"/>
+        <location filename="htmlexport.cpp" line="414"/>
         <source>Activate condition:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="418"/>
+        <location filename="htmlexport.cpp" line="421"/>
         <source>Code executed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="452"/>
+        <location filename="htmlexport.cpp" line="455"/>
         <source>View: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="477"/>
+        <location filename="htmlexport.cpp" line="480"/>
         <source>Document generated by SQLiteStudio v%1 on %2</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Plugins/HtmlExport/HtmlExport_fr.ts b/Plugins/HtmlExport/HtmlExport_fr.ts
index 594670e..cbc8676 100644
--- a/Plugins/HtmlExport/HtmlExport_fr.ts
+++ b/Plugins/HtmlExport/HtmlExport_fr.ts
@@ -147,7 +147,7 @@
     <message>
         <location filename="htmlexport.ui" line="73"/>
         <source>Output format</source>
-        <translation>Format d&apos;affichage</translation>
+        <translation>Format d&rsquo;affichage</translation>
     </message>
     <message>
         <location filename="htmlexport.ui" line="79"/>
@@ -162,12 +162,12 @@
     <message>
         <location filename="htmlexport.ui" line="108"/>
         <source>&lt;p&gt;When enabled, HTML characters such as &amp;lt;, &amp;gt; and &amp;amp; are not escaped in exported values. This allows you for example to export hyper-link enabled documents, but it also may result in incorrect HTML document (unmatched pairs of &amp;lt; and &amp;gt; characters). Be warned.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Lorsqu&apos;il y a des caractères HTML telque &amp;lt;, &amp;gt; et &amp;amp;ils ne sont pas enlevés des valeurs exportées. This allows you for example to export hyper-link enabled documents, but it also may result in incorrect HTML document (unmatched pairs of &amp;lt; and &amp;gt; characters).Soyez attentif.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Lorsqu&rsquo;il y a des caractères HTML telque &amp;lt;, &amp;gt; et &amp;amp;ils ne sont pas enlevés des valeurs exportées. This allows you for example to export hyper-link enabled documents, but it also may result in incorrect HTML document (unmatched pairs of &amp;lt; and &amp;gt; characters).Soyez attentif.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="htmlexport.ui" line="111"/>
         <source>Don&apos;t escape HTML characters</source>
-        <translation>N&apos;enlevez pas les caractères HTML</translation>
+        <translation>N&rsquo;enlevez pas les caractères HTML</translation>
     </message>
 </context>
 </TS>
diff --git a/Plugins/HtmlExport/HtmlExport_it.qm b/Plugins/HtmlExport/HtmlExport_it.qm
new file mode 100644
index 0000000..9dad8df
--- /dev/null
+++ b/Plugins/HtmlExport/HtmlExport_it.qm
diff --git a/Plugins/HtmlExport/HtmlExport_it.ts b/Plugins/HtmlExport/HtmlExport_it.ts
index 208900c..0aa5cd1 100644
--- a/Plugins/HtmlExport/HtmlExport_it.ts
+++ b/Plugins/HtmlExport/HtmlExport_it.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="it_IT">
+<TS version="2.0" language="it_IT">
 <context>
     <name>HtmlExport</name>
     <message>
@@ -77,47 +77,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="377"/>
+        <location filename="htmlexport.cpp" line="380"/>
         <source>Trigger: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="383"/>
+        <location filename="htmlexport.cpp" line="386"/>
         <source>Activated:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="391"/>
+        <location filename="htmlexport.cpp" line="394"/>
         <source>Action:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="398"/>
+        <location filename="htmlexport.cpp" line="401"/>
         <source>On view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="400"/>
+        <location filename="htmlexport.cpp" line="403"/>
         <source>On table:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="411"/>
+        <location filename="htmlexport.cpp" line="414"/>
         <source>Activate condition:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="418"/>
+        <location filename="htmlexport.cpp" line="421"/>
         <source>Code executed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="452"/>
+        <location filename="htmlexport.cpp" line="455"/>
         <source>View: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="477"/>
+        <location filename="htmlexport.cpp" line="480"/>
         <source>Document generated by SQLiteStudio v%1 on %2</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Plugins/HtmlExport/HtmlExport_pl.ts b/Plugins/HtmlExport/HtmlExport_pl.ts
index 3796e73..030f7b2 100644
--- a/Plugins/HtmlExport/HtmlExport_pl.ts
+++ b/Plugins/HtmlExport/HtmlExport_pl.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="pl_PL">
+<TS version="2.0" language="pl_PL">
 <context>
     <name>HtmlExport</name>
     <message>
@@ -77,47 +77,47 @@
         <translation>Sortowanie</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="377"/>
+        <location filename="htmlexport.cpp" line="380"/>
         <source>Trigger: %1</source>
         <translation>Wyzwalacz: %1</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="383"/>
+        <location filename="htmlexport.cpp" line="386"/>
         <source>Activated:</source>
         <translation>Aktywowany:</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="391"/>
+        <location filename="htmlexport.cpp" line="394"/>
         <source>Action:</source>
         <translation>Akcja:</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="398"/>
+        <location filename="htmlexport.cpp" line="401"/>
         <source>On view:</source>
         <translation>Na widoku:</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="400"/>
+        <location filename="htmlexport.cpp" line="403"/>
         <source>On table:</source>
         <translation>Na tabeli:</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="411"/>
+        <location filename="htmlexport.cpp" line="414"/>
         <source>Activate condition:</source>
         <translation>Warunek aktywacji:</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="418"/>
+        <location filename="htmlexport.cpp" line="421"/>
         <source>Code executed:</source>
         <translation>Wykonywany kod:</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="452"/>
+        <location filename="htmlexport.cpp" line="455"/>
         <source>View: %1</source>
         <translation>Widok: %1</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="477"/>
+        <location filename="htmlexport.cpp" line="480"/>
         <source>Document generated by SQLiteStudio v%1 on %2</source>
         <translation>Dokument wygenerowany przez SQLiteStudio v%1 dnia %2</translation>
     </message>
diff --git a/Plugins/HtmlExport/HtmlExport_pt_BR.ts b/Plugins/HtmlExport/HtmlExport_pt_BR.ts
index 66a2993..8f6986a 100644
--- a/Plugins/HtmlExport/HtmlExport_pt_BR.ts
+++ b/Plugins/HtmlExport/HtmlExport_pt_BR.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="pt_BR">
+<TS version="2.0" language="pt_BR">
 <context>
     <name>HtmlExport</name>
     <message>
@@ -77,47 +77,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="377"/>
+        <location filename="htmlexport.cpp" line="380"/>
         <source>Trigger: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="383"/>
+        <location filename="htmlexport.cpp" line="386"/>
         <source>Activated:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="391"/>
+        <location filename="htmlexport.cpp" line="394"/>
         <source>Action:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="398"/>
+        <location filename="htmlexport.cpp" line="401"/>
         <source>On view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="400"/>
+        <location filename="htmlexport.cpp" line="403"/>
         <source>On table:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="411"/>
+        <location filename="htmlexport.cpp" line="414"/>
         <source>Activate condition:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="418"/>
+        <location filename="htmlexport.cpp" line="421"/>
         <source>Code executed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="452"/>
+        <location filename="htmlexport.cpp" line="455"/>
         <source>View: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="477"/>
+        <location filename="htmlexport.cpp" line="480"/>
         <source>Document generated by SQLiteStudio v%1 on %2</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Plugins/HtmlExport/HtmlExport_ru.ts b/Plugins/HtmlExport/HtmlExport_ru.ts
index 9165c02..d3fdcc1 100644
--- a/Plugins/HtmlExport/HtmlExport_ru.ts
+++ b/Plugins/HtmlExport/HtmlExport_ru.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="ru_RU">
+<TS version="2.0" language="ru_RU">
 <context>
     <name>HtmlExport</name>
     <message>
@@ -77,47 +77,47 @@
         <translation>Порядок сортировки</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="377"/>
+        <location filename="htmlexport.cpp" line="380"/>
         <source>Trigger: %1</source>
         <translation>Триггер: %1</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="383"/>
+        <location filename="htmlexport.cpp" line="386"/>
         <source>Activated:</source>
         <translation>Активирован:</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="391"/>
+        <location filename="htmlexport.cpp" line="394"/>
         <source>Action:</source>
         <translation>Действие:</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="398"/>
+        <location filename="htmlexport.cpp" line="401"/>
         <source>On view:</source>
         <translation>Для представления:</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="400"/>
+        <location filename="htmlexport.cpp" line="403"/>
         <source>On table:</source>
         <translation>Для таблицы:</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="411"/>
+        <location filename="htmlexport.cpp" line="414"/>
         <source>Activate condition:</source>
         <translation>Условие активации:</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="418"/>
+        <location filename="htmlexport.cpp" line="421"/>
         <source>Code executed:</source>
         <translation>Исполненный код:</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="452"/>
+        <location filename="htmlexport.cpp" line="455"/>
         <source>View: %1</source>
         <translation>Представление: %1</translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="477"/>
+        <location filename="htmlexport.cpp" line="480"/>
         <source>Document generated by SQLiteStudio v%1 on %2</source>
         <translation>Документ сгенерирован с помощью SQLiteStudio v%1 в %2</translation>
     </message>
diff --git a/Plugins/HtmlExport/HtmlExport_sk.ts b/Plugins/HtmlExport/HtmlExport_sk.ts
index edcf4cc..5fe18e2 100644
--- a/Plugins/HtmlExport/HtmlExport_sk.ts
+++ b/Plugins/HtmlExport/HtmlExport_sk.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="sk_SK">
+<TS version="2.0" language="sk_SK">
 <context>
     <name>HtmlExport</name>
     <message>
@@ -77,47 +77,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="377"/>
+        <location filename="htmlexport.cpp" line="380"/>
         <source>Trigger: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="383"/>
+        <location filename="htmlexport.cpp" line="386"/>
         <source>Activated:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="391"/>
+        <location filename="htmlexport.cpp" line="394"/>
         <source>Action:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="398"/>
+        <location filename="htmlexport.cpp" line="401"/>
         <source>On view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="400"/>
+        <location filename="htmlexport.cpp" line="403"/>
         <source>On table:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="411"/>
+        <location filename="htmlexport.cpp" line="414"/>
         <source>Activate condition:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="418"/>
+        <location filename="htmlexport.cpp" line="421"/>
         <source>Code executed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="452"/>
+        <location filename="htmlexport.cpp" line="455"/>
         <source>View: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="477"/>
+        <location filename="htmlexport.cpp" line="480"/>
         <source>Document generated by SQLiteStudio v%1 on %2</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Plugins/HtmlExport/HtmlExport_zh_CN.ts b/Plugins/HtmlExport/HtmlExport_zh_CN.ts
index 72750a1..38e9d69 100644
--- a/Plugins/HtmlExport/HtmlExport_zh_CN.ts
+++ b/Plugins/HtmlExport/HtmlExport_zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="zh_CN">
+<TS version="2.0" language="zh_CN">
 <context>
     <name>HtmlExport</name>
     <message>
@@ -77,47 +77,47 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="377"/>
+        <location filename="htmlexport.cpp" line="380"/>
         <source>Trigger: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="383"/>
+        <location filename="htmlexport.cpp" line="386"/>
         <source>Activated:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="391"/>
+        <location filename="htmlexport.cpp" line="394"/>
         <source>Action:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="398"/>
+        <location filename="htmlexport.cpp" line="401"/>
         <source>On view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="400"/>
+        <location filename="htmlexport.cpp" line="403"/>
         <source>On table:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="411"/>
+        <location filename="htmlexport.cpp" line="414"/>
         <source>Activate condition:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="418"/>
+        <location filename="htmlexport.cpp" line="421"/>
         <source>Code executed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="452"/>
+        <location filename="htmlexport.cpp" line="455"/>
         <source>View: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="htmlexport.cpp" line="477"/>
+        <location filename="htmlexport.cpp" line="480"/>
         <source>Document generated by SQLiteStudio v%1 on %2</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/Plugins/HtmlExport/htmlexport.cpp b/Plugins/HtmlExport/htmlexport.cpp
index 75b3868..86ac13e 100644
--- a/Plugins/HtmlExport/htmlexport.cpp
+++ b/Plugins/HtmlExport/htmlexport.cpp
@@ -347,13 +347,16 @@ bool HtmlExport::exportIndex(const QString& database, const QString& name, const
     decrIndent();
     writeln("</tr>");
 
-    for (SqliteIndexedColumn* idxCol : createIndex->indexedColumns)
+    QString collate;
+    for (SqliteOrderBy* idxCol : createIndex->indexedColumns)
     {
+        collate = idxCol->getCollation();
+
         writeln("<tr>");
         incrIndent();
-        writeln(QString("<td>%1</td>").arg(escape(idxCol->name)));
-        writeln(QString("<td align=\"center\">%1</td>").arg(idxCol->collate.isNull() ? "&nbsp;" : escape(idxCol->collate)));
-        writeln(QString("<td align=\"center\">%1</td>").arg(idxCol->sortOrder == SqliteSortOrder::null ? "&nbsp;" : sqliteSortOrder(idxCol->sortOrder)));
+        writeln(QString("<td>%1</td>").arg(escape(idxCol->getColumnString())));
+        writeln(QString("<td align=\"center\">%1</td>").arg(collate.isNull() ? "&nbsp;" : escape(collate)));
+        writeln(QString("<td align=\"center\">%1</td>").arg(idxCol->order == SqliteSortOrder::null ? "&nbsp;" : sqliteSortOrder(idxCol->order)));
         decrIndent();
         writeln("</tr>");
     }