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

TextEditor: Add an option to hide file line ending combobox

Browse Source 
Change-Id: Iae8160f7cd567fc6d42116837fc367fa6dffdc4b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Alexander Akulich
2022-06-10 13:26:54 +03:00
parent 525ea8a1ec
commit 2bf46d9e7f
5 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -640,6 +640,7 @@ public:
void slotSelectionChanged();
void _q_animateUpdate(const QTextCursor &cursor, QPointF lastPos, QRectF rect);
void updateCodeFoldingVisible();
void updateFileLineEndingVisible();
void reconfigure();
void updateSyntaxInfoBar(const Highlighter::Definitions &definitions, const QString &fileName);
@@ -952,10 +953,9 @@ TextEditorWidgetPrivate::TextEditorWidgetPrivate(TextEditorWidget *parent)
m_fileLineEnding->addItems(ExtraEncodingSettings::lineTerminationModeNames());
m_fileLineEnding->setContentsMargins(spacing, 0, spacing, 0);
m_fileLineEndingAction = m_toolBar->addWidget(m_fileLineEnding);
m_fileLineEndingAction->setVisible(!q->isReadOnly());
connect(q, &TextEditorWidget::readOnlyChanged, this, [this] {
m_fileLineEndingAction->setVisible(!q->isReadOnly());
});
updateFileLineEndingVisible();
connect(q, &TextEditorWidget::readOnlyChanged,
this, &TextEditorWidgetPrivate::updateFileLineEndingVisible);
m_fileEncodingLabel = new FixedSizeClickLabel;
m_fileEncodingLabel->setContentsMargins(spacing, 0, spacing, 0);
@@ -3225,6 +3225,11 @@ void TextEditorWidgetPrivate::updateCodeFoldingVisible()
}
}
void TextEditorWidgetPrivate::updateFileLineEndingVisible()
{
m_fileLineEndingAction->setVisible(m_displaySettings.m_displayFileLineEnding && !q->isReadOnly());
}
void TextEditorWidgetPrivate::reconfigure()
{
m_document->setMimeType(Utils::mimeTypeForFile(m_document->filePath()).name());
@@ -7211,6 +7216,7 @@ void TextEditorWidget::setDisplaySettings(const DisplaySettings &ds)
}
d->updateCodeFoldingVisible();
d->updateFileLineEndingVisible();
d->updateHighlights();
d->setupScrollBar();
viewport()->update();