Commit 67cd4828 authored by Volker Krause's avatar Volker Krause
Browse files

SVN_MERGE

Merged revisions 1015853,1015855,1015859-1015860,1015863,1015898-1015899,1015907,1015939,1015974,1016056,1016268,1016279,1016285,1016290,1016293,1016295,1016297,1016389,1016391,1016433,1016455,1016457,1016462,1016470,1016555,1016610,1016640,1016657,1016693,1016744,1016754,1016778,1016901,1016921,1017139-1017140,1017289,1017340,1017348,1017430,1017439,1017452,1017472,1017513,1017516,1017538,1017648,1017650 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

................
  r1015853 | tmcguire | 2009-08-26 15:02:10 +0200 (Wed, 26 Aug 2009) | 588 lines
  
  Block cyclic merges, release stuff etc
  SVN_SILENT
  SVN_MERGE
  Blocked revisions 1013308,1013312,1013342,1013390,1013421-1013428,1013430,1013432,1013752,1013758,1014052,1014054,1015150,1015162,1015196-1015197,1015466 via svnmerge
  
  ................
    r1013308 | tmcguire | 2009-08-19 16:17:23 +0200 (Wed, 19 Aug 2009) | 13 lines
    
    Already fixed here.
    SVN_SILENT
    --
    Blocked revisions 1013190 via svnmerge
    
    ........
      r1013190 | tmcguire | 2009-08-19 10:50:38 +0200 (Wed, 19 Aug 2009) | 4 lines
      
      Make configuring the LDAP completion order work again.
      MERGE: e4 (already fixed in trunk)
      Part of kolab/issue3814
    ........
  ................
    r1013312 | tmcguire | 2009-08-19 16:23:47 +0200 (Wed, 19 Aug 2009) | 14 lines
    
    Not needed here, we use add_definition in CMake
    SVN_SILENT
    --
    Blocked revisions 1013205 via svnmerge
    
    ........
      r1013205 | tmcguire | 2009-08-19 11:54:50 +0200 (Wed, 19 Aug 2009) | 5 lines
      
      Make sure that config.h is included, for the KDEPIM_NEW_DISTLIST #define.
      Removes bogus "Distribution Lists" entry from the completion dialog.
      
      Part of kolab/issue3814
    ........
  ................
    r1013342 | tmcguire | 2009-08-19 17:52:07 +0200 (Wed, 19 Aug 2009) | 6 lines
    
    Crossport r1013112 by tmcguire from trunk to the enterprise4 branch:
    
    Fix i18n
    MERGE: e4
  ................
    r1013390 | tmcguire | 2009-08-19 21:19:49 +0200 (Wed, 19 Aug 2009) | 1 line
    
    SVN_SILENT fix typo. MERGE:none
  ................
    r1013421 | tmcguire | 2009-08-19 22:20:50 +0200 (Wed, 19 Aug 2009) | 287 lines
    
    Block cyclic merges, KAlarm, new message list, Akonadi, ...
    SVN_SILENT
    Blocked revisions 1010626,1010860,1010872,1010874,1010879,1010901-1010903,1010978,1011071,1011073,1011226,1011561,1011604,1011612,1011615,1011655,1011677,1011745,1011919,1012121,1012125,1012178,1012221,1012449,1012466,1012550,1013042 via svnmerge
    
    ................
      r1010626 | djarvie | 2009-08-13 03:15:05 +0200 (Thu, 13 Aug 2009) | 2 lines
      
      Correct #include for generated header
    ................
      r1010860 | tmcguire | 2009-08-13 16:49:43 +0200 (Thu, 13 Aug 2009) | 23 lines
      
      Backport r1010847 by tmcguire from trunk to the 4.3 branch:
      
      SVN_MERGE
      Merged revisions 1009313 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
      
      ................
        r1009313 | winterz | 2009-08-09 19:12:14 +0200 (Sun, 09 Aug 2009) | 12 lines
        
        Merged revisions 1009307 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1009307 | winterz | 2009-08-09 12:59:10 -0400 (Sun, 09 Aug 2009) | 5 lines
          
          If the invitation's ORGANIZER property isn't set, then default it to the sender.
          Fixes kolab/issue1536
          
          MERGE: e4,trunk,4.3
        ........
      ................
    ................
      r1010872 | tmcguire | 2009-08-13 16:55:33 +0200 (Thu, 13 Aug 2009) | 23 lines
      
      Backport r1010825 by tmcguire from trunk to the 4.3 branch:
      
      SVN_MERGE
      Merged revisions 1007086 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
      
      ................
        r1007086 | tmcguire | 2009-08-05 09:37:25 +0200 (Wed, 05 Aug 2009) | 12 lines
        
        Merged revisions 1007083 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1007083 | tmcguire | 2009-08-05 09:31:37 +0200 (Wed, 05 Aug 2009) | 5 lines
          
          Allow changing the folder type of local folders again, as they can apparently be used
          as groupware folders too.
          
          kolab/issue3742
        ........
      ................
    ................
      r1010874 | tmcguire | 2009-08-13 16:57:05 +0200 (Thu, 13 Aug 2009) | 22 lines
      
      Backport r1010830 by tmcguire from trunk to the 4.3 branch:
      
      SVN_MERGE
      Merged revisions 1007337 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
      
      ................
        r1007337 | winterz | 2009-08-05 16:56:43 +0200 (Wed, 05 Aug 2009) | 11 lines
        
        Merged revisions 1007225 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1007225 | tmcguire | 2009-08-05 06:33:45 -0400 (Wed, 05 Aug 2009) | 4 lines
          
          Make sure to also dive into encapsulated messages, to make deleting attachments from forwarded messages possible.
          
          MERGE: e4, trunk, 4.3
        ........
      ................
    ................
      r1010879 | tmcguire | 2009-08-13 17:02:20 +0200 (Thu, 13 Aug 2009) | 24 lines
      
      Backport r1010835 by tmcguire from trunk to the 4.3 branch:
      
      SVN_MERGE
      Merged revisions 1007381 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
      
      ................
        r1007381 | tmcguire | 2009-08-05 19:29:33 +0200 (Wed, 05 Aug 2009) | 13 lines
        
        Merged revisions 1007245 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1007245 | tmcguire | 2009-08-05 13:30:26 +0200 (Wed, 05 Aug 2009) | 6 lines
          
          When deleting or editing attachments of encapsulated messages that are displayed in a seperate
          reader window, make sure the original message is modified, not our dummy copy.
          
          kolab/issue3740
          MERGE: e4, trunk, 4.3, mailreader (if it has the same problem)
        ........
      ................
    ................
      r1010901 | tmcguire | 2009-08-13 17:20:07 +0200 (Thu, 13 Aug 2009) | 20 lines
      
      Backport r1010839 by tmcguire from trunk to the 4.3 branch:
      
      SVN_MERGE
      Merged revisions 1008228 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
      
      ................
        r1008228 | tmcguire | 2009-08-07 09:53:48 +0200 (Fri, 07 Aug 2009) | 9 lines
        
        Merged revisions 1007276 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1007276 | tmcguire | 2009-08-05 14:25:16 +0200 (Wed, 05 Aug 2009) | 1 line
          
          Move some stuff from the edit commands to kmmessage, I plan to reuse those.
        ........
      ................
    ................
      r1010902 | tmcguire | 2009-08-13 17:20:57 +0200 (Thu, 13 Aug 2009) | 23 lines
      
      Backport r1010840 by tmcguire from trunk to the 4.3 branch:
      
      SVN_MERGE
      Merged revisions 1008229 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
      
      ................
        r1008229 | tmcguire | 2009-08-07 09:56:31 +0200 (Fri, 07 Aug 2009) | 12 lines
        
        Merged revisions 1007283 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1007283 | tmcguire | 2009-08-05 14:46:17 +0200 (Wed, 05 Aug 2009) | 5 lines
          
          Be sure to also delete the attachment from our copy, so that the window
          is updated immediatley
          
          MERGE: e4, trunk, 4.3, mailreader (if the problem exists there)
        ........
      ................
    ................
      r1010903 | tmcguire | 2009-08-13 17:22:01 +0200 (Thu, 13 Aug 2009) | 22 lines
      
      Backport r1010841 by tmcguire from trunk to the 4.3 branch:
      
      Merged revisions 1008231 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
      
      ................
        r1008231 | tmcguire | 2009-08-07 10:02:11 +0200 (Fri, 07 Aug 2009) | 12 lines
        
        Merged revisions 1007372 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1007372 | tmcguire | 2009-08-05 19:08:49 +0200 (Wed, 05 Aug 2009) | 5 lines
          
          - Make sure to match also uppercase type strings
          - Don't show a bogus attachment for the text part in encapsulated messages
          
          MERGE: e4, trunk, 4.3, mailreader
        ........
      ................
    ................
      r1010978 | djarvie | 2009-08-13 20:09:08 +0200 (Thu, 13 Aug 2009) | 4 lines
      
      Backport SVN commit 1010801 by ahartmetz:
      
      link with gold
    ................
      r1011071 | mkoller | 2009-08-13 23:33:47 +0200 (Thu, 13 Aug 2009) | 4 lines
      
      backport bug 178402
      
      Make custom fonts settings work again.
    ................
      r1011073 | osterfeld | 2009-08-13 23:38:47 +0200 (Thu, 13 Aug 2009) | 1 line
      
      SVN_SILENT bump version
    ................
      r1011226 | scripty | 2009-08-14 05:21:30 +0200 (Fri, 14 Aug 2009) | 1 line
      
      SVN_SILENT made messages (.desktop file)
    ................
      r1011561 | scripty | 2009-08-15 05:05:54 +0200 (Sat, 15 Aug 2009) | 1 line
      
      SVN_SILENT made messages (.desktop file)
    ................
      r1011604 | djarvie | 2009-08-15 11:13:10 +0200 (Sat, 15 Aug 2009) | 2 lines
      
      Fix use of wrong time zone if cancel and then reinstate a deferral.
    ................
      r1011612 | djarvie | 2009-08-15 11:36:04 +0200 (Sat, 15 Aug 2009) | 3 lines
      
      Enable/disable the edit alarm dialogue OK button according to whether any
      changes have been made to the contents, to prevent user confusion.
    ................
      r1011615 | djarvie | 2009-08-15 11:42:44 +0200 (Sat, 15 Aug 2009) | 2 lines
      
      Update hicolor icons to new KAlarm icon
    ................
      r1011655 | djarvie | 2009-08-15 13:15:41 +0200 (Sat, 15 Aug 2009) | 1 line
      
      Fix main volume setting for sound files
    ................
      r1011677 | djarvie | 2009-08-15 14:13:13 +0200 (Sat, 15 Aug 2009) | 1 line
      
      Fix volume when fader used
    ................
      r1011745 | djarvie | 2009-08-15 20:54:24 +0200 (Sat, 15 Aug 2009) | 1 line
      
      Remove warning
    ................
      r1011919 | mkoller | 2009-08-16 12:47:03 +0200 (Sun, 16 Aug 2009) | 9 lines
      
      
      Backport r1011918 by mkoller from trunk to the 4.3 branch:
      
      CCBUG: 182910
      
      expand full thread when opening the root message as it was done with the old treeview
    ................
      r1012121 | mkoller | 2009-08-16 23:07:05 +0200 (Sun, 16 Aug 2009) | 10 lines
      
      
      Backport r1012120 by mkoller from trunk to the 4.3 branch:
      
      CCBUG: 203104
      
      On sorting by subject, ignore Re: and Fwd: prefixes to bring back
      the old KDE3 behavior.
    ................
      r1012125 | mkoller | 2009-08-16 23:15:03 +0200 (Sun, 16 Aug 2009) | 8 lines
      
      Backport r1012123 by mkoller from trunk to the 4.3 branch:
      
      CCBUG: 183517
      
      On columns which show only an icon as their content, show also the icon
      in the column header instead of the text.
      Brings back KDE3 behavior.
    ................
      r1012178 | scripty | 2009-08-17 05:03:13 +0200 (Mon, 17 Aug 2009) | 1 line
      
      SVN_SILENT made messages (.desktop file)
    ................
      r1012221 | vkrause | 2009-08-17 09:21:34 +0200 (Mon, 17 Aug 2009) | 8 lines
      
      Backport SVN commit 993338 by vkrause from trunk:
      
      Birthday resources can have different settings, so it does not make
      sense to only allow one instance. Should help with the migration problem
      David is seeing.
      
      BUG: 200973
    ................
      r1012449 | djarvie | 2009-08-17 19:27:25 +0200 (Mon, 17 Aug 2009) | 2 lines
      
      Remove unused parameter and declaration
    ................
      r1012466 | djarvie | 2009-08-17 19:37:29 +0200 (Mon, 17 Aug 2009) | 2 lines
      
      Make --test-set-time work
    ................
      r1012550 | mkoller | 2009-08-17 22:10:49 +0200 (Mon, 17 Aug 2009) | 8 lines
      
      
      Backport r1012548 by mkoller from trunk to the 4.3 branch:
      
      CCBUG: 204193
      
      Fix copy/paste error on GroupBy* enum
    ................
      r1013042 | djarvie | 2009-08-18 19:38:31 +0200 (Tue, 18 Aug 2009) | 2 lines
      
      Bug 203957: Fix crash when restoring alarm with invalid type.
    ................
  ................
    r1013422 | tmcguire | 2009-08-19 22:24:05 +0200 (Wed, 19 Aug 2009) | 29 lines
    
    Weekly Akregator blocks.
    CCMAIL: frank.osterfeld@kdemail.net
    SVN_SILENT
    Blocked revisions 1011091,1012116,1012119 via svnmerge
    
    ........
      r1011091 | osterfeld | 2009-08-14 00:28:58 +0200 (Fri, 14 Aug 2009) | 5 lines
      
      On the quest to more firefox compliance:
      Fix adding feeds via feed:// urls
      
      BUG:165160
      CCBUG:127322
    ........
      r1012116 | osterfeld | 2009-08-16 22:45:55 +0200 (Sun, 16 Aug 2009) | 2 lines
      
      fix initialization order
    ........
      r1012119 | osterfeld | 2009-08-16 22:50:36 +0200 (Sun, 16 Aug 2009) | 9 lines
      
      make the article pane a QFrame and give it a proper border
      
      Patch by Miroslav Los, milamby at yahoo.com
      
      His comment:
      "The ArticleViewer in Akregator's main tab does not have any borders. This makes the transition to its container look unclean and the splitter between it and the ArticleListView above it hard to make out and target with the mouse.
      My patch solves this by changing ArticleViewer's base class from QWidget to QFrame and setting its style to Qt::StyledPanel to match the GUI around it and Qt::Raised. I did not select Qt::Sunken because the ArticleView contains the scrollbars of its KHTML component, unlike the sunken ArticleListView next to it. A Qt::Sunken ArticleViewer would therefore break overall UI consistency."
    ........
  ................
    r1013423 | tmcguire | 2009-08-19 22:26:06 +0200 (Wed, 19 Aug 2009) | 11 lines
    
    Merged revisions 1010861 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1010861 | tmcguire | 2009-08-13 16:51:08 +0200 (Thu, 13 Aug 2009) | 4 lines
      
      Backport r1010744 by gateau from trunk to the 4.3 branch:
      
      Do not return 0 if a KMMainWin is found
    ........
  ................
    r1013424 | tmcguire | 2009-08-19 22:28:39 +0200 (Wed, 19 Aug 2009) | 11 lines
    
    Merged revisions 1011030 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1011030 | tmcguire | 2009-08-13 21:53:41 +0200 (Thu, 13 Aug 2009) | 5 lines
      
      Backport r1011020 by mkoller from trunk to the 4.3 branch:
      
      fix regression to my last commit r1010578 by defining the Edit-Menu for the Copy action
    ........
  ................
    r1013425 | tmcguire | 2009-08-19 22:30:17 +0200 (Wed, 19 Aug 2009) | 11 lines
    
    Merged revisions 1011083 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1011083 | tmcguire | 2009-08-14 00:04:26 +0200 (Fri, 14 Aug 2009) | 5 lines
      
      Backport r1009821 by mkoller from trunk to the 4.3 branch:
      
      create correct email headers from a digest mail
    ........
  ................
    r1013426 | tmcguire | 2009-08-19 22:31:32 +0200 (Wed, 19 Aug 2009) | 16 lines
    
    Merged revisions 1011085 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1011085 | tmcguire | 2009-08-14 00:06:07 +0200 (Fri, 14 Aug 2009) | 10 lines
      
      Backport r1011081 by tmcguire from trunk to the 4.3 branch:
      
      Add a newline between MIME headers and message header, so that the objecttree parser can correctly parse the new
      child nodes.
      Andras, the bug report has a nice testcase for that.
      CCMAIL: amantia@kde.org
      CCBUG: 53668
      MERGE: mailreader
    ........
  ................
    r1013427 | tmcguire | 2009-08-19 22:34:10 +0200 (Wed, 19 Aug 2009) | 11 lines
    
    Merged revisions 1011826 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1011826 | mkoller | 2009-08-16 00:36:40 +0200 (Sun, 16 Aug 2009) | 4 lines
      
      backport bug 203197
      
      fix usage of the undo action to use the correct name
    ........
  ................
    r1013428 | tmcguire | 2009-08-19 22:35:42 +0200 (Wed, 19 Aug 2009) | 15 lines
    
    Merged revisions 1012088 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1012088 | winterz | 2009-08-16 21:21:57 +0200 (Sun, 16 Aug 2009) | 9 lines
      
      Backport r1012087 by winterz from trunk to the 4.3 branch:
      
      do not assert if we encounter an invalid TodoTreeNode in ::processChanged().
      return normally instead.
      hopefully fixes
      CCBUG: 195282
      MERGE: e4,4.3
    ........
  ................
    r1013430 | tmcguire | 2009-08-19 22:43:26 +0200 (Wed, 19 Aug 2009) | 13 lines
    
    Merged revisions 1012118 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1012118 | winterz | 2009-08-16 22:49:23 +0200 (Sun, 16 Aug 2009) | 7 lines
      
      Backport r1012117 by winterz from trunk to the 4.3 branch:
      
      don't crash when applying templates when there is no currently seleted template.
      CCBUG: 204063
      MERGE: e4,4.3
    ........
  ................
    r1013432 | tmcguire | 2009-08-19 22:45:26 +0200 (Wed, 19 Aug 2009) | 13 lines
    
    Merged revisions 1012285 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1012285 | winterz | 2009-08-17 12:52:11 +0200 (Mon, 17 Aug 2009) | 7 lines
      
      Backport r1012284 by winterz from trunk to the 4.3 branch:
      
      crash guard for
      CCBUG: 195282
      MERGE: e4,4.3
    ........
  ................
    r1013752 | winterz | 2009-08-20 19:42:42 +0200 (Thu, 20 Aug 2009) | 10 lines
    
    Merged revisions 1013749 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1013749 | winterz | 2009-08-20 13:38:23 -0400 (Thu, 20 Aug 2009) | 3 lines
      
      make sure to convert Attachment labels from Utf8
      MERGE: e4,trunk,4.3
    ........
  ................
    r1013758 | winterz | 2009-08-20 19:51:59 +0200 (Thu, 20 Aug 2009) | 11 lines
    
    Merged revisions 1013756 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1013756 | winterz | 2009-08-20 13:48:34 -0400 (Thu, 20 Aug 2009) | 4 lines
      
      remove hack when printing the invitation attachment name and converting from Utf8.
      as this work is now done properly in the icalformat API.
      MERGE: e4,trunk,4.3
    ........
  ................
    r1014052 | tmcguire | 2009-08-21 13:32:53 +0200 (Fri, 21 Aug 2009) | 1 line
    
    Update newslog.txt
  ................
    r1014054 | tmcguire | 2009-08-21 13:33:40 +0200 (Fri, 21 Aug 2009) | 1 line
    
    SVN_SILENT Update version numbers for today's release.
  ................
    r1015150 | winterz | 2009-08-24 19:11:33 +0200 (Mon, 24 Aug 2009) | 14 lines
    
    Blocked revisions 1015148 via svnmerge
    
    ........
      r1015148 | winterz | 2009-08-24 13:10:28 -0400 (Mon, 24 Aug 2009) | 9 lines
      
      deprecate incidence date and time stringification methods in favor of
      the new IncidenceFormatter dateToString(), timeToString, dateTimeToString()
      backported from trunk.
      
      This is part 1 of the fix for kolab/issue3815
      
      MERGE: none (all the other branches already have this)
    ........
  ................
    r1015162 | winterz | 2009-08-24 19:47:30 +0200 (Mon, 24 Aug 2009) | 11 lines
    
    Merged revisions 1015158 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1015158 | winterz | 2009-08-24 13:36:11 -0400 (Mon, 24 Aug 2009) | 4 lines
      
      use long date formats in the event viewer and in the tooltips
      fixes kolab/issue3815
      MERGE: e4,trunk,4.3
    ........
  ................
    r1015196 | winterz | 2009-08-24 23:20:18 +0200 (Mon, 24 Aug 2009) | 9 lines
    
    Blocked revisions 1013313 via svnmerge
    
    ........
      r1013313 | tmcguire | 2009-08-19 10:26:14 -0400 (Wed, 19 Aug 2009) | 3 lines
      
      Better initalize this...
      MERGE: none
    ........
  ................
    r1015197 | winterz | 2009-08-24 23:21:55 +0200 (Mon, 24 Aug 2009) | 12 lines
    
    Blocked revisions 1014028,1014053 via svnmerge
    
    ........
      r1014028 | tmcguire | 2009-08-21 07:20:19 -0400 (Fri, 21 Aug 2009) | 1 line
      
      Update Newslog.txt
    ........
      r1014053 | tmcguire | 2009-08-21 07:33:40 -0400 (Fri, 21 Aug 2009) | 1 line
      
      SVN_SILENT Update version numbers for today's release.
    ........
  ................
    r1015466 | winterz | 2009-08-25 17:00:16 +0200 (Tue, 25 Aug 2009) | 13 lines
    
    Merged revisions 1015459 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1015459 | winterz | 2009-08-25 10:47:30 -0400 (Tue, 25 Aug 2009) | 6 lines
      
      add colons to the event viewer headers ("Date","Time","Location","Organizer","Attendees")
      fixed kolab/issue3816
      
      MERGE: e4,trunk
      DO_NOT_BACKPORT: 4.3
    ........
  ................
