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

Add Line/Column indicator to Markdown editor

Browse Source 
And make the LineColumnButton independent of IEditor for that (since the
IEditor for the Markdown editor is not a TextEditor.

Change-Id: I52d378ec46d86b1c7928d18f7d39f9726bb6ad23
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Eike Ziller
2023-11-14 11:27:12 +01:00
parent a810995aae
commit 583a9dcea1
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/texteditor/markdowneditor.cpp
View File

@@ -83,6 +83,7 @@ public:
context->setWidget(m_textEditorWidget); context->setWidget(m_textEditorWidget);
context->setContext(Context(MARKDOWNVIEWER_TEXT_CONTEXT)); context->setContext(Context(MARKDOWNVIEWER_TEXT_CONTEXT));
ICore::addContextObject(context); ICore::addContextObject(context);
m_lineColumnButton = new LineColumnButton(m_textEditorWidget);
m_splitter->addWidget(m_textEditorWidget); // sets splitter->focusWidget() on non-Windows m_splitter->addWidget(m_textEditorWidget); // sets splitter->focusWidget() on non-Windows
m_splitter->addWidget(m_previewWidget); m_splitter->addWidget(m_previewWidget);
@@ -115,6 +116,7 @@ public:
m_toggleEditorVisible->setCheckable(true); m_toggleEditorVisible->setCheckable(true);
m_toggleEditorVisible->setChecked(showEditor); m_toggleEditorVisible->setChecked(showEditor);
m_textEditorWidget->setVisible(showEditor); m_textEditorWidget->setVisible(showEditor);
m_lineColumnButton->setVisible(showEditor);
auto button = new CommandButton(EMPHASIS_ACTION); auto button = new CommandButton(EMPHASIS_ACTION);
button->setText("i"); button->setText("i");
@@ -150,6 +152,7 @@ public:
for (auto button : m_markDownButtons) for (auto button : m_markDownButtons)
m_toolbarLayout->addWidget(button); m_toolbarLayout->addWidget(button);
m_toolbarLayout->addStretch(); m_toolbarLayout->addStretch();
m_toolbarLayout->addWidget(m_lineColumnButton);
m_toolbarLayout->addWidget(m_togglePreviewVisible); m_toolbarLayout->addWidget(m_togglePreviewVisible);
m_toolbarLayout->addWidget(m_toggleEditorVisible); m_toolbarLayout->addWidget(m_toggleEditorVisible);
m_toolbarLayout->addWidget(m_swapViews); m_toolbarLayout->addWidget(m_swapViews);
@@ -210,6 +213,7 @@ public:
m_togglePreviewVisible); m_togglePreviewVisible);
for (auto button : m_markDownButtons) for (auto button : m_markDownButtons)
button->setVisible(visible); button->setVisible(visible);
m_lineColumnButton->setVisible(visible);
saveViewSettings(); saveViewSettings();
}); });
connect(m_togglePreviewVisible, connect(m_togglePreviewVisible,
@@ -443,6 +447,7 @@ private:
QWidget m_toolbar; QWidget m_toolbar;
QHBoxLayout *m_toolbarLayout; QHBoxLayout *m_toolbarLayout;
QList<QToolButton *> m_markDownButtons; QList<QToolButton *> m_markDownButtons;
LineColumnButton *m_lineColumnButton;
CommandButton *m_toggleEditorVisible; CommandButton *m_toggleEditorVisible;
CommandButton *m_togglePreviewVisible; CommandButton *m_togglePreviewVisible;
CommandButton *m_swapViews; CommandButton *m_swapViews;

2
src/plugins/texteditor/texteditor.cpp
View File

@@ -164,7 +164,7 @@ LineColumnButton::LineColumnButton(TextEditorWidget *parent)
m_d->m_editor = parent; m_d->m_editor = parent;
connect(m_d->m_editor, &QPlainTextEdit::cursorPositionChanged, this, &LineColumnButton::update); connect(m_d->m_editor, &QPlainTextEdit::cursorPositionChanged, this, &LineColumnButton::update);
connect(this, &QToolButton::clicked, ActionManager::instance(), [this] { connect(this, &QToolButton::clicked, ActionManager::instance(), [this] {
emit m_d->m_editor->activateEditor(EditorManager::IgnoreNavigationHistory); m_d->m_editor->setFocus();
QMetaObject::invokeMethod( QMetaObject::invokeMethod(
ActionManager::instance(), ActionManager::instance(),
[] { [] {