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

TextEditor: Move access to smaller settings chunks

Browse Source 
Change-Id: Id827edbd19dde54b66cb4349d9c832bc23110adc
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2024-01-26 18:27:53 +01:00
parent 2a29acdbaf
commit bc15dcd8fe
15 changed files with 30 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/bineditor/bineditorwidget.cpp
View File

@@ -494,7 +494,7 @@ void BinEditorWidget::changeEvent(QEvent *e)
void BinEditorWidget::wheelEvent(QWheelEvent *e)
{
if (e->modifiers() & Qt::ControlModifier) {
if (!TextEditor::TextEditorSettings::behaviorSettings().m_scrollWheelZooming) {
if (!TextEditor::globalBehaviorSettings().m_scrollWheelZooming) {
// When the setting is disabled globally,
// we have to skip calling QAbstractScrollArea::wheelEvent()
// that changes zoom in it.

2
src/plugins/fakevim/fakevimactions.cpp
View File

@@ -190,7 +190,7 @@ FakeVimSettings::FakeVimSettings()
text(Tr::tr("Copy Text Editor Settings")),
onClicked([this] {
TabSettings ts = TextEditorSettings::codeStyle()->tabSettings();
TypingSettings tps = TextEditorSettings::typingSettings();
TypingSettings tps = globalTypingSettings();
expandTab.setValue(ts.m_tabPolicy != TabSettings::TabsOnlyTabPolicy);
tabStop.setValue(ts.m_tabSize);
shiftWidth.setValue(ts.m_indentSize);

2
src/plugins/projectexplorer/appoutputpane.cpp
View File

@@ -436,7 +436,7 @@ void AppOutputPane::createNewOutputWindow(RunControl *rc)
auto updateBehaviorSettings = [ow] {
ow->setWheelZoomEnabled(
TextEditor::TextEditorSettings::behaviorSettings().m_scrollWheelZooming);
TextEditor::globalBehaviorSettings().m_scrollWheelZooming);
};
updateFontSettings();

2
src/plugins/projectexplorer/compileoutputwindow.cpp
View File

@@ -75,7 +75,7 @@ CompileOutputWindow::CompileOutputWindow(QAction *cancelBuildAction) :
auto updateZoomEnabled = [this] {
m_outputWindow->setWheelZoomEnabled(
TextEditor::TextEditorSettings::behaviorSettings().m_scrollWheelZooming);
TextEditor::globalBehaviorSettings().m_scrollWheelZooming);
};
updateFontSettings();

24
src/plugins/projectexplorer/editorconfiguration.cpp
View File

@@ -41,10 +41,10 @@ const Key kCodeStyleCount("EditorConfiguration.CodeStyle.Count");
struct EditorConfigurationPrivate
{
EditorConfigurationPrivate() :
m_typingSettings(TextEditorSettings::typingSettings()),
m_storageSettings(TextEditorSettings::storageSettings()),
m_behaviorSettings(TextEditorSettings::behaviorSettings()),
m_extraEncodingSettings(TextEditorSettings::extraEncodingSettings()),
m_typingSettings(globalTypingSettings()),
m_storageSettings(globalStorageSettings()),
m_behaviorSettings(globalBehaviorSettings()),
m_extraEncodingSettings(globalExtraEncodingSettings()),
m_textCodec(Core::EditorManager::defaultTextCodec())
{ }
@@ -106,10 +106,10 @@ bool EditorConfiguration::useGlobalSettings() const
void EditorConfiguration::cloneGlobalSettings()
{
d->m_defaultCodeStyle->setTabSettings(TextEditorSettings::codeStyle()->tabSettings());
setTypingSettings(TextEditorSettings::typingSettings());
setStorageSettings(TextEditorSettings::storageSettings());
setBehaviorSettings(TextEditorSettings::behaviorSettings());
setExtraEncodingSettings(TextEditorSettings::extraEncodingSettings());
setTypingSettings(globalTypingSettings());
setStorageSettings(globalStorageSettings());
setBehaviorSettings(globalBehaviorSettings());
setExtraEncodingSettings(globalExtraEncodingSettings());
setMarginSettings(TextEditorSettings::marginSettings());
d->m_textCodec = Core::EditorManager::defaultTextCodec();
}
@@ -302,10 +302,10 @@ void EditorConfiguration::switchSettings(TextEditorWidget *widget) const
{
if (d->m_useGlobal) {
widget->setMarginSettings(TextEditorSettings::marginSettings());
widget->setTypingSettings(TextEditorSettings::typingSettings());
widget->setStorageSettings(TextEditorSettings::storageSettings());
widget->setBehaviorSettings(TextEditorSettings::behaviorSettings());
widget->setExtraEncodingSettings(TextEditorSettings::extraEncodingSettings());
widget->setTypingSettings(globalTypingSettings());
widget->setStorageSettings(globalStorageSettings());
widget->setBehaviorSettings(globalBehaviorSettings());
widget->setExtraEncodingSettings(globalExtraEncodingSettings());
switchSettings_helper(TextEditorSettings::instance(), this, widget);
} else {
widget->setMarginSettings(marginSettings());

2
src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp
View File

@@ -89,7 +89,7 @@ bool JsonWizardGenerator::formatFile(const JsonWizard *wizard, GeneratedFile *fi
QChar::Null,
codeStylePrefs->currentTabSettings());
delete indenter;
if (TextEditorSettings::storageSettings().m_cleanWhitespace) {
if (globalStorageSettings().m_cleanWhitespace) {
QTextBlock block = doc.firstBlock();
while (block.isValid()) {
TabSettings::removeTrailingWhitespace(cursor, block);

2
src/plugins/projectexplorer/projectfilewizardextension.cpp
View File

@@ -250,7 +250,7 @@ void ProjectFileWizardExtension::applyCodeStyle(GeneratedFile *file) const
QChar::Null,
codeStylePrefs->currentTabSettings());
delete indenter;
if (TextEditorSettings::storageSettings().m_cleanWhitespace) {
if (globalStorageSettings().m_cleanWhitespace) {
QTextBlock block = doc.firstBlock();
while (block.isValid()) {
TabSettings::removeTrailingWhitespace(cursor, block);

4
src/plugins/texteditor/behaviorsettings.h
View File

@@ -32,9 +32,9 @@ public:
bool m_smartSelectionChanging;
};
TEXTEDITOR_EXPORT BehaviorSettings &globalBehaviorSettings();
void setupBehaviorSettings();
void updateGlobalBehaviorSettings(const BehaviorSettings &newBehaviorSettings);
TEXTEDITOR_EXPORT BehaviorSettings &globalBehaviorSettings();
} // namespace TextEditor

2
src/plugins/texteditor/extraencodingsettings.h
View File

@@ -33,6 +33,6 @@ public:
void setupExtraEncodingSettings();
void updateGlobalExtraEncodingSettings(const ExtraEncodingSettings &newExtraEncodingSettings);
ExtraEncodingSettings &globalExtraEncodingSettings();
TEXTEDITOR_EXPORT ExtraEncodingSettings &globalExtraEncodingSettings();
} // TextEditor

2
src/plugins/texteditor/storagesettings.h
View File

@@ -33,6 +33,6 @@ public:
void setupStorageSettings();
void updateGlobalStorageSettings(const StorageSettings &newStorageSettings);
StorageSettings &globalStorageSettings();
TEXTEDITOR_EXPORT StorageSettings &globalStorageSettings();
} // namespace TextEditor

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

@@ -1414,13 +1414,13 @@ void TextEditorWidgetPrivate::setDocument(const QSharedPointer<TextDocument> &do
else
m_document->setTabSettings(tabSettings); // also set through code style ???
q->setTypingSettings(TextEditorSettings::typingSettings());
q->setStorageSettings(TextEditorSettings::storageSettings());
q->setBehaviorSettings(TextEditorSettings::behaviorSettings());
q->setTypingSettings(globalTypingSettings());
q->setStorageSettings(globalStorageSettings());
q->setBehaviorSettings(globalBehaviorSettings());
q->setMarginSettings(TextEditorSettings::marginSettings());
q->setDisplaySettings(TextEditorSettings::displaySettings());
q->setCompletionSettings(TextEditorSettings::completionSettings());
q->setExtraEncodingSettings(TextEditorSettings::extraEncodingSettings());
q->setExtraEncodingSettings(globalExtraEncodingSettings());
q->setCodeStyle(TextEditorSettings::codeStyle(m_tabSettingsId));
m_blockCount = doc->document()->blockCount();

23
src/plugins/texteditor/texteditorsettings.cpp
View File

@@ -35,6 +35,7 @@
using namespace TextEditor::Constants;
using namespace TextEditor::Internal;
using namespace Utils;
namespace TextEditor {
namespace Internal {
@@ -442,7 +443,7 @@ TextEditorSettings::TextEditorSettings()
updateGeneralMessagesBehaviorSettings();
auto updateCamelCaseNavigation = [] {
Utils::FancyLineEdit::setCamelCaseNavigationEnabled(behaviorSettings().m_camelCaseNavigation);
FancyLineEdit::setCamelCaseNavigationEnabled(globalBehaviorSettings().m_camelCaseNavigation);
};
connect(this, &TextEditorSettings::behaviorSettingsChanged,
this, updateCamelCaseNavigation);
@@ -466,21 +467,6 @@ const FontSettings &TextEditorSettings::fontSettings()
return d->m_fontSettings;
}
const TypingSettings &TextEditorSettings::typingSettings()
{
return d->m_behaviorSettingsPage.typingSettings();
}
const StorageSettings &TextEditorSettings::storageSettings()
{
return d->m_behaviorSettingsPage.storageSettings();
}
const BehaviorSettings &TextEditorSettings::behaviorSettings()
{
return d->m_behaviorSettingsPage.behaviorSettings();
}
const MarginSettings &TextEditorSettings::marginSettings()
{
return d->m_displaySettingsPage.marginSettings();
@@ -501,11 +487,6 @@ const HighlighterSettings &TextEditorSettings::highlighterSettings()
return d->m_highlighterSettingsPage.highlighterSettings();
}
const ExtraEncodingSettings &TextEditorSettings::extraEncodingSettings()
{
return d->m_behaviorSettingsPage.extraEncodingSettings();
}
void TextEditorSettings::setCommentsSettingsRetriever(
const std::function<CommentsSettings::Data(const Utils::FilePath &)> &retrieve)
{

4
src/plugins/texteditor/texteditorsettings.h
View File

@@ -49,14 +49,10 @@ public:
static TextEditorSettings *instance();
static const FontSettings &fontSettings();
static const TypingSettings &typingSettings();
static const StorageSettings &storageSettings();
static const BehaviorSettings &behaviorSettings();
static const MarginSettings &marginSettings();
static const DisplaySettings &displaySettings();
static const CompletionSettings &completionSettings();
static const HighlighterSettings &highlighterSettings();
static const ExtraEncodingSettings &extraEncodingSettings();
static void setCommentsSettingsRetriever(
const std::function<CommentsSettings::Data(const Utils::FilePath &)> &);

2
src/plugins/texteditor/typingsettings.h
View File

@@ -57,7 +57,7 @@ public:
void setupTypingSettings();
void updateGlobalTypingSettings(const TypingSettings &newTypingSettings);
TypingSettings &globalTypingSettings();
TEXTEDITOR_EXPORT TypingSettings &globalTypingSettings();
} // namespace TextEditor

2
src/plugins/vcsbase/vcsoutputwindow.cpp
View File

@@ -265,7 +265,7 @@ VcsOutputWindow::VcsOutputWindow()
auto updateBehaviorSettings = [] {
d->widget.setWheelZoomEnabled(
TextEditor::TextEditorSettings::behaviorSettings().m_scrollWheelZooming);
TextEditor::globalBehaviorSettings().m_scrollWheelZooming);
};
auto updateFontSettings = [] {