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

MainWindow: Add project files to list of recently opened files

Browse Source 
When opening a project file add it to the list of recently opened files
instead of the database file associated with it.
This commit is contained in:
Martin Kleusberg
2014-10-15 13:38:32 +02:00
parent b841025bae
commit ff5cf3e63d
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/MainWindow.cpp
View File

@@ -180,7 +180,7 @@ void MainWindow::clearCompleterModelsFields()
completerModelsFields.clear();
}
bool MainWindow::fileOpen(const QString& fileName)
bool MainWindow::fileOpen(const QString& fileName, bool dontAddToRecentFiles)
{
bool retval = false;
@@ -199,6 +199,8 @@ bool MainWindow::fileOpen(const QString& fileName)
{
statusEncodingLabel->setText(db.getPragma("encoding"));
setCurrentFile(wFile);
if(!dontAddToRecentFiles)
addToRecentFilesMenu(wFile);
retval = true;
} else {
// Failed opening file; so it might be a project file instead
@@ -224,6 +226,7 @@ void MainWindow::fileNew()
QFile::remove(fileName);
db.create(fileName);
setCurrentFile(fileName);
addToRecentFilesMenu(fileName);
statusEncodingLabel->setText(db.getPragma("encoding"));
loadExtensionsFromSettings();
populateStructure();
@@ -1014,10 +1017,13 @@ void MainWindow::setCurrentFile(const QString &fileName)
setWindowFilePath(fileName);
setWindowTitle( QApplication::applicationName() +" - "+fileName);
activateFields(true);
}
void MainWindow::addToRecentFilesMenu(const QString& filename)
{
QStringList files = PreferencesDialog::getSettingsValue("General", "recentFileList").toStringList();
files.removeAll(fileName);
files.prepend(fileName);
files.removeAll(filename);
files.prepend(filename);
while (files.size() > MaxRecentFiles)
files.removeLast();
@@ -1741,6 +1747,8 @@ bool MainWindow::loadProject(QString filename)
return false;
}
addToRecentFilesMenu(filename);
while(!xml.atEnd() && !xml.hasError())
{
// Read next token
@@ -1755,7 +1763,7 @@ bool MainWindow::loadProject(QString filename)
QString dbfilename = xml.attributes().value("path").toString();
if(!QFile::exists(dbfilename))
dbfilename = QFileInfo(filename).absolutePath() + QDir::separator() + dbfilename;
fileOpen(dbfilename);
fileOpen(dbfilename, true);
ui->dbTreeWidget->collapseAll();
} else if(xml.name() == "window") {
// Window settings