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

Core: Enable context menu for document-less editors

Browse Source 
Change-Id: I92edf53230d34cb222dcc82391b8046e09c7599d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Orgad Shaneh
2014-07-22 12:08:43 +03:00
committed by Orgad Shaneh
parent 95d22fc972
commit f51553b228
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2031,9 +2031,10 @@ void EditorManager::updateMakeWritableWarning()
void EditorManager::setupSaveActions(IDocument *document, QAction *saveAction, QAction *saveAsAction, QAction *revertToSavedAction) void EditorManager::setupSaveActions(IDocument *document, QAction *saveAction, QAction *saveAsAction, QAction *revertToSavedAction)
{ {
saveAction->setEnabled(document != 0 && document->isModified()); const bool hasFile = document != 0 && !document->filePath().isEmpty();
saveAction->setEnabled(hasFile && document->isModified());
saveAsAction->setEnabled(document != 0 && document->isSaveAsAllowed()); saveAsAction->setEnabled(document != 0 && document->isSaveAsAllowed());
revertToSavedAction->setEnabled(document != 0 && !document->filePath().isEmpty()); revertToSavedAction->setEnabled(hasFile);
const QString documentName = document ? document->displayName() : QString(); const QString documentName = document ? document->displayName() : QString();
QString quotedName; QString quotedName;

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

@@ -317,12 +317,14 @@ void EditorToolBar::listContextMenu(QPoint pos)
d->m_editorList->currentIndex()); d->m_editorList->currentIndex());
QString fileName = entry ? entry->fileName() : QString(); QString fileName = entry ? entry->fileName() : QString();
QString shortFileName = entry ? QFileInfo(fileName).fileName() : QString(); QString shortFileName = entry ? QFileInfo(fileName).fileName() : QString();
if (fileName.isEmpty() || shortFileName.isEmpty())
return;
QMenu menu; QMenu menu;
QAction *copyPath = menu.addAction(tr("Copy Full Path to Clipboard")); QAction *copyPath = menu.addAction(tr("Copy Full Path to Clipboard"));
QAction *copyFileName = menu.addAction(tr("Copy File Name to Clipboard")); QAction *copyFileName = menu.addAction(tr("Copy File Name to Clipboard"));
menu.addSeparator(); menu.addSeparator();
if (fileName.isEmpty() || shortFileName.isEmpty()) {
copyPath->setEnabled(false);
copyFileName->setEnabled(false);
}
EditorManager::addSaveAndCloseEditorActions(&menu, entry); EditorManager::addSaveAndCloseEditorActions(&menu, entry);
menu.addSeparator(); menu.addSeparator();
EditorManager::addNativeDirAndOpenWithActions(&menu, entry); EditorManager::addNativeDirAndOpenWithActions(&menu, entry);