Commit 90d63a9b authored by Volker Krause's avatar Volker Krause
Browse files

SVN_MERGE

Merged revisions 1021457,1021459,1021473,1021514-1021515,1021518,1021522,1021525,1021527,1021532,1021534,1021536,1021540,1021545-1021546,1021549,1021551,1021553,1021561,1021580,1021591,1021657,1021698,1021821 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

................
  r1021457 | tnyblom | 2009-09-09 10:54:51 +0200 (Wed, 09 Sep 2009) | 7 lines
  
  Crash guard.
  
  Should fix the symptoms in bug 153411, but it's not the cure.
  The null consumer should not be there at all.
  
  CCBUG: 153411
................
  r1021459 | tokoe | 2009-09-09 11:20:38 +0200 (Wed, 09 Sep 2009) | 3 lines
  
  Add first patch from Marquel to the NepomukCalendarFeeder
  with some small adaptions.
................
  r1021473 | scripty | 2009-09-09 11:51:14 +0200 (Wed, 09 Sep 2009) | 1 line
  
  SVN_SILENT made messages (.desktop file)
................
  r1021514 | tmcguire | 2009-09-09 14:55:37 +0200 (Wed, 09 Sep 2009) | 576 lines
  
  Block cyclic merges, release stuff, etc
  SVN_SILENT
  SVN_MERGE
  Blocked revisions 1015870,1015923,1015931,1015933,1015935-1015937,1015941-1015942,1015944,1015946,1015949,1015951-1015954,1015957-1015958,1015963,1016360,1016651,1016654,1017787,1017873,1019070,1019447,1019850,1020969-1020970,1021200,1021288-1021289,1021295,1021301 via svnmerge
  
  ................
    r1015870 | tmcguire | 2009-08-26 15:34:46 +0200 (Wed, 26 Aug 2009) | 7 lines
    
    Crossport r1014138 by tmcguire from trunk to the enterprise4 branch:
    
    Fix the problem that the forward menu was empty, because the action list was
    plugged before createGUI() was called.
    Also, clean up a bit, for example don't set the shortcuts twice.
  ................
    r1015923 | winterz | 2009-08-26 18:12:14 +0200 (Wed, 26 Aug 2009) | 2 lines
    
    revert so I can fix my last svnmerge
  ................
    r1015931 | tmcguire | 2009-08-26 18:21:20 +0200 (Wed, 26 Aug 2009) | 118 lines
    
    Block cyclic merges, bugfixes for new features, KAlarm etc
    SVN_SILENT
    Blocked revisions 1013338,1013402,1013437,1013439,1013442,1013657,1013679,1013683,1014832,1014869,1015070,1015271 via svnmerge
    
    ................
      r1013338 | tmcguire | 2009-08-19 17:35:55 +0200 (Wed, 19 Aug 2009) | 7 lines
      
      Backport of:
      SVN commit 1012649 by tmcguire:
      
      Don't crash on mails where there are two embedded images on the same text block.
      
      CCBUG: 204214
    ................
      r1013402 | mkoller | 2009-08-19 21:30:29 +0200 (Wed, 19 Aug 2009) | 9 lines
      
      
      Backport r1013400 by mkoller from trunk to the 4.3 branch:
      
      CCBUG: 204257
      
      Don't unhide all folders when dragging over the tree, as the hidden
      folders got hidden due to a filter for a reason
    ................
      r1013437 | djarvie | 2009-08-19 23:15:59 +0200 (Wed, 19 Aug 2009) | 2 lines
      
      Bug 203957: fix alarms being marked invalid when restoring from previous session.
    ................
      r1013439 | tmcguire | 2009-08-19 23:16:21 +0200 (Wed, 19 Aug 2009) | 5 lines
      
      Backport r1013436 by tmcguire from trunk to the 4.3 branch:
      
      Don't crash when pasting an image from the clipboard.
    ................
      r1013442 | djarvie | 2009-08-19 23:27:48 +0200 (Wed, 19 Aug 2009) | 1 line
      
      Style
    ................
      r1013657 | winterz | 2009-08-20 13:45:11 +0200 (Thu, 20 Aug 2009) | 3 lines
      
      increase version string for upcoming 4.3.1 release.
      CCMAIL: kde-pim@kde.org
    ................
      r1013679 | winterz | 2009-08-20 14:39:56 +0200 (Thu, 20 Aug 2009) | 24 lines
      
      Backport r1007406 by tmcguire from trunk to the 4.3 branch:
      
      SVN_MERGE
      Merged revisions 1006371 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
      
      ................
        r1006371 | winterz | 2009-08-03 18:17:49 +0200 (Mon, 03 Aug 2009) | 13 lines
        
        Merged revisions 1006369 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1006369 | winterz | 2009-08-03 12:09:55 -0400 (Mon, 03 Aug 2009) | 6 lines
          
          when DND email messages as attachments, try to use the mail subject as the
          attachment name.
          kolab/issue3772
          
          MERGE: e4,trunk
        ........
      ................
    ................
      r1013683 | winterz | 2009-08-20 14:40:47 +0200 (Thu, 20 Aug 2009) | 23 lines
      
      Backport r1013408 by tmcguire from trunk to the 4.3 branch:
      
      SVN_MERGE
      Merged revisions 1011454 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
      
      ................
        r1011454 | winterz | 2009-08-14 19:37:54 +0200 (Fri, 14 Aug 2009) | 12 lines
        
        Merged revisions 1011452 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1011452 | winterz | 2009-08-14 13:19:44 -0400 (Fri, 14 Aug 2009) | 5 lines
          
          give attachments dragged from emails a proper name, even when the email subject
          is short.
          for kolab/issue3722
          MERGE: e4,trunk,4.3
        ........
      ................
    ................
      r1014832 | djarvie | 2009-08-24 00:16:20 +0200 (Mon, 24 Aug 2009) | 1 line
      
      Correct and add missing change
    ................
      r1014869 | scripty | 2009-08-24 05:33:36 +0200 (Mon, 24 Aug 2009) | 1 line
      
      SVN_SILENT made messages (.desktop file)
    ................
      r1015070 | winterz | 2009-08-24 14:32:18 +0200 (Mon, 24 Aug 2009) | 13 lines
      
      Backport r1015068 by winterz from trunk to the 4.3 branch:
      
      merge r1014915 | vkrause | 2009-08-24 04:57:14 -0400 (Mon, 24 Aug 2009)
      
      Unbreak LDAP completion.
      
      This reverts revisions 951431 and 951433 and adds a different fix for
      Kolab issue 1996 instead.
      
      Kolab issue 3359
    ................
      r1015271 | scripty | 2009-08-25 05:36:35 +0200 (Tue, 25 Aug 2009) | 1 line
      
      SVN_SILENT made messages (.desktop file)
    ................
  ................
    r1015933 | tmcguire | 2009-08-26 18:24:01 +0200 (Wed, 26 Aug 2009) | 13 lines
    
    Merged revisions 1013340 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1013340 | tmcguire | 2009-08-19 17:47:05 +0200 (Wed, 19 Aug 2009) | 6 lines
      
      Backport r1011385 by jtamate from trunk to the 4.3 branch:
      
      http://reviewboard.kde.org/r/1296/
      
      Make the menu entry "Use Fixed Font" follow what the reader win is doing.
    ........
  ................
    r1015935 | tmcguire | 2009-08-26 18:26:20 +0200 (Wed, 26 Aug 2009) | 10 lines
    
    Merged revisions 1013841 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1013841 | woebbe | 2009-08-20 23:30:09 +0200 (Thu, 20 Aug 2009) | 2 lines
      
      Also use the name of the attachment to determine the mime type if a silly, broken 
      client only gives you application/octet-stream as content type.
    ........
  ................
    r1015936 | tmcguire | 2009-08-26 18:30:27 +0200 (Wed, 26 Aug 2009) | 12 lines
    
    Merged revisions 1013860 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1013860 | winterz | 2009-08-21 00:37:04 +0200 (Fri, 21 Aug 2009) | 6 lines
      
      Backport r1013858 by winterz from trunk to the 4.3 branch:
      
      print the date *and* the time for the reminder time values
      MERGE: 4.3
    ........
  ................
    r1015937 | tmcguire | 2009-08-26 18:31:34 +0200 (Wed, 26 Aug 2009) | 13 lines
    
    Merged revisions 1014176 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1014176 | mkoller | 2009-08-21 21:30:00 +0200 (Fri, 21 Aug 2009) | 7 lines
      
      Backport r1014175 by mkoller from trunk to the 4.3 branch:
      
      CCBUG: 151141
      
      Limit wordwrap to max 998 chars per line according to RFC2822
    ........
  ................
    r1015941 | winterz | 2009-08-26 18:38:00 +0200 (Wed, 26 Aug 2009) | 12 lines
    
    Merged revisions 1015912 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1015912 | winterz | 2009-08-26 11:41:29 -0400 (Wed, 26 Aug 2009) | 5 lines
      
      fix initial sorting of the completion order entries
      kolab/issue3822
      
      MERGE: e4,trunk,4.3
    ........
  ................
    r1015942 | tmcguire | 2009-08-26 18:44:31 +0200 (Wed, 26 Aug 2009) | 13 lines
    
    Merged revisions 1014190 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1014190 | mkoller | 2009-08-21 22:09:49 +0200 (Fri, 21 Aug 2009) | 7 lines
      
      Backport r1014188 by mkoller from trunk to the 4.3 branch:
      
      CCBUG: 150759
      
      don't act on left/right cursor in a special way during selection (Shift pressed)
    ........
  ................
    r1015944 | tmcguire | 2009-08-26 18:45:40 +0200 (Wed, 26 Aug 2009) | 13 lines
    
    Merged revisions 1014199 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1014199 | mkoller | 2009-08-21 22:27:41 +0200 (Fri, 21 Aug 2009) | 7 lines
      
      Backport r1014198 by mkoller from trunk to the 4.3 branch:
      
      CCBUG: 150620
      
      fix lowercase typo which resulted in not detecting "OCT" as month
    ........
  ................
    r1015946 | tmcguire | 2009-08-26 18:46:54 +0200 (Wed, 26 Aug 2009) | 12 lines
    
    Merged revisions 1014300 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1014300 | winterz | 2009-08-22 13:54:08 +0200 (Sat, 22 Aug 2009) | 6 lines
      
      Backport r1014298 by winterz from trunk to the 4.3 branch:
      
      make sure the [Advanced] reminder button is enabled when editing Events and To-dos.
      MERGE: 4.3
    ........
  ................
    r1015949 | tmcguire | 2009-08-26 18:49:35 +0200 (Wed, 26 Aug 2009) | 17 lines
    
    Merged revisions 1014388 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1014388 | winterz | 2009-08-22 20:05:36 +0200 (Sat, 22 Aug 2009) | 11 lines
      
      Backport r1014387 by winterz from trunk to the 4.3 branch:
      
      in the D-Bus version of openComposer(), make sure to actually send the message
      if the hidden option is set.
      
      Note that one of the other openComposer() methods also has this possible bug but
      I'm not changing that at this time in order to reduce the possibility of regressions.
      
      MERGE: 4.3
    ........
  ................
    r1015951 | tmcguire | 2009-08-26 18:52:42 +0200 (Wed, 26 Aug 2009) | 14 lines
    
    Merged revisions 1014440 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1014440 | mkoller | 2009-08-22 22:40:48 +0200 (Sat, 22 Aug 2009) | 8 lines
      
      Backport r1014434 by mkoller from trunk to the 4.3 branch:
      
      CCBUG: 204780
      
      when cursor is in top most line, cursor up shall move focus to subject line
      also when cursor is after the last char in the line.
    ........
  ................
    r1015952 | tmcguire | 2009-08-26 18:55:04 +0200 (Wed, 26 Aug 2009) | 17 lines
    
    Not needed here.
    SVN_SILENT
    Blocked revisions 1014458 via svnmerge
    
    ........
      r1014458 | mkoller | 2009-08-22 23:39:19 +0200 (Sat, 22 Aug 2009) | 9 lines
      
      backport r1005691 by mkoller:
      
      make "mail to mailing list" action work again also on folders which
      do not contain a ML, which then - as was implemented in the slot - creates a
      normal new message without a To address.
      This make kmail compatible to KDE3 again and it simplifies the toolbar
      when a user uses the action "mail to mailing list" for all new mail creation - 
      without the need to think about which toolbutton (new mail or new mail to ML) to click...
    ........
  ................
    r1015953 | tmcguire | 2009-08-26 18:56:35 +0200 (Wed, 26 Aug 2009) | 13 lines
    
    Merged revisions 1014683 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1014683 | mkoller | 2009-08-23 17:29:59 +0200 (Sun, 23 Aug 2009) | 7 lines
      
      Backport r1014681 by mkoller from trunk to the 4.3 branch:
      
      CCBUG: 204765
      
      make sure to interpret status text as HTML instead showing tags as plain text
    ........
  ................
    r1015954 | tmcguire | 2009-08-26 18:58:48 +0200 (Wed, 26 Aug 2009) | 11 lines
    
    Merged revisions 1014688 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1014688 | mkoller | 2009-08-23 17:42:29 +0200 (Sun, 23 Aug 2009) | 5 lines
      
      Backport r1014687 by mkoller from trunk to the 4.3 branch:
      
      Properly decode mailto URL when dropping
    ........
  ................
    r1015957 | tmcguire | 2009-08-26 19:05:08 +0200 (Wed, 26 Aug 2009) | 14 lines
    
    Merged revisions 1015554 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1015554 | mkoller | 2009-08-25 22:53:27 +0200 (Tue, 25 Aug 2009) | 8 lines
      
      Backport r1015553 by mkoller from trunk to the 4.3 branch:
      
      CCBUG: 166922
      
      When not printing from kmail's separate reader window, use the font
      specified in the font settings.
    ........
  ................
    r1015958 | tmcguire | 2009-08-26 19:05:58 +0200 (Wed, 26 Aug 2009) | 13 lines
    
    Merged revisions 1015563 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1015563 | winterz | 2009-08-25 23:23:00 +0200 (Tue, 25 Aug 2009) | 7 lines
      
      Backport r1015561 by winterz from trunk to the 4.3 branch:
      
      fix crash that can happen when editing a to-do.
      CCBUG: 205067
      MERGE: 4.3
    ........
  ................
    r1015963 | tmcguire | 2009-08-26 19:07:18 +0200 (Wed, 26 Aug 2009) | 31 lines
    
    The Akregator blocks.
    CCMAIL: frank.osterfeld@kdemail.net
    SVN_SILENT
    Blocked revisions 1014557,1014560-1014561 via svnmerge
    
    ........
      r1014557 | osterfeld | 2009-08-23 12:48:46 +0200 (Sun, 23 Aug 2009) | 6 lines
      
      backport
      
      SVN commit 1011040 by mjansen:
      
      Fix memleak. Free the dummy factory if registerFactory returns false.
    ........
      r1014560 | osterfeld | 2009-08-23 12:51:32 +0200 (Sun, 23 Aug 2009) | 6 lines
      
      backport
      
      SVN commit 1011042 by mjansen:
      
      Fix memleak. Delete the articleModel if SelectionController is destroyed.
    ........
      r1014561 | osterfeld | 2009-08-23 12:52:40 +0200 (Sun, 23 Aug 2009) | 6 lines
      
      backport
      
      SVN commit 1011043 by mjansen:
      
      Fix memleak. Delete all registered factories when destroying the factory.
    ........
  ................
    r1016360 | winterz | 2009-08-27 17:49:35 +0200 (Thu, 27 Aug 2009) | 12 lines
    
    Recorded merge of revisions 1016324 via svnmerge from 
    Looks like this was already done in E4.
    
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1016324 | winterz | 2009-08-27 10:25:26 -0400 (Thu, 27 Aug 2009) | 3 lines
      
      remove the boxCenter as the image for it doesn't exist.
      MERGE: e4
    ........
  ................
    r1016651 | tmcguire | 2009-08-28 14:43:26 +0200 (Fri, 28 Aug 2009) | 1 line
    
    Update Newslog.txt
  ................
    r1016654 | tmcguire | 2009-08-28 14:44:45 +0200 (Fri, 28 Aug 2009) | 1 line
    
    SVN_SILENT Update version numbers for today's release.
  ................
    r1017787 | winterz | 2009-08-31 16:16:45 +0200 (Mon, 31 Aug 2009) | 12 lines
    
    Blocked revisions 1016647,1016653 via svnmerge
    
    ........
      r1016647 | tmcguire | 2009-08-28 08:30:45 -0400 (Fri, 28 Aug 2009) | 1 line
      
      Update Newslog.txt.
    ........
      r1016653 | tmcguire | 2009-08-28 08:44:44 -0400 (Fri, 28 Aug 2009) | 1 line
      
      SVN_SILENT Update version numbers for today's release.
    ........
  ................
    r1017873 | winterz | 2009-08-31 21:16:37 +0200 (Mon, 31 Aug 2009) | 26 lines
    
    Merged revisions 1017406,1017525,1017535 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1017406 | winterz | 2009-08-30 11:17:58 -0400 (Sun, 30 Aug 2009) | 5 lines
      
      follow recent changes in the trunk incidenceformatter for the displayViewer.
      part of the fixes for kolab/issue3618
      
      MERGE:e4
    ........
      r1017525 | winterz | 2009-08-30 16:31:30 -0400 (Sun, 30 Aug 2009) | 6 lines
      
      part 2: 
      follow recent changes in the trunk incidenceformatter for the displayViewer.
      part of the fixes for kolab/issue3618
      
      MERGE: e4
    ........
      r1017535 | winterz | 2009-08-30 16:57:03 -0400 (Sun, 30 Aug 2009) | 4 lines
      
      follow trunk for part3 of fixes for displayView formatting
      continuing improvements for kolab/issue3816
      MERGE: e4
    ........
  ................
    r1019070 | winterz | 2009-09-02 20:58:23 +0200 (Wed, 02 Sep 2009) | 9 lines
    
    merge SVN commit 1019064 by winterz from trunk to e4
    
    show UTC incidences in the local time zone, which is especially useful
    for Kolab users who see all their incidences in UTC.
    
    Based on a patch from Steffen Hanikel. Thanks!
    
    NOT needed in e35
  ................
    r1019447 | winterz | 2009-09-03 18:45:49 +0200 (Thu, 03 Sep 2009) | 13 lines
    
    Recorded merge of revisions 1019442 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1019442 | winterz | 2009-09-03 11:57:21 -0400 (Thu, 03 Sep 2009) | 7 lines
      
      backport SVN commit 1017853 by winterz from trunk to e35:
      
      follow the new IncidenceFormatter methods that put the Calendar name in
      the tooltip and displayView
      MERGE: e4
    ........
  ................
    r1019850 | winterz | 2009-09-04 18:19:01 +0200 (Fri, 04 Sep 2009) | 10 lines
    
    Blocked revisions 1019849 via svnmerge
    
    ........
      r1019849 | winterz | 2009-09-04 12:17:38 -0400 (Fri, 04 Sep 2009) | 4 lines
      
      remove the non-functional [...] button adjacent to the optional ReplyTo.
      fixes kolab/issue3803
      MERGE: none
    ........
  ................
    r1020969 | tmcguire | 2009-09-07 20:25:10 +0200 (Mon, 07 Sep 2009) | 1 line
    
    Update Newslog.txt
  ................
    r1020970 | tmcguire | 2009-09-07 20:28:32 +0200 (Mon, 07 Sep 2009) | 1 line
    
    SVN_SILENT Update version numbers for today's release.
  ................
    r1021200 | winterz | 2009-09-08 16:03:54 +0200 (Tue, 08 Sep 2009) | 17 lines
    
    Blocked revisions 1018164,1020965,1020971 via svnmerge
    
    ........
      r1018164 | winterz | 2009-09-01 07:42:33 -0400 (Tue, 01 Sep 2009) | 3 lines
      
      calendarhelper isn't ready yet. so remove it.
      this was committed by mistake.
    ........
      r1020965 | tmcguire | 2009-09-07 14:18:54 -0400 (Mon, 07 Sep 2009) | 1 line
      
      Update Newslog.txt
    ........
      r1020971 | tmcguire | 2009-09-07 14:28:39 -0400 (Mon, 07 Sep 2009) | 1 line
      
      SVN_SILENT Update version numbers for today's release.
    ........
  ................
    r1021288 | winterz | 2009-09-08 21:27:10 +0200 (Tue, 08 Sep 2009) | 6 lines
    
    merge SVN commit 1021235 by lueck from trunk to e4:
    
    add a desktop file for kontact-admin documentation to make it visible in khelpcenters navigation tree
    
    MERGE: none
  ................
    r1021289 | winterz | 2009-09-08 21:28:40 +0200 (Tue, 08 Sep 2009) | 8 lines
    
    Blocked revisions 1021150 via svnmerge
    
    ........
      r1021150 | ludwigreiter | 2009-09-08 06:27:24 -0400 (Tue, 08 Sep 2009) | 2 lines
      
      Removed not-fixed kolab/issue3717.
    ........
  ................
    r1021295 | winterz | 2009-09-08 21:40:47 +0200 (Tue, 08 Sep 2009) | 13 lines
    
    Merged revisions 1021292 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1021292 | winterz | 2009-09-08 15:35:40 -0400 (Tue, 08 Sep 2009) | 6 lines
      
      backport SVN commit 1021059 by winterz from trunk to e35:
      
      handle problems with editing in a more user-friendly way.
      
      MERGE: e4
    ........
  ................
    r1021301 | winterz | 2009-09-08 21:51:08 +0200 (Tue, 08 Sep 2009) | 13 lines
    
    Merged revisions 1021298 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1021298 | winterz | 2009-09-08 15:45:53 -0400 (Tue, 08 Sep 2009) | 6 lines
      
      backport SVN commit 1021060 by winterz from trunk to e35:
      
      improve error checking and error messages for failures in editing.
      
      MERGE: e4
    ........
  ................
