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

fixed issues with splitted editors

Browse Source
This commit is contained in:
Lasse Holmstedt
2010-03-12 16:47:46 +01:00
parent d450bcd760
commit 5567a01877
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/coreplugin/editortoolbar.cpp
View File

@@ -34,6 +34,8 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/minisplitter.h> #include <coreplugin/minisplitter.h>
#include <coreplugin/sidebar.h> #include <coreplugin/sidebar.h>
#include <coreplugin/editormanager/editorview.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/openeditorsmodel.h> #include <coreplugin/editormanager/openeditorsmodel.h>
#include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/ieditor.h>
@@ -142,9 +144,6 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
connect(m_lockButton, SIGNAL(clicked()), this, SLOT(makeEditorWritable())); connect(m_lockButton, SIGNAL(clicked()), this, SLOT(makeEditorWritable()));
connect(m_closeButton, SIGNAL(clicked()), this, SLOT(closeView()), Qt::QueuedConnection); connect(m_closeButton, SIGNAL(clicked()), this, SLOT(closeView()), Qt::QueuedConnection);
EditorManager *em = EditorManager::instance();
connect(em, SIGNAL(currentEditorChanged(Core::IEditor*)), SLOT(updateEditorListSelection(Core::IEditor*)));
ActionManager *am = ICore::instance()->actionManager(); ActionManager *am = ICore::instance()->actionManager();
connect(am->command(Constants::CLOSE), SIGNAL(keySequenceChanged()), connect(am->command(Constants::CLOSE), SIGNAL(keySequenceChanged()),
this, SLOT(updateActionShortcuts())); this, SLOT(updateActionShortcuts()));
@@ -216,6 +215,10 @@ void EditorToolBar::updateToolBar(QWidget *toolBar)
void EditorToolBar::setToolbarCreationFlags(ToolbarCreationFlags flags) void EditorToolBar::setToolbarCreationFlags(ToolbarCreationFlags flags)
{ {
m_ignoreEditorToolbar = flags & FlagsIgnoreIEditorToolBar; m_ignoreEditorToolbar = flags & FlagsIgnoreIEditorToolBar;
if (m_ignoreEditorToolbar) {
EditorManager *em = EditorManager::instance();
connect(em, SIGNAL(currentEditorChanged(Core::IEditor*)), SLOT(updateEditorListSelection(Core::IEditor*)));
}
} }
void EditorToolBar::setCurrentEditor(IEditor *editor) void EditorToolBar::setCurrentEditor(IEditor *editor)
@@ -232,9 +235,8 @@ void EditorToolBar::setCurrentEditor(IEditor *editor)
void EditorToolBar::updateEditorListSelection(IEditor *newSelection) void EditorToolBar::updateEditorListSelection(IEditor *newSelection)
{ {
if (newSelection) { if (newSelection)
m_editorList->setCurrentIndex(m_editorsListModel->indexOf(newSelection).row()); m_editorList->setCurrentIndex(m_editorsListModel->indexOf(newSelection).row());
}
} }
void EditorToolBar::listSelectionActivated(int row) void EditorToolBar::listSelectionActivated(int row)

6
src/plugins/coreplugin/editortoolbar.h
View File

@@ -46,6 +46,10 @@ namespace Core {
class IEditor; class IEditor;
class OpenEditorsModel; class OpenEditorsModel;
namespace Internal {
class EditorView;
}
/** /**
* Fakes an IEditor-like toolbar for design mode widgets such as Qt Designer and Bauhaus. * Fakes an IEditor-like toolbar for design mode widgets such as Qt Designer and Bauhaus.
@@ -120,6 +124,8 @@ private:
QWidget *m_defaultToolBar; QWidget *m_defaultToolBar;
bool m_ignoreEditorToolbar; bool m_ignoreEditorToolbar;
friend class Internal::EditorView;
}; };
} }