From d144eb517547dcdb22006bc92489470998d38c8c Mon Sep 17 00:00:00 2001 From: SeongTae Jeong Date: Wed, 14 Oct 2020 12:06:26 +0900 Subject: [PATCH] Update code according @mgrojo's review --- src/MainWindow.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 989bc0aca..8753bbac3 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -308,11 +308,10 @@ void MainWindow::init() // they are updated accordingly. connect(ui->mainTab, &QTabWidget::tabCloseRequested, this, &MainWindow::closeTab); - QAction* viewMenuPragmas = nullptr; - // Add entries for toggling the visibility of main tabs for (QWidget* widget : {ui->structure, ui->browser, ui->pragmas, ui->query}) { QAction* action = ui->viewMenu->addAction(QIcon(":/icons/open_sql"), widget->accessibleName()); + action->setObjectName(widget->accessibleName()); action->setCheckable(true); action->setChecked(ui->mainTab->indexOf(widget) != -1); connect(action, &QAction::toggled, [=](bool show) { toggleTabVisible(widget, show); }); @@ -322,9 +321,6 @@ void MainWindow::init() connect(ui->mainTab, &QTabWidget::tabCloseRequested, [=](int /*index*/) { action->setChecked(ui->mainTab->indexOf(widget) != -1); }); - - if (widget == ui->pragmas) - viewMenuPragmas = action; } ui->viewMenu->addSeparator(); @@ -344,8 +340,7 @@ void MainWindow::init() QAction* simplifyLayoutAction = layoutMenu->addAction(tr("Simplify Window Layout")); simplifyLayoutAction->setShortcut(QKeySequence(tr("Shift+Alt+0"))); connect(simplifyLayoutAction, &QAction::triggered, [=]() { - toggleTabVisible(ui->pragmas, false); - viewMenuPragmas->setChecked(false); + ui->viewMenu->findChild(ui->pragmas->accessibleName())->activate(QAction::Trigger); ui->dockLog->hide(); ui->dockPlot->hide(); ui->dockSchema->hide();