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

Fix split mode after last change for welcome page examples.

Browse Source 
We need to append "?view=split"to force the split mode check. Make the
check more readable in viewerForContextMode.
This commit is contained in:
kh1
2010-03-10 18:39:46 +01:00
parent 4e7bbbdaaf
commit 0ec23fefd1
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -829,10 +829,12 @@ HelpViewer* HelpPlugin::viewerForContextMode()
// side by side if possible // side by side if possible
if (IEditor *editor = EditorManager::instance()->currentEditor()) { if (IEditor *editor = EditorManager::instance()->currentEditor()) {
if (!placeHolder || !placeHolder->isVisible()) { if (!placeHolder || !placeHolder->isVisible()) {
if (!editor->widget() && editor->widget()->isVisible() if (!editor->widget())
&& editor->widget()->width() < 800) { break;
if (!editor->widget()->isVisible())
break;
if (editor->widget()->width() < 800)
break; break;
}
} }
} }
} // fall through } // fall through
@@ -850,8 +852,7 @@ HelpViewer* HelpPlugin::viewerForContextMode()
RightPaneWidget::instance()->setShown(true); RightPaneWidget::instance()->setShown(true);
viewer = m_helpViewerForSideBar; viewer = m_helpViewerForSideBar;
} else { } else {
if (!viewer) activateHelpMode();
activateHelpMode();
} }
return viewer; return viewer;
} }
@@ -1003,12 +1004,6 @@ void HelpPlugin::handleHelpRequest(const QString &address)
if (m_helpEngine->findFile(address).isValid()) { if (m_helpEngine->findFile(address).isValid()) {
const QUrl url(address); const QUrl url(address);
if (url.queryItemValue(QLatin1String("view")) == QLatin1String("split")) { if (url.queryItemValue(QLatin1String("view")) == QLatin1String("split")) {
using namespace Core::Constants;
Core::ModeManager *modeManager = Core::ICore::instance()->modeManager();
if (modeManager->currentMode() == modeManager->mode(MODE_WELCOME))
modeManager->activateMode(MODE_EDIT);
if (HelpViewer* viewer = viewerForContextMode()) if (HelpViewer* viewer = viewerForContextMode())
viewer->setSource(url); viewer->setSource(url);
} else { } else {

2
src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
View File

@@ -272,7 +272,7 @@ void GettingStartedWelcomePageWidget::slotOpenContextHelpPage(const QString& url
Help::HelpManager *helpManager Help::HelpManager *helpManager
= ExtensionSystem::PluginManager::instance()->getObject<Help::HelpManager>(); = ExtensionSystem::PluginManager::instance()->getObject<Help::HelpManager>();
Q_ASSERT(helpManager); Q_ASSERT(helpManager);
helpManager->handleHelpRequest(url); helpManager->handleHelpRequest(url % QLatin1String("?view=split"));
} }
void GettingStartedWelcomePageWidget::slotNextTip() void GettingStartedWelcomePageWidget::slotNextTip()