Also remove redudant code for minimizing to tray
This commit is contained in:
committed by
Jonathan White
parent
405b82588b
commit
9261d8ae9d
@@ -58,6 +58,12 @@ DatabaseOpenWidget::~DatabaseOpenWidget()
|
||||
{
|
||||
}
|
||||
|
||||
void DatabaseOpenWidget::showEvent(QShowEvent* event)
|
||||
{
|
||||
DialogyWidget::showEvent(event);
|
||||
m_ui->editPassword->setFocus();
|
||||
}
|
||||
|
||||
void DatabaseOpenWidget::load(const QString& filename)
|
||||
{
|
||||
m_filename = filename;
|
||||
|
||||
@@ -45,6 +45,7 @@ Q_SIGNALS:
|
||||
void editFinished(bool accepted);
|
||||
|
||||
protected:
|
||||
void showEvent(QShowEvent* event) override;
|
||||
CompositeKey databaseKey();
|
||||
|
||||
protected Q_SLOTS:
|
||||
|
||||
@@ -333,15 +333,6 @@ void MainWindow::openDatabase(const QString& fileName, const QString& pw, const
|
||||
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)
|
||||
{
|
||||
int currentIndex = m_ui->stackedWidget->currentIndex();
|
||||
|
||||
@@ -38,7 +38,6 @@ class MainWindow : public QMainWindow
|
||||
public:
|
||||
MainWindow();
|
||||
~MainWindow();
|
||||
void minimizeWindow();
|
||||
|
||||
public Q_SLOTS:
|
||||
void openDatabase(const QString& fileName, const QString& pw = QString(),
|
||||
|
||||
Reference in New Issue
Block a user