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

show and hide the editor info bar in the correct view

Browse Source
This commit is contained in:
mae
2009-02-16 18:44:04 +01:00
parent 0c09777ab4
commit 959ba534f6
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -484,8 +484,8 @@ void EditorManager::setCurrentEditor(IEditor *editor, bool ignoreNavigationHisto
if (addToHistory) if (addToHistory)
addCurrentPositionToNavigationHistory(true); addCurrentPositionToNavigationHistory(true);
EditorView *view = m_d->m_splitter->findView(editor)->view(); if (SplitterOrView *splitterOrView = m_d->m_splitter->findView(editor))
view->setCurrentEditor(editor); splitterOrView->view()->setCurrentEditor(editor);
} }
updateActions(); updateActions();
updateEditorHistory(); updateEditorHistory();
@@ -1560,19 +1560,29 @@ void EditorManager::revertToSaved()
currEditor->file()->modified(&temp); currEditor->file()->modified(&temp);
} }
Core::Internal::EditorView *EditorManager::currentEditorView()
{
if (m_d->m_currentView)
return m_d->m_currentView->view();
if (m_d->m_currentEditor)
if (SplitterOrView *splitterOrView = m_d->m_splitter->findView(m_d->m_currentEditor))
return splitterOrView->view();
return m_d->m_view;
}
void EditorManager::showEditorInfoBar(const QString &kind, void EditorManager::showEditorInfoBar(const QString &kind,
const QString &infoText, const QString &infoText,
const QString &buttonText, const QString &buttonText,
QObject *object, const char *member) QObject *object, const char *member)
{ {
m_d->m_view->showEditorInfoBar(kind, infoText, buttonText, object, member);
currentEditorView()->showEditorInfoBar(kind, infoText, buttonText, object, member);
} }
void EditorManager::hideEditorInfoBar(const QString &kind) void EditorManager::hideEditorInfoBar(const QString &kind)
{ {
m_d->m_view->hideEditorInfoBar(kind); currentEditorView()->hideEditorInfoBar(kind);
} }
QString EditorManager::externalEditorHelpText() const QString EditorManager::externalEditorHelpText() const

1
src/plugins/coreplugin/editormanager/editormanager.h
View File

@@ -227,6 +227,7 @@ private:
void closeEditor(Core::IEditor *editor); void closeEditor(Core::IEditor *editor);
void closeView(Core::Internal::EditorView *view); void closeView(Core::Internal::EditorView *view);
void emptyView(Core::Internal::EditorView *view); void emptyView(Core::Internal::EditorView *view);
Core::Internal::EditorView *currentEditorView();
IEditor *pickUnusedEditor() const; IEditor *pickUnusedEditor() const;
void updateCurrentPositionInNavigationHistory(); void updateCurrentPositionInNavigationHistory();