................
  r1015855 | tmcguire | 2009-08-26 15:07:30 +0200 (Wed, 26 Aug 2009) | 18 lines
  
  Merged revisions 1013273 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1013273 | winterz | 2009-08-19 14:33:19 +0200 (Wed, 19 Aug 2009) | 11 lines
    
    Merged revisions 1013233 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1013233 | vkrause | 2009-08-19 07:24:12 -0400 (Wed, 19 Aug 2009) | 4 lines
      
      Also pass the receiver when processing cancel requests.
      
      Kolab issue 3811
    ........
  ................
................
  r1015859 | tmcguire | 2009-08-26 15:12:59 +0200 (Wed, 26 Aug 2009) | 23 lines
  
  SVN_MERGE
  Merged revisions 1013323 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1013323 | tmcguire | 2009-08-19 17:06:47 +0200 (Wed, 19 Aug 2009) | 15 lines
    
    Merged revisions 1013301 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1013301 | tmcguire | 2009-08-19 15:50:00 +0200 (Wed, 19 Aug 2009) | 8 lines
      
      - Give the completion sources a weight as well
      - Use the weight of the completion source to correctly sort the results in the popup
      - Make sure completion weights are correctly updated when changing the order
      
      The code is not pretty, but hey, this is addresseelineedit, after all...
      
      All this should finally fix kolab/issue3814.
    ........
  ................
