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

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Change-Id: I4332eba9f1f66fef185359c79c4d96420d8b78ca
This commit is contained in:
Eike Ziller
2018-08-30 08:31:25 +02:00
parent db85693690 8ef4964168
commit 8e05783019
18 changed files with 358 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/projecttreewidget.cpp
View File

@@ -259,9 +259,11 @@ ProjectTreeWidget::ProjectTreeWidget(QWidget *parent) : QWidget(parent)
if (!ActionManager::command(focusActionId)) {
auto focusDocumentInProjectTree = new QAction(tr("Focus Document in Project Tree"), this);
Command *cmd = ActionManager::registerAction(focusDocumentInProjectTree, focusActionId);
cmd->setDefaultKeySequence(QKeySequence(tr("Alt+Shift+L")));
connect(focusDocumentInProjectTree, &QAction::triggered,
this, [this]() { syncFromDocumentManager(); });
cmd->setDefaultKeySequence(
QKeySequence(useMacShortcuts ? tr("Meta+Shift+L") : tr("Alt+Shift+L")));
connect(focusDocumentInProjectTree, &QAction::triggered, this, [this]() {
syncFromDocumentManager();
});
}
m_trimEmptyDirectoriesAction = new QAction(tr("Hide Empty Directories"), this);