................
  r1021515 | tmcguire | 2009-09-09 14:58:33 +0200 (Wed, 09 Sep 2009) | 18 lines
  
  SVN_MERGE
  Merged revisions 1015875 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1015875 | tmcguire | 2009-08-26 15:49:42 +0200 (Wed, 26 Aug 2009) | 10 lines
    
    Merged revisions 1015834 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1015834 | tmcguire | 2009-08-26 14:24:04 +0200 (Wed, 26 Aug 2009) | 3 lines
      
      Fix Till's todo: Also take local folders into account when collecting the resource folders.
      Fixes kolab/issue3792.
    ........
  ................
................
  r1021518 | tmcguire | 2009-09-09 15:05:00 +0200 (Wed, 09 Sep 2009) | 23 lines
  
  SVN_MERGE
  Merged revisions 1015902 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1015902 | tmcguire | 2009-08-26 17:11:13 +0200 (Wed, 26 Aug 2009) | 15 lines
    
    Merged revisions 1015811 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1015811 | tmcguire | 2009-08-26 13:55:50 +0200 (Wed, 26 Aug 2009) | 8 lines
      
      Make dragging attachments work again.
      The problem was that we no longer user file:// urls, but custom ones that start with
      attachment:.
      To fix this, we handle dragging ourselves, so we can deal with it properly and create a
      drag object that points to the actual temp file.
      
      kolab/issue3821
    ........
  ................
................
  r1021522 | tmcguire | 2009-09-09 15:07:20 +0200 (Wed, 09 Sep 2009) | 52 lines
  
  Block three more commits that shouldn't go into trunk which I overlooked
  SVN_MERGE
  SVN_SILENT
  Blocked revisions 1016357,1019454,1021301 via svnmerge
  
  ................
    r1016357 | winterz | 2009-08-27 17:43:25 +0200 (Thu, 27 Aug 2009) | 10 lines
    
    Merged revisions 1015867 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1015867 | tmcguire | 2009-08-26 09:28:09 -0400 (Wed, 26 Aug 2009) | 3 lines
      
      Fix another regression: Display images inline again.
      MERGE: e4 (already in trunk)
    ........
  ................
    r1019454 | winterz | 2009-09-03 19:02:22 +0200 (Thu, 03 Sep 2009) | 16 lines
    
    Merged revisions 1019450 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1019450 | winterz | 2009-09-03 12:56:08 -0400 (Thu, 03 Sep 2009) | 10 lines
      
      backport SVN commit 1018577 by winterz from trunk to e35:
      
      for displayView:
      + also show non-uri attachments
      + move the Calendar field prints to displayViewFormat(Event|Todo|Journal)
        instead of doing that in displayViewFormatHeader, because that screws-up
        the table row prints
      MERGE: e4
    ........
  ................
    r1021301 | winterz | 2009-09-08 21:51:08 +0200 (Tue, 08 Sep 2009) | 13 lines
    
    Merged revisions 1021298 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1021298 | winterz | 2009-09-08 15:45:53 -0400 (Tue, 08 Sep 2009) | 6 lines
      
      backport SVN commit 1021060 by winterz from trunk to e35:
      
      improve error checking and error messages for failures in editing.
      
      MERGE: e4
    ........
  ................