................
  r1015860 | tmcguire | 2009-08-26 15:13:49 +0200 (Wed, 26 Aug 2009) | 12 lines
  
  SVN_MERGE
  Merged revisions 1013676 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ........
    r1013676 | winterz | 2009-08-20 14:32:34 +0200 (Thu, 20 Aug 2009) | 4 lines
    
    whoopsie!
    must include config-enterprise.h if you do conditional compiles against ENTERPRISE_BUILD
    MERGE: e4
  ........
................
  r1015863 | tmcguire | 2009-08-26 15:16:47 +0200 (Wed, 26 Aug 2009) | 33 lines
  
  Merged revisions 1015494,1015521 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1015494 | winterz | 2009-08-25 18:44:49 +0200 (Tue, 25 Aug 2009) | 12 lines
    
    Merged revisions 1015486 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1015486 | winterz | 2009-08-25 12:18:24 -0400 (Tue, 25 Aug 2009) | 6 lines
      
      display the Recent Addresses sublist last, by default.
      kolab/issue3804
      
      MERGE: e4,trunk,4.3
    ........
  ................
    r1015521 | winterz | 2009-08-25 20:23:24 +0200 (Tue, 25 Aug 2009) | 12 lines
    
    Merged revisions 1015510 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1015510 | winterz | 2009-08-25 13:57:21 -0400 (Tue, 25 Aug 2009) | 5 lines
      
      make the Recent Addresses configurable
      kolab/issue3804
      
      MERGE: e4,trunk,4.3
    ........
  ................
