SVN_MERGE
Merged revisions 1030345,1030382,1030411,1030418,1030421,1030440-1030444,1030446,1030481,1030499,1030501,1030505-1030507,1030606,1030632,1030645,1030673,1030851,1030855,1030887,1030927,1030966-1030967,1031021,1031046,1031175,1031256,1031370 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
........
r1030345 | vkrause | 2009-10-02 10:37:12 +0200 (Fri, 02 Oct 2009) | 2 lines no longer used apparently
........
r1030382 | tokoe | 2009-10-02 11:02:11 +0200 (Fri, 02 Oct 2009) | 4 lines Implement the 'Phone Numbers' functionality BUG: 209150
........
r1030411 | tokoe | 2009-10-02 11:18:47 +0200 (Fri, 02 Oct 2009) | 4 lines Fix heading titles BUG: 209156
........
r1030418 | vkrause | 2009-10-02 11:21:54 +0200 (Fri, 02 Oct 2009) | 2 lines Use the new contact view from kdepimlibs.
........
r1030421 | tokoe | 2009-10-02 11:27:25 +0200 (Fri, 02 Oct 2009) | 2 lines Adapt header alignment depending on the number of columns
........
r1030440 | skelly | 2009-10-02 11:43:19 +0200 (Fri, 02 Oct 2009) | 1 line Start refactoring some logic from EntityTreeView into a sharable class.
........
r1030441 | skelly | 2009-10-02 11:43:24 +0200 (Fri, 02 Oct 2009) | 1 line Refactor the processing of a drop event into the DragDropManager.
........
r1030442 | skelly | 2009-10-02 11:43:26 +0200 (Fri, 02 Oct 2009) | 1 line Refactor the startDrag stuff into the DragDropManager
........
r1030443 | skelly | 2009-10-02 11:43:31 +0200 (Fri, 02 Oct 2009) | 3 lines Disconnect signals before connecting them in these kinds of places. This will prevent unexpected behaviour if a different model is set on a view which already holds one.
........
r1030444 | skelly | 2009-10-02 11:43:33 +0200 (Fri, 02 Oct 2009) | 1 line Port FavoriteCollectionsView to DragDropManager.
........
r1030446 | skelly | 2009-10-02 12:00:45 +0200 (Fri, 02 Oct 2009) | 1 line Make this compile with NO_CAST_FROM_ASCII
........
r1030481 | skelly | 2009-10-02 13:18:57 +0200 (Fri, 02 Oct 2009) | 12 lines Move EntityTreeView and FavoriteCollectionsView into kdepimlibs I have patches to port playground/pim and mailody to use them from installed locations. If I've forgotten anyhing, simply change the includes to use <akonadi/entitytreeview.h> instead of "akonadi_next/entitytreeview.h" CCMAIL: kde-pim@kde.org
........
r1030499 | cgiboudeaux | 2009-10-02 14:08:21 +0200 (Fri, 02 Oct 2009) | 2 lines kpilot doesn't need akonadi_next anymore
........
r1030501 | cgiboudeaux | 2009-10-02 14:12:21 +0200 (Fri, 02 Oct 2009) | 1 line KPilot can be built again by packagers.
........
r1030505 | cgiboudeaux | 2009-10-02 14:19:04 +0200 (Fri, 02 Oct 2009) | 1 line kabc doesn't have to link against akonadi_next anymore.
........
r1030506 | vkrause | 2009-10-02 14:19:32 +0200 (Fri, 02 Oct 2009) | 3 lines Move the Akonadi command line client to playground. It hasn't been touched nor installed for quite some time and it barely works.
........
r1030507 | cgiboudeaux | 2009-10-02 14:20:41 +0200 (Fri, 02 Oct 2009) | 1 line Fix -Wmissing-include-dirs warnings when building kdepim without kdepim-runtime
........
r1030606 | tokoe | 2009-10-02 20:10:08 +0200 (Fri, 02 Oct 2009) | 2 lines Bring back the Crypto Settings editor page as plugin
........
r1030632 | momeny | 2009-10-02 22:12:33 +0200 (Fri, 02 Oct 2009) | 3 lines Patch from Golnaz: Clear undo stack after sending html content to the visual editor
........
r1030645 | cgiboudeaux | 2009-10-02 22:48:18 +0200 (Fri, 02 Oct 2009) | 1 line Cleanup. Remove unnecessary includes.(is boost really needed?)
........
r1030673 | momeny | 2009-10-03 00:28:47 +0200 (Sat, 03 Oct 2009) | 3 lines String fix by pano GUI
........
r1030851 | tokoe | 2009-10-03 12:22:11 +0200 (Sat, 03 Oct 2009) | 2 lines Parse the Anniversary field correctly
........
r1030855 | tokoe | 2009-10-03 12:40:20 +0200 (Sat, 03 Oct 2009) | 7 lines Remove the distlist resource. This resource was meant for testing contact groups only and shouldn't be used in daily use. A better solution is the 'contacts' resource which allows to store contacts and contact groups in a hierarchy.
........
r1030887 | winterz | 2009-10-03 14:31:49 +0200 (Sat, 03 Oct 2009) | 9 lines Show kcm pages for all the summary plugins, not just the active summary plugins. I think this is less confusing. The old way went like this: select a summary plugin to be active -> apply/ok -> then configure Now you can configure and select a summary plugin and then apply/ok MERGE: none DO_NOT_BACKPORT:
........
r1030927 | winterz | 2009-10-03 16:18:43 +0200 (Sat, 03 Oct 2009) | 3 lines fix data corruption for recurring events MERGE: e4,4.3
........
r1030966 | winterz | 2009-10-03 18:13:09 +0200 (Sat, 03 Oct 2009) | 9 lines Read the Groupware:Enabled settings from kmailrc. Use this to determine if Groupware is being used. If so, put the Sync button on by default. In the Enterprise version, we still put on the Sync button unless the user explicitly turns if off using kontactrc's Kontact Groupware Settings:GroupwareMailFoldersEnabled. MERGE: e4 DO_NOT_BACKPORT:
........
r1030967 | winterz | 2009-10-03 18:19:32 +0200 (Sat, 03 Oct 2009) | 4 lines add helpText() for the KActions MERGE: none DO_NOT_BACKPORT:
........
r1031021 | winterz | 2009-10-03 21:41:02 +0200 (Sat, 03 Oct 2009) | 2 lines "Sync Contacts" not "Synchronize Contacts"
........
r1031046 | winterz | 2009-10-03 22:45:11 +0200 (Sat, 03 Oct 2009) | 8 lines we set KMAIL_SUPPORTED if we are building KMail. which is good. however we never added KMAIL_SUPPORTED to the defined compiler macros. which is bad. Now that we define KMAIL_SUPPORTED, we can actually see a list of accounts to synchronize in the "Sync All" tool submenu. MERGE: e4,4.3
........
r1031175 | scripty | 2009-10-04 11:36:37 +0200 (Sun, 04 Oct 2009) | 1 line SVN_SILENT made messages (.desktop file)
........
r1031256 | winterz | 2009-10-04 16:11:38 +0200 (Sun, 04 Oct 2009) | 5 lines don't display the summary plugin unless it is also active. fixes the bug where all summaries are shown. caused by r1030887 MERGE: none DO_NOT_BACKPORT:
........
r1031370 | aacid | 2009-10-04 21:56:05 +0200 (Sun, 04 Oct 2009) | 2 lines load the libkdepim catalog as it is used
........
svn path=/branches/work/akonadi-ports/kdepim/; revision=1031483