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

List:       kde-commits
Subject:    [kdepim] /: Store send later action
From:       Montel Laurent <montel () kde ! org>
Date:       2013-07-01 5:56:21
Message-ID: E1UtX65-00068k-RA () scm ! kde ! org
[Download RAW message or body]

Git commit 76b205e4ef7fe4bef3c79dd6b475485d3b778722 by Montel Laurent.
Committed on 01/07/2013 at 05:56.
Pushed by mlaurent into branch 'master'.

Store send later action

M  +7    -0    messagecomposer/composer/composerviewbase.cpp
M  +5    -0    messagecomposer/composer/composerviewbase.h
M  +5    -4    sendlateragent/sendlaterdialog.h

http://commits.kde.org/kdepim/76b205e4ef7fe4bef3c79dd6b475485d3b778722

diff --git a/messagecomposer/composer/composerviewbase.cpp \
b/messagecomposer/composer/composerviewbase.cpp index 6ac47d4..546313d 100644
--- a/messagecomposer/composer/composerviewbase.cpp
+++ b/messagecomposer/composer/composerviewbase.cpp
@@ -110,6 +110,7 @@ MessageComposer::ComposerViewBase::ComposerViewBase ( QObject* \
parent, QWidget *  , m_autoSaveErrorShown( false )
  , m_autoSaveInterval( 1 * 1000 * 60 ) // default of 1 min
  , mSendLaterInfo (0)
+ , mSendLaterAction(SendLater::SendLaterDialog::Unknown)
 {
   m_charsets << "utf-8"; // default, so we have a backup in case client code forgot \
to set.  
@@ -1884,4 +1885,10 @@ bool \
MessageComposer::ComposerViewBase::determineWhetherToEncrypt( bool doEncryp  return \
encrypt || doEncryptCompletely;  }
 
+void MessageComposer::ComposerViewBase::setSendLaterInfo( SendLater::SendLaterInfo \
*info) +{
+    delete mSendLaterInfo;
+    mSendLaterInfo = info;
+}
+
 #include "composerviewbase.moc"
diff --git a/messagecomposer/composer/composerviewbase.h \
b/messagecomposer/composer/composerviewbase.h index ee68ffd..e31ea9e 100644
--- a/messagecomposer/composer/composerviewbase.h
+++ b/messagecomposer/composer/composerviewbase.h
@@ -24,6 +24,7 @@
 #include "messagecomposer_export.h"
 #include "sender/messagesender.h"
 #include "messagecomposer/recipient/recipient.h"
+#include "sendlateragent/sendlaterdialog.h"
 
 #include <akonadi/collection.h>
 #include <KDE/KMime/Message>
@@ -41,6 +42,7 @@ namespace SendLater {
 class SendLaterInfo;
 }
 
+
 namespace Akonadi {
 class CollectionComboBox;
 }
@@ -207,6 +209,8 @@ public:
 
   bool hasMissingAttachments( const QStringList& attachmentKeywords );
 
+  void setSendLaterInfo( SendLater::SendLaterInfo *info);
+
 public slots:
 
   void identityChanged( const KPIMIdentities::Identity &ident, const \
KPIMIdentities::Identity &oldIdent, bool msgCleared = false); @@ -334,6 +338,7 @@ \
private:  MessageComposer::MessageSender::SaveIn mSaveIn;
 
   SendLater::SendLaterInfo *mSendLaterInfo;
+  SendLater::SendLaterDialog::SendLaterAction mSendLaterAction;
 };
 
 } // namespace
diff --git a/sendlateragent/sendlaterdialog.h b/sendlateragent/sendlaterdialog.h
index 54ab751..a25ed36 100644
--- a/sendlateragent/sendlaterdialog.h
+++ b/sendlateragent/sendlaterdialog.h
@@ -33,10 +33,11 @@ class SENDLATER_EXPORT SendLaterDialog : public KDialog
     Q_OBJECT
 public:
     enum SendLaterAction {
-        SendNow = 0,
-        SendLater = 1,
-        Canceled = 2,
-        SendDeliveryAtTime = 3
+        Unknown = 0,
+        SendNow = 1,
+        SendLater = 2,
+        Canceled = 3,
+        SendDeliveryAtTime = 4
     };
 
     explicit SendLaterDialog(SendLater::SendLaterInfo *info, QWidget *parent = 0);


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