Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
libksieve
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PIM
libksieve
Commits
4d5a06dc
Commit
4d5a06dc
authored
May 17, 2017
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add indentation
parent
292f882d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
5 deletions
+14
-5
src/ksieveui/autocreatescripts/autotests/data/test-foreach-ref.siv
...eui/autocreatescripts/autotests/data/test-foreach-ref.siv
+1
-1
src/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp
src/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp
+8
-2
src/ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp
...ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp
+3
-0
src/ksieveui/autocreatescripts/sievescriptblockwidget.cpp
src/ksieveui/autocreatescripts/sievescriptblockwidget.cpp
+2
-2
No files found.
src/ksieveui/autocreatescripts/autotests/data/test-foreach-ref.siv
View file @
4d5a06dc
...
...
@@ -6,6 +6,6 @@ require "ihave";
foreverypart :name "foreach1" {
if ihave "value"
{
stop;
stop;
}
}
src/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp
View file @
4d5a06dc
...
...
@@ -87,12 +87,18 @@ void SieveActionWidget::generatedScript(QString &script, QStringList &requires,
}
}
QString
comment
=
widgetAction
->
comment
();
QString
indent
;
if
(
!
onlyActions
)
{
indent
+=
AutoCreateScriptUtil
::
indentation
();
}
if
(
inForEveryPartLoop
)
{
indent
+=
AutoCreateScriptUtil
::
indentation
();
}
if
(
!
comment
.
trimmed
().
isEmpty
())
{
const
QString
indent
=
(
onlyActions
?
QString
()
:
AutoCreateScriptUtil
::
indentation
());
script
+=
indent
;
script
+=
QLatin1Char
(
'#'
)
+
comment
.
replace
(
QLatin1Char
(
'\n'
),
QStringLiteral
(
"
\n
%1#"
).
arg
(
indent
))
+
QLatin1Char
(
'\n'
);
}
script
+=
(
onlyActions
?
QString
()
:
AutoCreateScriptUtil
::
indentation
())
+
widgetAction
->
code
(
currentWidget
)
+
QLatin1Char
(
'\n'
);
script
+=
indent
+
widgetAction
->
code
(
currentWidget
)
+
QLatin1Char
(
'\n'
);
}
}
...
...
src/ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp
View file @
4d5a06dc
...
...
@@ -80,6 +80,9 @@ void SieveConditionWidget::generatedScript(QString &script, QStringList &require
requires
.
append
(
r
);
}
}
if
(
inForEveryPartLoop
)
{
//FIXME script += AutoCreateScriptUtil::indentation();
}
script
+=
mConditionList
.
at
(
mComboBox
->
currentIndex
())
->
code
(
currentWidget
)
+
QLatin1Char
(
'\n'
);
}
}
...
...
src/ksieveui/autocreatescripts/sievescriptblockwidget.cpp
View file @
4d5a06dc
...
...
@@ -216,12 +216,12 @@ void SieveScriptBlockWidget::generatedScript(QString &script, QStringList &requi
if
(
conditionStr
.
isEmpty
())
{
return
;
}
else
{
script
+=
indentation
+
filterStr
+
conditionStr
;
script
+=
indentation
+
filterStr
+
conditionStr
;
}
if
(
hasUniqCondition
)
{
script
+=
indentation
+
QLatin1String
(
"{
\n
"
);
}
else
{
script
+=
indentation
+
QLatin1String
(
")
\n
{
\n
"
);
script
+=
indentation
+
QStringLiteral
(
")
\n
%1{
\n
"
).
arg
(
indentation
);
}
}
mScriptActionLister
->
generatedScript
(
script
,
requires
,
onlyActions
,
inForEveryPartLoop
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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