................
  r1021525 | tmcguire | 2009-09-09 15:13:42 +0200 (Wed, 09 Sep 2009) | 20 lines
  
  SVN_MERGE
  Merged revisions 1015919 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1015919 | winterz | 2009-08-26 17:50:34 +0200 (Wed, 26 Aug 2009) | 12 lines
    
    Merged revisions 1015912 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1015912 | winterz | 2009-08-26 11:41:29 -0400 (Wed, 26 Aug 2009) | 5 lines
      
      fix initial sorting of the completion order entries
      kolab/issue3822
      
      MERGE: e4,trunk,4.3
    ........
  ................
................
  r1021527 | tmcguire | 2009-09-09 15:18:19 +0200 (Wed, 09 Sep 2009) | 17 lines
  
  SVN_MERGE
  Merged revisions 1015921 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1015921 | tmcguire | 2009-08-26 18:08:44 +0200 (Wed, 26 Aug 2009) | 9 lines
    
    Merged revisions 1015918 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1015918 | tmcguire | 2009-08-26 17:50:21 +0200 (Wed, 26 Aug 2009) | 2 lines
      
      Fix the hopefully last regression with attachment handling: Handle shift-clicks correctly
    ........
  ................
................
  r1021532 | tmcguire | 2009-09-09 15:21:28 +0200 (Wed, 09 Sep 2009) | 21 lines
  
  SVN_SILENT
  SVN_MERGE
  Recorded merge of revisions 1015926 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1015926 | winterz | 2009-08-26 18:14:40 +0200 (Wed, 26 Aug 2009) | 12 lines
    
    Merged revisions 1015912 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1015912 | winterz | 2009-08-26 11:41:29 -0400 (Wed, 26 Aug 2009) | 5 lines
      
      fix initial sorting of the completion order entries
      kolab/issue3822
      
      MERGE: e4,trunk,4.3
    ........
  ................
