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

Editor: transform the encoding label into button

Browse Source 
Like for the line number label: Having a button instead of a labal makes
it more obvious that there is an action triggered when clicking the
label.

Change-Id: Ied15c05658c0b0b7df75cbcf1704808e94f6985d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
David Schulz
2023-09-22 10:52:58 +02:00
parent 5d4849f058
commit 7c28cc0565
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,6 @@
#include <utils/fadingindicator.h>
#include <utils/filesearch.h>
#include <utils/fileutils.h>
#include <utils/fixedsizeclicklabel.h>
#include <utils/hostosinfo.h>
#include <utils/infobar.h>
#include <utils/mimeutils.h>
@@ -727,8 +726,8 @@ public:
QWidget *m_stretchWidget = nullptr;
QAction *m_stretchAction = nullptr;
QAction *m_toolbarOutlineAction = nullptr;
LineColumnButton *m_cursorPositionLabel = nullptr;
FixedSizeClickLabel *m_fileEncodingLabel = nullptr;
LineColumnButton *m_cursorPositionButton = nullptr;
QToolButton *m_fileEncodingButton = nullptr;
QAction *m_fileEncodingLabelAction = nullptr;
BaseTextFind *m_find = nullptr;
@@ -1037,9 +1036,9 @@ TextEditorWidgetPrivate::TextEditorWidgetPrivate(TextEditorWidget *parent)
m_toolBarWidget->layout()->addWidget(m_toolBar);
const int spacing = q->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 2;
m_cursorPositionLabel = new LineColumnButton(q);
m_cursorPositionLabel->setContentsMargins(spacing, 0, spacing, 0);
m_toolBarWidget->layout()->addWidget(m_cursorPositionLabel);
m_cursorPositionButton = new LineColumnButton(q);
m_cursorPositionButton->setContentsMargins(spacing, 0, spacing, 0);
m_toolBarWidget->layout()->addWidget(m_cursorPositionButton);
m_fileLineEnding = new QToolButton(q);
m_fileLineEnding->setContentsMargins(spacing, 0, spacing, 0);
@@ -1048,9 +1047,9 @@ TextEditorWidgetPrivate::TextEditorWidgetPrivate(TextEditorWidget *parent)
connect(q, &TextEditorWidget::readOnlyChanged,
this, &TextEditorWidgetPrivate::updateFileLineEndingVisible);
m_fileEncodingLabel = new FixedSizeClickLabel;
m_fileEncodingLabel->setContentsMargins(spacing, 0, spacing, 0);
m_fileEncodingLabelAction = m_toolBar->addWidget(m_fileEncodingLabel);
m_fileEncodingButton = new QToolButton;
m_fileEncodingButton->setContentsMargins(spacing, 0, spacing, 0);
m_fileEncodingLabelAction = m_toolBar->addWidget(m_fileEncodingButton);
m_extraSelections.reserve(NExtraSelectionKinds);
@@ -1091,7 +1090,7 @@ TextEditorWidgetPrivate::TextEditorWidgetPrivate(TextEditorWidget *parent)
connect(&m_delayedUpdateTimer, &QTimer::timeout,
q->viewport(), QOverload<>::of(&QWidget::update));
connect(m_fileEncodingLabel, &FixedSizeClickLabel::clicked,
connect(m_fileEncodingButton, &QToolButton::clicked,
q, &TextEditorWidget::selectEncoding);
connect(m_fileLineEnding, &QToolButton::clicked, ActionManager::instance(), [this] {
@@ -1834,7 +1833,7 @@ void TextEditorWidget::updateTextLineEndingLabel()
void TextEditorWidget::updateTextCodecLabel()
{
QString text = QString::fromLatin1(d->m_document->codec()->name());
d->m_fileEncodingLabel->setText(text, text);
d->m_fileEncodingButton->setText(text);
}
QString TextEditorWidget::msgTextTooLarge(quint64 size)