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

Merge remote-tracking branch 'origin/7.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/languageclient/languageclientoutline.cpp

Change-Id: I106fbde6467818368a8358d612d793313cad27e6
This commit is contained in:
Eike Ziller
2022-05-02 15:06:08 +02:00
parent 07195cea8b 9159bdaed2
commit 1b7295514c
51 changed files with 1868 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/languageclient/languageclientoutline.cpp
View File

@@ -31,6 +31,7 @@
#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/find/itemviewfind.h>
#include <languageserverprotocol/languagefeatures.h>
#include <texteditor/outlinefactory.h>>
#include <texteditor/textdocument.h>
#include <texteditor/texteditor.h>
#include <utils/itemviews.h>
@@ -345,13 +346,18 @@ OutlineComboBox::OutlineComboBox(Client *client, TextEditor::BaseTextEditor *edi
setMaxVisibleItems(40);
setContextMenuPolicy(Qt::ActionsContextMenu);
auto sortAction = new QAction(tr("Sort Alphabetically"), this);
const QString sortActionText
= QCoreApplication::translate("TextEditor::Internal::OutlineWidgetStack",
"Sort Alphabetically");
auto sortAction = new QAction(sortActionText, this);
sortAction->setCheckable(true);
sortAction->setChecked(sorted);
addAction(sortAction);
connect(client->documentSymbolCache(), &DocumentSymbolCache::gotSymbols,
this, &OutlineComboBox::updateModel);
connect(client->documentSymbolCache(),
&DocumentSymbolCache::gotSymbols,
this,
&OutlineComboBox::updateModel);
connect(client, &Client::documentUpdated, this, &OutlineComboBox::documentUpdated);
connect(m_editorWidget, &TextEditor::TextEditorWidget::cursorPositionChanged,
this, &OutlineComboBox::updateEntry);