Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-09-21 13:24:47 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release/2.3.1' into develop

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

1
src/gui/DatabaseWidget.cpp
View file

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

2
src/gui/MainWindow.cpp
View file

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

1
src/main.cpp
View file

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