Commit ae00df7c authored by Volker Krause's avatar Volker Krause
Browse files

SVN_MERGE

Merged revisions 1010322,1010326,1010341,1010350,1010359,1010372-1010373,1010383-1010384,1010415,1010418,1010421,1010488,1010576,1010578,1010586,1010624,1010715,1010722,1010744,1010749,1010760,1010763-1010764,1010766,1010793,1010801,1010803,1010818,1010820,1010825-1010826,1010828,1010830,1010835-1010836,1010839-1010841,1010845,1010847,1010849-1010850,1010884,1010958-1010959,1011019-1011020,1011040-1011043,1011045,1011081,1011104,1011111,1011252,1011294,1011314,1011342,1011351,1011354,1011360-1011361,1011373,1011376,1011385,1011389,1011477,1011485,1011500,1011598,1011605,1011616,1011620,1011626,1011656,1011675,1011699,1011712,1011726,1011746,1011825,1011918,1012087,1012117,1012120,1012123,1012225-1012226 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

................
  r1010322 | robertm | 2009-08-12 11:09:26 +0200 (Wed, 12 Aug 2009) | 3 lines
  
  Make the Akonadi settings widget remember state.
................
  r1010326 | stikonas | 2009-08-12 11:31:02 +0200 (Wed, 12 Aug 2009) | 1 line
  
  i18n: Fix plural support in spinboxes and comboboxes of Akregator.
................
  r1010341 | scripty | 2009-08-12 12:00:54 +0200 (Wed, 12 Aug 2009) | 1 line
  
  SVN_SILENT made messages (.desktop file)
................
  r1010350 | tokoe | 2009-08-12 12:10:40 +0200 (Wed, 12 Aug 2009) | 6 lines
  
  Create new library akonadi-contact
  
  This library will contain a contact editor, a contact viewer
  and several contact specific commands. It is supposed to be
  moved to kdepimlibs/akonadi/kabc/ later on
................
  r1010359 | tokoe | 2009-08-12 12:12:22 +0200 (Wed, 12 Aug 2009) | 2 lines
  
  Add translation extraction script
................
  r1010372 | tmcguire | 2009-08-12 12:29:05 +0200 (Wed, 12 Aug 2009) | 4 lines
  
  Revert r1009406, apparently that was by design.
  
  CCBUG: 202297
................
  r1010373 | tmcguire | 2009-08-12 12:34:30 +0200 (Wed, 12 Aug 2009) | 1 line
  
  SVN_SILENT add comment about my previous change.
................
  r1010383 | tokoe | 2009-08-12 13:05:38 +0200 (Wed, 12 Aug 2009) | 2 lines
  
  Add an akonadi attribute for storing contact metadata
................
  r1010384 | tokoe | 2009-08-12 13:06:20 +0200 (Wed, 12 Aug 2009) | 2 lines
  
  api and apidox cleanups
................
  r1010415 | tokoe | 2009-08-12 14:05:06 +0200 (Wed, 12 Aug 2009) | 2 lines
  
  Add support for akonadi-based contact meta data storage
................
  r1010418 | cgiboudeaux | 2009-08-12 14:15:21 +0200 (Wed, 12 Aug 2009) | 1 line
  
  Fix include
................
  r1010421 | cgiboudeaux | 2009-08-12 14:20:17 +0200 (Wed, 12 Aug 2009) | 1 line
  
  Fix include
................
  r1010488 | stikonas | 2009-08-12 18:41:01 +0200 (Wed, 12 Aug 2009) | 1 line
  
  Add plural compatible suffix support to spinbox.
................
  r1010576 | djarvie | 2009-08-12 23:18:42 +0200 (Wed, 12 Aug 2009) | 2 lines
  
  Fix KMail not starting minimised when adding mail to a KMail folder.
................
  r1010578 | mkoller | 2009-08-12 23:27:04 +0200 (Wed, 12 Aug 2009) | 5 lines
  
  BUG: 203220
  
  remove duplicate copy action
