Skip to content
  • Sergio Luis Martins's avatar
    SVN_MERGE: · c6c85b8c
    Sergio Luis Martins authored
    Merged revisions 1150259,1150271,1150278,1150287-1150288,1150301,1150316,1150319,1150322,1150325,1150327,1150329,1150336,1150340,1150344,1150404,1150417,1150420-1150421,1150438-1150450,1150502,1150534,1150538,1150546,1150567,1150571,1150575-1150576,1150590,1150592,1150595,1150598,1150605,1150608,1150612,1150614 via svnmerge from 
    svn+ssh://smartins@svn.kde.org/home/kde/trunk/KDE/kdepim
    
    ................
      r1150259 | winterz | 2010-07-15 14:06:14 +0000 (Thu, 15 Jul 2010) | 9 lines
      
      SVN_SILENT:
      Blocked revisions 1149803 via svnmerge
      
      ........
        r1149803 | ludwigreiter | 2010-07-14 07:28:35 -0400 (Wed, 14 Jul 2010) | 1 line
        
        update after test of newslog 2010-07-09
      ........
    ................
      r1150271 | krake | 2010-07-15 14:46:35 +0000 (Thu, 15 Jul 2010) | 10 lines
      
      Merged revisions 1150269 via svnmerge from 
      https://kevin@svn.kde.org/home/kde/branches/KDE/4.5/kdepim
      
      ........
        r1150269 | krake | 2010-07-15 16:44:40 +0200 (Thu, 15 Jul 2010) | 3 lines
        
        Add log output to the sent behavior cases where we don't move to the default sent folder.
        Makes it distinguishable whether a move to a strange folder is a bug in special collections or wrong config in emailidentities
      ........
    ................
      r1150278 | krake | 2010-07-15 15:08:00 +0000 (Thu, 15 Jul 2010) | 9 lines
      
      Merged revisions 1150274 via svnmerge from 
      https://kevin@svn.kde.org/home/kde/branches/KDE/4.5/kdepim
    
    
      
      ........
        r1150274 | krake | 2010-07-15 16:49:31 +0200 (Thu, 15 Jul 2010) | 2 lines
        
        Network handling seems to work reliably nowadays, reenable its use
      ........
    ................
      r1150287 | link | 2010-07-15 15:29:57 +0000 (Thu, 15 Jul 2010) | 1 line
      
      Add the scheduling dialog.
    ................
      r1150288 | link | 2010-07-15 15:30:03 +0000 (Thu, 15 Jul 2010) | 3 lines
      
      Instead of using a dateTimesChanged() signal, break it up into separate signals.
      
      CCMAIL: bertjan@kdab.com
    ................
      r1150301 | mlaurent | 2010-07-15 16:28:38 +0000 (Thu, 15 Jul 2010) | 2 lines
      
      const'ify
    ................
      r1150316 | mlaurent | 2010-07-15 17:12:38 +0000 (Thu, 15 Jul 2010) | 2 lines
      
      Const'ify and use "KDE::versionRelease"
    ................
      r1150319 | mlaurent | 2010-07-15 17:16:21 +0000 (Thu, 15 Jul 2010) | 2 lines
      
      Cleanup
    ................
      r1150322 | mlaurent | 2010-07-15 17:18:48 +0000 (Thu, 15 Jul 2010) | 2 lines
      
      Cleanup
    ................
      r1150325 | mlaurent | 2010-07-15 17:29:22 +0000 (Thu, 15 Jul 2010) | 2 lines
      
      Cleanup
    ................
      r1150327 | bbroeksema | 2010-07-15 17:33:46 +0000 (Thu, 15 Jul 2010) | 3 lines
      
      First step in factoring out and creating a nicer API for invitation handling,
      i.e. sending and receiving.
    ................
      r1150329 | mlaurent | 2010-07-15 17:38:43 +0000 (Thu, 15 Jul 2010) | 2 lines
      
      Fix mem leak
    ................
      r1150336 | mlaurent | 2010-07-15 17:47:12 +0000 (Thu, 15 Jul 2010) | 2 lines
      
      Fix config name
    ................
      r1150340 | mlaurent | 2010-07-15 17:54:48 +0000 (Thu, 15 Jul 2010) | 2 lines
      
      not necessary now
    ................
      r1150344 | mlaurent | 2010-07-15 18:09:07 +0000 (Thu, 15 Jul 2010) | 2 lines
      
      Load catalog
    ................
      r1150404 | djarvie | 2010-07-15 21:21:09 +0000 (Thu, 15 Jul 2010) | 2 lines
      
      Compile for both KDE 4.5 and trunk
    ................
      r1150417 | djarvie | 2010-07-15 22:00:24 +0000 (Thu, 15 Jul 2010) | 2 lines
      
      Improve error messages
    ................
      r1150420 | asouza | 2010-07-15 22:07:29 +0000 (Thu, 15 Jul 2010) | 16 lines
      
      Make the mobile composer view flickable
      
      Now the composer view is vertically flickable so you're able to scroll
      the entire view when you write more text into the message dialog.
      
      Also created a helper class to make the original widget grow as you type
      text and fixed declarativewidgetbase to properly setup it's size when the
      proxy widget inside it grows in a way that QML couldn't be aware of.
      
    Reviewed-by: default avatarAnselmo Lacerda S. de Melo <anselmolsm@gmail.com>
      
      Following Bjoern Ricks advice of telling him when new files are created
      for the mobile version of kde-pim :)
      
      CCMAIL:bjoern.ricks@intevation.de
    ................
      r1150421 | bbroeksema | 2010-07-15 22:10:35 +0000 (Thu, 15 Jul 2010) | 1 line
      
      Fix build
    ................
      r1150438 | link | 2010-07-16 00:58:31 +0000 (Fri, 16 Jul 2010) | 1 line
      
      Add some start/end date/time accessors to the date time incidence.
    ................
      r1150439 | link | 2010-07-16 00:58:43 +0000 (Fri, 16 Jul 2010) | 1 line
      
      Set current date times on the conflict resolver.
    ................
      r1150440 | link | 2010-07-16 00:58:46 +0000 (Fri, 16 Jul 2010) | 1 line
      
      while using a uint is logically correct, it causes compiler warnings, and a cast is overkill. so we'll just use an int like everyone else.
    ................
      r1150441 | link | 2010-07-16 00:58:48 +0000 (Fri, 16 Jul 2010) | 3 lines
      
      Refactor the weekday check combo box used in the recurrence incidence editor into a standalone widget, and place it in libkdepim. It will be re-used in the scheduling conflicts dialog.
      
      CCMAIL: bertjan@kdab.com
    ................
      r1150442 | link | 2010-07-16 00:58:51 +0000 (Fri, 16 Jul 2010) | 3 lines
      
      Use the new KWeekdayCheckCombo in the recurrence incidence editor.
      
      CCMAIL: bertjan@kdab.com
    ................
      r1150443 | link | 2010-07-16 00:58:53 +0000 (Fri, 16 Jul 2010) | 1 line
      
      Add constraint setters to the conflict resolver. This will enable the resolver to match free time slots absed on a set of constraints. Currently these constraints are min/max timeframe to search, allowed weekdays, and mandatory roles. Hopefully the documentation is sufficient.
    ................
      r1150444 | link | 2010-07-16 00:58:55 +0000 (Fri, 16 Jul 2010) | 1 line
      
      Flesh out the Scheduling dialog, which will be the front end to the conflict resolver. Only the desktop version is supported for the moment, so it is #ifdefed in the attendee incidence editor, and not included in the mobile ie-ng shared sources.
    ................
      r1150445 | link | 2010-07-16 00:58:58 +0000 (Fri, 16 Jul 2010) | 1 line
      
      Change the resolver interface. A bit array makes more sense, and matches the api of the other places in kpim where weekdays are passed around.
    ................
      r1150446 | link | 2010-07-16 00:59:01 +0000 (Fri, 16 Jul 2010) | 1 line
      
      Notify the conflict resolver, when the constraints change.
    ................
      r1150447 | link | 2010-07-16 00:59:03 +0000 (Fri, 16 Jul 2010) | 3 lines
      
      Make the datetime accessor methods public. Bertjan, this makes my life a thousand times easier when reacting to changes in the conflict resolver, I'll flag you in the commits so you can see the usage.
      
      CCMAIL: bertjan@kdab.com
    ................
      r1150448 | link | 2010-07-16 00:59:05 +0000 (Fri, 16 Jul 2010) | 1 line
      
      Rename methods. Now they're shorter and less redundant.
    ................
      r1150449 | link | 2010-07-16 00:59:08 +0000 (Fri, 16 Jul 2010) | 1 line
      
      Some work on the conflict resolver. Flesh out the interface a bit, and work some on the finding all free slots algorithm. I'm way to tired to finish this now, gonna tackle it in the morning when I'm fresh.
    ................
      r1150450 | link | 2010-07-16 00:59:10 +0000 (Fri, 16 Jul 2010) | 3 lines
      
      Handle the event duration change for the resolver. Bertjan, this is what I was talking about.. those convenience methods are super nice :)
      
      CCMAIL: bertjan@kdab.com
    ................
      r1150502 | scripty | 2010-07-16 06:36:15 +0000 (Fri, 16 Jul 2010) | 1 line
      
      SVN_SILENT made messages (.desktop file)
    ................
      r1150534 | bbroeksema | 2010-07-16 08:09:07 +0000 (Fri, 16 Jul 2010) | 3 lines
      
      * Refactor Groupware::handleInvitation into InvitationHandler::receiveInvitation
      * Various small code clean ups.
    ................
      r1150538 | vkrause | 2010-07-16 08:17:24 +0000 (Fri, 16 Jul 2010) | 3 lines
      
      Remember the message in case it's set before the QML loading is
      finished, happens eg. with reply and orward.
    ................
      r1150546 | bbroeksema | 2010-07-16 08:35:28 +0000 (Fri, 16 Jul 2010) | 4 lines
      
      - Action -> SendStatus. 
      - Use more meaningfull enum values.
      - Fix some cases where nothing was returned.
    ................
      r1150567 | aacid | 2010-07-16 09:00:42 +0000 (Fri, 16 Jul 2010) | 2 lines
      
      Fix akonadimodel.cpp:1: warning: unterminated character constant
    ................
      r1150571 | vkrause | 2010-07-16 09:03:55 +0000 (Fri, 16 Jul 2010) | 3 lines
      
      We need the full email when replying, otherwise we have a hard time
      quoting it correctly.
    ................
      r1150575 | vkrause | 2010-07-16 09:10:01 +0000 (Fri, 16 Jul 2010) | 2 lines
      
      Fix forwarding as well, we need the full mail here too.
    ................
      r1150576 | bbroeksema | 2010-07-16 09:17:16 +0000 (Fri, 16 Jul 2010) | 1 line
      
      Fix some warnings regarding to not returning a value in non-void functions
    ................
      r1150590 | bbroeksema | 2010-07-16 09:45:47 +0000 (Fri, 16 Jul 2010) | 2 lines
      
      Factor out the messagebox calls to make the code less cluttered.
    ................
      r1150592 | bbroeksema | 2010-07-16 09:48:53 +0000 (Fri, 16 Jul 2010) | 3 lines
      
      - for -> foreach
      - Fix a build error.
    ................
      r1150595 | krake | 2010-07-16 09:54:51 +0000 (Fri, 16 Jul 2010) | 9 lines
      
      Merged revisions 1150594 via svnmerge from 
      https://kevin@svn.kde.org/home/kde/branches/KDE/4.5/kdepim
      
      ........
        r1150594 | krake | 2010-07-16 11:49:58 +0200 (Fri, 16 Jul 2010) | 2 lines
        
        Instead of fetching all items with a default FetchScope, use per-collection FetchScopes to handle collections of certain resources differently and to actually make use of the user's config settings
      ........
    ................
      r1150598 | bbroeksema | 2010-07-16 09:59:55 +0000 (Fri, 16 Jul 2010) | 3 lines
      
      - sendCounterProposal returns a SendStatus as well now.
      - It also reused Private::sendInvitation for error handling.
    ................
      r1150605 | bbroeksema | 2010-07-16 10:20:36 +0000 (Fri, 16 Jul 2010) | 8 lines
      
      The iTIPMethod is not really a class state thing, but a per function call
      variable. Add the method to the sending methods and remove the setMethod()
      call.
      
      TODO: I still have to figure out if it is actually needed to pass the method
            or that it can be deduced fromt the specific use cases like in
            sendCounterProposal.
    ................
      r1150608 | bbroeksema | 2010-07-16 10:25:44 +0000 (Fri, 16 Jul 2010) | 1 line
      
      Rename the file to match the class name
    ................
      r1150612 | bbroeksema | 2010-07-16 10:38:09 +0000 (Fri, 16 Jul 2010) | 1 line
      
      When we create a new incidence, than the iTIP Request method must be used
    ................
      r1150614 | bbroeksema | 2010-07-16 10:40:42 +0000 (Fri, 16 Jul 2010) | 1 line
      
      Revert the last commit, not completely sure about the correctness of it
    ................
    
    svn path=/branches/work/kdepim_kcalcore/akonadi/kcal/; revision=1150666
    c6c85b8c