................
  r1021534 | tmcguire | 2009-09-09 15:24:13 +0200 (Wed, 09 Sep 2009) | 20 lines
  
  SVN_MERGE
  Merged revisions 1015955 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1015955 | winterz | 2009-08-26 19:01:33 +0200 (Wed, 26 Aug 2009) | 12 lines
    
    Merged revisions 1015950 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1015950 | winterz | 2009-08-26 12:52:41 -0400 (Wed, 26 Aug 2009) | 5 lines
      
      make "Go to Today" work properly when in Work Week view.
      kolab/issue3671
      
      MERGE: e4,trunk,4.3
    ........
  ................
................
  r1021536 | tmcguire | 2009-09-09 15:29:15 +0200 (Wed, 09 Sep 2009) | 20 lines
  
  SVN_MERGE
  Merged revisions 1016356 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1016356 | winterz | 2009-08-27 17:32:40 +0200 (Thu, 27 Aug 2009) | 12 lines
    
    Merged revisions 1016353 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1016353 | winterz | 2009-08-27 11:26:36 -0400 (Thu, 27 Aug 2009) | 5 lines
      
      provide a bit more left-padding when printing
      kolab/issue3254
      
      MERGE: e4,trunk,4.3
    ........
  ................
................
  r1021540 | tmcguire | 2009-09-09 15:38:31 +0200 (Wed, 09 Sep 2009) | 19 lines
  
  SVN_MERGE
  Merged revisions 1016435 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1016435 | winterz | 2009-08-27 22:01:47 +0200 (Thu, 27 Aug 2009) | 11 lines
    
    Merged revisions 1016428 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1016428 | winterz | 2009-08-27 15:56:44 -0400 (Thu, 27 Aug 2009) | 4 lines
      
      ensure that recent addresses don't get double-double-quoted
      kolab/issue3812
      MERGE: e4,trunk,4.3
    ........
  ................
