[Kde-pim] [kdepim] mobile/mail: ifdef out the broken compile

[Allen Winter]

On Sunday 20 January 2013 02:32:05 PM Jonathan Marten wrote:
> Hello Allen,
> 
> Apologies for breaking the compile of mobile;  should really have made sure to 
> check the whole of kdepim with this change, or at least grepped for the 
> removed header.  I've prototyped a fix, but would welcome your advice on how 
> to proceed.  Should we:
> 
> (a) remove the show_expire_properties action from kmail-mobile (with the 
> corresponding slot, etc) and add the page to the standard collection 
> properties dialogue instead, or:
> 
> (b) retain the action, and have it open a collection properties dialogue but 
> with a single "Expiry" page, or:
> 
> (c) retain the action and have it open the standard collection properties 
> dialogue, with the "Expiry" page added, at that page (i.e. as desktop KMail 
> now does).
> 
> I'd tend to favour (a) as the option is not a frequently used one, and 
> simplifying the GUI should be worthwhile for a mobile app.  But let me know 
> what you think would be the best option, and I'll submit the change for 
> review.
> 

(a) sounds fine to me.
I was hoping someone else who knows the Kontact Touch UI would answer though.


> 
> On Saturday 19 January 2013 21:02:03 Allen Winter wrote:
> > Git commit 0ce3b5c93ba3b8a17e9e63fcae561d01f8e030c7 by Allen Winter.
> > Committed on 19/01/2013 at 20:59.
> > Pushed by winterz into branch 'master'.
> > 
> > ifdef out the broken compile
> > Jonathan: please port to your new folder properties for expiry
> > CCMAIL: jjm at keelhaul.me.uk
> > 
> > M  +2    -1    mobile/mail/mainview.cpp
> > 
> > http://commits.kde.org/kdepim/0ce3b5c93ba3b8a17e9e63fcae561d01f8e030c7
> > 
> > diff --git a/mobile/mail/mainview.cpp b/mobile/mail/mainview.cpp
> > index 80df3ba..ad2e2e9 100644
> > --- a/mobile/mail/mainview.cpp
> > +++ b/mobile/mail/mainview.cpp
> > @@ -97,7 +97,6 @@
> >  #include <kpimidentities/identitymanager.h>
> >  #include <kselectionproxymodel.h>
> >  #include <kstandarddirs.h>
> > -#include <mailcommon/expirypropertiesdialog.h>
> >  #include <mailcommon/filter/filteraction.h>
> >  #include <mailcommon/foldercollection.h>
> >  #include <mailcommon/mailutil.h>
> > @@ -1691,6 +1690,7 @@ void MainView::folderChanged()
> > 
> >  void MainView::showExpireProperties()
> >  {
> > +#if 0
> >    const QItemSelectionModel *collectionSelectionModel =
> > regularSelectionModel(); if (
> > collectionSelectionModel->selection().indexes().isEmpty() ) return;
> > @@ -1701,6 +1701,7 @@ void MainView::showExpireProperties()
> > 
> >    MailCommon::ExpiryPropertiesDialog *dlg = new
> > MailCommon::ExpiryPropertiesDialog( this, collection ); dlg->show();
> > +#endif
> >  }
> > 
> >  void MainView::moveToOrEmptyTrash()
> 
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/