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

EditorManager: adding save (as/all) to editor list's context menu

Browse Source 
It is confusing that save is missing in the context menu
of the editor manager.

Split mode requires to use different actions then the ones
in the File menu, since the editor in question might not be the
current editor.

Change-Id: I47cd5295f7a3b58906e9b158e88d9128142d4311
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
This commit is contained in:
Thomas Hartmann
2012-12-20 09:49:15 +01:00
parent f320426cd1
commit 4add39e31b
4 changed files with 118 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -206,6 +206,10 @@ struct EditorManagerPrivate
QAction *m_removeAllSplitsAction;
QAction *m_gotoOtherSplitAction;
QAction *m_saveCurrentEditorContextAction;
QAction *m_saveAsCurrentEditorContextAction;
QAction *m_revertToSavedCurrentEditorContextAction;
QAction *m_closeCurrentEditorContextAction;
QAction *m_closeAllEditorsContextAction;
QAction *m_closeOtherEditorsContextAction;
@@ -244,6 +248,9 @@ EditorManagerPrivate::EditorManagerPrivate(QWidget *parent) :
m_gotoPreviousDocHistoryAction(new QAction(EditorManager::tr("Previous Open Document in History"), parent)),
m_goBackAction(new QAction(QIcon(QLatin1String(Constants::ICON_PREV)), EditorManager::tr("Go Back"), parent)),
m_goForwardAction(new QAction(QIcon(QLatin1String(Constants::ICON_NEXT)), EditorManager::tr("Go Forward"), parent)),
m_saveCurrentEditorContextAction(new QAction(EditorManager::tr("&Save"), parent)),
m_saveAsCurrentEditorContextAction(new QAction(EditorManager::tr("Save &As..."), parent)),
m_revertToSavedCurrentEditorContextAction(new QAction(EditorManager::tr("Revert to Saved"), parent)),
m_closeCurrentEditorContextAction(new QAction(EditorManager::tr("Close"), parent)),
m_closeAllEditorsContextAction(new QAction(EditorManager::tr("Close All"), parent)),
m_closeOtherEditorsContextAction(new QAction(EditorManager::tr("Close Others"), parent)),
@@ -335,6 +342,11 @@ EditorManager::EditorManager(QWidget *parent) :
cmd->setAttribute(Core::Command::CA_UpdateText);
connect(d->m_closeOtherEditorsAction, SIGNAL(triggered()), this, SLOT(closeOtherEditors()));
//Save XXX Context Actions
connect(d->m_saveCurrentEditorContextAction, SIGNAL(triggered()), this, SLOT(saveDocumentFromContextMenu()));
connect(d->m_saveAsCurrentEditorContextAction, SIGNAL(triggered()), this, SLOT(saveDocumentAsFromContextMenu()));
connect(d->m_revertToSavedCurrentEditorContextAction, SIGNAL(triggered()), this, SLOT(revertToSavedFromContextMenu()));
// Close XXX Context Actions
connect(d->m_closeAllEditorsContextAction, SIGNAL(triggered()), this, SLOT(closeAllEditors()));
connect(d->m_closeCurrentEditorContextAction, SIGNAL(triggered()), this, SLOT(closeEditorFromContextMenu()));
@@ -723,10 +735,37 @@ void EditorManager::closeEditor()
closeEditor(d->m_currentEditor);
}
void EditorManager::addCloseEditorActions(QMenu *contextMenu, const QModelIndex &editorIndex)
static void assignAction(QAction *self, QAction *other)
{
self->setText(other->text());
self->setIcon(other->icon());
self->setShortcut(other->shortcut());
self->setEnabled(other->isEnabled());
}
void EditorManager::addSaveAndCloseEditorActions(QMenu *contextMenu, const QModelIndex &editorIndex)
{
QTC_ASSERT(contextMenu, return);
d->m_contextMenuEditorIndex = editorIndex;
assignAction(d->m_saveCurrentEditorContextAction, ActionManager::command(Constants::SAVE)->action());
assignAction(d->m_saveAsCurrentEditorContextAction, ActionManager::command(Constants::SAVEAS)->action());
assignAction(d->m_revertToSavedCurrentEditorContextAction, ActionManager::command(Constants::REVERTTOSAVED)->action());
IEditor *editor = d->m_contextMenuEditorIndex.data(Qt::UserRole).value<Core::IEditor*>();
setupSaveActions(editor,
d->m_saveCurrentEditorContextAction,
d->m_saveAsCurrentEditorContextAction,
d->m_revertToSavedCurrentEditorContextAction);
contextMenu->addAction(d->m_saveCurrentEditorContextAction);
contextMenu->addAction(d->m_saveAsCurrentEditorContextAction);
contextMenu->addAction(ActionManager::command(Constants::SAVEALL)->action());
contextMenu->addAction(d->m_revertToSavedCurrentEditorContextAction);
contextMenu->addSeparator();
d->m_closeCurrentEditorContextAction->setText(editorIndex.isValid()
? tr("Close \"%1\"").arg(editorIndex.data().toString())
: tr("Close Editor"));
@@ -750,6 +789,27 @@ void EditorManager::addNativeDirActions(QMenu *contextMenu, const QModelIndex &e
contextMenu->addAction(d->m_openTerminalAction);
}
void EditorManager::saveDocumentFromContextMenu()
{
IEditor *editor = d->m_contextMenuEditorIndex.data(Qt::UserRole).value<Core::IEditor*>();
if (editor)
saveDocument(editor->document());
}
void EditorManager::saveDocumentAsFromContextMenu()
{
IEditor *editor = d->m_contextMenuEditorIndex.data(Qt::UserRole).value<Core::IEditor*>();
if (editor)
saveDocumentAs(editor->document());
}
void EditorManager::revertToSavedFromContextMenu()
{
IEditor *editor = d->m_contextMenuEditorIndex.data(Qt::UserRole).value<Core::IEditor*>();
if (editor)
revertToSaved(editor);
}
void EditorManager::closeEditorFromContextMenu()
{
closeEditor(d->m_contextMenuEditorIndex);
@@ -1731,21 +1791,47 @@ void EditorManager::updateMakeWritableWarning()
}
}
QString EditorManager::fileNameForEditor(IEditor *editor)
{
QString fileName;
if (editor) {
if (!editor->document()->fileName().isEmpty()) {
QFileInfo fileInfo(curEditor->document()->fileName());
fileName = fileInfo.fileName();
} else {
fileName = editor->displayName();
}
}
return fileName;
}
void EditorManager::setupSaveActions(IEditor *editor, QAction *saveAction, QAction *saveAsAction, QAction *revertToSavedAction)
{
saveAction->setEnabled(editor != 0 && editor->document()->isModified());
saveAsAction->setEnabled(editor != 0 && editor->document()->isSaveAsAllowed());
revertToSavedAction->setEnabled(editor != 0
&& !editor->document()->fileName().isEmpty() && editor->document()->isModified());
const QString fileName = fileNameForEditor(editor);
QString quotedName;
if (!fileName.isEmpty())
quotedName = QLatin1Char('"') + fileName + QLatin1Char('"');
if (!quotedName.isEmpty()) {
saveAction->setText(tr("&Save %1").arg(quotedName));
saveAsAction->setText(tr("Save %1 &As...").arg(quotedName));
revertToSavedAction->setText(tr("Revert %1 to Saved").arg(quotedName));
}
}
void EditorManager::updateActions()
{
QString fName;
IEditor *curEditor = currentEditor();
const QString fileName = fileNameForEditor(curEditor);
int openedCount = openedEditors().count() + d->m_editorModel->restoredEditors().count();
if (curEditor) {
if (!curEditor->document()->fileName().isEmpty()) {
QFileInfo fi(curEditor->document()->fileName());
fName = fi.fileName();
} else {
fName = curEditor->displayName();
}
if (HostOsInfo::isMacHost())
window()->setWindowModified(curEditor->document()->isModified());
updateMakeWritableWarning();
@@ -1755,18 +1841,10 @@ void EditorManager::updateActions()
setCloseSplitEnabled(d->m_splitter, d->m_splitter->isSplitter());
d->m_saveAction->setEnabled(curEditor != 0 && curEditor->document()->isModified());
d->m_saveAsAction->setEnabled(curEditor != 0 && curEditor->document()->isSaveAsAllowed());
d->m_revertToSavedAction->setEnabled(curEditor != 0
&& !curEditor->document()->fileName().isEmpty() && curEditor->document()->isModified());
QString quotedName;
if (!fName.isEmpty())
quotedName = QLatin1Char('"') + fName + QLatin1Char('"');
d->m_saveAsAction->setText(tr("Save %1 &As...").arg(quotedName));
d->m_saveAction->setText(tr("&Save %1").arg(quotedName));
d->m_revertToSavedAction->setText(tr("Revert %1 to Saved").arg(quotedName));
if (!fileName.isEmpty())
quotedName = QLatin1Char('"') + fileName + QLatin1Char('"');
setupSaveActions(curEditor, d->m_saveAction, d->m_saveAsAction, d->m_revertToSavedAction);
d->m_closeCurrentEditorAction->setEnabled(curEditor != 0);
d->m_closeCurrentEditorAction->setText(tr("Close %1").arg(quotedName));
@@ -2020,13 +2098,17 @@ void EditorManager::readSettings()
void EditorManager::revertToSaved()
{
IEditor *currEditor = currentEditor();
if (!currEditor)
revertToSaved(currentEditor());
}
void EditorManager::revertToSaved(Core::IEditor *editor)
{
if (!editor)
return;
const QString fileName = currEditor->document()->fileName();
const QString fileName = editor->document()->fileName();
if (fileName.isEmpty())
return;
if (currEditor->document()->isModified()) {
if (editor->document()->isModified()) {
QMessageBox msgBox(QMessageBox::Question, tr("Revert to Saved"),
tr("You will lose your current changes if you proceed reverting %1.").arg(QDir::toNativeSeparators(fileName)),
QMessageBox::Yes|QMessageBox::No, ICore::mainWindow());
@@ -2039,7 +2121,7 @@ void EditorManager::revertToSaved()
}
QString errorString;
if (!currEditor->document()->reload(&errorString, IDocument::FlagReload, IDocument::TypeContents))
if (!editor->document()->reload(&errorString, IDocument::FlagReload, IDocument::TypeContents))
QMessageBox::critical(ICore::mainWindow(), tr("File Error"), errorString);
}

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

@@ -186,7 +186,7 @@ public:
void setWindowTitleAddition(const QString &addition);
QString windowTitleAddition() const;
void addCloseEditorActions(QMenu *contextMenu, const QModelIndex &editorIndex);
void addSaveAndCloseEditorActions(QMenu *contextMenu, const QModelIndex &editorIndex);
void addNativeDirActions(QMenu *contextMenu, const QModelIndex &editorIndex);
signals:
@@ -203,6 +203,7 @@ public slots:
bool saveDocument(Core::IDocument *documentParam = 0);
bool saveDocumentAs(Core::IDocument *documentParam = 0);
void revertToSaved();
void revertToSaved(Core::IEditor *editor);
void closeEditor();
void closeOtherEditors();
@@ -218,6 +219,10 @@ private slots:
void updateVariable(const QByteArray &variable);
void autoSave();
void saveDocumentFromContextMenu();
void saveDocumentAsFromContextMenu();
void revertToSavedFromContextMenu();
void closeEditorFromContextMenu();
void closeOtherEditorsFromContextMenu();
@@ -264,6 +269,8 @@ private:
void updateAutoSave();
void setCloseSplitEnabled(Internal::SplitterOrView *splitterOrView, bool enable);
void updateMakeWritableWarning();
QString fileNameForEditor(IEditor *editor);
void setupSaveActions(IEditor *editor, QAction *saveAction, QAction *saveAsAction, QAction *revertToSavedAction);
EditorManagerPrivate *d;

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

@@ -215,7 +215,7 @@ void OpenEditorsWidget::contextMenuRequested(QPoint pos)
{
QMenu contextMenu;
QModelIndex editorIndex = indexAt(pos);
EditorManager::instance()->addCloseEditorActions(&contextMenu, editorIndex);
EditorManager::instance()->addSaveAndCloseEditorActions(&contextMenu, editorIndex);
contextMenu.addSeparator();
EditorManager::instance()->addNativeDirActions(&contextMenu, editorIndex);
contextMenu.exec(mapToGlobal(pos));

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

@@ -333,7 +333,7 @@ void EditorToolBar::listContextMenu(QPoint pos)
QMenu menu;
QAction *copyPath = menu.addAction(tr("Copy Full Path to Clipboard"));
menu.addSeparator();
EditorManager::instance()->addCloseEditorActions(&menu, index);
EditorManager::instance()->addSaveAndCloseEditorActions(&menu, index);
menu.addSeparator();
EditorManager::instance()->addNativeDirActions(&menu, index);
QAction *result = menu.exec(d->m_editorList->mapToGlobal(pos));