................
  r1015898 | tokoe | 2009-08-26 16:59:34 +0200 (Wed, 26 Aug 2009) | 2 lines
  
  Show only collections that allow saving of new contacts / contact groups
................
  r1015899 | tokoe | 2009-08-26 17:00:42 +0200 (Wed, 26 Aug 2009) | 2 lines
  
  Handle missing default collections properly by not closing the dialog
................
  r1015907 | tokoe | 2009-08-26 17:36:03 +0200 (Wed, 26 Aug 2009) | 2 lines
  
  Start always the nepomuk contact feeder
................
  r1015939 | skelly | 2009-08-26 18:36:29 +0200 (Wed, 26 Aug 2009) | 1 line
  
  Remove all use of Akonadi::{Descendants,Selection}ProxyModels which are about to be removed.
................
  r1015974 | tnyblom | 2009-08-26 19:45:02 +0200 (Wed, 26 Aug 2009) | 3 lines
  
  Split the Misc page Groupware tab into two tabs. Move Invitation rellated options into a new tab.
................
  r1016056 | mkoller | 2009-08-26 23:49:34 +0200 (Wed, 26 Aug 2009) | 2 lines
  
  make sure we have spacing between buttons
................
  r1016268 | tokoe | 2009-08-27 13:25:24 +0200 (Thu, 27 Aug 2009) | 2 lines
  
  Add a clear button to reset the date
