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

TextEditor: Make TextEditorSettings all static

Browse Source 
Move the fading indicator to the widget

Change-Id: I762c46845153c93c75ea0198c993b655559fad3b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-12-18 10:28:00 +02:00
committed by Orgad Shaneh
parent 0f8a3abb8b
commit 3f46e3da30
4 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,6 +81,7 @@
#include <utils/linecolumnlabel.h>
#include <utils/fileutils.h>
#include <utils/dropsupport.h>
#include <utils/fadingindicator.h>
#include <utils/filesearch.h>
#include <utils/hostosinfo.h>
#include <utils/mimetypes/mimedatabase.h>
@@ -3022,11 +3023,6 @@ void TextEditorWidgetPrivate::setupDocumentSignals()
connect(settings, &TextEditorSettings::extraEncodingSettingsChanged,
q, &TextEditorWidget::setExtraEncodingSettings);
connect(q, &TextEditorWidget::requestFontZoom,
settings, &TextEditorSettings::fontZoomRequested);
connect(q, &TextEditorWidget::requestZoomReset,
settings, &TextEditorSettings::zoomResetRequested);
// Apply current settings
m_document->setFontSettings(settings->fontSettings());
m_document->setTabSettings(settings->codeStyle()->tabSettings()); // also set through code style ???
@@ -5494,12 +5490,15 @@ void TextEditorWidget::zoomF(float delta)
else if (step < 0 && step > -1)
step = -1;
emit requestFontZoom(step);
const int newZoom = TextEditorSettings::instance()->increaseFontZoom(int(step));
Utils::FadingIndicator::showText(this,
tr("Zoom: %1%").arg(newZoom),
Utils::FadingIndicator::SmallText);
}
void TextEditorWidget::zoomReset()
{
emit requestZoomReset();
TextEditorSettings::instance()->resetFontZoom();
}
TextEditorWidget::Link TextEditorWidget::findLinkAt(const QTextCursor &, bool, bool)