From d9aa870e5d509cc7309ab82dd102a937ab58613a Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@ubuntu.com>
Date: Thu, 9 Feb 2017 04:36:04 -0500
Subject: Imported Upstream version 3.1.1+dfsg1

---
 .../guiSQLiteStudio/dialogs/configdialog.ui        | 90 ++++++++++++++--------
 1 file changed, 58 insertions(+), 32 deletions(-)

(limited to 'SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.ui')

diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.ui
index c69ad20..6bedd25 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.ui
@@ -229,7 +229,7 @@
           </sizepolicy>
          </property>
          <property name="currentIndex">
-          <number>5</number>
+          <number>1</number>
          </property>
          <widget class="QWidget" name="databaseListPage">
           <layout class="QVBoxLayout" name="verticalLayout_36">
@@ -408,7 +408,7 @@
                 <x>0</x>
                 <y>0</y>
                 <width>564</width>
-                <height>504</height>
+                <height>580</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_34">
@@ -418,10 +418,13 @@
                   <string>Data browsing and editing</string>
                  </property>
                  <layout class="QGridLayout" name="gridLayout_2">
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="rowsPerPageLabel">
+                  <item row="1" column="0">
+                   <widget class="QLabel" name="initColWidthLimitLabel">
+                    <property name="toolTip">
+                     <string>&lt;p&gt;When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.&lt;/p&gt;</string>
+                    </property>
                     <property name="text">
-                     <string>Number of data rows per page:</string>
+                     <string>Limit initial data column width to (in pixels):</string>
                     </property>
                    </widget>
                   </item>
@@ -444,16 +447,6 @@
                     </property>
                    </widget>
                   </item>
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="initColWidthLimitLabel">
-                    <property name="toolTip">
-                     <string>&lt;p&gt;When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.&lt;/p&gt;</string>
-                    </property>
-                    <property name="text">
-                     <string>Limit initial data column width to (in pixels):</string>
-                    </property>
-                   </widget>
-                  </item>
                   <item row="1" column="1">
                    <widget class="QSpinBox" name="initColWidthLimitSpin">
                     <property name="toolTip">
@@ -473,7 +466,7 @@
                     </property>
                    </widget>
                   </item>
-                  <item row="2" column="0" colspan="2">
+                  <item row="2" column="0">
                    <widget class="QCheckBox" name="tolltipInDataViewCheck">
                     <property name="toolTip">
                      <string>&lt;p&gt;When this is enabled and user holds mouse pointer over a cell in any data view (query results, a table data, a view data) a tooltip will appear with details about the cell - it includes details like column data type, constraints, ROWID and others.&lt;/p&gt;</string>
@@ -486,6 +479,39 @@
                     </property>
                    </widget>
                   </item>
+                  <item row="0" column="0">
+                   <widget class="QLabel" name="rowsPerPageLabel">
+                    <property name="text">
+                     <string>Number of data rows per page:</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="3" column="0">
+                   <widget class="QCheckBox" name="keepNullWhenEmptyCheck">
+                    <property name="toolTip">
+                     <string>&lt;p&gt;When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).&lt;/p&gt;</string>
+                    </property>
+                    <property name="text">
+                     <string>Keep NULL value when entering empty value</string>
+                    </property>
+                    <property name="cfg" stdset="0">
+                     <string notr="true">General.KeepNullWhenEmptyValue</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="4" column="0" colspan="2">
+                   <widget class="QCheckBox" name="useDefaultForNullCheck">
+                    <property name="toolTip">
+                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable this to always enforce DEFAULT value when committing a NULL value for a column that has DEFAULT value defined, even though the column is allowed to contain NULL values.&lt;/p&gt;&lt;p&gt;Disable this option to use DEFAULT value exclusively when NULL value is committed for column with NOT NULL constraint.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                    </property>
+                    <property name="text">
+                     <string>Use DEFAULT value (if defined), when committing NULL value</string>
+                    </property>
+                    <property name="cfg" stdset="0">
+                     <string notr="true">General.UseDefaultValueForNull</string>
+                    </property>
+                   </widget>
+                  </item>
                  </layout>
                 </widget>
                </item>
