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

List:       kde-commits
Subject:    KDE/kdepim/mobile/mail
From:       Andras Mantia <amantia () kde ! org>
Date:       2010-10-14 11:48:26
Message-ID: 20101014114826.3BCA4AC895 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1185846 by amantia:

Implement Reply Without Quoting.

 M  +8 -0      kmail-mobile.qml  
 M  +3 -0      mailactionmanager.cpp  
 M  +14 -1     mainview.cpp  
 M  +2 -1      mainview.h  


--- trunk/KDE/kdepim/mobile/mail/kmail-mobile.qml #1185845:1185846
@@ -95,6 +95,14 @@
             }
             KPIM.Button2 {
               width: parent.width
+              buttonText : KDE.i18n( "Reply Without Quoting" )
+              onClicked : {
+                application.getAction("message_reply_without_quoting", \
"").trigger(); +                replyOptionsPage.visible = false
+              }
+            }
+            KPIM.Button2 {
+              width: parent.width
               buttonText : KDE.i18n( "Discard" )
               onClicked : {
                 replyOptionsPage.visible = false
--- trunk/KDE/kdepim/mobile/mail/mailactionmanager.cpp #1185845:1185846
@@ -66,6 +66,9 @@
   action = actionCollection->addAction("message_reply_to_list");
   action->setText( i18n("Reply to Mailing List") );
 
+  action = actionCollection->addAction("message_reply_without_quoting");
+  action->setText( i18n("Reply Without Quoting") );
+
   action = actionCollection->addAction("message_reply_variants");
 
   action = actionCollection->addAction("message_forward");
--- trunk/KDE/kdepim/mobile/mail/mainview.cpp #1185845:1185846
@@ -156,6 +156,7 @@
   connect( actionCollection()->action( "message_reply_to_all" ), SIGNAL( triggered( \
bool ) ), SLOT( replyToAll() ) );  connect( actionCollection()->action( \
"message_reply_to_author" ), SIGNAL( triggered( bool ) ), SLOT( replyToAuthor() ) );  \
connect( actionCollection()->action( "message_reply_to_list" ), SIGNAL( triggered( \
bool ) ), SLOT( replyToMailingList() ) ); +  connect( actionCollection()->action( \
"message_reply_without_quoting" ), SIGNAL( triggered( bool ) ), SLOT( \
replyWithoutQuoting() ) );  connect( actionCollection()->action( "message_forward" ), \
SIGNAL( triggered( bool ) ), SLOT( forwardMessage() ) );  connect( \
actionCollection()->action( "message_forward_as_attachment" ), SIGNAL( triggered( \
bool ) ), SLOT( forwardAsAttachment() ) );  connect( actionCollection()->action( \
"message_redirect" ), SIGNAL( triggered( bool ) ), SLOT( redirect() ) ); @@ -425,11 \
+426,12 @@  reply( item.id(), MessageComposer::ReplyList );
 }
 
-void MainView::reply( quint64 id, MessageComposer::ReplyStrategy replyStrategy )
+void MainView::reply( quint64 id, MessageComposer::ReplyStrategy replyStrategy, bool \
quoteOriginal )  {
   ItemFetchJob *job = new ItemFetchJob( Item( id ), this );
   job->fetchScope().fetchFullPayload();
   job->setProperty( "replyStrategy", QVariant::fromValue( replyStrategy ) );
+  job->setProperty( "quoteOriginal", QVariant::fromValue( quoteOriginal ) );
   connect( job, SIGNAL( result( KJob* ) ), SLOT( replyFetchResult( KJob* ) ) );
 }
 
@@ -447,6 +449,8 @@
   factory.setIdentityManager( MobileKernel::self()->identityManager() );
   factory.setReplyStrategy( fetchJob->property( "replyStrategy" \
).value<MessageComposer::ReplyStrategy>() );  
+  factory.setQuote( fetchJob->property( "quoteOriginal" ).toBool() );
+  
   ComposerView *composer = new ComposerView;
   composer->setMessage( factory.createReply().msg );
   composer->show();
@@ -548,6 +552,15 @@
   reply( item.id(), MessageComposer::ReplySmart );
 }
 
+void MainView::replyWithoutQuoting()
+{
+  const Item item = currentItem();
+  if ( !item.isValid() )
+    return;
+
+  reply( item.id(), MessageComposer::ReplySmart, false);
+}
+
 void MainView::replyToAll()
 {
   const Item item = currentItem();
--- trunk/KDE/kdepim/mobile/mail/mainview.h #1185845:1185846
@@ -78,6 +78,7 @@
     void replyToAuthor();
     void replyToMailingList();
     void replyToMessage();
+    void replyWithoutQuoting();
     void sendAgain();
     void sendQueued();
     void sendQueuedVia();
@@ -112,7 +113,7 @@
     void showExpireProperties();
 
   private:
-    void reply( quint64 id, MessageComposer::ReplyStrategy replyStrategy );
+    void reply( quint64 id, MessageComposer::ReplyStrategy replyStrategy, bool \
quoteOriginal = true );  void forward( quint64 id, ForwardMode mode );
     void findCreateDefaultCollection( Akonadi::SpecialMailCollections::Type type );
     void recoverAutoSavedMessages();


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