................
  r1016279 | tokoe | 2009-08-27 14:06:55 +0200 (Thu, 27 Aug 2009) | 3 lines
  
  Fetch the parent collection explicitly
    -> rights are handled correctly now
................
  r1016285 | tokoe | 2009-08-27 14:22:59 +0200 (Thu, 27 Aug 2009) | 3 lines
  
  Don't iterate over the model to find a matching item,
  use ItemFetchJob instead to prevent race conditions
................
  r1016290 | tokoe | 2009-08-27 14:50:27 +0200 (Thu, 27 Aug 2009) | 2 lines
  
  Trigger synchronization after configuration has changed
................
  r1016293 | tokoe | 2009-08-27 14:52:55 +0200 (Thu, 27 Aug 2009) | 3 lines
  
  No need to trigger synchronization here, the resource
  is responsible to do so after configuration
................
  r1016295 | tokoe | 2009-08-27 15:02:49 +0200 (Thu, 27 Aug 2009) | 2 lines
  
  Check whether the viewers got the right payload
................
  r1016297 | tokoe | 2009-08-27 15:03:41 +0200 (Thu, 27 Aug 2009) | 2 lines
  
  SVN_SILENT remove debug statement
................
  r1016389 | djarvie | 2009-08-27 20:11:14 +0200 (Thu, 27 Aug 2009) | 2 lines
  
  Implement KAlarm akonadi resource.
