Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-07-26 00:05:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

Force focus on password field, resolves #116 (#117)

Browse source 
Also remove redudant code for minimizing to tray
This commit is contained in:
Janek Bevendorff 2016-11-26 15:37:25 +01:00 • committed by Jonathan White
parent 405b82588b
commit 9261d8ae9d
5 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/gui/DatabaseOpenWidget.cpp
View file

@ -58,6 +58,12 @@ DatabaseOpenWidget::~DatabaseOpenWidget()
{ {
} }
void DatabaseOpenWidget::showEvent(QShowEvent* event)
{
DialogyWidget::showEvent(event);
m_ui->editPassword->setFocus();
}
void DatabaseOpenWidget::load(const QString& filename) void DatabaseOpenWidget::load(const QString& filename)
{ {
m_filename = filename; m_filename = filename;

1
src/gui/DatabaseOpenWidget.h
View file

@ -45,6 +45,7 @@ Q_SIGNALS:
void editFinished(bool accepted); void editFinished(bool accepted);
protected: protected:
void showEvent(QShowEvent* event) override;
CompositeKey databaseKey(); CompositeKey databaseKey();
protected Q_SLOTS: protected Q_SLOTS:

9
src/gui/MainWindow.cpp
View file

@ -333,15 +333,6 @@ void MainWindow::openDatabase(const QString& fileName, const QString& pw, const
m_ui->tabWidget->openDatabase(fileName, pw, keyFile); m_ui->tabWidget->openDatabase(fileName, pw, keyFile);
} }
void MainWindow::minimizeWindow()
{
if (isTrayIconEnabled() && config()->get("GUI/MinimizeToTray").toBool()) {
hide();
} else {
setWindowState(Qt::WindowMinimized);
}
}
void MainWindow::setMenuActionState(DatabaseWidget::Mode mode) void MainWindow::setMenuActionState(DatabaseWidget::Mode mode)
{ {
int currentIndex = m_ui->stackedWidget->currentIndex(); int currentIndex = m_ui->stackedWidget->currentIndex();

1
src/gui/MainWindow.h
View file

@ -38,7 +38,6 @@ class MainWindow : public QMainWindow
public: public:
MainWindow(); MainWindow();
~MainWindow(); ~MainWindow();
void minimizeWindow();
public Q_SLOTS: public Q_SLOTS:
void openDatabase(const QString& fileName, const QString& pw = QString(), void openDatabase(const QString& fileName, const QString& pw = QString(),

10
src/main.cpp
View file

@ -91,6 +91,11 @@ int main(int argc, char** argv)
QObject::connect(&app, SIGNAL(openFile(QString)), &mainWindow, SLOT(openDatabase(QString))); QObject::connect(&app, SIGNAL(openFile(QString)), &mainWindow, SLOT(openDatabase(QString)));
// start minimized if configured
if (config()->get("GUI/MinimizeOnStartup").toBool()) {
mainWindow.setWindowState(Qt::WindowMinimized);
}
for (int ii=0; ii < args.length(); ii++) { for (int ii=0; ii < args.length(); ii++) {
QString filename = args[ii]; QString filename = args[ii];
if (!filename.isEmpty() && QFile::exists(filename)) { if (!filename.isEmpty() && QFile::exists(filename)) {
@ -112,10 +117,5 @@ int main(int argc, char** argv)
} }
} }
// start minimized if configured
if (config()->get("GUI/MinimizeOnStartup").toBool()) {
mainWindow.minimizeWindow();
}
return app.exec(); return app.exec();
} }