Merge branch 'release/2.3.1' into develop

This commit is contained in:
Janek Bevendorff 2018-03-03 13:33:47 +01:00
commit a06e85f6ce
3 changed files with 4 additions and 2 deletions

View File

@ -129,6 +129,7 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
m_detailSplitter->setStretchFactor(0, 100);
m_detailSplitter->setStretchFactor(1, 0);
m_detailSplitter->setSizes({1, 1});
m_searchingLabel->setVisible(false);

View File

@ -933,7 +933,7 @@ void MainWindow::setShortcut(QAction* action, QKeySequence::StandardKey standard
void MainWindow::rememberOpenDatabases(const QString& filePath)
{
m_openDatabases.append(filePath);
m_openDatabases.prepend(filePath);
}
void MainWindow::applySettingsChanges()
@ -1150,4 +1150,4 @@ void MainWindow::closeAllDatabases()
void MainWindow::lockAllDatabases()
{
lockDatabasesAfterInactivity();
}
}

View File

@ -149,6 +149,7 @@ int main(int argc, char** argv)
static QTextStream in(stdin, QIODevice::ReadOnly);
password = in.readLine();
}
mainWindow.openDatabase(filename, password, parser.value(keyfileOption));
}
}