feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Help: Remove indirection when synchronizing current page

Browse Source 
Task-number: QTCREATORBUG-20558
Change-Id: Ia76b6a11ed39f6b65d1c949fe57f8c3c4064c3ed
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2019-09-03 09:03:38 +02:00
parent b34102ceea
commit 25935d2da9
8 changed files with 47 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/plugins/help/openpagesmanager.cpp
View File

@@ -60,16 +60,27 @@ OpenPagesManager::OpenPagesManager(HelpWidget *helpWidget)
m_comboBox = new QComboBox;
m_comboBox->setModel(m_helpWidget->model());
m_comboBox->setContextMenuPolicy(Qt::CustomContextMenu);
connect(m_comboBox, QOverload<int>::of(&QComboBox::activated),
this, &OpenPagesManager::setCurrentPageByRow);
connect(m_comboBox, &QWidget::customContextMenuRequested, this,
&OpenPagesManager::openPagesContextMenu);
connect(m_comboBox,
QOverload<int>::of(&QComboBox::activated),
m_helpWidget,
&HelpWidget::setCurrentIndex);
connect(m_helpWidget, &HelpWidget::currentIndexChanged, m_comboBox, &QComboBox::setCurrentIndex);
connect(m_comboBox,
&QWidget::customContextMenuRequested,
this,
&OpenPagesManager::openPagesContextMenu);
m_openPagesSwitcher = new OpenPagesSwitcher(m_helpWidget->model());
connect(m_openPagesSwitcher, &OpenPagesSwitcher::closePage, this,
&OpenPagesManager::closePage);
connect(m_openPagesSwitcher, &OpenPagesSwitcher::setCurrentPage,
this, &OpenPagesManager::setCurrentPage);
connect(m_openPagesSwitcher,
&OpenPagesSwitcher::setCurrentPage,
m_helpWidget,
[this](const QModelIndex &index) { m_helpWidget->setCurrentIndex(index.row()); });
connect(m_helpWidget,
&HelpWidget::currentIndexChanged,
m_openPagesSwitcher,
&OpenPagesSwitcher::selectCurrentPage);
}
OpenPagesManager ::~OpenPagesManager()
@@ -88,8 +99,14 @@ QWidget *OpenPagesManager::openPagesWidget() const
{
if (!m_openPagesWidget) {
m_openPagesWidget = new OpenPagesWidget(m_helpWidget->model());
connect(m_openPagesWidget, &OpenPagesWidget::setCurrentPage,
this, &OpenPagesManager::setCurrentPage);
connect(m_openPagesWidget,
&OpenPagesWidget::setCurrentPage,
m_helpWidget,
[this](const QModelIndex &index) { m_helpWidget->setCurrentIndex(index.row()); });
connect(m_helpWidget,
&HelpWidget::currentIndexChanged,
m_openPagesWidget,
&OpenPagesWidget::selectCurrentPage);
connect(m_openPagesWidget, &OpenPagesWidget::closePage,
this, &OpenPagesManager::closePage);
connect(m_openPagesWidget, &OpenPagesWidget::closePagesExcept,
@@ -153,8 +170,7 @@ void OpenPagesManager::setupInitialPages()
if (m_helpWidget->viewerCount() == 0)
m_helpWidget->addViewer(homePage);
setCurrentPageByRow(std::max(initialPage, m_helpWidget->viewerCount() - 1));
m_openPagesSwitcher->selectCurrentPage();
m_helpWidget->setCurrentIndex(std::max(initialPage, m_helpWidget->viewerCount() - 1));
}
HelpViewer *OpenPagesManager::createPage()
@@ -168,26 +184,11 @@ HelpViewer *OpenPagesManager::createPage(const QUrl &url)
return nullptr;
HelpViewer *page = m_helpWidget->addViewer(url);
setCurrentPageByRow(m_helpWidget->viewerCount() - 1);
m_helpWidget->setCurrentIndex(m_helpWidget->viewerCount() - 1);
return page;
}
void OpenPagesManager::setCurrentPageByRow(int index)
{
m_helpWidget->setCurrentIndex(index);
m_comboBox->setCurrentIndex(index);
if (m_openPagesWidget)
m_openPagesWidget->selectCurrentPage();
}
void OpenPagesManager::setCurrentPage(const QModelIndex &index)
{
if (index.isValid())
setCurrentPageByRow(index.row());
}
void OpenPagesManager::closeCurrentPage()
{
if (!m_openPagesWidget)
@@ -230,7 +231,6 @@ void OpenPagesManager::closePagesExcept(const QModelIndex &index)
void OpenPagesManager::gotoNextPage()
{
if (!m_openPagesSwitcher->isVisible()) {
m_openPagesSwitcher->selectCurrentPage();
m_openPagesSwitcher->gotoNextPage();
showTwicherOrSelectPage();
} else {
@@ -241,7 +241,6 @@ void OpenPagesManager::gotoNextPage()
void OpenPagesManager::gotoPreviousPage()
{
if (!m_openPagesSwitcher->isVisible()) {
m_openPagesSwitcher->selectCurrentPage();
m_openPagesSwitcher->gotoPreviousPage();
showTwicherOrSelectPage();
} else {
@@ -256,9 +255,6 @@ void OpenPagesManager::removePage(int index)
QTC_ASSERT(index < m_helpWidget->viewerCount(), return );
m_helpWidget->removeViewerAt(index);
if (m_openPagesWidget)
m_openPagesWidget->selectCurrentPage();
}
void OpenPagesManager::showTwicherOrSelectPage() const