diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2015-04-04 14:41:10 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2015-04-04 14:41:10 -0400 |
| commit | b5f93b05578293d1d233b4920a28a5c2fd826f94 (patch) | |
| tree | 82332679f647e9c76e331206786d07a58dcfa9b8 /SQLiteStudio3/guiSQLiteStudio/dialogs/importdialog.ui | |
| parent | af8a7a3e3dccf9c9ad257e3952173d180c8a7421 (diff) | |
| parent | a5b034d4a9c44f9bc1e83b01de82530f8fc63013 (diff) | |
Merge tag 'upstream/3.0.4'
Upstream version 3.0.4
# gpg: Signature made Sat 04 Apr 2015 02:41:09 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.org>"
# gpg: aka "Unit 193 <unit193@ubuntu.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.com>"
Diffstat (limited to 'SQLiteStudio3/guiSQLiteStudio/dialogs/importdialog.ui')
| -rw-r--r-- | SQLiteStudio3/guiSQLiteStudio/dialogs/importdialog.ui | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/importdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/importdialog.ui index c8756f7..dfa8ace 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dialogs/importdialog.ui +++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/importdialog.ui @@ -103,8 +103,8 @@ <rect> <x>0</x> <y>0</y> - <width>479</width> - <height>310</height> + <width>269</width> + <height>280</height> </rect> </property> <property name="styleSheet"> @@ -141,13 +141,6 @@ <string>Options</string> </property> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="inputFileLabel"> - <property name="text"> - <string>Input file:</string> - </property> - </widget> - </item> <item row="0" column="1"> <widget class="QWidget" name="inputFileWidget" native="true"> <layout class="QHBoxLayout" name="horizontalLayout"> @@ -183,9 +176,26 @@ </property> </widget> </item> + <item row="0" column="0"> + <widget class="QLabel" name="inputFileLabel"> + <property name="text"> + <string>Input file:</string> + </property> + </widget> + </item> <item row="1" column="1"> <widget class="QComboBox" name="codecCombo"/> </item> + <item row="2" column="0" colspan="2"> + <widget class="QCheckBox" name="ignoreErrorsCheck"> + <property name="toolTip"> + <string><p>If enabled, any constraint violation, or invalid data format (wrong column count), or any other problem encountered during import will be ignored and the importing will be continued.</p></string> + </property> + <property name="text"> + <string>Ignore errors</string> + </property> + </widget> + </item> </layout> </widget> </item> |