Imported Upstream version 3.0.2upstream/3.0.2

8 files changed, 72 insertions, 69 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/plugins/exportplugin.h b/SQLiteStudio3/coreSQLiteStudio/plugins/exportplugin.h
index 06aded7..8c269e2 100644
--- a/SQLiteStudio3/coreSQLiteStudio/plugins/exportplugin.h
+++ b/SQLiteStudio3/coreSQLiteStudio/plugins/exportplugin.h
@@ -224,6 +224,7 @@ class ExportPlugin : virtual public Plugin
          * @param database "Attach" name of the database that the table belongs to. Can be "main", "temp", or any attach name.
          * @param table Name of the table to export.
          * @param columnNames Name of columns in the table, in order they will appear in the rows passed to exportTableRow().
+         * This will be empty if data is not being exported. This is different than for exportTable(), where columnNames are always present.
          * @param ddl The DDL of the table.
          * @param createTable Table DDL parsed into an object.
          * @param providedData All data entries requested by the plugin in the return value of getProviderFlags().
diff --git a/SQLiteStudio3/coreSQLiteStudio/plugins/genericexportplugin.h b/SQLiteStudio3/coreSQLiteStudio/plugins/genericexportplugin.h
index 1719baa..0edbde6 100644
--- a/SQLiteStudio3/coreSQLiteStudio/plugins/genericexportplugin.h
+++ b/SQLiteStudio3/coreSQLiteStudio/plugins/genericexportplugin.h
@@ -6,6 +6,8 @@
 
 class API_EXPORT GenericExportPlugin : virtual public GenericPlugin, public ExportPlugin
 {
+        Q_OBJECT
+
     public:
         bool initBeforeExport(Db* db, QIODevice* output, const ExportManager::StandardExportConfig& config);
         ExportManager::ExportModes getSupportedModes() const;
diff --git a/SQLiteStudio3/coreSQLiteStudio/plugins/populateconstant.ui b/SQLiteStudio3/coreSQLiteStudio/plugins/populateconstant.ui
index 39e80e1..ddd1131 100644
--- a/SQLiteStudio3/coreSQLiteStudio/plugins/populateconstant.ui
+++ b/SQLiteStudio3/coreSQLiteStudio/plugins/populateconstant.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -23,7 +23,7 @@
       <item>
        <widget class="QLineEdit" name="valueEdit">
         <property name="cfg" stdset="0">
-         <string>PopulateConstant.Value</string>
+         <string notr="true">PopulateConstant.Value</string>
         </property>
        </widget>
       </item>
diff --git a/SQLiteStudio3/coreSQLiteStudio/plugins/populatedictionary.ui b/SQLiteStudio3/coreSQLiteStudio/plugins/populatedictionary.ui
index f99491f..6a28476 100644
--- a/SQLiteStudio3/coreSQLiteStudio/plugins/populatedictionary.ui
+++ b/SQLiteStudio3/coreSQLiteStudio/plugins/populatedictionary.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -23,7 +23,7 @@
       <item>
        <widget class="FileEdit" name="fileEdit" native="true">
         <property name="cfg" stdset="0">
-         <string>PopulateDictionary.File</string>
+         <string notr="true">PopulateDictionary.File</string>
         </property>
         <property name="dialogTitle" stdset="0">
          <string>Pick dictionary file</string>
@@ -41,12 +41,12 @@
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
        <widget class="ConfigRadioButton" name="whitespaceRadio">
-        <property name="cfg" stdset="0">
-         <string>PopulateDictionary.Lines</string>
-        </property>
         <property name="text">
          <string>Whitespace</string>
         </property>
+        <property name="cfg" stdset="0">
+         <string notr="true">PopulateDictionary.Lines</string>
+        </property>
         <property name="assignedValue" stdset="0">
          <bool>false</bool>
         </property>
@@ -54,12 +54,12 @@
       </item>
       <item>
        <widget class="ConfigRadioButton" name="libeBreakRadio">
-        <property name="cfg" stdset="0">
-         <string>PopulateDictionary.Lines</string>
-        </property>
         <property name="text">
          <string>Line break</string>
         </property>
+        <property name="cfg" stdset="0">
+         <string notr="true">PopulateDictionary.Lines</string>
+        </property>
         <property name="assignedValue" stdset="0">
          <bool>true</bool>
         </property>
@@ -76,12 +76,12 @@
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <widget class="ConfigRadioButton" name="orderedRadio">
-        <property name="cfg" stdset="0">
-         <string>PopulateDictionary.Random</string>
-        </property>
         <property name="text">
          <string>Ordered</string>
         </property>
+        <property name="cfg" stdset="0">
+         <string notr="true">PopulateDictionary.Random</string>
+        </property>
         <property name="assignedValue" stdset="0">
          <bool>false</bool>
         </property>
@@ -89,12 +89,12 @@
       </item>
       <item>
        <widget class="ConfigRadioButton" name="randomlyRadio">
-        <property name="cfg" stdset="0">
-         <string>PopulateDictionary.Random</string>
-        </property>
         <property name="text">
          <string>Randomly</string>
         </property>
+        <property name="cfg" stdset="0">
+         <string notr="true">PopulateDictionary.Random</string>
+        </property>
         <property name="assignedValue" stdset="0">
          <bool>true</bool>
         </property>
diff --git a/SQLiteStudio3/coreSQLiteStudio/plugins/populaterandom.ui b/SQLiteStudio3/coreSQLiteStudio/plugins/populaterandom.ui
index fb304ea..4e7853e 100644
--- a/SQLiteStudio3/coreSQLiteStudio/plugins/populaterandom.ui
+++ b/SQLiteStudio3/coreSQLiteStudio/plugins/populaterandom.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="2" column="0">
@@ -22,12 +22,12 @@
      <layout class="QVBoxLayout" name="verticalLayout_4">
       <item>
        <widget class="QLineEdit" name="prefixEdit">
-        <property name="cfg" stdset="0">
-         <string>PopulateRandom.Prefix</string>
-        </property>
         <property name="placeholderText">
          <string>No prefix</string>
         </property>
+        <property name="cfg" stdset="0">
+         <string notr="true">PopulateRandom.Prefix</string>
+        </property>
        </widget>
       </item>
      </layout>
@@ -41,15 +41,15 @@
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
        <widget class="QSpinBox" name="minSpin">
-        <property name="cfg" stdset="0">
-         <string>PopulateRandom.MinValue</string>
-        </property>
         <property name="minimum">
          <number>-999999999</number>
         </property>
         <property name="maximum">
          <number>999999999</number>
         </property>
+        <property name="cfg" stdset="0">
+         <string notr="true">PopulateRandom.MinValue</string>
+        </property>
        </widget>
       </item>
      </layout>
@@ -63,9 +63,6 @@
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <widget class="QSpinBox" name="maxSpin">
-        <property name="cfg" stdset="0">
-         <string>PopulateRandom.MaxValue</string>
-        </property>
         <property name="minimum">
          <number>-999999999</number>
         </property>
@@ -75,6 +72,9 @@
         <property name="value">
          <number>999999999</number>
         </property>
+        <property name="cfg" stdset="0">
+         <string notr="true">PopulateRandom.MaxValue</string>
+        </property>
        </widget>
       </item>
      </layout>
@@ -88,12 +88,12 @@
      <layout class="QHBoxLayout" name="horizontalLayout">
       <item>
        <widget class="QLineEdit" name="suffixEdit">
-        <property name="cfg" stdset="0">
-         <string>PopulateRandom.Suffix</string>
-        </property>
         <property name="placeholderText">
          <string>No suffix</string>
         </property>
+        <property name="cfg" stdset="0">
+         <string notr="true">PopulateRandom.Suffix</string>
+        </property>
        </widget>
       </item>
      </layout>
diff --git a/SQLiteStudio3/coreSQLiteStudio/plugins/populaterandomtext.ui b/SQLiteStudio3/coreSQLiteStudio/plugins/populaterandomtext.ui
index 28febde..00ff1e5 100644
--- a/SQLiteStudio3/coreSQLiteStudio/plugins/populaterandomtext.ui
+++ b/SQLiteStudio3/coreSQLiteStudio/plugins/populaterandomtext.ui
@@ -11,20 +11,20 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="1" column="0" colspan="2">
     <widget class="ConfigRadioButton" name="commonSetRadio">
-     <property name="cfg" stdset="0">
-      <string>PopulateRandomText.UseCustomSets</string>
-     </property>
      <property name="text">
       <string>Use characters from common sets:</string>
      </property>
      <property name="checked">
       <bool>true</bool>
      </property>
+     <property name="cfg" stdset="0">
+      <string notr="true">PopulateRandomText.UseCustomSets</string>
+     </property>
      <property name="assignedValue" stdset="0">
       <bool>false</bool>
      </property>
@@ -38,12 +38,12 @@
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <widget class="QSpinBox" name="minLengthSpin">
-        <property name="cfg" stdset="0">
-         <string>PopulateRandomText.MinLength</string>
-        </property>
         <property name="maximum">
          <number>999999999</number>
         </property>
+        <property name="cfg" stdset="0">
+         <string notr="true">PopulateRandomText.MinLength</string>
+        </property>
        </widget>
       </item>
      </layout>
@@ -63,12 +63,12 @@
         <property name="toolTip">
          <string>Letters from a to z.</string>
         </property>
-        <property name="cfg" stdset="0">
-         <string>PopulateRandomText.IncludeAlpha</string>
-        </property>
         <property name="text">
          <string>Alpha</string>
         </property>
+        <property name="cfg" stdset="0">
+         <string notr="true">PopulateRandomText.IncludeAlpha</string>
+        </property>
        </widget>
       </item>
       <item>
@@ -76,12 +76,12 @@
         <property name="toolTip">
          <string>Numbers from 0 to 9.</string>
         </property>
-        <property name="cfg" stdset="0">
-         <string>PopulateRandomText.IncludeNumeric</string>
-        </property>
         <property name="text">
          <string>Numeric</string>
         </property>
+        <property name="cfg" stdset="0">
+         <string notr="true">PopulateRandomText.IncludeNumeric</string>
+        </property>
        </widget>
       </item>
       <item>
@@ -89,12 +89,12 @@
         <property name="toolTip">
          <string>A whitespace, a tab and a new line character.</string>
         </property>
-        <property name="cfg" stdset="0">
-         <string>PopulateRandomText.IncludeWhitespace</string>
-        </property>
         <property name="text">
          <string>Whitespace</string>
         </property>
+        <property name="cfg" stdset="0">
+         <string notr="true">PopulateRandomText.IncludeWhitespace</string>
+        </property>
        </widget>
       </item>
       <item>
@@ -102,12 +102,12 @@
         <property name="toolTip">
          <string>Includes all above and all others.</string>
         </property>
-        <property name="cfg" stdset="0">
-         <string>PopulateRandomText.IncludeBinary</string>
-        </property>
         <property name="text">
          <string>Binary</string>
         </property>
+        <property name="cfg" stdset="0">
+         <string notr="true">PopulateRandomText.IncludeBinary</string>
+        </property>
        </widget>
       </item>
      </layout>
@@ -115,12 +115,12 @@
    </item>
    <item row="3" column="0" colspan="2">
     <widget class="ConfigRadioButton" name="customSetRadio">
-     <property name="cfg" stdset="0">
-      <string>PopulateRandomText.UseCustomSets</string>
-     </property>
      <property name="text">
       <string>Use characters from my custom set:</string>
      </property>
+     <property name="cfg" stdset="0">
+      <string notr="true">PopulateRandomText.UseCustomSets</string>
+     </property>
      <property name="assignedValue" stdset="0">
       <bool>true</bool>
      </property>
@@ -134,12 +134,12 @@
      <layout class="QVBoxLayout" name="verticalLayout_4">
       <item>
        <widget class="QSpinBox" name="maxLengthSpin">
-        <property name="cfg" stdset="0">
-         <string>PopulateRandomText.MaxLength</string>
-        </property>
         <property name="maximum">
          <number>999999999</number>
         </property>
+        <property name="cfg" stdset="0">
+         <string notr="true">PopulateRandomText.MaxLength</string>
+        </property>
        </widget>
       </item>
      </layout>
@@ -160,7 +160,7 @@
          <string>If you type some character multiple times, it's more likely to be used.</string>
         </property>
         <property name="cfg" stdset="0">
-         <string>PopulateRandomText.CustomCharacters</string>
+         <string notr="true">PopulateRandomText.CustomCharacters</string>
         </property>
        </widget>
       </item>
diff --git a/SQLiteStudio3/coreSQLiteStudio/plugins/populatescript.ui b/SQLiteStudio3/coreSQLiteStudio/plugins/populatescript.ui
index 8d37994..7e530f5 100644
--- a/SQLiteStudio3/coreSQLiteStudio/plugins/populatescript.ui
+++ b/SQLiteStudio3/coreSQLiteStudio/plugins/populatescript.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <property name="initialSize" stdset="0">
    <size>
@@ -29,7 +29,7 @@
       <item>
        <widget class="QPlainTextEdit" name="initCodeEdit">
         <property name="cfg" stdset="0">
-         <string>PopulateScript.InitCode</string>
+         <string notr="true">PopulateScript.InitCode</string>
         </property>
         <property name="scriptingEdit" stdset="0">
          <bool>true</bool>
@@ -48,7 +48,7 @@
       <item>
        <widget class="QPlainTextEdit" name="codeEdit">
         <property name="cfg" stdset="0">
-         <string>PopulateScript.Code</string>
+         <string notr="true">PopulateScript.Code</string>
         </property>
         <property name="scriptingEdit" stdset="0">
          <bool>true</bool>
@@ -73,7 +73,7 @@
       <item>
        <widget class="QComboBox" name="langCombo">
         <property name="cfg" stdset="0">
-         <string>PopulateScript.Language</string>
+         <string notr="true">PopulateScript.Language</string>
         </property>
         <property name="ScriptingLangCombo" stdset="0">
          <bool>true</bool>
@@ -92,13 +92,13 @@
       <item>
        <widget class="QToolButton" name="toolButton">
         <property name="text">
-         <string>...</string>
+         <string notr="true">...</string>
         </property>
         <property name="openUrl" stdset="0">
-         <string>http://sqlitestudio.pl/wiki/index.php/Official_plugins#Script_.28built-in.29</string>
+         <string notr="true">http://sqlitestudio.pl/wiki/index.php/Official_plugins#Script_.28built-in.29</string>
         </property>
         <property name="customIcon" stdset="0">
-         <string>help</string>
+         <string notr="true">help</string>
         </property>
        </widget>
       </item>
diff --git a/SQLiteStudio3/coreSQLiteStudio/plugins/populatesequence.ui b/SQLiteStudio3/coreSQLiteStudio/plugins/populatesequence.ui
index 231af85..20c7064 100644
--- a/SQLiteStudio3/coreSQLiteStudio/plugins/populatesequence.ui
+++ b/SQLiteStudio3/coreSQLiteStudio/plugins/populatesequence.ui
@@ -11,20 +11,20 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="1">
     <widget class="QSpinBox" name="startValueSpin">
-     <property name="cfg" stdset="0">
-      <string>PopulateSequence.StartValue</string>
-     </property>
      <property name="minimum">
       <number>-99999999</number>
      </property>
      <property name="maximum">
       <number>99999999</number>
      </property>
+     <property name="cfg" stdset="0">
+      <string notr="true">PopulateSequence.StartValue</string>
+     </property>
     </widget>
    </item>
    <item row="0" column="0">
@@ -36,9 +36,6 @@
    </item>
    <item row="1" column="1">
     <widget class="QSpinBox" name="stepSpin">
-     <property name="cfg" stdset="0">
-      <string>PopulateSequence.Step</string>
-     </property>
      <property name="minimum">
       <number>-999999</number>
      </property>
@@ -48,6 +45,9 @@
      <property name="value">
       <number>1</number>
      </property>
+     <property name="cfg" stdset="0">
+      <string notr="true">PopulateSequence.Step</string>
+     </property>
     </widget>
    </item>
    <item row="1" column="0">