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
PIM
KPimTextEdit
Commits
184d7bf0
Commit
184d7bf0
authored
Feb 28, 2022
by
Laurent Montel
Browse files
Rename actions + minor optimization
parent
655e4dde
Pipeline
#143549
passed with stages
in 2 minutes and 36 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/texteditor/commonwidget/findutils.cpp
View file @
184d7bf0
...
...
@@ -31,7 +31,7 @@ QTextDocument::FindFlags FindUtils::convertTextEditFindFlags(TextEditFindBarBase
return
flags
;
}
int
FindUtils
::
replaceAll
(
QTextDocument
*
document
,
const
TextFindWidget
*
findWidget
,
const
TextReplaceWidget
*
replaceWidget
)
int
FindUtils
::
replaceAll
(
QTextDocument
*
document
,
const
TextFindWidget
*
findWidget
,
const
QString
&
replaceWidget
)
{
QTextCursor
c
(
document
);
c
.
beginEditBlock
();
...
...
@@ -46,7 +46,7 @@ int FindUtils::replaceAll(QTextDocument *document, const TextFindWidget *findWid
}
if
(
!
c
.
isNull
())
{
// find() selects found text, and insertText() replaces selection
c
.
insertText
(
replaceWidget
->
replaceLineEdit
()
->
text
()
);
c
.
insertText
(
replaceWidget
);
count
++
;
}
}
...
...
src/texteditor/commonwidget/findutils.h
View file @
184d7bf0
...
...
@@ -27,7 +27,7 @@ namespace FindUtils
*
* @return number of replacements done
*/
Q_REQUIRED_RESULT
int
replaceAll
(
QTextDocument
*
document
,
const
TextFindWidget
*
findWidget
,
const
TextReplaceWidget
*
replaceWidget
);
Q_REQUIRED_RESULT
int
replaceAll
(
QTextDocument
*
document
,
const
TextFindWidget
*
findWidget
,
const
QString
&
replaceWidget
);
Q_REQUIRED_RESULT
QString
normalize
(
QStringView
str
);
Q_REQUIRED_RESULT
QChar
normalize
(
QChar
c
);
...
...
src/texteditor/commonwidget/textfindreplacewidget.cpp
View file @
184d7bf0
...
...
@@ -98,8 +98,8 @@ TextFindWidget::TextFindWidget(QWidget *parent)
mWholeWordAct
=
optionsMenu
->
addAction
(
i18n
(
"Whole word"
));
mWholeWordAct
->
setCheckable
(
true
);
mReg
Exp
Act
=
optionsMenu
->
addAction
(
i18n
(
"Regular Expression"
));
mReg
Exp
Act
->
setCheckable
(
true
);
mReg
ularExpression
Act
=
optionsMenu
->
addAction
(
i18n
(
"Regular Expression"
));
mReg
ularExpression
Act
->
setCheckable
(
true
);
mRespectDiacriticAct
=
optionsMenu
->
addAction
(
i18n
(
"Respect Diacritic and Accents"
));
mRespectDiacriticAct
->
setCheckable
(
true
);
...
...
@@ -112,7 +112,7 @@ TextFindWidget::TextFindWidget(QWidget *parent)
connect
(
mCaseSensitiveAct
,
&
QAction
::
toggled
,
this
,
&
TextFindWidget
::
updateSearchOptions
);
connect
(
mWholeWordAct
,
&
QAction
::
toggled
,
this
,
&
TextFindWidget
::
updateSearchOptions
);
connect
(
mRespectDiacriticAct
,
&
QAction
::
toggled
,
this
,
&
TextFindWidget
::
updateSearchOptions
);
connect
(
mReg
Exp
Act
,
&
QAction
::
toggled
,
this
,
&
TextFindWidget
::
updateSearchOptions
);
connect
(
mReg
ularExpression
Act
,
&
QAction
::
toggled
,
this
,
&
TextFindWidget
::
updateSearchOptions
);
connect
(
mSearch
,
&
QLineEdit
::
textChanged
,
this
,
&
TextFindWidget
::
slotAutoSearch
);
connect
(
mSearch
,
&
QLineEdit
::
returnPressed
,
this
,
&
TextFindWidget
::
findNext
);
}
...
...
@@ -161,7 +161,7 @@ QLineEdit *TextFindWidget::searchLineEdit() const
bool
TextFindWidget
::
isRegularExpression
()
const
{
return
mReg
Exp
Act
->
isChecked
();
return
mReg
ularExpression
Act
->
isChecked
();
}
QString
TextFindWidget
::
searchText
()
const
...
...
src/texteditor/commonwidget/textfindreplacewidget.h
View file @
184d7bf0
...
...
@@ -49,7 +49,7 @@ private:
QLineEdit
*
const
mSearch
;
QAction
*
mCaseSensitiveAct
=
nullptr
;
QAction
*
mWholeWordAct
=
nullptr
;
QAction
*
mReg
Exp
Act
=
nullptr
;
QAction
*
mReg
ularExpression
Act
=
nullptr
;
QAction
*
mRespectDiacriticAct
=
nullptr
;
QPushButton
*
mFindPrevBtn
=
nullptr
;
...
...
src/texteditor/plaintexteditor/plaintexteditfindbar.cpp
View file @
184d7bf0
...
...
@@ -110,6 +110,6 @@ void PlainTextEditFindBar::slotReplaceText()
void
PlainTextEditFindBar
::
slotReplaceAllText
()
{
const
int
count
=
FindUtils
::
replaceAll
(
d
->
mView
->
document
(),
mFindWidget
,
mReplaceWidget
);
const
int
count
=
FindUtils
::
replaceAll
(
d
->
mView
->
document
(),
mFindWidget
,
mReplaceWidget
->
replaceLineEdit
()
->
text
()
);
Q_EMIT
displayMessageIndicator
(
i18np
(
"%1 replacement made"
,
"%1 replacements made"
,
count
));
}
src/texteditor/richtexteditor/richtexteditfindbar.cpp
View file @
184d7bf0
...
...
@@ -101,6 +101,6 @@ void RichTextEditFindBar::slotReplaceText()
void
RichTextEditFindBar
::
slotReplaceAllText
()
{
const
int
count
=
FindUtils
::
replaceAll
(
d
->
mView
->
document
(),
mFindWidget
,
mReplaceWidget
);
const
int
count
=
FindUtils
::
replaceAll
(
d
->
mView
->
document
(),
mFindWidget
,
mReplaceWidget
->
replaceLineEdit
()
->
text
()
);
Q_EMIT
displayMessageIndicator
(
i18np
(
"%1 replacement made"
,
"%1 replacements made"
,
count
));
}
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