Commit b539d43f authored by Volker Krause's avatar Volker Krause

SVN_MERGE

Merged revisions 1021447,1021502,1021505-1021506,1021510-1021512,1021524,1021529,1021589 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

................
  r1021447 | ervin | 2009-09-09 09:48:54 +0200 (Wed, 09 Sep 2009) | 7 lines
  
  Also trigger the CollectionMoveJob on drops. First step at having move
  support in ETM.
  
  Needs more work for a complete support, but I'm working on some other
  stuff now.
................
  r1021502 | tokoe | 2009-09-09 14:01:53 +0200 (Wed, 09 Sep 2009) | 2 lines
  
  Add missing @since 4.4 tags
................
  r1021505 | ervin | 2009-09-09 14:32:11 +0200 (Wed, 09 Sep 2009) | 3 lines
  
  Adding an improved collectionChanged() method to Observer2 so that we
  get a chance to know which parts of the collection changed.
................
  r1021506 | tokoe | 2009-09-09 14:36:09 +0200 (Wed, 09 Sep 2009) | 2 lines
  
  Extend apidocs by examples
................
  r1021510 | tmcguire | 2009-09-09 14:41:33 +0200 (Wed, 09 Sep 2009) | 163 lines
  
  Block cyclic merges.
  SVN_SILENT
  SVN_MERGE
  --
  Blocked revisions 1015922,1015925,1015927-1015928,1017872,1019403,1019453,1019804 via svnmerge
  
  ................
    r1015922 | tmcguire | 2009-08-26 18:11:38 +0200 (Wed, 26 Aug 2009) | 17 lines
    
    Block cyclic merge
    SVN_SILENT
    Blocked revisions 1013754 via svnmerge
    
    ........
      r1013754 | winterz | 2009-08-20 19:46:26 +0200 (Thu, 20 Aug 2009) | 10 lines
      
      Backport r1013753 by winterz from trunk to the 4.3 branch:
      
      merge SVN commit 1013751 from e4 kdepimlibs to trunk
      
      make sure to convert Attachment labels from Utf8
      
      Sorry Thomas, you'll need to record this for us.
      MERGE: 4.3
    ........
  ................
    r1015925 | tmcguire | 2009-08-26 18:13:23 +0200 (Wed, 26 Aug 2009) | 33 lines
    
    Merged revisions 1013328-1013329,1013331 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs
    
    ........
      r1013328 | tmcguire | 2009-08-19 17:25:59 +0200 (Wed, 19 Aug 2009) | 11 lines
      
      Backport r1012151 by tmcguire from trunk to the 4.3 branch:
      
      Don't remove my whitespace if I set the PreserceSpaces flag.
      Strange is that the code seems to do that intentionally, but it is so old that svn annotate doesn't say anything useful.
      
      
      Add small unit test for that.
      
      BUG :204101
    ........
      r1013329 | tmcguire | 2009-08-19 17:26:48 +0200 (Wed, 19 Aug 2009) | 7 lines
      
      Backport r1012907 by tmcguire from trunk to the 4.3 branch:
      
      Now I know why the code didn't simply replace all spaces with nbsps: That would break
      word-wrapping.
      Therefore, take this into account and adjust the tests for it.
    ........
      r1013331 | tmcguire | 2009-08-19 17:27:44 +0200 (Wed, 19 Aug 2009) | 7 lines
      
      Backport r1012912 by tmcguire from trunk to the 4.3 branch:
      
      Fix spaces one and for all, hopefully.
      I forgot that in a sequence of spaces, all must be non-breaking, otherwise the breaking one
      isn't taken into account.
    ........
  ................
    r1015927 | tmcguire | 2009-08-26 18:14:46 +0200 (Wed, 26 Aug 2009) | 13 lines
    
    Merged revisions 1013810 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs
    
    ........
      r1013810 | winterz | 2009-08-20 21:43:58 +0200 (Thu, 20 Aug 2009) | 7 lines
      
      Backport r1013809 by winterz from trunk to the 4.3 branch:
      
      don't crash if the calendar passed to the FreeBusy is zero.
      CCBUG: 186597
      MERGE: 4.3
    ........
  ................
    r1015928 | tmcguire | 2009-08-26 18:15:38 +0200 (Wed, 26 Aug 2009) | 15 lines
    
    Merged revisions 1015198 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs
    
    ........
      r1015198 | mkoller | 2009-08-24 23:22:31 +0200 (Mon, 24 Aug 2009) | 9 lines
      
      Backport r1015195 by mkoller from trunk to the 4.3 branch:
      
      CCBUG: 202445
      
      Try much better to discover a URL, even if it is enclosed with
      some sort of brackets/quotes and even interrupted by line breaks or white space.
      RFC3986 explains this in appendix C
    ........
  ................
    r1017872 | winterz | 2009-08-31 21:16:15 +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
    ........
  ................
    r1019403 | winterz | 2009-09-03 16:21:38 +0200 (Thu, 03 Sep 2009) | 14 lines
    
    Merged revisions 1019400 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1019400 | winterz | 2009-09-03 10:03:23 -0400 (Thu, 03 Sep 2009) | 7 lines
      
      backport SVN commit 1017820 by winterz from trunk to e35:
      
      Provide a new toolTipStr() and extensiveDisplayStr() that print the Incidence's calendar.
      Deprecate the old toolTipStr() and extensiveDisplayStr().
      
      MERGE: e4
    ........
  ................
    r1019453 | winterz | 2009-09-03 19:02:00 +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
    ........
  ................
    r1019804 | winterz | 2009-09-04 14:34:56 +0200 (Fri, 04 Sep 2009) | 5 lines
    
    merge SVN commit 1019799 by winterz from trunk to e4:
    
    Fix "kmail: Kiosk-based [$e] config variables are not evaluated for file emailidentities"
    Thanks for the patch Jörg!
  ................
