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

Merge remote branch 'origin/2.1'

Browse Source
This commit is contained in:
dt
2010-10-12 18:09:25 +02:00
parent 335a95e5e0 f707cfd834
commit 552a2d0226
15 changed files with 1223 additions and 4655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/help/helpplugin.cpp
View File

@@ -797,17 +797,16 @@ HelpViewer* HelpPlugin::viewerForContextMode()
break;
}
HelpViewer *viewer = m_centralWidget->currentHelpViewer();
if (placeHolder && showSideBySide) {
RightPaneWidget::instance()->setShown(true);
createRightPaneContextViewer();
viewer = m_helpViewerForSideBar;
} else {
activateHelpMode();
if (!viewer)
viewer = OpenPagesManager::instance().createPage();
return m_helpViewerForSideBar;
}
activateHelpMode(); // should trigger an createPage...
HelpViewer *viewer = m_centralWidget->currentHelpViewer();
if (!viewer)
viewer = OpenPagesManager::instance().createPage();
return viewer;
}

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

@@ -177,7 +177,8 @@ void OpenPagesManager::setupInitialPages()
CentralWidget::instance()->addPage(m_model->pageAt(i));
emit pagesChanged();
setCurrentPage(initialPage);
setCurrentPage((initialPage >= m_model->rowCount())
? m_model->rowCount() - 1 : initialPage);
m_openPagesSwitcher->selectCurrentPage();
}