Don't show cells with long text values as BLOB

rp- · MKleusberg · commit 516d71f1467b · 2014-05-24T20:34:03.000+02:00
Don't show cells with a text value longer than 1024 characters as '(BLOB)'. Also don't change back to binary mode in the EditDialog after manually switching to the text mode. Closes issue sqlitebrowser#16.
diff --git a/src/EditDialog.cpp b/src/EditDialog.cpp
@@ -141,7 +141,7 @@ void EditDialog::checkDataType()
 {
     // Check if data is text only
     ui->comboEditor->setVisible(true);
-    if(QString(hexEdit->data()).toLatin1() == hexEdit->data())     // Any proper way??
+    if(QString(hexEdit->data()).toUtf8() == hexEdit->data())     // Any proper way??
     {
         ui->editorStack->setCurrentIndex(0);
 
diff --git a/src/sqlitetablemodel.cpp b/src/sqlitetablemodel.cpp
@@ -436,6 +436,6 @@ void SqliteTableModel::clearCache()
 
 bool SqliteTableModel::isBinary(const QModelIndex& index) const
 {
-    QByteArray val = m_data.at(index.row()).at(index.column());
-    return val.size() > 1024 || val.contains('\0');     // Cheap BLOB test here...
+    QByteArray val = m_data.at(index.row()).at(index.column()).left(1024);
+    return val.contains('\0');     // Cheap BLOB test here...
 }

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ void EditDialog::checkDataType()`
`141`	`141`	`{`
`142`	`142`	`// Check if data is text only`
`143`	`143`	`ui->comboEditor->setVisible(true);`
`144`		`- if(QString(hexEdit->data()).toLatin1() == hexEdit->data()) // Any proper way??`
	`144`	`+ if(QString(hexEdit->data()).toUtf8() == hexEdit->data()) // Any proper way??`
`145`	`145`	`{`
`146`	`146`	`ui->editorStack->setCurrentIndex(0);`
`147`	`147`
Original file line number	Diff line number	Diff line change
`@@ -436,6 +436,6 @@ void SqliteTableModel::clearCache()`
`436`	`436`
`437`	`437`	`bool SqliteTableModel::isBinary(const QModelIndex& index) const`
`438`	`438`	`{`
`439`		`- QByteArray val = m_data.at(index.row()).at(index.column());`
`440`		`- return val.size() > 1024 \|\| val.contains('\0'); // Cheap BLOB test here...`
	`439`	`+ QByteArray val = m_data.at(index.row()).at(index.column()).left(1024);`
	`440`	`+ return val.contains('\0'); // Cheap BLOB test here...`
`441`	`441`	`}`