................
  r1016391 | djarvie | 2009-08-27 20:12:46 +0200 (Thu, 27 Aug 2009) | 1 line
  
  Remove debug statement
................
  r1016433 | mkoller | 2009-08-27 22:01:01 +0200 (Thu, 27 Aug 2009) | 16 lines
  
  BUG: 205253
  
  Fix inconsistent selection behavior in "Find Messages" window:
  - Selecting a mail updates the message preview (if there is one) and
    does not open a new window for the selected mail
  - Double clicking and the button "open message" opens the mail in a new window
  
  This also fixes the problems:
  - double clicking no longer opens three mail reader windows when no message preview
    is shown
  - changing the shown message in the message preview no longer flickers
    due to now checking if the folder containing the selected mail is already shown,
    which also fixes the problem that when you clicked a currently shown folder the second time
    on the folder tree, the current message shown was cleared.
................
  r1016455 | cgiboudeaux | 2009-08-27 22:38:33 +0200 (Thu, 27 Aug 2009) | 1 line
  
  Add a copy of the kcfg_generate_dbus_interface macro. Should fix the kalarm compilation.
................
  r1016457 | mkoller | 2009-08-27 22:40:22 +0200 (Thu, 27 Aug 2009) | 5 lines
  
  BUG: 186162
  
  when selecting a mail in the "Find Messages" window, correctly update
  the selection in the message list.