................
  r1021511 | tmcguire | 2009-09-09 14:42:58 +0200 (Wed, 09 Sep 2009) | 11 lines
  
  SVN_MERGE
  --
  Merged revisions 1020958 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
  
  ........
    r1020958 | tmcguire | 2009-09-07 20:06:13 +0200 (Mon, 07 Sep 2009) | 1 line
    
    Fix typo
  ........
................
  r1021512 | ervin | 2009-09-09 14:45:16 +0200 (Wed, 09 Sep 2009) | 2 lines
  
  Of course forgot a @since 4.4... meh.
................
  r1021524 | ervin | 2009-09-09 15:12:32 +0200 (Wed, 09 Sep 2009) | 3 lines
  
  Get rid of the "collectionMoved() from Observer2 hides collectionMoved()
  from Observer" warning. It's perfectly intended here.
................
  r1021529 | ervin | 2009-09-09 15:19:12 +0200 (Wed, 09 Sep 2009) | 3 lines
  
  Another warning related to collectionChanged (AH! got it right now!)
  which goes away.
................
  r1021589 | djarvie | 2009-09-09 17:41:25 +0200 (Wed, 09 Sep 2009) | 2 lines
  
  Change licence to LGPL
................

svn path=/branches/work/akonadi-ports/kdepimlibs/; revision=1021825
parent fd9d135a
......@@ -35,7 +35,28 @@ namespace Akonadi {
/**
* @short A combobox for selecting an Akonadi address book.
*
* This widget provides a combobox to select an address book
* collection from the Akonadi storage.
* The available address books can be filtered to show only
* address books that can contain contacts, contact groups or both.
*
* Example:
*
* @code
*
* using namespace Akonadi;
*
* AddressBookComboBox *box = new AddressBookComboBox( AddressBookComboBox::All,
* AddressBookComboBox::Readable, this );
*
* ...
*
* const Collection addressBook = box->selectedAddressBook();
*
* @endcode
*
* @author Tobias Koenig <tokoe@kde.org>
* @since 4.4
*/
class AKONADI_CONTACT_EXPORT AddressBookComboBox : public QWidget
{
......
......@@ -34,7 +34,27 @@ class Collection;
/**
* @short A dialog to select an address book in Akonadi.
*
* This dialog provides a combobox to select an address book
* collection from the Akonadi storage.
* The available address books can be filtered to show only
* address books that can contain contacts, contact groups or both.
*
* Example:
*
* @code
*
* using namespace Akonadi;
*
* AddressBookSelectionDialog dlg( AddressBookSelectionDialog::All, this );
* if ( dlg.exec() ) {
* const Collection addressBook = dlg.selectedAddressBook();
* ...
* }
*
* @endcode
*
* @author Tobias Koenig <tokoe@kde.org>
* @since 4.4
*/
class AKONADI_CONTACT_EXPORT AddressBookSelectionDialog : public KDialog
{
......
......@@ -4,19 +4,20 @@
*
* Copyright © 2009 by David Jarvie <djarvie@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU 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 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 program 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 General Public License for more details.
* 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 General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* 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 AUTOQPOINTER_H
......
......@@ -35,7 +35,46 @@ class Item;
/**
* @short An widget to edit contacts in Akonadi.
*
* This widget provides a way to create a new contact or edit
* an existing contact in Akonadi.
*
* Example for creating a new contact:
*
* @code
*
* using namespace Akonadi;
*
* ContactEditor *editor = new ContactEditor( Akonadi::ContactEditor::CreateMode, this );
*
* ...
*
* if ( !editor->saveContact() ) {
* qDebug() << "Unable to save new contact to storage";
* return;
* }
*
* @endcode
*
* Example for editing an existing contact:
*
* @code
*
* const Akonadi::Item contact = ...;
*
* ContactEditor *editor = new ContactEditor( Akonadi::ContactEditor::EditMode, this );
* editor->loadContact( contact );
*
* ...
*
* if ( !editor->saveContact() ) {
* qDebug() << "Unable to save changed contact to storage";
* return;
* }
*
* @endcode
*
* @author Tobias Koenig <tokoe@kde.org>
* @since 4.4
*/
class AKONADI_CONTACT_EXPORT ContactEditor : public QWidget
{
......
......@@ -72,6 +72,7 @@ class Item;
* @endcode
*
* @author Tobias Koenig <tokoe@kde.org>
* @since 4.4
*/
class AKONADI_CONTACT_EXPORT ContactEditorDialog : public KDialog
{
......
......@@ -32,10 +32,48 @@ class Collection;
class Item;
/**
* @short An editor for contact groups.
* @short An widget to edit contact groups in Akonadi.
*
* This widget provides a way to create a new contact group or edit
* an existing contact group in Akonadi.
*
* Example for creating a new contact group:
*
* @code
*
* using namespace Akonadi;
*
* ContactGroupEditor *editor = new ContactGroupEditor( Akonadi::ContactGroupEditor::CreateMode, this );
*
* ...
*
* if ( !editor->saveContactGroup() ) {
* qDebug() << "Unable to save new contact group to storage";
* return;
* }
*
* @endcode
*
* Example for editing an existing contact group:
*
* @code
*
* const Akonadi::Item contactGroup = ...;
*
* ContactGroupEditor *editor = new ContactGroupEditor( Akonadi::ContactGroupEditor::EditMode, this );
* editor->loadContactGroup( contactGroup );
*
* ...
*
* if ( !editor->saveContactGroup() ) {
* qDebug() << "Unable to save changed contact group to storage";
* return;
* }
*
* @endcode
*
* @author Tobias Koenig <tokoe@kde.org>
* @since 4.3
* @since 4.4
*/
class AKONADI_CONTACT_EXPORT ContactGroupEditor : public QWidget
{
......
......@@ -34,9 +34,44 @@ class Item;
class ContactGroupEditor;
/**
* @short A dialog for editing a contact group.
* @short A dialog for creating or editing a contact group in Akonadi.
*
* This dialog provides a way to create a new contact group or edit
* an existing contact group in Akonadi.
*
* Example for creating a new contact group:
*
* @code
*
* Akonadi::ContactGroupEditorDialog dlg( Akonadi::ContactGroupEditorDialog::CreateMode, this );
*
* if ( dlg.exec() ) {
* qDebug() << "New contact group has been added to the address book";
* } else {
* qDebug() << "User has canceled operation";
* }
*
* @endcode
*
* Example for editing an existing contact group:
*
* @code
*
* const Akonadi::Item contactGroup = ...;
*
* Akonadi::ContactGroupEditorDialog dlg( Akonadi::ContactGroupEditorDialog::EditMode, this );
* dlg.setContactGroup( contactGroup );
*
* if ( dlg.exec() ) {
* qDebug() << "Contact group has been edited";
* } else {
* qDebug() << "User has canceled operation";
* }
*
* @endcode
*
* @author Tobias Koenig <tokoe@kde.org>
* @since 4.4
*/
class AKONADI_CONTACT_EXPORT ContactGroupEditorDialog : public KDialog
{
......
......@@ -59,6 +59,7 @@ namespace Akonadi {
* @endcode
*
* @author Tobias Koenig <tokoe@kde.org>
* @since 4.4
*/
class AKONADI_CONTACT_EXPORT ContactGroupExpandJob : public KJob
{
......
......@@ -55,6 +55,7 @@ namespace Akonadi {
* @endcode
*
* @author Tobias Koenig <tokoe@kde.org>
* @since 4.4
*/
class AKONADI_CONTACT_EXPORT ContactGroupSearchJob : public KJob
{
......
......@@ -33,7 +33,24 @@ namespace Akonadi {
/**
* @short A viewer component for contact groups in Akonadi.
*
* This widgets provides a way to show a contact group from the
* Akonadi storage.
*
* Example:
*
* @code
*
* using namespace Akonadi;
*
* const Item group = ...
*
* ContactGroupViewer *viewer = new ContactGroupViewer( this );
* viewer->setContactGroup( group );
*
* @endcode
*
* @author Tobias Koenig <tokoe@kde.org>
* @since 4.4
*/
class AKONADI_CONTACT_EXPORT ContactGroupViewer : public QWidget, public Akonadi::ItemMonitor
{
......
......@@ -33,7 +33,23 @@ class Item;
/**
* @short A dialog for displaying a contact group in Akonadi.
*
* This dialog provides a way to show a contact group from the
* Akonadi storage.
*
* Example:
*
* @code
*
* const Akonadi::Item group = ...
*
* Akonadi::ContactGroupViewerDialog dlg( this );
* dlg.setContactGroup( group );
* dlg.exec();
*
* @endcode
*
* @author Tobias Koenig <tokoe@kde.org>
* @since 4.4
*/
class AKONADI_CONTACT_EXPORT ContactGroupViewerDialog : public KDialog
{
......
......@@ -55,6 +55,7 @@ namespace Akonadi {
* @endcode
*
* @author Tobias Koenig <tokoe@kde.org>
* @since 4.4
*/
class AKONADI_CONTACT_EXPORT ContactSearchJob : public KJob
{
......
......@@ -33,7 +33,24 @@ namespace Akonadi {
/**
* @short A viewer component for contacts in Akonadi.
*
* This widgets provides a way to show a contact from the
* Akonadi storage.
*
* Example:
*
* @code
*
* using namespace Akonadi;
*
* const Item contact = ...
*
* ContactViewer *viewer = new ContactViewer( this );
* viewer->setContact( contact );
*
* @endcode
*
* @author Tobias Koenig <tokoe@kde.org>
* @since 4.4
*/
class AKONADI_CONTACT_EXPORT ContactViewer : public QWidget, public Akonadi::ItemMonitor
{
......
......@@ -33,7 +33,23 @@ class Item;
/**
* @short A dialog for displaying a contact in Akonadi.
*
* This dialog provides a way to show a contact from the
* Akonadi storage.
*
* Example:
*
* @code
*
* const Akonadi::Item contact = ...
*
* Akonadi::ContactViewerDialog dlg( this );
* dlg.setContact( contact );
* dlg.exec();
*
* @endcode
*
* @author Tobias Koenig <tokoe@kde.org>
* @since 4.4
*/
class AKONADI_CONTACT_EXPORT ContactViewerDialog : public KDialog
{
......
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