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

Address comments in PR XML mode for the cell editor #1275

Browse Source 
Set breaks in nested switch where missing.

Fix editModeChanged since it was overwriting the dataType for JSON and
SVG.

Additionally, removed unnecessary conversion in fromJson.
This commit is contained in:
mgrojo
2018-01-27 18:30:24 +01:00
parent 5a4d8fdd36
commit 0c99f32ce7
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/EditDialog.cpp
View File

@@ -473,6 +473,7 @@ void EditDialog::accept()
}
break;
}
break;
case HexBuffer:
// The data source is the hex widget buffer, thus binary data
QByteArray oldData = currentIndex.data(Qt::EditRole).toByteArray();
@@ -553,6 +554,7 @@ void EditDialog::setDataInBuffer(const QByteArray& data, DataSources source)
}
break;
}
break;
case HexBuffer:
hexEdit->setData(data);
hexEdit->setEnabled(true);
@@ -648,8 +650,10 @@ 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.
dataType = Text;
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
// updateCellInfo() only works with QByteArray's (for now)
int dataLength;
@@ -661,7 +665,6 @@ void EditDialog::editTextChanged()
dataLength = sciEdit->text().length();
break;
}
ui->labelType->setText(tr("Type of data currently in cell: Text / Numeric"));
ui->labelSize->setText(tr("%n char(s)", "", dataLength));
}
}
@@ -698,7 +701,7 @@ int EditDialog::checkDataType(const QByteArray& data)
// Check if it's text only
if (QString(cellData).toUtf8() == cellData) { // Is there a better way to check this?
QJsonDocument jsonDoc = QJsonDocument::fromJson(QString(cellData).toUtf8());
QJsonDocument jsonDoc = QJsonDocument::fromJson(cellData);
if (!jsonDoc.isNull())
return JSON;
else