................
  r1016462 | cgiboudeaux | 2009-08-27 22:47:12 +0200 (Thu, 27 Aug 2009) | 1 line
  
  Kalarm won't build for packagers due to some kdepim-runtime deps. Disable the compilation in this case.
................
  r1016470 | mkoller | 2009-08-27 23:15:59 +0200 (Thu, 27 Aug 2009) | 4 lines
  
  BUG: 180878
  
  scroll to the selected message after clearing the quick search edit line
................
  r1016555 | scripty | 2009-08-28 05:06:01 +0200 (Fri, 28 Aug 2009) | 1 line
  
  SVN_SILENT made messages (.desktop file)
................
  r1016610 | tokoe | 2009-08-28 12:26:05 +0200 (Fri, 28 Aug 2009) | 2 lines
  
  Add skeleton implementation of the nepomuk calendar feeder
................
  r1016640 | tmcguire | 2009-08-28 13:44:02 +0200 (Fri, 28 Aug 2009) | 3 lines
  
  Delay the loading of the addressbook in the filter until it is needed, otherwise
  D-Bus deadlock on startup is possible.
................
  r1016657 | tokoe | 2009-08-28 14:45:12 +0200 (Fri, 28 Aug 2009) | 4 lines
  
  Bring back the coordinates edit widget
  
  BUG: 204081
................
  r1016693 | skelly | 2009-08-28 17:01:46 +0200 (Fri, 28 Aug 2009) | 3 lines
  
  Take out the Filter proxy model here.
  
  It's not needed as we can set the ETM to not fetch items in the first place, and then they don't need to be filtered.
................
  r1016744 | mkoller | 2009-08-28 21:11:38 +0200 (Fri, 28 Aug 2009) | 4 lines
  
  BUG: 205018
  
  obey the current icons size when setting the column width for the first three columns
................
  r1016754 | mkoller | 2009-08-28 21:44:13 +0200 (Fri, 28 Aug 2009) | 5 lines
  
  BUG: 181794
  
  if the aggregation is defined without grouping only show the root decoration when
  threading is enabled
................
  r1016778 | mkoller | 2009-08-28 23:12:33 +0200 (Fri, 28 Aug 2009) | 4 lines
  
  BUG: 204532
  
  Show clear button in text input field
................
  r1016901 | mlaurent | 2009-08-29 12:00:30 +0200 (Sat, 29 Aug 2009) | 2 lines
  
  Fix iterator
................
  r1016921 | mkoller | 2009-08-29 13:22:57 +0200 (Sat, 29 Aug 2009) | 2 lines
  
  When compressing an attachment, mark the mail as modified.
................
  r1017139 | scripty | 2009-08-29 21:12:25 +0200 (Sat, 29 Aug 2009) | 1 line
  
  SVN_SILENT made messages (.desktop file)
................
  r1017140 | mkoller | 2009-08-29 21:13:14 +0200 (Sat, 29 Aug 2009) | 2 lines
  
  remove accelerator marker when selecting one of many mail addresses on dropping a vcard
................
  r1017289 | mlaurent | 2009-08-30 11:41:18 +0200 (Sun, 30 Aug 2009) | 2 lines
  
  fix ui files
................
  r1017340 | mkoller | 2009-08-30 12:16:33 +0200 (Sun, 30 Aug 2009) | 5 lines
  
  BUG: 140353
  
  try to find the annoyance-filter executable in the default installation
  path but also in a system path
................
  r1017348 | scripty | 2009-08-30 12:21:43 +0200 (Sun, 30 Aug 2009) | 1 line
  
  SVN_SILENT made messages (.desktop file)
................
  r1017430 | mkoller | 2009-08-30 18:19:01 +0200 (Sun, 30 Aug 2009) | 6 lines
  
  FEATURE: 54098
  
  Allow another non-RFC2822 conforming date to be parsed to be more tolerant.
  
  Added unit test
................
  r1017439 | mkoller | 2009-08-30 19:05:25 +0200 (Sun, 30 Aug 2009) | 5 lines
  
  BUG: 115672
  
  do not cache the time offset from UTC as the DST/non-DST day change
  would not be detected
................
  r1017452 | mkoller | 2009-08-30 19:37:12 +0200 (Sun, 30 Aug 2009) | 5 lines
  
  BUG: 160990
  
  When scrolling one page, use 80% of the available height of the current
  view (not the height of the complete widget including the message structure viewer)
................
  r1017472 | mkoller | 2009-08-30 20:25:23 +0200 (Sun, 30 Aug 2009) | 2 lines
  
  Improve the text in the "encoding problem" dialog.
................
  r1017513 | tokoe | 2009-08-30 22:08:06 +0200 (Sun, 30 Aug 2009) | 2 lines
  
  SVN_SILENT coding style cleanup
................
  r1017516 | tokoe | 2009-08-30 22:11:16 +0200 (Sun, 30 Aug 2009) | 10 lines
  
  Don't use Addressee::fullEmail() for autocompletion
  
  The fullEmail() method might return quoted strings
  (e.g. "John Smith-Miller" <john@smithmiller.com>) if
  the name contains special characters, so we can't use it
  for auto completion but have to implement our own
  algorithm.
  
  BUG: 205721
