diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2017-02-09 04:37:26 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2017-02-09 04:37:26 -0500 |
| commit | c9d6debf9015b7853c3e061bbc64a555d85e2fcd (patch) | |
| tree | 53341bc57ae9fbad2beb5b6c08d97a68bee0ec8e /SQLiteStudio3/guiSQLiteStudio/uiconfig.h | |
| parent | d5caba2b1f36dc3b92fa705a06097d0597fa2ddd (diff) | |
| parent | d9aa870e5d509cc7309ab82dd102a937ab58613a (diff) | |
Merge tag 'upstream/3.1.1+dfsg1'
Upstream version 3.1.1+dfsg1
# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg: using RSA key 5001E1B09AA3744B
# gpg: issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg: aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18 5A5C 5001 E1B0 9AA3 744B
Diffstat (limited to 'SQLiteStudio3/guiSQLiteStudio/uiconfig.h')
| -rw-r--r-- | SQLiteStudio3/guiSQLiteStudio/uiconfig.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/SQLiteStudio3/guiSQLiteStudio/uiconfig.h b/SQLiteStudio3/guiSQLiteStudio/uiconfig.h index 75ea87d..0f2d17c 100644 --- a/SQLiteStudio3/guiSQLiteStudio/uiconfig.h +++ b/SQLiteStudio3/guiSQLiteStudio/uiconfig.h @@ -44,8 +44,8 @@ CFG_CATEGORIES(Ui, CFG_ENTRY(QColor, SqlEditorBlobFg, Qt::darkCyan)
CFG_ENTRY(QColor, SqlEditorCommentFg, Qt::darkGray)
CFG_ENTRY(QColor, SqlEditorNumberFg, Qt::darkBlue)
- CFG_ENTRY(QColor, DataUncommitedError, Qt::red)
- CFG_ENTRY(QColor, DataUncommited, Qt::blue)
+ CFG_ENTRY(QColor, DataUncommittedError, Qt::red)
+ CFG_ENTRY(QColor, DataUncommitted, Qt::blue)
CFG_ENTRY(QColor, DataNullFg, Qt::gray)
CFG_ENTRY(QColor, DataDeletedBg, Qt::gray)
CFG_ENTRY(QColor, DbTreeLabelsFg, Qt::blue)
@@ -101,6 +101,8 @@ CFG_CATEGORIES(Ui, CFG_ENTRY(bool, CompactLayout, true)
CFG_ENTRY(int, InsertRowPlacement, Cfg::BEFORE_CURRENT)
CFG_ENTRY(bool, ShowDataViewTooltips, true)
+ CFG_ENTRY(bool, KeepNullWhenEmptyValue, true)
+ CFG_ENTRY(bool, UseDefaultValueForNull, false)
)
)
|