mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-04-14 04:53:12 -04:00
Merge branch 'release/2.3.1' into develop
This commit is contained in:
commit
a06e85f6ce
@ -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);
|
||||
|
||||
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
@ -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));
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user