From 921615c970166f78f143aada5dc7c980a75faf1a Mon Sep 17 00:00:00 2001 From: Alexander Sashnov Date: Sat, 29 Jan 2022 02:28:34 +0700 Subject: [PATCH] Localize MainWindow inner-children connections Move 'connect()' call from KiwixApp to MainWindow because MainWindow should be responsible for connecting its children between each other. --- src/kiwixapp.cpp | 2 -- src/mainwindow.cpp | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/kiwixapp.cpp b/src/kiwixapp.cpp index cdcafd9..a22be45 100644 --- a/src/kiwixapp.cpp +++ b/src/kiwixapp.cpp @@ -398,8 +398,6 @@ void KiwixApp::createAction() } void KiwixApp::postInit() { - connect(getTabWidget(), &TabBar::webActionEnabledChanged, - mp_mainWindow->getTopWidget(), &TopWidget::handleWebActionEnabledChanged); connect(getTabWidget(), &TabBar::libraryPageDisplayed, this, &KiwixApp::disableItemsOnLibraryPage); emit(m_library.booksChanged()); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index d9e86fe..155278f 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -72,6 +72,9 @@ MainWindow::MainWindow(QWidget *parent) : connect(mp_ui->tabBar, &TabBar::currentTitleChanged, mp_ui->mainToolBar, &TopWidget::updateBackForwardButtons); + connect(mp_ui->tabBar, &TabBar::webActionEnabledChanged, + mp_ui->mainToolBar, &TopWidget::handleWebActionEnabledChanged); + mp_ui->contentmanagerside->setContentManager(app->getContentManager()); mp_ui->sideBar->setCurrentWidget(mp_ui->contentmanagerside); }