................
  r1010586 | mkoller | 2009-08-12 23:46:56 +0200 (Wed, 12 Aug 2009) | 4 lines
  
  BUG: 202294
  
  work around a bug in KCharSets (see bug #203633)
................
  r1010624 | djarvie | 2009-08-13 03:14:22 +0200 (Thu, 13 Aug 2009) | 2 lines
  
  Correct #include for generated header
................
  r1010715 | scripty | 2009-08-13 11:33:23 +0200 (Thu, 13 Aug 2009) | 1 line
  
  SVN_SILENT made messages (.desktop file)
................
  r1010722 | tokoe | 2009-08-13 11:35:42 +0200 (Thu, 13 Aug 2009) | 4 lines
  
  Add ContactViewer component to Akonadi Contact library
  
  Make use of the new component in KAddressBook
................
  r1010744 | gateau | 2009-08-13 12:29:11 +0200 (Thu, 13 Aug 2009) | 1 line
  
  Do not return 0 if a KMMainWin is found
................
  r1010749 | tokoe | 2009-08-13 12:38:40 +0200 (Thu, 13 Aug 2009) | 2 lines
  
  Add ContactViewerDialog component to Akonadi Contact library
................
  r1010760 | tokoe | 2009-08-13 13:08:20 +0200 (Thu, 13 Aug 2009) | 2 lines
  
  Add ContactGroupViewer and ContactGroupViewerDialog components
................
  r1010763 | tokoe | 2009-08-13 13:20:21 +0200 (Thu, 13 Aug 2009) | 2 lines
  
  Bring back the image for contact groups
................
  r1010764 | tokoe | 2009-08-13 13:20:59 +0200 (Thu, 13 Aug 2009) | 2 lines
  
  Make use of ContactGroupViewer
................
  r1010766 | tokoe | 2009-08-13 13:25:23 +0200 (Thu, 13 Aug 2009) | 2 lines
  
  Nothing from kabcommon-akonadi used anymore
................
  r1010793 | ahartmetz | 2009-08-13 15:17:49 +0200 (Thu, 13 Aug 2009) | 1 line
  
  KDE4_*_LIBS (as opposed to _LIBRARY) already includes dependencies.
................
  r1010801 | ahartmetz | 2009-08-13 15:29:48 +0200 (Thu, 13 Aug 2009) | 1 line
  
  link with gold
................
  r1010803 | tokoe | 2009-08-13 15:33:00 +0200 (Thu, 13 Aug 2009) | 4 lines
  
  Created the new component AddressBookComboBox and AddressBookSelectionDialog
  
  These two classes allow the user to select an address book collection
................
  r1010818 | tokoe | 2009-08-13 15:59:01 +0200 (Thu, 13 Aug 2009) | 2 lines
  
  Allow to defined what kind of address books to select
................
  r1010820 | tmcguire | 2009-08-13 16:04:08 +0200 (Thu, 13 Aug 2009) | 486 lines
  
  Block cyclic merges, release stuff
  SVN_MERGE
  SVN_SILENT
  --
  Blocked revisions 1007377,1007427,1007430,1007434,1007437-1007438,1007440-1007443,1007445,1007447,1007449,1007451,1008353,1008355,1008412,1008421,1008453,1008458-1008459,1008465,1009286,1009787,1010411 via svnmerge
  
  ................
    r1007377 | winterz | 2009-08-05 19:20:40 +0200 (Wed, 05 Aug 2009) | 10 lines
    
    Merged revisions 1007373 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1007373 | winterz | 2009-08-05 13:14:29 -0400 (Wed, 05 Aug 2009) | 4 lines
      
      Revert the remaining parts of SVN commit 1004175 that caused 
      the [Accept], etc. buttons not to be shown on updated invitation mails.
    ........
  ................
    r1007427 | tmcguire | 2009-08-05 20:53:51 +0200 (Wed, 05 Aug 2009) | 159 lines
    
    Block cyclic merges, Akonadi, KAlarm, new message list, etc
    SVN_SILENT
    Blocked revisions 1005085,1005087-1005090,1005094,1005607,1005723,1005876,1006617 via svnmerge
    
    ................
      r1005085 | tmcguire | 2009-07-31 12:18:35 +0200 (Fri, 31 Jul 2009) | 23 lines
      
      Backport r1004667 by tmcguire from trunk to the 4.3 branch:
      
      SVN_MERGE
      Merged revisions 1001019 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
      
      ................
        r1001019 | winterz | 2009-07-22 15:14:18 +0200 (Wed, 22 Jul 2009) | 12 lines
        
        Merged revisions 1000952 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1000952 | vkrause | 2009-07-22 07:33:21 -0400 (Wed, 22 Jul 2009) | 5 lines
          
          Also write Kolab properties of default groupware folders.
          
          Kolab issue 3734
          MERGE: e4, trunk, 4.3
        ........
      ................
    ................
      r1005087 | tmcguire | 2009-07-31 12:19:55 +0200 (Fri, 31 Jul 2009) | 22 lines
      
      Backport r1004680 by tmcguire from trunk to the 4.3 branch:
      
      SVN_MERGE
      Merged revisions 1001528 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
      
      ................
        r1001528 | tmcguire | 2009-07-23 17:05:09 +0200 (Thu, 23 Jul 2009) | 11 lines
        
        Merged revisions 1001524 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1001524 | tmcguire | 2009-07-23 17:00:24 +0200 (Thu, 23 Jul 2009) | 4 lines
          
          By default, don't disable the check for too many recepients.
          
          Fixes kolab/issue3718.
        ........
      ................
    ................
      r1005088 | tmcguire | 2009-07-31 12:20:54 +0200 (Fri, 31 Jul 2009) | 34 lines
      
      Backport r1004681 by tmcguire from trunk to the 4.3 branch:
      
      SVN_MERGE
      Merged revisions 1001563,1004554 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
      
      ................
        r1001563 | tmcguire | 2009-07-23 18:33:11 +0200 (Thu, 23 Jul 2009) | 10 lines
        
        Merged revisions 1001562 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1001562 | tmcguire | 2009-07-23 18:28:14 +0200 (Thu, 23 Jul 2009) | 3 lines
          
          Don't show a folder content type combo box for online IMAP folders, because that is not supported.
          Fixes kolab/issue3742
        ........
      ................
        r1004554 | winterz | 2009-07-30 15:29:00 +0200 (Thu, 30 Jul 2009) | 11 lines
        
        Merged revisions 1004535 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1004535 | tmcguire | 2009-07-30 08:51:43 -0400 (Thu, 30 Jul 2009) | 4 lines
          
          Fix silly crash when creating a folder.
          
          kolab/issue3777
        ........
      ................
    ................
      r1005089 | tmcguire | 2009-07-31 12:21:52 +0200 (Fri, 31 Jul 2009) | 4 lines
      
      Backport r1003213 by stefanek from trunk to the 4.3 branch:
      
      Fix a problem with the sort indicator not properly restored after a folder change.
    ................
      r1005090 | tmcguire | 2009-07-31 12:23:36 +0200 (Fri, 31 Jul 2009) | 24 lines
      
      Backport r1004666 by tmcguire from trunk to the 4.3 branch:
      
      SVN_MERGE
      Merged revisions 1001006 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
      
      ................
        r1001006 | winterz | 2009-07-22 15:02:04 +0200 (Wed, 22 Jul 2009) | 13 lines
        
        Merged revisions 1000899 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1000899 | vkrause | 2009-07-22 05:44:38 -0400 (Wed, 22 Jul 2009) | 6 lines
          
          Also recognize invitation attachments marked as text/x-vcalendar instead
          of text/calendar.
          
          Kolab issue 3744
          MERGE: e4, trunk, 4.3
        ........
      ................
    ................
      r1005094 | tmcguire | 2009-07-31 12:29:12 +0200 (Fri, 31 Jul 2009) | 23 lines
      
      Backport r1004665 by tmcguire from trunk to the 4.3 branch:
      
      SVN_MERGE
      Merged revisions 1000998 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
      
      ................
        r1000998 | winterz | 2009-07-22 14:49:03 +0200 (Wed, 22 Jul 2009) | 12 lines
        
        Merged revisions 1000859 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1000859 | vkrause | 2009-07-22 04:43:06 -0400 (Wed, 22 Jul 2009) | 5 lines
          
          Allow to edit the organizer field if it is empty.
          
          Kolab issue 3771
          MERGE: e4, trunk, 4.3
        ........
      ................
    ................
      r1005607 | djarvie | 2009-08-01 15:13:56 +0200 (Sat, 01 Aug 2009) | 1 line
      
      Remove unused forward declaration
    ................
      r1005723 | djarvie | 2009-08-02 00:46:59 +0200 (Sun, 02 Aug 2009) | 2 lines
      
      Set compiler definition KMAIL_SUPPORTED to fix KMail dependent functions never being compiled.
    ................
      r1005876 | mikearthur | 2009-08-02 14:47:42 +0200 (Sun, 02 Aug 2009) | 2 lines
      
      Include Webkit to fix compilation on Nokia Qt OSX SDK.
    ................
      r1006617 | scripty | 2009-08-04 05:05:34 +0200 (Tue, 04 Aug 2009) | 1 line
      
      SVN_SILENT made messages (.desktop file)
    ................
  ................
    r1007430 | tmcguire | 2009-08-05 20:55:16 +0200 (Wed, 05 Aug 2009) | 12 lines
    
    SVN_SILENT new msg list again
    Blocked revisions 1005077 via svnmerge
    
    ........
      r1005077 | tmcguire | 2009-07-31 12:10:16 +0200 (Fri, 31 Jul 2009) | 6 lines
      
      Backport r1002191 by jtamate from trunk to the 4.3 branch:
      
      Fixes a memory leak of 5,956,964 (72 direct, 5,956,892 indirect) bytes.
      tested with valgrind.
    ........
  ................
    r1007434 | tmcguire | 2009-08-05 20:58:45 +0200 (Wed, 05 Aug 2009) | 17 lines
    
    Merged revisions 1005078 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1005078 | tmcguire | 2009-07-31 12:11:17 +0200 (Fri, 31 Jul 2009) | 11 lines
      
      Backport r1002770 by tmcguire from trunk to the 4.3 branch:
      
      Also support multipart/alternative with text/plain and multipart/related as children, instead
      of the usual text/plain and text/html.
      
      This fixes that the content of some Newsletters with images was rendered twice, bot the HTML and
      the plain text part was shown.
      
      CCBUG: 187989
    ........
  ................
    r1007437 | tmcguire | 2009-08-05 21:09:35 +0200 (Wed, 05 Aug 2009) | 13 lines
    
    Merged revisions 1005081 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1005081 | tmcguire | 2009-07-31 12:17:17 +0200 (Fri, 31 Jul 2009) | 7 lines
      
      Backport r1004266 by tmcguire from trunk to the 4.3 branch:
      
      Also support cc, body and subject when passing mailto urls on the command line.
      
      CCMAIL: l.lunak@kde.org
    ........
  ................
    r1007438 | tmcguire | 2009-08-05 21:10:21 +0200 (Wed, 05 Aug 2009) | 11 lines
    
    Merged revisions 1005095 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1005095 | tmcguire | 2009-07-31 12:31:46 +0200 (Fri, 31 Jul 2009) | 5 lines
      
      Backport r1004525 by tmcguire from trunk to the 4.3 branch:
      
      Use better icons for "More" and "Fewer", as suggested by Nuno.
    ........
  ................
    r1007440 | tmcguire | 2009-08-05 21:11:39 +0200 (Wed, 05 Aug 2009) | 17 lines
    
    Block this week's Akregator commit.
    CCMAIL: frank.osterfeld@kdemail.net
    SVN_SILENT
    Blocked revisions 1005313 via svnmerge
    
    ........
      r1005313 | osterfeld | 2009-07-31 21:19:26 +0200 (Fri, 31 Jul 2009) | 6 lines
      
      - Move zoom action into tabwidget and send zoom in/out signals to all tabs. I didn't find out how to tell a readonly part to zoom, so I casted it to khtmlpart (if the part is khtml). Could be extended for other types.
      - Tabs load/save zoom factor
      - Add zoom in/out entries in popup menu for tabs.
      - Remove dead code (scroll up/down)
      
      Patch by Alexander Elbs plus some minor changes from me
    ........
  ................
    r1007441 | tmcguire | 2009-08-05 21:16:38 +0200 (Wed, 05 Aug 2009) | 12 lines
    
    Merged revisions 1006055 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1006055 | winterz | 2009-08-03 00:24:47 +0200 (Mon, 03 Aug 2009) | 6 lines
      
      Backport r1006054 by winterz from trunk to the 4.3 branch:
      
      don't show the Advanced reminder button unless reminders are checked-on
      MERGE: e4,4.3.1
    ........
  ................
    r1007442 | tmcguire | 2009-08-05 21:17:39 +0200 (Wed, 05 Aug 2009) | 13 lines
    
    Merged revisions 1006072 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1006072 | winterz | 2009-08-03 01:12:06 +0200 (Mon, 03 Aug 2009) | 7 lines
      
      Backport r1006071 by winterz from trunk to the 4.3 branch:
      
      put the initial focus on the time interval spinbox
      CCBUG: 143197
      MERGE: e4,4.3.1
    ........
  ................
    r1007443 | tmcguire | 2009-08-05 21:18:46 +0200 (Wed, 05 Aug 2009) | 9 lines
    
    Merged revisions 1006445 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1006445 | mkoller | 2009-08-03 21:07:25 +0200 (Mon, 03 Aug 2009) | 2 lines
      
      Backport for  bug 169092
    ........
  ................
    r1007445 | tmcguire | 2009-08-05 21:19:45 +0200 (Wed, 05 Aug 2009) | 11 lines
    
    Merged revisions 1006454 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1006454 | mkoller | 2009-08-03 21:22:12 +0200 (Mon, 03 Aug 2009) | 4 lines
      
      make sure the changed file is known to be modified to not lose
      the change when the composer is closed.
      Backport from trunk
    ........
  ................
    r1007447 | tmcguire | 2009-08-05 21:21:02 +0200 (Wed, 05 Aug 2009) | 9 lines
    
    Merged revisions 1006460 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1006460 | mkoller | 2009-08-03 21:39:48 +0200 (Mon, 03 Aug 2009) | 2 lines
      
      Backport: do not launch the external editor on modifier keypress alone
    ........
  ................
    r1007449 | tmcguire | 2009-08-05 21:23:05 +0200 (Wed, 05 Aug 2009) | 10 lines
    
    KUrlrequester has no such method here.
    SVN_SILENT
    Blocked revisions 1006762 via svnmerge
    
    ........
      r1006762 | mkoller | 2009-08-04 12:39:33 +0200 (Tue, 04 Aug 2009) | 2 lines
      
      backport: avoid URL encoding of external editor argument %f
    ........
  ................
    r1007451 | tmcguire | 2009-08-05 21:25:55 +0200 (Wed, 05 Aug 2009) | 14 lines
    
    Merged revisions 1006790 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1006790 | mkoller | 2009-08-04 14:22:59 +0200 (Tue, 04 Aug 2009) | 7 lines
      
      backport BUG: 136407
      
      make sure to find the real mail address part when adding the defaultdomain
      -- Diese und die folgenden Zeilen werden ignoriert --
      
      M    stringutil.cpp
    ........
  ................
    r1008353 | tmcguire | 2009-08-07 11:35:00 +0200 (Fri, 07 Aug 2009) | 1 line
    
    Update Newslog.txt
  ................
    r1008355 | tmcguire | 2009-08-07 11:36:44 +0200 (Fri, 07 Aug 2009) | 1 line
    
    SVN_SILENT Update version numbers for today's release.
  ................
    r1008412 | winterz | 2009-08-07 15:15:07 +0200 (Fri, 07 Aug 2009) | 16 lines
    
    Blocked revisions 1008276,1008354,1008389 via svnmerge
    
    ........
      r1008276 | tmcguire | 2009-08-07 04:43:50 -0400 (Fri, 07 Aug 2009) | 1 line
      
      Update Newslog.txt
    ........
      r1008354 | tmcguire | 2009-08-07 05:36:42 -0400 (Fri, 07 Aug 2009) | 1 line
      
      SVN_SILENT Update version numbers for today's release.
    ........
      r1008389 | winterz | 2009-08-07 07:25:40 -0400 (Fri, 07 Aug 2009) | 2 lines
      
      add the email DND issue number
    ........
  ................
    r1008421 | winterz | 2009-08-07 15:25:18 +0200 (Fri, 07 Aug 2009) | 12 lines
    
    Blocked revisions 1007568 via svnmerge
    
    ........
      r1007568 | winterz | 2009-08-05 19:56:55 -0400 (Wed, 05 Aug 2009) | 6 lines
      
      Oh happy day!
      Finally a much nicer icon for the organizer to replace the old "tux" icon.
      Thanks to Nuno
      
      MERGE: none
    ........
  ................
    r1008453 | winterz | 2009-08-07 16:44:21 +0200 (Fri, 07 Aug 2009) | 9 lines
    
    Blocked revisions 1007994 via svnmerge
    
    ........
      r1007994 | winterz | 2009-08-06 12:48:07 -0400 (Thu, 06 Aug 2009) | 3 lines
      
      assignmentvisitor and comparisonvisitor backported from e4
      MERGE: none
    ........
  ................
    r1008458 | winterz | 2009-08-07 17:02:58 +0200 (Fri, 07 Aug 2009) | 12 lines
    
    Merged revisions 1008004 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1008004 | winterz | 2009-08-06 13:12:09 -0400 (Thu, 06 Aug 2009) | 5 lines
      
      Make life easier by using the separate class files for AssignmentVisitor 
      and ComparisonVisitor. Copied from trunk.
      
      MERGE: e4
    ........
  ................
    r1008459 | winterz | 2009-08-07 17:04:53 +0200 (Fri, 07 Aug 2009) | 9 lines
    
    Blocked revisions 1008005 via svnmerge
    
    ........
      r1008005 | winterz | 2009-08-06 13:12:49 -0400 (Thu, 06 Aug 2009) | 3 lines
      
      whoopsie, forgot this
      MERGE: e4
    ........
  ................
    r1008465 | winterz | 2009-08-07 17:11:22 +0200 (Fri, 07 Aug 2009) | 18 lines
    
    Merged revisions 1008129 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1008129 | winterz | 2009-08-06 19:17:26 -0400 (Thu, 06 Aug 2009) | 12 lines
      
      When an invitation incidence is being updated only, do not delete-then-add
      the incidence to the calendar; instead, use and AssignmentVisitor to 
      simply assign the update.  This is better because the user is not
      prompted with a Resource Selector dialog with a simple assignment.
      
      and when the user is not prompted they are not allowed to move
      the incidence to a different calendar resource -- which can lead
      to sorts of trouble.
      
      kolab/issue3776
    ........
  ................
    r1009286 | winterz | 2009-08-09 18:00:51 +0200 (Sun, 09 Aug 2009) | 10 lines
    
    Blocked revisions 1009285 via svnmerge
    
    ........
      r1009285 | winterz | 2009-08-09 11:59:56 -0400 (Sun, 09 Aug 2009) | 4 lines
      
      make sure to set an Organizer when scheduling forward.
      backported from trunk. I was reminded of this bugfix due to issue1536
      MERGE: none
    ........
  ................
    r1009787 | winterz | 2009-08-10 22:56:03 +0200 (Mon, 10 Aug 2009) | 11 lines
    
    Recorded merge of revisions 1009784 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1009784 | winterz | 2009-08-10 16:50:57 -0400 (Mon, 10 Aug 2009) | 4 lines
      
      don't print the Attachments section if there aren't any Attachments.
      improves the fix for kolab/issue3717
      MERGE: e4,trunk
    ........
  ................
    r1010411 | winterz | 2009-08-12 13:51:05 +0200 (Wed, 12 Aug 2009) | 11 lines
    
    Merged revisions 1010324 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1010324 | vkrause | 2009-08-12 05:27:00 -0400 (Wed, 12 Aug 2009) | 4 lines
      
      Correctly preserve uids and scheduling ids when updating incidences.
      
      Kolab issue 3802
    ........
  ................
................
  r1010825 | tmcguire | 2009-08-13 16:08:29 +0200 (Thu, 13 Aug 2009) | 20 lines
  
  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
    ........
  ................
................
  r1010826 | tokoe | 2009-08-13 16:08:57 +0200 (Thu, 13 Aug 2009) | 3 lines
  
  Passing collection model to AddressBookComboBox/SelectionDialog
  is not needed anymore since they have their own model
................
  r1010828 | tokoe | 2009-08-13 16:11:53 +0200 (Thu, 13 Aug 2009) | 2 lines
  
  This hack is no longer needed since ETM supports getColumnCount()
................
  r1010830 | tmcguire | 2009-08-13 16:12:41 +0200 (Thu, 13 Aug 2009) | 19 lines
  
  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
    ........
  ................
................
  r1010835 | tmcguire | 2009-08-13 16:18:07 +0200 (Thu, 13 Aug 2009) | 21 lines
  
  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)
    ........
  ................
