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
P
PIM Sieve Editor
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
1
Merge Requests
1
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
PIM Sieve Editor
Commits
f8c1a216
Commit
f8c1a216
authored
Dec 28, 2016
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Astyle kdelibs
parent
29b8cd62
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
11 deletions
+7
-11
src/serversievelistwidget.h
src/serversievelistwidget.h
+1
-1
src/serversievesettings.cpp
src/serversievesettings.cpp
+0
-2
src/serversievesettings.h
src/serversievesettings.h
+2
-1
src/sieveeditorpagewidget.h
src/sieveeditorpagewidget.h
+1
-1
src/sieveeditorutil.cpp
src/sieveeditorutil.cpp
+2
-4
src/sieveeditorutil.h
src/sieveeditorutil.h
+1
-2
No files found.
src/serversievelistwidget.h
View file @
f8c1a216
...
...
@@ -45,7 +45,7 @@ public:
void
readConfig
();
void
writeConfig
();
void
addServerConfig
();
void
addServerConfig
();
void
deleteServerConfig
(
QListWidgetItem
*
item
);
public
Q_SLOTS
:
...
...
src/serversievesettings.cpp
View file @
f8c1a216
...
...
@@ -93,7 +93,6 @@ ServerSieveSettings::ServerSieveSettings(QWidget *parent) :
ui
->
safeImapGroup
->
setId
(
ui
->
sslRadio
,
KSieveUi
::
SieveImapAccountSettings
::
AnySslVersion
);
ui
->
safeImapGroup
->
setId
(
ui
->
tlsRadio
,
KSieveUi
::
SieveImapAccountSettings
::
TlsV1
);
connect
(
ui
->
testButton
,
&
QPushButton
::
pressed
,
this
,
&
ServerSieveSettings
::
slotTest
);
populateDefaultComboBoxAuthenticationOptions
();
...
...
@@ -106,7 +105,6 @@ ServerSieveSettings::~ServerSieveSettings()
delete
ui
;
}
void
ServerSieveSettings
::
populateDefaultComboBoxAuthenticationOptions
()
{
populateDefaultAuthenticationOptions
(
ui
->
authenticationCombo
);
...
...
src/serversievesettings.h
View file @
f8c1a216
...
...
@@ -27,7 +27,8 @@ namespace Ui
{
class
ServerSieveSettings
;
}
namespace
MailTransport
{
namespace
MailTransport
{
class
ServerTest
;
}
class
QComboBox
;
...
...
src/sieveeditorpagewidget.h
View file @
f8c1a216
...
...
@@ -99,7 +99,7 @@ private Q_SLOTS:
void
slotGetResult
(
KManageSieve
::
SieveJob
*
,
bool
success
,
const
QString
&
script
,
bool
isActive
);
void
slotCheckSyntaxClicked
();
void
slotPutResult
(
KManageSieve
::
SieveJob
*
,
bool
success
);
void
slotValueChanged
(
bool
b
);
void
slotValueChanged
(
bool
b
);
void
slotCheckScriptJobFinished
(
const
QString
&
errorMsg
,
bool
success
);
private:
...
...
src/sieveeditorutil.cpp
View file @
f8c1a216
...
...
@@ -102,9 +102,9 @@ QVector<SieveEditorUtil::SieveServerConfig> SieveEditorUtil::readServerSieveConf
sieve
.
sieveImapAccountSettings
.
setServerName
(
group
.
readEntry
(
QStringLiteral
(
"ImapServerName"
)));
sieve
.
sieveImapAccountSettings
.
setUserName
(
group
.
readEntry
(
QStringLiteral
(
"ImapUserName"
)));
sieve
.
sieveImapAccountSettings
.
setAuthenticationType
(
static_cast
<
KSieveUi
::
SieveImapAccountSettings
::
AuthenticationMode
>
(
group
.
readEntry
(
QStringLiteral
(
"ImapAuthentication"
),
static_cast
<
int
>
(
KSieveUi
::
SieveImapAccountSettings
::
Plain
))));
static_cast
<
KSieveUi
::
SieveImapAccountSettings
::
AuthenticationMode
>
(
group
.
readEntry
(
QStringLiteral
(
"ImapAuthentication"
),
static_cast
<
int
>
(
KSieveUi
::
SieveImapAccountSettings
::
Plain
))));
sieve
.
sieveImapAccountSettings
.
setEncryptionMode
(
static_cast
<
KSieveUi
::
SieveImapAccountSettings
::
EncryptionMode
>
(
group
.
readEntry
(
QStringLiteral
(
"ImapEncrypt"
),
static_cast
<
int
>
(
KSieveUi
::
SieveImapAccountSettings
::
TlsV1
))));
static_cast
<
KSieveUi
::
SieveImapAccountSettings
::
EncryptionMode
>
(
group
.
readEntry
(
QStringLiteral
(
"ImapEncrypt"
),
static_cast
<
int
>
(
KSieveUi
::
SieveImapAccountSettings
::
TlsV1
))));
if
(
!
sieve
.
sieveImapAccountSettings
.
userName
().
isEmpty
()
&&
!
sieve
.
sieveImapAccountSettings
.
serverName
().
isEmpty
()
&&
...
...
@@ -180,7 +180,6 @@ void SieveEditorUtil::writeSieveSettings(KWallet::Wallet *wallet, const KSharedC
}
group
.
writeEntry
(
QStringLiteral
(
"Authentication"
),
static_cast
<
int
>
(
conf
.
sieveSettings
.
authenticationType
));
//Imap Account Settings
group
.
writeEntry
(
QStringLiteral
(
"ImapPort"
),
conf
.
sieveImapAccountSettings
.
port
());
group
.
writeEntry
(
QStringLiteral
(
"ImapAuthentication"
),
static_cast
<
int
>
(
conf
.
sieveImapAccountSettings
.
authenticationType
()));
...
...
@@ -216,7 +215,6 @@ void SieveEditorUtil::addServerSieveConfig(const SieveEditorUtil::SieveServerCon
cfg
->
sync
();
}
void
SieveEditorUtil
::
deletePasswords
(
const
QStringList
&
identifiers
)
{
if
(
!
identifiers
.
isEmpty
())
{
...
...
src/sieveeditorutil.h
View file @
f8c1a216
...
...
@@ -30,8 +30,7 @@ class Wallet;
}
namespace
SieveEditorUtil
{
struct
SieveAccountSettings
{
struct
SieveAccountSettings
{
SieveAccountSettings
()
:
authenticationType
(
MailTransport
::
Transport
::
EnumAuthenticationType
::
PLAIN
),
port
(
-
1
)
...
...
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