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

Add EditorModel::openDocumentCount and use it.

Browse Source 
As is, EditorModel::rowCount() could also be used, but this will most
probably change later. So we simply add a method that is independent
from all the "model" methods.

Change-Id: I39a2338d765ed6a269bf8977b816a5eda371afdf
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Eike Ziller
2013-06-28 17:05:50 +02:00
parent 3e117b125d
commit c531970b57
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2053,7 +2053,7 @@ void EditorManager::updateActions()
{
IEditor *curEditor = currentEditor();
const QString fileName = fileNameForEditor(curEditor);
int openedCount = openedEditors().count() + d->m_editorModel->restoredEditors().count();
int openedCount = d->m_editorModel->openDocumentCount();
if (curEditor) {
if (HostOsInfo::isMacHost())

5
src/plugins/coreplugin/editormanager/openeditorsmodel.cpp
View File

@@ -295,6 +295,11 @@ QModelIndex OpenEditorsModel::index(int row, int column, const QModelIndex &pare
return createIndex(row, column);
}
int OpenEditorsModel::openDocumentCount() const
{
return d->m_editors.count();
}
QVariant OpenEditorsModel::data(const QModelIndex &index, int role) const
{
if (!index.isValid() || (index.column() != 0 && role < Qt::UserRole))

2
src/plugins/coreplugin/editormanager/openeditorsmodel.h
View File

@@ -60,6 +60,8 @@ public:
int rowCount(const QModelIndex &parent = QModelIndex()) const;
QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const;
int openDocumentCount() const;
void addEditor(IEditor *editor, bool isDuplicate = false);
void addRestoredEditor(const QString &fileName, const QString &displayName, const Id &id);
QModelIndex firstRestoredEditor() const;

3
src/plugins/qmldesigner/shortcutmanager.cpp
View File

@@ -172,8 +172,7 @@ void ShortCutManager::registerActions(const Core::Context &qmlDesignerMainContex
void ShortCutManager::updateActions(Core::IEditor* currentEditor)
{
int openedCount = Core::ICore::editorManager()->openedEditors().count()
+ Core::ICore::editorManager()->openedEditorsModel()->restoredEditors().count();
int openedCount = Core::ICore::editorManager()->openedEditorsModel()->openDocumentCount();
QString fileName;
if (currentEditor) {