@@ -766,7 +792,7 @@
               <item row="0" column="0" colspan="2">
                <widget class="QCheckBox" name="dontShowDdlPreview">
                 <property name="text">
-                 <string>Don't show DDL preview dialog when commiting schema changes</string>
+                 <string>Don't show DDL preview dialog when committing schema changes</string>
                 </property>
                 <property name="cfg" stdset="0">
                  <string notr="true">General.DontShowDdlPreview</string>
@@ -1001,8 +1027,8 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>596</width>
-                <height>487</height>
+                <width>447</width>
+                <height>307</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_31">
@@ -1422,7 +1448,7 @@
                         <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Abcdefgh&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                        </property>
                       </widget>
@@ -1513,8 +1539,8 @@ p, li { white-space: pre-wrap; }
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>290</width>
-                <height>323</height>
+                <width>268</width>
+                <height>328</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_9">
@@ -1635,8 +1661,8 @@ p, li { white-space: pre-wrap; }
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>352</width>
-                <height>806</height>
+                <width>331</width>
+                <height>829</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_12">
@@ -1921,17 +1947,17 @@ p, li { white-space: pre-wrap; }
                  </property>
                  <layout class="QGridLayout" name="gridLayout_6">
                   <item row="0" column="0">
-                   <widget class="QLabel" name="dataViewUncommitedLabel">
+                   <widget class="QLabel" name="dataViewUncommittedLabel">
                     <property name="toolTip">
-                     <string>&lt;p&gt;Any data changes will be outlined with this color, until they're commited to the database.&lt;/p&gt;</string>
+                     <string>&lt;p&gt;Any data changes will be outlined with this color, until they're committed to the database.&lt;/p&gt;</string>
                     </property>
                     <property name="text">
-                     <string>Uncommited data outline color</string>
+                     <string>Uncommitted data outline color</string>
                     </property>
                    </widget>
                   </item>
                   <item row="0" column="1">
-                   <widget class="ColorButton" name="dataViewUncommitedButton">
+                   <widget class="ColorButton" name="dataViewUncommittedButton">
                     <property name="maximumSize">
                      <size>
                       <width>50</width>
@@ -1942,14 +1968,14 @@ p, li { white-space: pre-wrap; }
                      <string/>
                     </property>
                     <property name="cfg" stdset="0">
-                     <string notr="true">Colors.DataUncommited</string>
+                     <string notr="true">Colors.DataUncommitted</string>
                     </property>
                    </widget>
                   </item>
                   <item row="1" column="0">
                    <widget class="QLabel" name="dataViewErrorLabel">
                     <property name="toolTip">
-                     <string>&lt;p&gt;In case of error while commiting data changes, the problematic cell will be outlined with this color.&lt;/p&gt;</string>
+                     <string>&lt;p&gt;In case of error while committing data changes, the problematic cell will be outlined with this color.&lt;/p&gt;</string>
                     </property>
                     <property name="text">
                      <string>Commit error outline color</string>
@@ -1968,7 +1994,7 @@ p, li { white-space: pre-wrap; }
                      <string/>
                     </property>
                     <property name="cfg" stdset="0">
-                     <string notr="true">Colors.DataUncommitedError</string>
+                     <string notr="true">Colors.DataUncommittedError</string>
                     </property>
                    </widget>
                   </item>
@@ -2238,7 +2264,7 @@ p, li { white-space: pre-wrap; }
   <tabstop>sqlEditorNumberFgButton</tabstop>
   <tabstop>sqlEditorBindParamFgButton</tabstop>
   <tabstop>sqlEditorValidObjectsButton</tabstop>
-  <tabstop>dataViewUncommitedButton</tabstop>
+  <tabstop>dataViewUncommittedButton</tabstop>
   <tabstop>dataViewErrorButton</tabstop>
   <tabstop>dataViewNullFgButton</tabstop>
   <tabstop>dataViewDeletedRowBgButton</tabstop>
-- 
cgit v1.2.3