................
  r1017538 | tokoe | 2009-08-30 23:04:22 +0200 (Sun, 30 Aug 2009) | 5 lines
  
  Give a more general message error as we can't find out
  what part of the entry is missing exactly.
  
  BUG: 205722
................
  r1017648 | djarvie | 2009-08-31 05:12:20 +0200 (Mon, 31 Aug 2009) | 2 lines
  
  Use KDE system settings to determine default working days in the week.
................
  r1017650 | djarvie | 2009-08-31 05:25:08 +0200 (Mon, 31 Aug 2009) | 2 lines
  
  Bug 156814: Add configuration setting for event duration for alarms copied to KOrganizer.
................

svn path=/branches/work/akonadi-ports/kdepim/; revision=1017693
parents 49dc080f e8b76c74
......@@ -33,11 +33,9 @@
#include <akonadi/collectionfilterproxymodel.h>
#include <akonadi/collectionmodel.h>
#include <akonadi/control.h>
#include <akonadi/descendantsproxymodel.h>
#include <akonadi/entityfilterproxymodel.h>
#include <akonadi/itemview.h>
#include <akonadi/mimetypechecker.h>
#include <akonadi/selectionproxymodel.h>
#include <akonadi/entitytreeviewstatesaver.h>
#include <kaction.h>
......@@ -46,9 +44,11 @@
#include <kabc/contactgroup.h>
#include <kabc/contactlineedit.h>
#include <kabc/kabcmodel.h>
#include <kdescendantsproxymodel.h>
#include <kicon.h>
#include <klineedit.h>
#include <klocale.h>
#include <kselectionproxymodel.h>
#include <ktoggleaction.h>
#include <ktoolbar.h>
#include <kxmlguiwindow.h>
......@@ -129,11 +129,12 @@ MainWidget::MainWidget( KXMLGUIClient *guiClient, QWidget *parent )
mCollectionView->header()->setDefaultAlignment( Qt::AlignCenter );
mCollectionView->header()->setSortIndicatorShown( false );
Akonadi::SelectionProxyModel *selectionProxyModel = new Akonadi::SelectionProxyModel( mCollectionView->selectionModel(),
KSelectionProxyModel *selectionProxyModel = new KSelectionProxyModel( mCollectionView->selectionModel(),
this );
selectionProxyModel->setSourceModel( GlobalContactModel::instance()->model() );
mDescendantTree = new Akonadi::DescendantsProxyModel( this );
mDescendantTree = new KDescendantsProxyModel( this );
mDescendantTree->setSourceModel( selectionProxyModel );
mItemTree = new Akonadi::EntityFilterProxyModel( this );
......
......@@ -29,7 +29,6 @@ namespace Akonadi {
class Collection;
class ContactGroupViewer;
class ContactViewer;
class DescendantsProxyModel;
class EntityFilterProxyModel;
class EntityTreeView;
class Item;
......@@ -39,6 +38,7 @@ class StandardContactActionManager;
class ContactSwitcher;
class KActionCollection;
class KDescendantsProxyModel;
class KXMLGUIClient;
class ModelColumnManager;
class QStackedWidget;
......@@ -78,7 +78,7 @@ class KADDRESSBOOK_EXPORT MainWidget : public QWidget
Akonadi::EntityFilterProxyModel *mCollectionTree;
Akonadi::EntityFilterProxyModel *mItemTree;
Akonadi::DescendantsProxyModel *mDescendantTree;
KDescendantsProxyModel *mDescendantTree;
QuickSearchWidget *mQuickSearchWidget;
Akonadi::EntityTreeView *mCollectionView;
......
......@@ -34,8 +34,8 @@
#include <kdialog.h>
#include <kglobal.h>
#include <klocale.h>
#include <kdescendantsproxymodel.h>
#include <akonadi/descendantsproxymodel.h>
#include <akonadi/entitytreemodel.h>
#include <akonadi/entityfilterproxymodel.h>
......@@ -175,7 +175,7 @@ void PrintingWizard::print()
} else {
Akonadi::ContactsTreeModel *contactsModel = GlobalContactModel::instance()->model();
Akonadi::DescendantsProxyModel *descendantTree = new Akonadi::DescendantsProxyModel( this );
KDescendantsProxyModel *descendantTree = new KDescendantsProxyModel( this );
descendantTree->setSourceModel( contactsModel );
Akonadi::EntityFilterProxyModel *allContacts = new Akonadi::EntityFilterProxyModel( this );
......
......@@ -167,12 +167,6 @@ class StandardContactActionManager::Private
if ( job->error() ) {
KMessageBox::error( mParentWidget, i18n( "Could not add address book: %1", job->errorString() ),
i18n( "Adding Address Book failed" ) );
} else {
const AgentInstanceCreateJob *createJob = static_cast<AgentInstanceCreateJob*>( job );
AgentInstance instance = createJob->instance();
if ( instance.isValid() )
instance.synchronize();
}
}
......
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