................
  r1021545 | tmcguire | 2009-09-09 15:42:42 +0200 (Wed, 09 Sep 2009) | 22 lines
  
  SVN_MERGE
  Merged revisions 1018372 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1018372 | winterz | 2009-09-01 18:21:34 +0200 (Tue, 01 Sep 2009) | 14 lines
    
    Merged revisions 1018368 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1018368 | winterz | 2009-09-01 12:10:27 -0400 (Tue, 01 Sep 2009) | 7 lines
      
      When decoding url's in partNodeFromXKMailUrl(), don't convert to latin1 first.
      In the calendar bodypartformatter, no longer any need to attempt
      conversion of the url to latin1 or any other encoding.
      
      fix for kolab/issue3717
      MERGE: e4,trunk
    ........
  ................
................
  r1021546 | tmcguire | 2009-09-09 15:45:17 +0200 (Wed, 09 Sep 2009) | 12 lines
  
  SVN_MERGE
  Merged revisions 1019122 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ........
    r1019122 | winterz | 2009-09-03 00:28:18 +0200 (Thu, 03 Sep 2009) | 4 lines
    
    improve menu text for adding/removing timezones
    MERGE: trunk
    DO_NOT_BACKPORT: 4.3 due to new i18n strings
  ........
................
  r1021549 | tmcguire | 2009-09-09 15:48:31 +0200 (Wed, 09 Sep 2009) | 20 lines
  
  SVN_MERGE
  Merged revisions 1019476 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1019476 | winterz | 2009-09-03 19:56:11 +0200 (Thu, 03 Sep 2009) | 12 lines
    
    Merged revisions 1019474 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1019474 | winterz | 2009-09-03 13:53:14 -0400 (Thu, 03 Sep 2009) | 5 lines
      
      don't always set the alarm on for new to-dos.
      should be the final fix for kolab/issue3788
      
      MERGE: e4,trunk
    ........
  ................
................
  r1021551 | tmcguire | 2009-09-09 15:50:53 +0200 (Wed, 09 Sep 2009) | 20 lines
  
  SVN_MERGE
  Merged revisions 1019556 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1019556 | winterz | 2009-09-03 23:10:46 +0200 (Thu, 03 Sep 2009) | 12 lines
    
    Merged revisions 1019553 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1019553 | winterz | 2009-09-03 16:55:24 -0400 (Thu, 03 Sep 2009) | 5 lines
      
      Volker's patch for missing LDAP sources in the completion list.
      for kolab/issue3827
      
      MERGE: e4,trunk,4.3
    ........
  ................
................
  r1021553 | tmcguire | 2009-09-09 15:54:44 +0200 (Wed, 09 Sep 2009) | 20 lines
  
  SVN_MERGE
  Merged revisions 1019831 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1019831 | winterz | 2009-09-04 16:59:28 +0200 (Fri, 04 Sep 2009) | 12 lines
    
    Merged revisions 1019828 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1019828 | winterz | 2009-09-04 10:49:59 -0400 (Fri, 04 Sep 2009) | 5 lines
      
      make sure authorization dialogs are shown on top.
      fixes kolab/issue3799
      
      MERGE:e4,trunk,4.3
    ........
  ................
................
  r1021561 | tokoe | 2009-09-09 16:20:53 +0200 (Wed, 09 Sep 2009) | 5 lines
  
  Allow to select all contacts from a given address book
  or address book folder.
  
  BUG: 206299
................
  r1021580 | yurchor | 2009-09-09 17:07:06 +0200 (Wed, 09 Sep 2009) | 1 line
  
  Typo fix
