[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim] libksieve/ksieveui: create vacationutils
From: Montel Laurent <montel () kde ! org>
Date: 2013-12-14 9:19:20
Message-ID: E1VrlNY-0002PO-Fq () scm ! kde ! org
[Download RAW message or body]
Git commit 3e4b034861f956167790ac623c7a2b0df44922c4 by Montel Laurent.
Committed on 14/12/2013 at 09:19.
Pushed by mlaurent into branch 'master'.
create vacationutils
M +1 -0 libksieve/ksieveui/CMakeLists.txt
M +2 -2 libksieve/ksieveui/templates/sievedefaulttemplate.cpp
M +17 -55 libksieve/ksieveui/vacation/vacation.cpp
M +0 -6 libksieve/ksieveui/vacation/vacation.h
A +65 -0 libksieve/ksieveui/vacation/vacationutils.cpp [License: GPL (v2)]
A +34 -0 libksieve/ksieveui/vacation/vacationutils.h [License: GPL (v2)]
http://commits.kde.org/kdepim/3e4b034861f956167790ac623c7a2b0df44922c4
diff --git a/libksieve/ksieveui/CMakeLists.txt b/libksieve/ksieveui/CMakeLists.txt
index a43b1ae..ab9b4df 100644
--- a/libksieve/ksieveui/CMakeLists.txt
+++ b/libksieve/ksieveui/CMakeLists.txt
@@ -31,6 +31,7 @@ set(ksieveui_vacation_LIB_SRCS
vacation/vacationpagewidget.cpp
vacation/vacationwarningwidget.cpp
vacation/vacationscriptextractor.cpp
+ vacation/vacationutils.cpp
)
set(ksieveui_editor_LIB_SRCS
diff --git a/libksieve/ksieveui/templates/sievedefaulttemplate.cpp \
b/libksieve/ksieveui/templates/sievedefaulttemplate.cpp index 80d2bb3..f0b1b6b 100644
--- a/libksieve/ksieveui/templates/sievedefaulttemplate.cpp
+++ b/libksieve/ksieveui/templates/sievedefaulttemplate.cpp
@@ -16,7 +16,7 @@
*/
#include "sievedefaulttemplate.h"
-#include "vacation/vacation.h"
+#include "vacation/vacationutils.h"
#include <KLocale>
@@ -87,7 +87,7 @@ QList<PimCommon::defaultTemplate> \
KSieveUi::SieveDefaultTemplate::defaultTemplat tmp.text = \
QString::fromLatin1("require \"vacation\";\n\n"
"if header :contains \"X-Spam-Flag\" \"YES\" { \
keep; stop; }\n"
"vacation :addresses [ \"me@example.net\", \
\"other@example.net\" ] :days 7 text: \n%1"
- "\n.\n;\n").arg(Vacation::defaultMessageText());
+ \
"\n.\n;\n").arg(VacationUtils::defaultMessageText()); lst << tmp;
diff --git a/libksieve/ksieveui/vacation/vacation.cpp \
b/libksieve/ksieveui/vacation/vacation.cpp index efce13c..4a259c4 100644
--- a/libksieve/ksieveui/vacation/vacation.cpp
+++ b/libksieve/ksieveui/vacation/vacation.cpp
@@ -13,6 +13,7 @@
*/
#include "vacation.h"
+#include "vacationutils.h"
#include "vacationscriptextractor.h"
#include "sieve-vacation.h"
@@ -103,7 +104,7 @@ QString Vacation::composeScript( const QString & messageText,
if ( notificationInterval > 0 )
script += QString::fromLatin1(":days %1 ").arg( notificationInterval );
script += QString::fromLatin1("text:\n");
- script += dotstuff( messageText.isEmpty() ? defaultMessageText() : messageText \
); + script += dotstuff( messageText.isEmpty() ? \
VacationUtils::defaultMessageText() : messageText ); script += QString::fromLatin1( \
"\n.\n;\n" ); return script;
}
@@ -130,11 +131,11 @@ bool Vacation::parseScript( const QString & script, QString & \
messageText,
int & notificationInterval, QStringList & aliases,
bool & sendForSpam, QString & domainName ) {
if ( script.trimmed().isEmpty() ) {
- messageText = defaultMessageText();
- notificationInterval = defaultNotificationInterval();
- aliases = defaultMailAliases();
- sendForSpam = defaultSendForSpam();
- domainName = defaultDomainName();
+ messageText = VacationUtils::defaultMessageText();
+ notificationInterval = VacationUtils::defaultNotificationInterval();
+ aliases = VacationUtils::defaultMailAliases();
+ sendForSpam = VacationUtils::defaultSendForSpam();
+ domainName = VacationUtils::defaultDomainName();
return true;
}
@@ -162,45 +163,6 @@ bool Vacation::parseScript( const QString & script, QString & \
messageText, return true;
}
-QString Vacation::defaultMessageText() {
- return i18n( "I am out of office till %1.\n"
- "\n"
- "In urgent cases, please contact Mrs. \"vacation replacement\"\n"
- "\n"
- "email: \"email address of vacation replacement\"\n"
- "phone: +49 711 1111 11\n"
- "fax.: +49 711 1111 12\n"
- "\n"
- "Yours sincerely,\n"
- "-- \"enter your name and email address here\"\n",
- KGlobal::locale()->formatDate( QDate::currentDate().addDays( 1 ) ) \
);
-}
-
-int Vacation::defaultNotificationInterval() {
- return 7; // days
-}
-
-QStringList Vacation::defaultMailAliases()
-{
- QStringList sl;
- KPIMIdentities::IdentityManager manager( true );
- KPIMIdentities::IdentityManager::ConstIterator end(manager.end());
- for ( KPIMIdentities::IdentityManager::ConstIterator it = manager.begin(); it != \
end ; ++it ) {
- if ( !(*it).primaryEmailAddress().isEmpty() ) {
- sl.push_back( (*it).primaryEmailAddress() );
- }
- sl += (*it).emailAliases();
- }
- return sl;
-}
-
-bool Vacation::defaultSendForSpam() {
- return VacationSettings::outOfOfficeReactToSpam();
-}
-
-QString Vacation::defaultDomainName() {
- return VacationSettings::outOfOfficeDomain();
-}
void Vacation::slotGetResult( KManageSieve::SieveJob * job, bool success,
const QString & script, bool active ) {
@@ -224,11 +186,11 @@ void Vacation::slotGetResult( KManageSieve::SieveJob * job, \
bool success, if ( !mDialog && !mCheckOnly )
mDialog = new VacationDialog( i18n("Configure \"Out of Office\" Replies"), \
0, false );
- QString messageText = defaultMessageText();
- int notificationInterval = defaultNotificationInterval();
- QStringList aliases = defaultMailAliases();
- bool sendForSpam = defaultSendForSpam();
- QString domainName = defaultDomainName();
+ QString messageText = VacationUtils::defaultMessageText();
+ int notificationInterval = VacationUtils::defaultNotificationInterval();
+ QStringList aliases = VacationUtils::defaultMailAliases();
+ bool sendForSpam = VacationUtils::defaultSendForSpam();
+ QString domainName = VacationUtils::defaultDomainName();
if ( !success ) active = false; // default to inactive
if ( !mCheckOnly && ( !success || !parseScript( script, messageText, \
notificationInterval, aliases, sendForSpam, domainName ) ) ) @@ -271,11 +233,11 @@ \
void Vacation::slotDialogDefaults() { if ( !mDialog )
return;
mDialog->setActivateVacation( true );
- mDialog->setMessageText( defaultMessageText() );
- mDialog->setNotificationInterval( defaultNotificationInterval() );
- mDialog->setMailAliases( defaultMailAliases().join(QLatin1String(", ")) );
- mDialog->setSendForSpam( defaultSendForSpam() );
- mDialog->setDomainName( defaultDomainName() );
+ mDialog->setMessageText( VacationUtils::defaultMessageText() );
+ mDialog->setNotificationInterval( VacationUtils::defaultNotificationInterval() \
); + mDialog->setMailAliases( \
VacationUtils::defaultMailAliases().join(QLatin1String(", ")) ); + \
mDialog->setSendForSpam( VacationUtils::defaultSendForSpam() ); + \
mDialog->setDomainName( VacationUtils::defaultDomainName() ); \
mDialog->setDomainCheck( false ); }
diff --git a/libksieve/ksieveui/vacation/vacation.h \
b/libksieve/ksieveui/vacation/vacation.h index 5e0b296..80b3d0f 100644
--- a/libksieve/ksieveui/vacation/vacation.h
+++ b/libksieve/ksieveui/vacation/vacation.h
@@ -52,12 +52,6 @@ public:
void showVacationDialog();
- static QString defaultMessageText();
- static int defaultNotificationInterval();
- static QStringList defaultMailAliases();
- static bool defaultSendForSpam();
- static QString defaultDomainName();
-
protected:
static QString composeScript( const QString & messageText,
int notificationInterval,
diff --git a/libksieve/ksieveui/vacation/vacationutils.cpp \
b/libksieve/ksieveui/vacation/vacationutils.cpp new file mode 100644
index 0000000..b5168af
--- /dev/null
+++ b/libksieve/ksieveui/vacation/vacationutils.cpp
@@ -0,0 +1,65 @@
+/*
+ Copyright (c) 2013 Montel Laurent <montel@kde.org>
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License, version 2, as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#include "vacationutils.h"
+#include "sieve-vacation.h"
+#include <KPIMIdentities/IdentityManager>
+#include <KPIMIdentities/Identity>
+
+#include <KLocale>
+#include <KGlobal>
+#include <QDate>
+
+QString KSieveUi::VacationUtils::defaultMessageText() {
+ return i18n( "I am out of office till %1.\n"
+ "\n"
+ "In urgent cases, please contact Mrs. \"vacation replacement\"\n"
+ "\n"
+ "email: \"email address of vacation replacement\"\n"
+ "phone: +49 711 1111 11\n"
+ "fax.: +49 711 1111 12\n"
+ "\n"
+ "Yours sincerely,\n"
+ "-- \"enter your name and email address here\"\n",
+ KGlobal::locale()->formatDate( QDate::currentDate().addDays( 1 ) ) \
); +}
+
+int KSieveUi::VacationUtils::defaultNotificationInterval() {
+ return 7; // days
+}
+
+QStringList KSieveUi::VacationUtils::defaultMailAliases()
+{
+ QStringList sl;
+ KPIMIdentities::IdentityManager manager( true );
+ KPIMIdentities::IdentityManager::ConstIterator end(manager.end());
+ for ( KPIMIdentities::IdentityManager::ConstIterator it = manager.begin(); it != \
end ; ++it ) { + if ( !(*it).primaryEmailAddress().isEmpty() ) {
+ sl.push_back( (*it).primaryEmailAddress() );
+ }
+ sl += (*it).emailAliases();
+ }
+ return sl;
+}
+
+bool KSieveUi::VacationUtils::defaultSendForSpam() {
+ return VacationSettings::outOfOfficeReactToSpam();
+}
+
+QString KSieveUi::VacationUtils::defaultDomainName() {
+ return VacationSettings::outOfOfficeDomain();
+}
diff --git a/libksieve/ksieveui/vacation/vacationutils.h \
b/libksieve/ksieveui/vacation/vacationutils.h new file mode 100644
index 0000000..a6f90db
--- /dev/null
+++ b/libksieve/ksieveui/vacation/vacationutils.h
@@ -0,0 +1,34 @@
+/*
+ Copyright (c) 2013 Montel Laurent <montel@kde.org>
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License, version 2, as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#ifndef VACATIONUTILS_H
+#define VACATIONUTILS_H
+#include <QStringList>
+#include <QString>
+
+namespace KSieveUi {
+namespace VacationUtils {
+QString defaultMessageText();
+int defaultNotificationInterval();
+QStringList defaultMailAliases();
+bool defaultSendForSpam();
+QString defaultDomainName();
+
+}
+}
+
+#endif // VACATIONUTILS_H
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic