mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-20 02:50:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #712 from justinclift/edit_mode_minor_perf_improvement

Browse Source 
Only load cell data into the text editor when needed
This commit is contained in:
Justin Clift
2016-08-06 21:52:10 +01:00
committed by GitHub
parent e66ac3e666 fe23d56e25
commit 34a248aea8
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/EditDialog.cpp
View File

@@ -90,11 +90,19 @@ void EditDialog::loadText(const QByteArray& data, int row, int col)
curCol = col;
oldData = data;
// Load data
QString textData = QString::fromUtf8(data.constData(), data.size());
ui->editorText->setPlainText(textData);
// Always load the data into the hex editor, as other methods in this class
// rely on it being there
hexEdit->setData(data);
// Get the current editor mode (eg text, hex, or image mode)
int editMode = ui->editorStack->currentIndex();
// Only load the data into the text editor if that's the active edit mode
if (editMode == 0) {
QString textData = QString::fromUtf8(data.constData(), data.size());
ui->editorText->setPlainText(textData);
}
// Determine the data type in the cell
int dataType = checkDataType();
@@ -102,8 +110,11 @@ void EditDialog::loadText(const QByteArray& data, int row, int col)
QImage img;
switch (dataType) {
case Text:
// For text, ensure it's all selected in the Edit Cell
ui->editorText->selectAll();
// If in text editor mode, select all of the text by default
if (editMode == 0) {
ui->editorText->selectAll();
}
// Clear any image from the image viewing widget
ui->editorImage->setPixmap(QPixmap(0,0));
@@ -111,7 +122,7 @@ void EditDialog::loadText(const QByteArray& data, int row, int col)
case Image:
// For images, load the image into the image viewing widget
if (img.loadFromData(hexEdit->data())) {
if (img.loadFromData(data)) {
ui->editorImage->setPixmap(QPixmap::fromImage(img));
}
break;
@@ -122,9 +133,6 @@ void EditDialog::loadText(const QByteArray& data, int row, int col)
break;
}
// Get the current editor mode (eg text, hex, or image mode)
int editMode = ui->editorStack->currentIndex();
// Show or hide the warning about editing binary data in text mode
updateBinaryEditWarning(editMode, dataType);
@@ -210,6 +218,13 @@ void EditDialog::accept()
// Called when the user manually changes the "Mode" drop down combobox
void EditDialog::editModeChanged(int editMode)
{
// If the new editor mode is "text editor", load the data into it
if (editMode == 0) {
QByteArray data = hexEdit->data();
QString textData = QString::fromUtf8(data, data.size());
ui->editorText->setPlainText(textData);
}
// Switch to the selected editor
ui->editorStack->setCurrentIndex(editMode);