................
  r1021591 | tmcguire | 2009-09-09 18:04:29 +0200 (Wed, 09 Sep 2009) | 4 lines
  
  Don't be Expandable by default, because then it crashes by default because the fieldname is empty
  by default.
  This can happen when using the plain header style and there are more than 4 addressees.
................
  r1021657 | tnyblom | 2009-09-09 20:25:18 +0200 (Wed, 09 Sep 2009) | 4 lines
  
  Restore the original bcc field when resending (send again).
  
  BUG: 176590
................
  r1021698 | mkoller | 2009-09-09 22:43:39 +0200 (Wed, 09 Sep 2009) | 4 lines
  
  BUG: 98553
  
  Add account name to error dialog text
................
  r1021821 | vkrause | 2009-09-10 09:20:07 +0200 (Thu, 10 Sep 2009) | 4 lines
  
  Guard payload() calls and get rid of the no longer needed typedef.
  
  BUG: 206254 
................

svn path=/branches/work/akonadi-ports/kdepim/; revision=1021829
parents 95e33e91 61b5a90e
......@@ -45,6 +45,7 @@ set( kaddressbook_LIB_SRCS
mainwidget.cpp
modelcolumnmanager.cpp
quicksearchwidget.cpp
recursiveitemfetchjob.cpp
standardcontactactionmanager.cpp
xxport/csv/csv_xxport.cpp
xxport/csv/csvimportdialog.cpp
......
......@@ -55,10 +55,14 @@ void ContactSelectionDialog::slotSelectedContacts( const KABC::Addressee::List &
accept();
}
void ContactSelectionDialog::slotOkClicked()
void ContactSelectionDialog::slotButtonClicked( int button )
{
// this will trigger slotSelectedContacts via signal/slot
mSelectionWidget->requestSelectedContacts();
if ( button == KDialog::Ok ) {
// this will trigger slotSelectedContacts via signal/slot
mSelectionWidget->requestSelectedContacts();
} else {
KDialog::slotButtonClicked( button );
}
}
#include "contactselectiondialog.moc"
......@@ -57,9 +57,11 @@ class ContactSelectionDialog : public KDialog
*/
KABC::Addressee::List selectedContacts() const;
protected Q_SLOTS:
void slotButtonClicked( int button );
private Q_SLOTS:
void slotSelectedContacts( const KABC::Addressee::List& );
void slotOkClicked();
private:
ContactSelectionWidget *mSelectionWidget;
......
......@@ -19,8 +19,11 @@
#include "contactselectionwidget.h"
#include "recursiveitemfetchjob.h"
#include <akonadi/contact/addressbookcombobox.h>
#include <akonadi/entitytreemodel.h>
#include <akonadi/itemfetchscope.h>
#include <klocale.h>
#include <QtCore/QAbstractItemModel>
......@@ -40,9 +43,6 @@ ContactSelectionWidget::ContactSelectionWidget( QAbstractItemModel *model, QItem
mSelectedContactsButton->setEnabled( mSelectionModel->hasSelection() );
mAddressBookSelection->setEnabled( false );
// disable until we can fetch a collection recursivly
mAddressBookContactsButton->setEnabled( false );
connect( mAddressBookContactsButton, SIGNAL( toggled( bool ) ),
mAddressBookSelection, SLOT( setEnabled( bool ) ) );
......@@ -136,7 +136,35 @@ void ContactSelectionWidget::collectSelectedContacts()
void ContactSelectionWidget::collectAddressBookContacts()
{
const Akonadi::Collection collection = mAddressBookSelection->selectedAddressBook();
if ( !collection.isValid() ) {
emit selectedContacts( KABC::Addressee::List() );
return;
}
Akonadi::RecursiveItemFetchJob *job = new Akonadi::RecursiveItemFetchJob( collection, this );
job->fetchScope().fetchFullPayload();
connect( job, SIGNAL( result( KJob* ) ), SLOT( addressBookContactsFetched( KJob* ) ) );
job->start();
}
void ContactSelectionWidget::addressBookContactsFetched( KJob *job )
{
KABC::Addressee::List contacts;
if ( !job->error() ) {
Akonadi::RecursiveItemFetchJob *fetchJob = qobject_cast<Akonadi::RecursiveItemFetchJob*>( job );
const Akonadi::Item::List items = fetchJob->items();
foreach ( const Akonadi::Item &item, items ) {
if ( item.hasPayload<KABC::Addressee>() ) {
contacts.append( item.payload<KABC::Addressee>() );
}
}
}
emit selectedContacts( contacts );
}
#include "contactselectionwidget.moc"
......@@ -29,6 +29,8 @@ class QItemSelectionModel;
class QLabel;
class QRadioButton;
class KJob;
namespace Akonadi
{
class AddressBookComboBox;
......@@ -71,6 +73,9 @@ class ContactSelectionWidget : public QWidget
*/
void selectedContacts( const KABC::Addressee::List &contacts );
private Q_SLOTS:
void addressBookContactsFetched( KJob* );
private:
void initGui();
......
/*
Copyright (c) 2009 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
This library is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
*/
#include "recursiveitemfetchjob.h"
#include <akonadi/collectionfetchjob.h>
#include <akonadi/itemfetchjob.h>
#include <akonadi/itemfetchscope.h>
#include <QtCore/QVariant>
using namespace Akonadi;
class RecursiveItemFetchJob::Private
{
public:
Private( const Collection &collection, RecursiveItemFetchJob *parent )
: mParent( parent ), mCollection( collection ), mFetchCount( 0 )
{
}
void collectionFetchResult( KJob *job )
{
if ( job->error() ) {
mParent->emitResult();
return;
}
const CollectionFetchJob *fetchJob = qobject_cast<CollectionFetchJob*>( job );
Collection::List collections = fetchJob->collections();
collections.prepend( mCollection );
foreach ( const Collection &collection, collections ) {
ItemFetchJob *itemFetchJob = new ItemFetchJob( collection, mParent );
itemFetchJob->setFetchScope( mFetchScope );
mParent->connect( itemFetchJob, SIGNAL( result( KJob* ) ),
mParent, SLOT( itemFetchResult( KJob* ) ) );
mFetchCount++;
}
}
void itemFetchResult( KJob *job )
{
if ( !job->error() ) {
const ItemFetchJob *fetchJob = qobject_cast<ItemFetchJob*>( job );
mItems << fetchJob->items();
}
mFetchCount--;
if ( mFetchCount == 0 )
mParent->emitResult();
}
RecursiveItemFetchJob *mParent;
Collection mCollection;
Item::List mItems;
ItemFetchScope mFetchScope;
int mFetchCount;
};
RecursiveItemFetchJob::RecursiveItemFetchJob( const Collection &collection, QObject * parent )
: KJob( parent ), d( new Private( collection, this ) )
{
}
RecursiveItemFetchJob::~RecursiveItemFetchJob()
{
delete d;
}
void RecursiveItemFetchJob::setFetchScope( const ItemFetchScope &fetchScope )
{
d->mFetchScope = fetchScope;
}
ItemFetchScope &RecursiveItemFetchJob::fetchScope()
{
return d->mFetchScope;
}
void RecursiveItemFetchJob::start()
{
CollectionFetchJob *job = new CollectionFetchJob( d->mCollection, CollectionFetchJob::Recursive, this );
connect( job, SIGNAL( result( KJob* ) ), this, SLOT( collectionFetchResult( KJob* ) ) );
}
Akonadi::Item::List RecursiveItemFetchJob::items() const
{
return d->mItems;
}
#include "recursiveitemfetchjob.moc"
/*
Copyright (c) 2009 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
This library is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
*/
#ifndef AKONADI_RECURSIVEITEMFETCHJOB_H
#define AKONADI_RECURSIVEITEMFETCHJOB_H
#include <akonadi/item.h>
#include <kjob.h>
namespace Akonadi {
class Collection;
class ItemFetchScope;
/**
* @short Job that fetches all items of a collection recursive.
*
* This job takes a collection as argument and returns a list of
* all items that are part of the passed collection and its child
* collections. The parts of the items that shall be fetched can
* by specified via an ItemFetchScope.
*
* Example:
*
* @code
*
* // Assume the following Akonadi storage tree structure:
* //
* // Root Collection
* // |
* // +- Contacts
* // | |
* // | +- Private
* // | |
* // | `- Business
* // |
* // `- Events
* //
* // Collection 'Contacts' has the ID 15, then the following code
* // returns all items from 'Contacts', 'Private' and 'Business'.
*
* const Akonadi::Collection contactsCollection( 15 );
*
* Akonadi::RecursiveItemFetchJob *job = new Akonadi::RecursiveItemFetchJob( contactsCollection );
* job->fetchScope().fetchFullPayload();
* connect( job, SIGNAL( result( KJob* ) ), this, SLOT( fetchResult( KJob* ) ) );
*
* job->start();
*
* ...
*
* MyClass::fetchResult( KJob *job )
* {
* Akonadi::RecursiveItemFetchJob *fetchJob = qobject_cast<Akonadi::RecursiveItemFetchJob*>( job );
* const Akonadi::Item::List items = fetchJob->items();
* // do something with the items
* }
*
* @endcode
*
* @author Tobias Koenig <tokoe@kde.org>
*/
class RecursiveItemFetchJob : public KJob
{
Q_OBJECT
public:
/**
* Creates a new recursive item fetch job.
*
* @param collection The collection that shall be fetched recursive.
* @param parent The parent object.
*/
explicit RecursiveItemFetchJob( const Akonadi::Collection &collection, QObject *parent = 0 );
/**
* Destroys the recursive item fetch job.
*/
~RecursiveItemFetchJob();
/**
* Sets the item fetch scope.
*
* The ItemFetchScope controls how much of an item's data is fetched
* from the server, e.g. whether to fetch the full item payload or
* only meta data.
*
* @param fetchScope The new scope for item fetch operations.
*
* @see fetchScope()
*/
void setFetchScope( const Akonadi::ItemFetchScope &fetchScope );
/**
* Returns the item fetch scope.
*
* Since this returns a reference it can be used to conveniently modify the
* current scope in-place, i.e. by calling a method on the returned reference
* without storing it in a local variable. See the ItemFetchScope documentation
* for an example.
*
* @return a reference to the current item fetch scope
*
* @see setFetchScope() for replacing the current item fetch scope
*/
Akonadi::ItemFetchScope &fetchScope();
/**
* Returns the list of fetched items.
*/
Akonadi::Item::List items() const;
/**
* Starts the recursive item fetch job.
*/
virtual void start();
private:
//@cond PRIVATE
class Private;
Private* const d;
Q_PRIVATE_SLOT( d, void collectionFetchResult( KJob* ) )
Q_PRIVATE_SLOT( d, void itemFetchResult( KJob* ) )
//@endcond
};
}
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment