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

Get rid of the resetBrowser() method

Browse Source 
This hopefully helps to simplify and restructure the code. If it turns
out to make things only worse we can undo it. This *should* make no
changes for the user.
This commit is contained in:
Martin Kleusberg
2016-08-15 23:08:32 +02:00
parent 5fd3a80c0d
commit 014174bc26
4 changed files with 71 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/DbStructureModel.cpp
View File

@@ -136,21 +136,37 @@ void DbStructureModel::reloadData(DBBrowserDB* db)
return;
}
// Create the nodes for tables, indices, views and triggers
// Create the nodes for browsables and for tables, indices, views and triggers. The idea here is to basically have two trees in one model:
// In the root node there are two nodes: 'browsables' and 'all'. The first node contains a list of a all browsable objects, i.e. views and tables.
// The seconds node contains four sub-nodes (tables, indices, views and triggers), each containing a list of objects of that type.
// This way we only have to have and only have to update one model and can use it in all sorts of places, just by setting a different root node.
QMap<QString, QTreeWidgetItem*> typeToParentItem;
QTreeWidgetItem* itemTables = new QTreeWidgetItem(rootItem);
QTreeWidgetItem* itemBrowsables = new QTreeWidgetItem(rootItem);
itemBrowsables->setIcon(0, QIcon(QString(":/icons/view")));
itemBrowsables->setText(0, tr("Browsables (%1)").arg(db->objMap.values("table").count() + db->objMap.values("view").count()));
typeToParentItem.insert("browsable", itemBrowsables);
QTreeWidgetItem* itemAll = new QTreeWidgetItem(rootItem);
itemAll->setIcon(0, QIcon(QString(":/icons/view")));
itemAll->setText(0, tr("All"));
QTreeWidgetItem* itemTables = new QTreeWidgetItem(itemAll);
itemTables->setIcon(0, QIcon(QString(":/icons/table")));
itemTables->setText(0, tr("Tables (%1)").arg(db->objMap.values("table").count()));
typeToParentItem.insert("table", itemTables);
QTreeWidgetItem* itemIndices = new QTreeWidgetItem(rootItem);
QTreeWidgetItem* itemIndices = new QTreeWidgetItem(itemAll);
itemIndices->setIcon(0, QIcon(QString(":/icons/index")));
itemIndices->setText(0, tr("Indices (%1)").arg(db->objMap.values("index").count()));
typeToParentItem.insert("index", itemIndices);
QTreeWidgetItem* itemViews = new QTreeWidgetItem(rootItem);
QTreeWidgetItem* itemViews = new QTreeWidgetItem(itemAll);
itemViews->setIcon(0, QIcon(QString(":/icons/view")));
itemViews->setText(0, tr("Views (%1)").arg(db->objMap.values("view").count()));
typeToParentItem.insert("view", itemViews);
QTreeWidgetItem* itemTriggers = new QTreeWidgetItem(rootItem);
QTreeWidgetItem* itemTriggers = new QTreeWidgetItem(itemAll);
itemTriggers->setIcon(0, QIcon(QString(":/icons/trigger")));
itemTriggers->setText(0, tr("Triggers (%1)").arg(db->objMap.values("trigger").count()));
typeToParentItem.insert("trigger", itemTriggers);
@@ -164,18 +180,18 @@ void DbStructureModel::reloadData(DBBrowserDB* db)
for(QMultiMap<QString, DBBrowserObject>::ConstIterator it=dbobjs.begin(); it != dbobjs.end(); ++it)
{
// Object node
QTreeWidgetItem *tableItem = new QTreeWidgetItem(typeToParentItem.value((*it).gettype()));
tableItem->setIcon(0, QIcon(QString(":/icons/%1").arg((*it).gettype())));
tableItem->setText(0, (*it).getname());
tableItem->setText(1, (*it).gettype());
tableItem->setText(3, (*it).getsql());
QTreeWidgetItem* item = addNode(typeToParentItem.value((*it).gettype()), *it);
// If it is a table or view add the field Nodes
// If it is a table or view add the field nodes
if((*it).gettype() == "table" || (*it).gettype() == "view")
{
// Add extra node for browsable section
addNode(typeToParentItem.value("browsable"), *it);
// Add field nodes
for(int i=0; i < (*it).table.fields().size(); ++i)
{
QTreeWidgetItem *fldItem = new QTreeWidgetItem(tableItem);
QTreeWidgetItem *fldItem = new QTreeWidgetItem(item);
fldItem->setText(0, (*it).table.fields().at(i)->name());
fldItem->setText(1, "field");
fldItem->setText(2, (*it).table.fields().at(i)->type());
@@ -261,3 +277,14 @@ bool DbStructureModel::dropMimeData(const QMimeData* data, Qt::DropAction action
return false;
}
}
QTreeWidgetItem* DbStructureModel::addNode(QTreeWidgetItem* parent, const DBBrowserObject& object)
{
QTreeWidgetItem *item = new QTreeWidgetItem(parent);
item->setIcon(0, QIcon(QString(":/icons/%1").arg(object.gettype())));
item->setText(0, object.getname());
item->setText(1, object.gettype());
item->setText(3, object.getsql());
return item;
}

3
src/DbStructureModel.h
View File

@@ -4,6 +4,7 @@
#include <QAbstractItemModel>
class DBBrowserDB;
class DBBrowserObject;
class QTreeWidgetItem;
class DbStructureModel : public QAbstractItemModel
@@ -31,6 +32,8 @@ public:
private:
QTreeWidgetItem* rootItem;
DBBrowserDB* m_db;
QTreeWidgetItem* addNode(QTreeWidgetItem* parent, const DBBrowserObject& object);
};
#endif

82
src/MainWindow.cpp
View File

@@ -100,6 +100,9 @@ void MainWindow::init()
ui->treeSchemaDock->setColumnHidden(1, true);
ui->treeSchemaDock->setColumnWidth(0, 300);
// Set up the table combo box in the Browse Data tab
ui->comboBrowseTable->setModel(dbStructureModel);
// Edit dock
ui->dockEdit->setWidget(editDock);
@@ -290,7 +293,7 @@ bool MainWindow::fileOpen(const QString& fileName, bool dontAddToRecentFiles)
loadExtensionsFromSettings();
populateStructure();
if(ui->mainTab->currentIndex() == 1)
resetBrowser();
populateTable(ui->comboBrowseTable->currentText());
else if(ui->mainTab->currentIndex() == 2)
loadPragmas();
retval = true;
@@ -321,7 +324,7 @@ void MainWindow::fileNew()
statusReadOnlyLabel->setVisible(false);
loadExtensionsFromSettings();
populateStructure();
resetBrowser();
populateTable(ui->comboBrowseTable->currentText());
openSqlTab(true);
createTable();
}
@@ -329,12 +332,27 @@ void MainWindow::fileNew()
void MainWindow::populateStructure()
{
QString old_table = ui->comboBrowseTable->currentText();
// Refresh the structure tab
db.updateSchema();
dbStructureModel->reloadData(&db);
ui->dbTreeWidget->setRootIndex(dbStructureModel->index(1, 0)); // Show the 'All' part of the db structure
ui->dbTreeWidget->expandToDepth(0);
ui->treeSchemaDock->setRootIndex(dbStructureModel->index(1, 0)); // Show the 'All' part of the db structure
ui->treeSchemaDock->expandToDepth(0);
// Refresh the browse data tab
ui->comboBrowseTable->setRootModelIndex(dbStructureModel->index(0, 0)); // Show the 'browsable' section of the db structure tree
int old_table_index = ui->comboBrowseTable->findText(old_table);
if(old_table_index == -1 && ui->comboBrowseTable->count()) // If the old table couldn't be found anymore but there is another table, select that
ui->comboBrowseTable->setCurrentIndex(0);
else if(old_table_index == -1) // If there aren't any tables to be selected anymore, clear the table view
populateTable("");
else // Under normal circumstances just select the old table again
ui->comboBrowseTable->setCurrentIndex(old_table_index);
// Cancel here if no database is opened
if(!db.isOpen())
return;
@@ -368,7 +386,7 @@ void MainWindow::populateStructure()
void MainWindow::populateTable(QString tablename)
{
// Remove the model-view link if the table name is empty in order to remove any data from the view
if(ui->comboBrowseTable->model()->rowCount() == 0 && tablename.isEmpty())
if(ui->comboBrowseTable->model()->rowCount(ui->comboBrowseTable->rootModelIndex()) == 0 && tablename.isEmpty())
{
if (!ui->dataTable->model())
return;
@@ -381,19 +399,6 @@ void MainWindow::populateTable(QString tablename)
QApplication::setOverrideCursor(Qt::WaitCursor);
// Update combo box
if(ui->comboBrowseTable->currentText() != tablename)
{
int pos = ui->comboBrowseTable->findText(tablename);
if(pos == -1)
{
ui->comboBrowseTable->setCurrentIndex(0);
tablename = ui->comboBrowseTable->currentText();
} else {
ui->comboBrowseTable->setCurrentIndex(pos);
}
}
// Set model
bool reconnectSelectionSignals = false;
if(ui->dataTable->model() == 0)
@@ -490,33 +495,6 @@ void MainWindow::populateTable(QString tablename)
QApplication::restoreOverrideCursor();
}
void MainWindow::resetBrowser(bool reloadTable)
{
ui->comboBrowseTable->clear();
const objectMap& tab = db.getBrowsableObjects();
// fill a objmap which is sorted by table/view names
QMap<QString, DBBrowserObject> objmap;
for(objectMap::ConstIterator i=tab.begin();i!=tab.end();++i)
{
objmap[i.value().getname()] = i.value();
}
// Finally fill the combobox in sorted order
for(QMap<QString, DBBrowserObject>::ConstIterator it=objmap.constBegin();
it!=objmap.constEnd();
++it)
{
ui->comboBrowseTable->addItem(
QIcon(QString(":icons/%1").arg((*it).gettype())),
(*it).getname());
}
setRecordsetLabel();
if(reloadTable)
populateTable(ui->comboBrowseTable->currentText());
}
bool MainWindow::fileClose()
{
// Close the database but stop the closing process here if the user pressed the cancel button in there
@@ -524,7 +502,6 @@ bool MainWindow::fileClose()
return false;
setWindowTitle(QApplication::applicationName());
resetBrowser();
populateStructure();
loadPragmas();
statusEncryptionLabel->setVisible(false);
@@ -721,7 +698,7 @@ void MainWindow::createTable()
if(dialog.exec())
{
populateStructure();
resetBrowser();
populateTable(ui->comboBrowseTable->currentText());
}
}
@@ -763,7 +740,7 @@ void MainWindow::deleteObject()
QMessageBox::warning(this, QApplication::applicationName(), error);
} else {
populateStructure();
resetBrowser();
populateTable(ui->comboBrowseTable->currentText());
changeTreeSelection();
}
}
@@ -784,7 +761,7 @@ void MainWindow::editTable()
if(dialog.exec())
{
populateStructure();
resetBrowser();
populateTable(ui->comboBrowseTable->currentText());
}
}
@@ -1020,7 +997,7 @@ void MainWindow::mainTabSelected(int tabindex)
} else if(tabindex == 1) {
m_currentTabTableModel = m_browseTableModel;
populateStructure();
resetBrowser();
populateTable(ui->comboBrowseTable->currentText());
} else if(tabindex == 2) {
loadPragmas();
} else if(tabindex == 3) {
@@ -1047,7 +1024,7 @@ void MainWindow::importTableFromCSV()
if(dialog.exec())
{
populateStructure();
resetBrowser();
populateTable(ui->comboBrowseTable->currentText());
QMessageBox::information(this, QApplication::applicationName(), tr("Import completed"));
}
}
@@ -1092,7 +1069,7 @@ void MainWindow::fileRevert()
{
db.revertAll();
populateStructure();
resetBrowser();
populateTable(ui->comboBrowseTable->currentText());
}
}
}
@@ -1160,7 +1137,7 @@ void MainWindow::importDatabaseFromSQL()
fileOpen(newDbFile);
} else {
populateStructure();
resetBrowser();
populateTable(ui->comboBrowseTable->currentText());
}
}
@@ -1614,7 +1591,7 @@ void MainWindow::reloadSettings()
// Refresh view
populateStructure();
resetBrowser();
populateTable(ui->comboBrowseTable->currentText());
}
void MainWindow::httpresponse(QNetworkReply *reply)
@@ -2343,7 +2320,6 @@ void MainWindow::switchToBrowseDataTab(QString tableToBrowse)
tableToBrowse = ui->dbTreeWidget->model()->data(ui->dbTreeWidget->currentIndex().sibling(ui->dbTreeWidget->currentIndex().row(), 0)).toString();
}
resetBrowser(false);
ui->comboBrowseTable->setCurrentIndex(ui->comboBrowseTable->findText(tableToBrowse));
ui->mainTab->setCurrentIndex(1);
}

1
src/MainWindow.h
View File

@@ -161,7 +161,6 @@ private slots:
void fileNew();
void populateStructure();
void populateTable(QString tablename);
void resetBrowser(bool reloadTable = true);
bool fileClose();
void addRecord();
void deleteRecord();