[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim] importwizard: Add DelayedMarkAsRead
From:       Montel Laurent <montel () kde ! org>
Date:       2012-08-31 20:24:16
Message-ID: 20120831202416.77AEEA6094 () git ! kde ! org
[Download RAW message or body]

Git commit c48fc9d8ee9edf0ed964aeac47a1b2a5c9583db1 by Montel Laurent.
Committed on 31/08/2012 at 16:40.
Pushed by mlaurent into branch 'master'.

Add DelayedMarkAsRead

M  +13   -0    importwizard/claws-mail/clawsmailsettings.cpp
M  +2    -0    importwizard/claws-mail/clawsmailsettings.h
M  +1    -1    importwizard/sylpheed/sylpheedsettings.h

http://commits.kde.org/kdepim/c48fc9d8ee9edf0ed964aeac47a1b2a5c9583db1

diff --git a/importwizard/claws-mail/clawsmailsettings.cpp \
b/importwizard/claws-mail/clawsmailsettings.cpp index 801cef2c..2a01b95 100644
--- a/importwizard/claws-mail/clawsmailsettings.cpp
+++ b/importwizard/claws-mail/clawsmailsettings.cpp
@@ -132,3 +132,16 @@ void ClawsMailSettings::readTemplateFormat(const KConfigGroup& \
                group)
     addKmailConfig(QLatin1String("TemplateParser"), \
QLatin1String("TemplateNewMessage"), convertToKmailTemplate(composerNewMessage));  }
 }
+
+void ClawsMailSettings::readGlobalSettings(const KConfigGroup& group)
+{
+    SylpheedSettings::readGlobalSettings(group);
+    if(!group.readEntry(QLatin1String("check_while_typing"),0) == 1) {
+      addKmailConfig(QLatin1String("Spelling"), \
QLatin1String("backgroundCheckerEnabled"), true); +    }
+    const int markAsRead = group.readEntry(QLatin1String("mark_as_read_delay"),-1);
+    if(markAsRead!=-1) {
+      addKmailConfig(QLatin1String("Behaviour"), QLatin1String("DelayedMarkTime"), \
markAsRead); +      addKmailConfig(QLatin1String("Behaviour"), \
QLatin1String("DelayedMarkAsRead"), true); +    }
+}
diff --git a/importwizard/claws-mail/clawsmailsettings.h \
b/importwizard/claws-mail/clawsmailsettings.h index 7fda7d8..3ae1abb 100644
--- a/importwizard/claws-mail/clawsmailsettings.h
+++ b/importwizard/claws-mail/clawsmailsettings.h
@@ -34,6 +34,8 @@ protected:
   //Reimplement from sylpheed
   void readSettingsColor(const KConfigGroup& group);
   void readTemplateFormat(const KConfigGroup& group);
+  void readGlobalSettings(const KConfigGroup& group);
+
 private:
   QString writeColor(const QColor& col);
 };
diff --git a/importwizard/sylpheed/sylpheedsettings.h \
b/importwizard/sylpheed/sylpheedsettings.h index cf637c9..b159ea9 100644
--- a/importwizard/sylpheed/sylpheedsettings.h
+++ b/importwizard/sylpheed/sylpheedsettings.h
@@ -35,7 +35,7 @@ public:
 
 protected:
   void readCustomHeader(QFile *customHeaderFile);
-  void readGlobalSettings(const KConfigGroup& group);
+  virtual void readGlobalSettings(const KConfigGroup& group);
   void readAccount(const KConfigGroup& accountConfig, bool checkMailOnStartup , int \
intervalCheckMail);  void readIdentity( const KConfigGroup& accountConfig );
   QString readTransport( const KConfigGroup& accountConfig );


[prev in list] [next in list] [prev in thread] [next in thread]