................
  r1010836 | tmcguire | 2009-08-13 16:18:41 +0200 (Thu, 13 Aug 2009) | 1 line
  
  Remove now unused variable.
................
  r1010839 | tmcguire | 2009-08-13 16:22:36 +0200 (Thu, 13 Aug 2009) | 17 lines
  
  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.
    ........
  ................
................
  r1010840 | tmcguire | 2009-08-13 16:23:47 +0200 (Thu, 13 Aug 2009) | 20 lines
  
  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)
    ........
  ................
................
  r1010841 | tmcguire | 2009-08-13 16:25:10 +0200 (Thu, 13 Aug 2009) | 19 lines
  
  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
    ........
  ................
................
  r1010845 | tmcguire | 2009-08-13 16:29:06 +0200 (Thu, 13 Aug 2009) | 25 lines
  
  SVN_MERGE
  Merged revisions 1008234 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1008234 | tmcguire | 2009-08-07 10:09:59 +0200 (Fri, 07 Aug 2009) | 17 lines
    
    Merged revisions 1007369,1007397 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1007369 | tmcguire | 2009-08-05 18:52:52 +0200 (Wed, 05 Aug 2009) | 6 lines
      
      When scrolling to attachments, visually mark them with a yellow border.
      
      Part of kolab/issue3375.
      
      MERGE: e4, trunk, mailreader
    ........
      r1007397 | tmcguire | 2009-08-05 19:56:37 +0200 (Wed, 05 Aug 2009) | 1 line
      
      Commit some bits I forgot, for the attachment scrolling color thing.
    ........
  ................
................
  r1010847 | tmcguire | 2009-08-13 16:32:15 +0200 (Thu, 13 Aug 2009) | 20 lines
  
  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
    ........
  ................
................
  r1010849 | tmcguire | 2009-08-13 16:33:44 +0200 (Thu, 13 Aug 2009) | 21 lines
  
  SVN_MERGE
  Merged revisions 1009692 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1009692 | winterz | 2009-08-10 18:19:25 +0200 (Mon, 10 Aug 2009) | 13 lines
    
    Merged revisions 1009672 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1009672 | winterz | 2009-08-10 11:46:13 -0400 (Mon, 10 Aug 2009) | 7 lines
      
      Support attachments in invitations.
      Kolab/issue3717
      
      FEATURE:
      MERGE: e4,trunk
    ........
  ................
................
  r1010850 | tmcguire | 2009-08-13 16:35:04 +0200 (Thu, 13 Aug 2009) | 19 lines
  
  SVN_MERGE
  Merged revisions 1010095 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1010095 | winterz | 2009-08-11 18:00:36 +0200 (Tue, 11 Aug 2009) | 11 lines
    
    Merged revisions 1010087 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1010087 | winterz | 2009-08-11 11:36:12 -0400 (Tue, 11 Aug 2009) | 4 lines
      
      beautify the invitations display of attachments
      be nicer about attachment links that cannot be accessed.
      MERGE: e4,trunk
    ........
  ................
................
  r1010884 | tokoe | 2009-08-13 17:08:56 +0200 (Thu, 13 Aug 2009) | 2 lines
  
  Add a job for searching contacts by email or name
................
  r1010958 | tokoe | 2009-08-13 18:41:47 +0200 (Thu, 13 Aug 2009) | 2 lines
  
  Converted Akonadi::Job to KJob and fixed email search query
................
  r1010959 | tokoe | 2009-08-13 18:42:51 +0200 (Thu, 13 Aug 2009) | 4 lines
  
  Ported KAddrBookExternal to native Akonadi calls
  
  (distribution lists must be fixed later)
................
  r1011019 | djarvie | 2009-08-13 21:34:46 +0200 (Thu, 13 Aug 2009) | 2 lines
  
  Update for latest version
................
  r1011020 | mkoller | 2009-08-13 21:35:06 +0200 (Thu, 13 Aug 2009) | 2 lines
  
  fix regression to my last commit r1010578 by defining the Edit-Menu for the Copy action
................
  r1011040 | mjansen | 2009-08-13 22:14:42 +0200 (Thu, 13 Aug 2009) | 1 line
  
  Fix memleak. Free the dummy factory if registerFactory returns false.
................
  r1011041 | tokoe | 2009-08-13 22:14:42 +0200 (Thu, 13 Aug 2009) | 2 lines
  
  Code and API cleanup
................
  r1011042 | mjansen | 2009-08-13 22:15:01 +0200 (Thu, 13 Aug 2009) | 1 line
  
  Fix memleak. Delete the articleModel if SelectionController is destroyed.
................
  r1011043 | mjansen | 2009-08-13 22:15:18 +0200 (Thu, 13 Aug 2009) | 1 line
  
  Fix memleak. Delete all registered factories when destroying the factory.
................
  r1011045 | tokoe | 2009-08-13 22:18:03 +0200 (Thu, 13 Aug 2009) | 2 lines
  
  header cleanup
................
  r1011081 | tmcguire | 2009-08-14 00:00:20 +0200 (Fri, 14 Aug 2009) | 7 lines
  
  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
  BUG: 53668
  MERGE: mailreader
................
  r1011104 | tmcguire | 2009-08-14 01:12:40 +0200 (Fri, 14 Aug 2009) | 2 lines
  
  Don't use KMail's debug area here.
................
  r1011111 | tmcguire | 2009-08-14 01:42:50 +0200 (Fri, 14 Aug 2009) | 1 line
  
  Port to dynamic debug areas.
................
  r1011252 | mlaurent | 2009-08-14 08:31:45 +0200 (Fri, 14 Aug 2009) | 2 lines
  
  Fix iterator
................
  r1011294 | scripty | 2009-08-14 11:30:45 +0200 (Fri, 14 Aug 2009) | 1 line
  
  SVN_SILENT made messages (.desktop file)
................
  r1011314 | tokoe | 2009-08-14 12:19:59 +0200 (Fri, 14 Aug 2009) | 3 lines
  
  Replace deprecated addressbook code
................
  r1011342 | tokoe | 2009-08-14 13:23:54 +0200 (Fri, 14 Aug 2009) | 2 lines
  
  Return the correct selected addressbook collection
................
  r1011351 | tokoe | 2009-08-14 14:00:56 +0200 (Fri, 14 Aug 2009) | 2 lines
  
  fix apidox
................
  r1011354 | tokoe | 2009-08-14 14:06:55 +0200 (Fri, 14 Aug 2009) | 2 lines
  
  fix memory leak + apidox
................
  r1011360 | tokoe | 2009-08-14 14:40:14 +0200 (Fri, 14 Aug 2009) | 5 lines
  
  Add ContactGroupExpandJob
  
  This job can be used to expand a KABC::ContactGroup to a list
  of KABC::Addressee objects
................
  r1011361 | tokoe | 2009-08-14 14:41:09 +0200 (Fri, 14 Aug 2009) | 2 lines
  
  Make use of ContactGroupExpand job to show all contact group entries
................
  r1011373 | tokoe | 2009-08-14 15:30:42 +0200 (Fri, 14 Aug 2009) | 4 lines
  
  Add ContactGroupSearchJob
  
  This jobs allows to search for a contact group by name
................
  r1011376 | winterz | 2009-08-14 15:50:07 +0200 (Fri, 14 Aug 2009) | 2 lines
  
  build with pedantic
................
  r1011385 | jtamate | 2009-08-14 16:03:06 +0200 (Fri, 14 Aug 2009) | 3 lines
  
  http://reviewboard.kde.org/r/1296/
  
  Make the menu entry "Use Fixed Font" follow what the reader win is doing.
................
  r1011389 | tokoe | 2009-08-14 16:22:52 +0200 (Fri, 14 Aug 2009) | 2 lines
  
  Implement distribution list expanding with Akonadi calls
................
  r1011477 | tokoe | 2009-08-14 20:57:26 +0200 (Fri, 14 Aug 2009) | 2 lines
  
  Add convenience method to returns email addresses of a contact group
................
  r1011485 | djarvie | 2009-08-14 21:47:43 +0200 (Fri, 14 Aug 2009) | 2 lines
  
  Display command alarm edit: show error message if no command/script has been entered.
................
  r1011500 | djarvie | 2009-08-14 23:14:42 +0200 (Fri, 14 Aug 2009) | 3 lines
  
  Enable/disable the edit alarm dialogue OK button according to whether any
  changes have been made to the contents.
................
  r1011598 | djarvie | 2009-08-15 10:42:48 +0200 (Sat, 15 Aug 2009) | 4 lines
  
  Enable/disable the edit alarm dialogue OK button according to whether any
  changes have been made to the contents.
  Part 2: a few corrections.
................
  r1011605 | djarvie | 2009-08-15 11:13:28 +0200 (Sat, 15 Aug 2009) | 2 lines
  
  Fix use of wrong time zone if cancel and then reinstate a deferral.
................
  r1011616 | djarvie | 2009-08-15 11:44:06 +0200 (Sat, 15 Aug 2009) | 2 lines
  
  Update hicolor icons to new KAlarm icon
................
  r1011620 | scripty | 2009-08-15 11:46:06 +0200 (Sat, 15 Aug 2009) | 1 line
  
  SVN_SILENT made messages (.desktop file)
................
  r1011626 | djarvie | 2009-08-15 11:50:12 +0200 (Sat, 15 Aug 2009) | 2 lines
  
  Restore after accidental change
................
  r1011656 | djarvie | 2009-08-15 13:15:55 +0200 (Sat, 15 Aug 2009) | 1 line
  
  Fix main volume setting for sound files
................
  r1011675 | djarvie | 2009-08-15 14:11:24 +0200 (Sat, 15 Aug 2009) | 1 line
  
  Fix volume when fader used
................
  r1011699 | yurchor | 2009-08-15 15:42:57 +0200 (Sat, 15 Aug 2009) | 1 line
  
  selelcted->selected
................
  r1011712 | winterz | 2009-08-15 17:27:31 +0200 (Sat, 15 Aug 2009) | 8 lines
  
  Add configuration option for enabling reminders by default for new Events and To-dos.
  kolab/issue3788
  
  BUG: 162855,189841
  MERGE: e35,e4
  DO_NOT_BACKPORT: new feature, new i18n strings
................
  r1011726 | winterz | 2009-08-15 18:50:21 +0200 (Sat, 15 Aug 2009) | 4 lines
  
  Warning prompt (with a do-not-ask-again) if the event start or end date/time is in the past.
  MERGE: none
  DO_NOT_BACKPORT: new i18n strings
................
  r1011746 | djarvie | 2009-08-15 20:54:45 +0200 (Sat, 15 Aug 2009) | 1 line
  
  Remove warning
................
  r1011825 | mkoller | 2009-08-16 00:35:21 +0200 (Sun, 16 Aug 2009) | 5 lines
  
  BUG: 203197
  
  fix usage of the undo action to use the correct name
................
  r1011918 | mkoller | 2009-08-16 12:45:19 +0200 (Sun, 16 Aug 2009) | 5 lines
  
  BUG: 182910
  
  expand full thread when opening the root message as it was done with the old treeview
................
  r1012087 | winterz | 2009-08-16 21:21:05 +0200 (Sun, 16 Aug 2009) | 6 lines
  
  do not assert if we encounter an invalid TodoTreeNode in ::processChanged().
  return normally instead.
  hopefully fixes
  BUG: 195282
  MERGE: e4,4.3
................
  r1012117 | winterz | 2009-08-16 22:48:12 +0200 (Sun, 16 Aug 2009) | 4 lines
  
  don't crash when applying templates when there is no currently seleted template.
  BUG: 204063
  MERGE: e4,4.3
................
  r1012120 | mkoller | 2009-08-16 23:04:59 +0200 (Sun, 16 Aug 2009) | 6 lines
  
  BUG: 203104
  
  On sorting by subject, ignore Re: and Fwd: prefixes to bring back
  the old KDE3 behavior.
................
  r1012123 | mkoller | 2009-08-16 23:11:16 +0200 (Sun, 16 Aug 2009) | 7 lines
  
  BUG: 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.
................
  r1012225 | mlaurent | 2009-08-17 09:36:44 +0200 (Mon, 17 Aug 2009) | 2 lines
  
  Fix mem leak
................
  r1012226 | mlaurent | 2009-08-17 09:39:07 +0200 (Mon, 17 Aug 2009) | 2 lines
  
  fix mem leak
................

