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

Moved the mouse navigation option to the Behaviour settings page

Browse Source 
It used to be hidden on the Display settings page.

Task-number: QTCREATORBUG-135
This commit is contained in:
Thorbjørn Lindeijer
2009-12-08 17:37:40 +01:00
parent 2774c9c0bf
commit 3d2d122472
14 changed files with 221 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -34,6 +34,7 @@
#include "texteditorplugin.h"
#include "completionsupport.h"
#endif
#include "behaviorsettings.h"
#include "basetextdocument.h"
#include "basetexteditor_p.h"
#include "codecselector.h"
@@ -48,8 +49,8 @@
#include <extensionsystem/pluginmanager.h>
#include <find/basetextfind.h>
#include <utils/stylehelper.h>
#endif
#include <utils/linecolumnlabel.h>
#include <utils/qtcassert.h>
@@ -4659,7 +4660,6 @@ void BaseTextEditor::setDisplaySettings(const DisplaySettings &ds)
setCodeFoldingVisible(ds.m_displayFoldingMarkers);
setHighlightCurrentLine(ds.m_highlightCurrentLine);
setRevisionsVisible(ds.m_markTextChanges);
setMouseNavigationEnabled(ds.m_mouseNavigation);
if (d->m_displaySettings.m_visualizeWhitespace != ds.m_visualizeWhitespace) {
if (QSyntaxHighlighter *highlighter = baseTextDocument()->syntaxHighlighter())
@@ -4684,6 +4684,11 @@ void BaseTextEditor::setDisplaySettings(const DisplaySettings &ds)
extraArea()->update();
}
void BaseTextEditor::setBehaviorSettings(const TextEditor::BehaviorSettings &bs)
{
setMouseNavigationEnabled(bs.m_mouseNavigation);
}
void BaseTextEditor::setStorageSettings(const StorageSettings &storageSettings)
{
d->m_document->setStorageSettings(storageSettings);