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

List:       kde-commits
Subject:    [kdepim] messagecomposer: Start to add sendlater support
From:       Montel Laurent <montel () kde ! org>
Date:       2013-07-01 5:38:34
Message-ID: E1UtWos-0008Ee-OZ () scm ! kde ! org
[Download RAW message or body]

Git commit 08c507ec101b4a18166c99fdc64ec4715ebca569 by Montel Laurent.
Committed on 01/07/2013 at 05:38.
Pushed by mlaurent into branch 'master'.

Start to add sendlater support

M  +1    -1    messagecomposer/CMakeLists.txt
M  +4    -1    messagecomposer/composer/composerviewbase.cpp
M  +16   -14   messagecomposer/composer/composerviewbase.h

http://commits.kde.org/kdepim/08c507ec101b4a18166c99fdc64ec4715ebca569

diff --git a/messagecomposer/CMakeLists.txt b/messagecomposer/CMakeLists.txt
index 4d1ead0..ab50dcc 100644
--- a/messagecomposer/CMakeLists.txt
+++ b/messagecomposer/CMakeLists.txt
@@ -112,7 +112,7 @@ kde4_add_kcfg_files(messagecomposer_src
 =

 kde4_add_library( messagecomposer ${LIBRARY_TYPE} ${messagecomposer_src} )
 target_link_libraries( messagecomposer ${KDE4_KIO_LIBS} ${KDEPIMLIBS_KMIME=
_LIBS} ${KDEPIMLIBS_AKONADI_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIM=
LIBS_MAILTRANSPORT_LIBS} ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} ${KDEPIMLIBS_KPIMI=
DENTITIES_LIBS}
- messagecore messageviewer templateparser kleo kdepim ${QGPGME_LIBRARIES} =
${Grantlee_GUI_LIBRARIES})
+ messagecore messageviewer templateparser kleo kdepim ${QGPGME_LIBRARIES} =
${Grantlee_GUI_LIBRARIES} sendlater)
 =

 set_target_properties( messagecomposer PROPERTIES VERSION ${GENERIC_LIB_VE=
RSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 =

diff --git a/messagecomposer/composer/composerviewbase.cpp b/messagecompose=
r/composer/composerviewbase.cpp
index eaf81e6..c0a6a10 100644
--- a/messagecomposer/composer/composerviewbase.cpp
+++ b/messagecomposer/composer/composerviewbase.cpp
@@ -33,6 +33,8 @@
 #include "utils/util.h"
 #include "imagescaling/imagescalingutils.h"
 =

+#include "sendlateragent/sendlaterinfo.h"
+
 #include <messageviewer/viewer/objecttreeemptysource.h>
 #include <messageviewer/viewer/objecttreeparser.h>
 #include <messagecore/helpers/messagehelpers.h>
@@ -100,6 +102,7 @@ MessageComposer::ComposerViewBase::ComposerViewBase ( Q=
Object* parent, QWidget *
  , m_autoSaveTimer( 0 )
  , m_autoSaveErrorShown( false )
  , m_autoSaveInterval( 1 * 1000 * 60 ) // default of 1 min
+ , mSendLaterInfo (0)
 {
   m_charsets << "utf-8"; // default, so we have a backup in case client co=
de forgot to set.
 =

@@ -109,7 +112,7 @@ MessageComposer::ComposerViewBase::ComposerViewBase ( Q=
Object* parent, QWidget *
 =

 MessageComposer::ComposerViewBase::~ComposerViewBase()
 {
-
+  delete mSendLaterInfo;
 }
 =

 bool MessageComposer::ComposerViewBase::isComposing() const
diff --git a/messagecomposer/composer/composerviewbase.h b/messagecomposer/=
composer/composerviewbase.h
index 681217f..ee68ffd 100644
--- a/messagecomposer/composer/composerviewbase.h
+++ b/messagecomposer/composer/composerviewbase.h
@@ -37,27 +37,27 @@ class QAction;
 class KJob;
 class QWidget;
 =

-namespace Akonadi
-{
-  class CollectionComboBox;
+namespace SendLater {
+class SendLaterInfo;
 }
 =

-namespace MailTransport
-{
-  class TransportComboBox;
+namespace Akonadi {
+class CollectionComboBox;
+}
+
+namespace MailTransport {
+class TransportComboBox;
 class MessageQueueJob;
 }
 =

-namespace KPIMIdentities
-{
-  class IdentityCombo;
-  class Identity;
-  class IdentityManager;
+namespace KPIMIdentities {
+class IdentityCombo;
+class Identity;
+class IdentityManager;
 }
 =

-namespace Kleo
-{
-  class KeyResolver;
+namespace Kleo {
+class KeyResolver;
 }
 =

 namespace MessageComposer {
@@ -332,6 +332,8 @@ private:
 =

   MessageComposer::MessageSender::SendMethod mSendMethod;
   MessageComposer::MessageSender::SaveIn mSaveIn;
+
+  SendLater::SendLaterInfo *mSendLaterInfo;
 };
 =

 } // namespace
[prev in list] [next in list] [prev in thread] [next in thread]