mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-21 03:21:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixes and improvement of NULL value handling in Edit DB Cell dock

Browse Source 
Fix: NULL data are correctly indicated in the Cell Info footer when loading
data from the database. Previously, the automatic trigger of
editModeChanged when setting the text in the widget was causing the change
to Text data type. Now the modified flag of the widget is taken into
account.

Fix: NULL values could not be overwritten with empty strings, since the
old vs. new check was incorrectly returning false as the conversion to
string was discarding the NULL information.

Improvement: NULL values are visually indicated using the placeholder as
already done in the Add Record dialog. The italic style is applied to both
cases now for better indication and coherence to the browse data widget.

Known problem: when the cell is changed from a JSON cell to a NULL cell
and the automatic switch is on, the NULL information and visual indication
are still lost.
This commit is contained in:
mgr
2018-09-21 23:19:48 +02:00
parent dd3417e1c4
commit a5d6b5018b
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/AddRecordDialog.cpp
View File

@@ -22,9 +22,11 @@ public:
void setNull(bool value) {
if (value) {
clear();
setStyleSheet("QLineEdit{ font-style: italic; }");
setPlaceholderText(Settings::getValue("databrowser", "null_text").toString());
setModified(false);
} else
setStyleSheet("");
setPlaceholderText("");
m_isNull = value;
}
@@ -51,6 +53,7 @@ protected:
setNull(true);
else {
// Remove any possible NULL mark when user starts typing
setStyleSheet("");
setPlaceholderText("");
QLineEdit::keyPressEvent(evt);
}

27
src/EditDialog.cpp
View File

@@ -434,6 +434,8 @@ void EditDialog::setNull()
sciEdit->setEnabled(true);
// Update the cell data info in the bottom left of the Edit Cell
// The mode is also (if required) updated to text since it gives
// the better visual clue of containing a NULL value (placeholder).
updateCellInfoAndMode(hexEdit->data());
ui->editorText->setFocus();
@@ -470,7 +472,8 @@ void EditDialog::accept()
{
QString oldData = currentIndex.data(Qt::EditRole).toString();
QString newData = removedBom + ui->editorText->toPlainText();
if (oldData != newData)
// Check first for null case, otherwise empty strings cannot overwrite NULL values
if ((currentIndex.data(Qt::EditRole).isNull() && dataType != Null) || oldData != newData)
// The data is different, so commit it back to the database
emit recordTextUpdated(currentIndex, removedBom + newData.toUtf8(), false);
break;
@@ -716,23 +719,31 @@ void EditDialog::editModeChanged(int newMode)
void EditDialog::editTextChanged()
{
if (dataSource == TextBuffer || dataSource == SciBuffer) {
// Data has been changed in the text editor, so it can't be a NULL
// any more. It hasn't been validated yet, so it cannot be JSON nor XML.
if (dataType == Null) {
dataType = Text;
ui->labelType->setText(tr("Type of data currently in cell: Text / Numeric"));
}
// Update the cell info in the bottom left manually. This is because
// updateCellInfoAndMode() only works with QByteArray's (for now)
int dataLength;
bool isModified;
switch (dataSource) {
case TextBuffer:
dataLength = ui->editorText->toPlainText().length();
isModified = ui->editorText->document()->isModified();
break;
case SciBuffer:
dataLength = sciEdit->text().length();
isModified = sciEdit->isModified();
break;
}
// Data has been changed in the text editor, so it can't be a NULL
// any more. It hasn't been validated yet, so it cannot be JSON nor XML.
if (dataType == Null && isModified)
dataType = Text;
if (dataType != Null) {
ui->editorText->setStyleSheet("");
ui->editorText->setPlaceholderText("");
ui->labelType->setText(tr("Type of data currently in cell: Text / Numeric"));
}
ui->labelSize->setText(tr("%n char(s)", "", dataLength));
}
}
@@ -914,6 +925,8 @@ void EditDialog::updateCellInfoAndMode(const QByteArray& data)
// NULL data type
ui->labelType->setText(tr("Type of data currently in cell: NULL"));
ui->labelSize->setText(tr("%n byte(s)", "", 0));
ui->editorText->setStyleSheet("QTextEdit{ font-style: italic; }");
ui->editorText->setPlaceholderText(Settings::getValue("databrowser", "null_text").toString());
break;
case Text: {