svn path=/branches/work/akonadi-ports/kdepim/; revision=1012236
parent 8d27a150
......@@ -41,10 +41,10 @@ K_EXPORT_PLUGIN(KCMAkregatorAdvancedConfigFactory( "kcmakradvancedconfig" ))
KCMAkregatorAdvancedConfig::KCMAkregatorAdvancedConfig( QWidget* parent, const QVariantList& args )
: KCModule( KCMAkregatorAdvancedConfigFactory::componentData(), parent, args ), m_widget( new SettingsAdvanced )
{
{
QVBoxLayout* layout = new QVBoxLayout( this );
layout->addWidget( m_widget );
KAboutData *about = new KAboutData( I18N_NOOP( "kcmakradvancedconfig" ), 0,
ki18n( "Advanced Feed Reader Settings" ),
0, KLocalizedString(), KAboutData::License_GPL,
......@@ -60,12 +60,20 @@ KCMAkregatorAdvancedConfig::KCMAkregatorAdvancedConfig( QWidget* parent, const Q
void KCMAkregatorAdvancedConfig::load()
{
KCModule::load();
#ifdef KRSS_PORT_DISABLED
m_widget->selectFactory(Settings::archiveBackend());
#else
kWarning() << "Code temporarily disabled (Akonadi port)";
#endif //KRSS_PORT_DISABLED
}
void KCMAkregatorAdvancedConfig::save()
{
#ifdef KRSS_PORT_DISABLED
Settings::setArchiveBackend( m_widget->selectedFactory() );
#else
kWarning() << "Code temporarily disabled (Akonadi port)";
#endif //KRSS_PORT_DISABLED
KCModule::save();
}
......
......@@ -24,8 +24,6 @@
#include "akregatorconfig.h"
#include "settings_advanced.h"
#include "storagefactory.h"
#include "storagefactoryregistry.h"
#include <KComboBox>
......@@ -41,18 +39,22 @@ SettingsAdvanced::SettingsAdvanced(QWidget* parent, const char* name) : QWidget(
{
setObjectName(name);
setupUi(this);
#ifdef KRSS_PORT_DISABLED
const QStringList backends = Backend::StorageFactoryRegistry::self()->list();
Q_FOREACH( const QString& i, backends)
{
Backend::StorageFactory* const factory = Backend::StorageFactoryRegistry::self()->getFactory( i );
if ( !factory )
continue;
m_factories.insert( factory->key(), factory );
cbBackend->addItem( factory->name(), factory->key() );
}
#else
kWarning() << "Code temporarily disabled (Akonadi port)";
#endif //KRSS_PORT_DISABLED
connect(pbBackendConfigure, SIGNAL(clicked()), this, SLOT(slotConfigureStorage()));
connect(cbBackend, SIGNAL(activated(int)), this, SLOT(slotFactorySelected(int)));
connect( kcfg_UseMarkReadDelay, SIGNAL( toggled( bool ) ),
......@@ -66,6 +68,7 @@ QString SettingsAdvanced::selectedFactory() const
void SettingsAdvanced::selectFactory( const QString& key )
{
#ifdef KRSS_PORT_DISABLED
const int idx = cbBackend->findData( key );
if ( idx < 0 )
return;
......@@ -73,22 +76,33 @@ void SettingsAdvanced::selectFactory( const QString& key )
const Backend::StorageFactory* const factory = m_factories.value( key );
assert( factory );
pbBackendConfigure->setEnabled( factory->isConfigurable() );
#else
kWarning() << "Code temporarily disabled (Akonadi port)";
#endif //KRSS_PORT_DISABLED
}
void SettingsAdvanced::slotConfigureStorage()
{
#ifdef KRSS_PORT_DISABLED
const QString key = cbBackend->itemData( cbBackend->currentIndex() ).toString();
Backend::StorageFactory* const factory = m_factories.value( key );
assert( factory );
factory->configure();
#else
kWarning() << "Code temporarily disabled (Akonadi port)";
#endif //KRSS_PORT_DISABLED
}
void SettingsAdvanced::slotFactorySelected( int pos )
{
#ifdef KRSS_PORT_DISABLED
const QString key = cbBackend->itemData( pos ).toString();
const Backend::StorageFactory* const factory = m_factories.value( key );
assert( factory );
pbBackendConfigure->setEnabled( factory->isConfigurable() );
#else
kWarning() << "Code temporarily disabled (Akonadi port)";
#endif //KRSS_PORT_DISABLED
}
} //namespace Akregator
......
include_directories( ${CMAKE_SOURCE_DIR}/akregator/interfaces ${CMAKE_SOURCE_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${CMAKE_SOURCE_DIR}/akregator/export/metakit/include
${CMAKE_SOURCE_DIR}
${KDE4_INCLUDE_DIR}
${QT_INCLUDES}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/akregator
${Boost_INCLUDE_DIR} )
set(akregatorstorageexporter_SRCS
set(metakit_SRCS
metakit/src/column.cpp
metakit/src/custom.cpp
metakit/src/derived.cpp
metakit/src/field.cpp
metakit/src/fileio.cpp
metakit/src/format.cpp
metakit/src/handler.cpp
metakit/src/persist.cpp
metakit/src/remap.cpp
metakit/src/std.cpp
metakit/src/store.cpp
metakit/src/string.cpp
metakit/src/table.cpp
metakit/src/univ.cpp
metakit/src/view.cpp
metakit/src/viewx.cpp
)
set(akregatorstorageexporter_SRCS
${metakit_SRCS}
akregatorstorageexporter.cpp
storagemk4impl.cpp
feedstoragemk4impl.cpp
)
kde4_add_executable(akregatorstorageexporter NOGUI ${akregatorstorageexporter_SRCS})
target_link_libraries(akregatorstorageexporter
${KDE4_KDECORE_LIBS}
${KDEPIMLIBS_SYNDICATION_LIBS}
akregatorinterfaces)
${KDEPIMLIBS_SYNDICATION_LIBS})
install(TARGETS akregatorstorageexporter ${INSTALL_TARGETS_DEFAULT_ARGS})
......@@ -19,11 +19,8 @@
* Boston, MA 02110-1301, USA.
*
*/
#include "feedstorage.h"
#include "storage.h"
#include "storagefactory.h"
#include "storagefactoryregistry.h"
#include "plugin.h"
#include "feedstoragemk4impl.h"
#include "storagemk4impl.h"
#include <syndication/atom/constants.h>
#include <syndication/constants.h>
......@@ -40,9 +37,6 @@
#include <KComponentData>
#include <KGlobal>
#include <KPluginLoader>
#include <KService>
#include <KServiceTypeTrader>
#include <iostream>
......@@ -309,23 +303,6 @@ namespace {
serialize( storage->archiveFor( url ), url, device );
}
static KService::List queryStoragePlugins() {
return KServiceTypeTrader::self()->query( "Akregator/Plugin",
QString::fromLatin1( "[X-KDE-akregator-framework-version] == %1 and [X-KDE-akregator-plugintype] == 'storage' and [X-KDE-akregator-rank] > 0" ).arg( QString::number( AKREGATOR_PLUGIN_INTERFACE_VERSION ) ) );
}
static Plugin* createFromService( const KService::Ptr& service )
{
KPluginLoader loader( *service );
KPluginFactory* factory = loader.factory();
if ( !factory ) {
qCritical() << QString( " Could not create plugin factory for: %1\n"
" Error message: %2" ).arg( service->library(), loader.errorString() );
return 0;
}
return factory->create<Akregator::Plugin>();
}
static void printUsage() {
std::cout << "akregatorstorageexporter [--base64] url" << std::endl;
}
......@@ -334,7 +311,6 @@ namespace {
int main( int argc, char** argv ) {
KGlobal::setActiveComponent( KComponentData( "akregatorstorageexporter" ) );
const QString backend = QString::fromLatin1( "metakit" );
if ( argc < 2 ) {
printUsage();
......@@ -351,21 +327,8 @@ int main( int argc, char** argv ) {
const int pos = base64 ? 2 : 1;
const QString url = QUrl::fromEncoded( base64 ? QByteArray::fromBase64( argv[pos] ) : QByteArray( argv[pos] ) ).toString();
Q_FOREACH( const KService::Ptr& i, queryStoragePlugins() )
if ( Plugin* const plugin = createFromService( i ) )
plugin->initialize();
const StorageFactory* const storageFactory = StorageFactoryRegistry::self()->getFactory( backend );
if ( !storageFactory ) {
qCritical( "Could not create storage factory for %s.", qPrintable( backend ) );
return 1;
}
Storage* const storage = storageFactory->createStorage( QStringList() );
if ( !storage ) {
qCritical( "Could not create storage object for %s.", qPrintable( backend ) );
return 1;
}
StorageMK4Impl* storage = new StorageMK4Impl;
storage->initialize( QStringList() );
QFile out;
if ( !out.open( stdout, QIODevice::WriteOnly ) ) {
......
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