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

LanguageClient: support sorting outline combo box items

Browse Source 
Fixes: QTCREATORBUG-26976
Change-Id: I6ec31072629c62a007bc27381f4adba597307057
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2022-02-04 12:05:31 +01:00
parent 46a012bc11
commit 505358cb82
3 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,6 +39,7 @@
#include <utils/treeviewcombobox.h>
#include <utils/utilsicons.h>
#include <QAction>
#include <QBoxLayout>
#include <QSortFilterProxyModel>
@@ -302,6 +303,7 @@ TextEditor::IOutlineWidget *LanguageClientOutlineWidgetFactory::createWidget(Cor
class OutlineComboBox : public Utils::TreeViewComboBox
{
Q_DECLARE_TR_FUNCTIONS(LanguageClient::OutlineComboBox)
public:
OutlineComboBox(Client *client, TextEditor::BaseTextEditor *editor);
@@ -310,8 +312,10 @@ private:
void updateEntry();
void activateEntry();
void documentUpdated(TextEditor::TextDocument *document);
void setSorted(bool sorted);
LanguageClientOutlineModel m_model;
QSortFilterProxyModel m_proxyModel;
QPointer<Client> m_client;
TextEditor::TextEditorWidget *m_editorWidget;
const DocumentUri m_uri;
@@ -331,19 +335,29 @@ OutlineComboBox::OutlineComboBox(Client *client, TextEditor::BaseTextEditor *edi
, m_uri(DocumentUri::fromFilePath(editor->document()->filePath()))
{
m_model.setSymbolStringifier(client->symbolStringifier());
setModel(&m_model);
m_proxyModel.setSourceModel(&m_model);
const bool sorted = LanguageClientSettings::outlineComboBoxIsSorted();
m_proxyModel.sort(sorted ? 0 : -1);
setModel(&m_proxyModel);
setMinimumContentsLength(13);
QSizePolicy policy = sizePolicy();
policy.setHorizontalPolicy(QSizePolicy::Expanding);
setSizePolicy(policy);
setMaxVisibleItems(40);
setContextMenuPolicy(Qt::ActionsContextMenu);
auto sortAction = new QAction(tr("Sort Alphabetically"), this);
sortAction->setCheckable(true);
sortAction->setChecked(sorted);
addAction(sortAction);
connect(client->documentSymbolCache(), &DocumentSymbolCache::gotSymbols,
this, &OutlineComboBox::updateModel);
connect(client, &Client::documentUpdated, this, &OutlineComboBox::documentUpdated);
connect(m_editorWidget, &TextEditor::TextEditorWidget::cursorPositionChanged,
this, &OutlineComboBox::updateEntry);
connect(this, QOverload<int>::of(&QComboBox::activated), this, &OutlineComboBox::activateEntry);
connect(sortAction, &QAction::toggled, this, &OutlineComboBox::setSorted);
documentUpdated(editor->textDocument());
}
@@ -367,12 +381,12 @@ void OutlineComboBox::updateModel(const DocumentUri &resultUri, const DocumentSy
void OutlineComboBox::updateEntry()
{
if (LanguageClientOutlineItem *item = itemForCursor(m_model, m_editorWidget->textCursor()))
setCurrentIndex(m_model.indexForItem(item));
setCurrentIndex(m_proxyModel.mapFromSource(m_model.indexForItem(item)));
}
void OutlineComboBox::activateEntry()
{
const QModelIndex modelIndex = view()->currentIndex();
const QModelIndex modelIndex = m_proxyModel.mapToSource(view()->currentIndex());
if (modelIndex.isValid()) {
const Position &pos = m_model.itemForIndex(modelIndex)->pos();
Core::EditorManager::cutForwardNavigationHistory();
@@ -389,4 +403,10 @@ void OutlineComboBox::documentUpdated(TextEditor::TextDocument *document)
m_client->documentSymbolCache()->requestSymbols(m_uri, Schedule::Delayed);
}
void OutlineComboBox::setSorted(bool sorted)
{
LanguageClientSettings::setOutlineComboBoxSorted(sorted);
m_proxyModel.sort(sorted ? 0 : -1);
}
} // namespace LanguageClient