Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
20ab82ce
Commit
20ab82ce
authored
Sep 15, 2009
by
mae
Browse files
make auto parentheses opt-in for individual editors. Currently
its only turned on in the cpp editor.
parent
1c4fc0d7
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/plugins/cppeditor/cppeditor.cpp
View file @
20ab82ce
...
...
@@ -536,6 +536,7 @@ CPPEditor::CPPEditor(QWidget *parent)
m_semanticHighlighter
->
start
();
setParenthesesMatchingEnabled
(
true
);
setAutoParenthesesEnabled
(
true
);
setMarksVisible
(
true
);
setCodeFoldingSupported
(
true
);
setCodeFoldingVisible
(
true
);
...
...
src/plugins/texteditor/basetexteditor.cpp
View file @
20ab82ce
...
...
@@ -178,6 +178,7 @@ BaseTextEditor::BaseTextEditor(QWidget *parent)
// (void) new QShortcut(tr("F11"), this, SLOT(slotToggleBlockVisible()));
d
->
m_autoParenthesesEnabled
=
false
;
// parentheses matcher
d
->
m_parenthesesMatchingEnabled
=
false
;
d
->
m_formatRange
=
true
;
...
...
@@ -890,7 +891,7 @@ void BaseTextEditor::keyPressEvent(QKeyEvent *e)
const
TabSettings
&
ts
=
d
->
m_document
->
tabSettings
();
cursor
.
beginEditBlock
();
if
(
ts
.
m_autoParentheses
if
(
d
->
m_autoParenthesesEnabled
&&
ts
.
m_autoParentheses
&&
characterAt
(
cursor
.
position
())
==
QLatin1Char
(
'}'
))
{
int
pos
=
cursor
.
position
();
if
(
ts
.
m_autoIndent
)
{
...
...
@@ -1059,7 +1060,7 @@ void BaseTextEditor::keyPressEvent(QKeyEvent *e)
QTextCursor
cursor
=
textCursor
();
QString
text
=
e
->
text
();
QString
autoText
;
if
(
d
->
m_document
->
tabSettings
().
m_autoParentheses
)
{
if
(
d
->
m_autoParenthesesEnabled
&&
d
->
m_document
->
tabSettings
().
m_autoParentheses
)
{
foreach
(
QChar
c
,
text
)
{
QChar
close
;
if
(
c
==
QLatin1Char
(
'{'
))
...
...
@@ -1312,6 +1313,16 @@ bool BaseTextEditor::isParenthesesMatchingEnabled() const
return
d
->
m_parenthesesMatchingEnabled
;
}
void
BaseTextEditor
::
setAutoParenthesesEnabled
(
bool
b
)
{
d
->
m_autoParenthesesEnabled
=
b
;
}
bool
BaseTextEditor
::
isAutoParenthesesEnabled
()
const
{
return
d
->
m_autoParenthesesEnabled
;
}
void
BaseTextEditor
::
setHighlightCurrentLine
(
bool
b
)
{
d
->
m_highlightCurrentLine
=
b
;
...
...
src/plugins/texteditor/basetexteditor.h
View file @
20ab82ce
...
...
@@ -322,6 +322,9 @@ public:
void
setParenthesesMatchingEnabled
(
bool
b
);
bool
isParenthesesMatchingEnabled
()
const
;
void
setAutoParenthesesEnabled
(
bool
b
);
bool
isAutoParenthesesEnabled
()
const
;
void
setHighlightCurrentLine
(
bool
b
);
bool
highlightCurrentLine
()
const
;
...
...
src/plugins/texteditor/basetexteditor_p.h
View file @
20ab82ce
...
...
@@ -163,6 +163,7 @@ public:
QString
m_displayName
;
bool
m_parenthesesMatchingEnabled
;
bool
m_autoParenthesesEnabled
;
QTimer
*
m_updateTimer
;
// parentheses matcher
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment