-
Sergio Luis Martins authored
Merged revisions 1149804,1149806-1149807,1149835,1149863-1149882,1149886,1149910-1149912,1149925-1149926,1149928,1149965,1149967-1149972,1149974,1149976,1149978,1149984-1149986,1150050,1150068,1150126,1150129,1150135,1150168,1150175-1150176,1150182,1150188-1150189,1150196,1150208,1150243 via svnmerge from svn+ssh://smartins@svn.kde.org/home/kde/trunk/KDE/kdepim ................ r1149804 | vkrause | 2010-07-14 11:29:43 +0000 (Wed, 14 Jul 2010) | 2 lines Update application icon to the latest version from Nuno. ................ r1149806 | aholzammer | 2010-07-14 11:33:11 +0000 (Wed, 14 Jul 2010) | 1 line - made kdepim wince compatible ................ r1149807 | aholzammer | 2010-07-14 11:34:58 +0000 (Wed, 14 Jul 2010) | 1 line - clean up cmake file ................ r1149835 | krake | 2010-07-14 12:34:46 +0000 (Wed, 14 Jul 2010) | 10 lines Merged revisions 1149822 via svnmerge from https://kevin@svn.kde.org/home/kde/branches/KDE/4.5/kdepim ........ r1149822 | krake | 2010-07-14 14:17:21 +0200 (Wed, 14 Jul 2010) | 3 lines Call the new writeConfig() method on all settings D-Bus interfaces after changing of values is done. This should get rid of those occasional issued of resources claiming their config is not sufficient. ........ ................ r1149863 | link | 2010-07-14 13:52:51 +0000 (Wed, 14 Jul 2010) | 1 line More freebusy porting, use AttendeeData::Ptrs, and correct the namespaces. ................ r1149864 | link | 2010-07-14 13:52:54 +0000 (Wed, 14 Jul 2010) | 3 lines Port groupwareintegration, and activate it in main.cpp. Also add a EditorFreeBusy member to incidenceattendee. Doesn't do much, but compiles and runs without crashing. ................ r1149865 | link | 2010-07-14 13:52:56 +0000 (Wed, 14 Jul 2010) | 3 lines make the solve button launch the free busy dialog. eventually attendees will be added to the freebusy object as the user adds them, then the conflict label will be changed when a conflict is detected. to keep things simple as we work towards that goal, no conflict resolution occurs until the solve button is pressed. ................ r1149866 | link | 2010-07-14 13:52:59 +0000 (Wed, 14 Jul 2010) | 1 line remove unecessary cruft from pre-ng eras. ................ r1149867 | link | 2010-07-14 13:53:01 +0000 (Wed, 14 Jul 2010) | 1 line alert free busy dialog when the organizer changes. ................ r1149868 | link | 2010-07-14 13:53:04 +0000 (Wed, 14 Jul 2010) | 1 line Emit a signal in incidencedatetime when the start end dates are changed, and connect that up to the free busy editor so it can adjust the gantview. ................ r1149869 | link | 2010-07-14 13:53:06 +0000 (Wed, 14 Jul 2010) | 1 line fetch the organizer's free busy data ................ r1149870 | link | 2010-07-14 13:53:09 +0000 (Wed, 14 Jul 2010) | 3 lines Robustly handle the connection to Akonadi's Groupware FreeBusyManager. Cannot assume the FreeBusyManager is initialized in the EditorFreeBusy constructor. Though it would be nice if we could. This is a workaround in the meantime. Freebusy items are now retrieved and drawn on the Gantt view! ................ r1149871 | link | 2010-07-14 13:53:11 +0000 (Wed, 14 Jul 2010) | 1 line Remove stale code. ................ r1149872 | link | 2010-07-14 13:53:14 +0000 (Wed, 14 Jul 2010) | 1 line Add Conflict Resolver and Free Busy item. Both come from editorfreebusy, but have been refactpred to not make any assumptions about the presentation of Free Busy data. This greatly simplifies things as it provides a nice seperation between the stringy and complicater KDGantt code, and the code that actually calculates scheduling conflicts. ................ r1149873 | link | 2010-07-14 13:53:16 +0000 (Wed, 14 Jul 2010) | 1 line Track whether the freebusy manager connection has been made, and ensure attendees added before the connection is made are reloaded. ................ r1149874 | link | 2010-07-14 13:53:19 +0000 (Wed, 14 Jul 2010) | 1 line Whenever FB data is updated, re-calculate conflicts and emit the number of conflicts found. ................ r1149875 | link | 2010-07-14 13:53:21 +0000 (Wed, 14 Jul 2010) | 1 line Add a contains attendee method to the conflict resolver. ................ r1149876 | link | 2010-07-14 13:53:23 +0000 (Wed, 14 Jul 2010) | 3 lines Integrate the conflict resolver into the Attendee Incidence, and connect some plumbing to insert new Attendees and update the conflict label. Doesn't quite work as expected yet, because the attendee objects are all shated pointers, so the name/email of the attendee that the conflict resolver fetches the freebusy data from akonadi for is the first character the user types into the edit. Example: "J" if the user started typing "Joe <joe@email.com>". So, either making the attendees shared pointers was a bad idea and should be undone, or the attendee objects need to notify the conflict resolver. I'm guessing with an editingfinished signal. ................ r1149877 | link | 2010-07-14 13:53:26 +0000 (Wed, 14 Jul 2010) | 1 line don't update everytime the user presses a key, rather only update when the editingfinished signal is emitted. ................ r1149878 | link | 2010-07-14 13:53:28 +0000 (Wed, 14 Jul 2010) | 1 line Add a method to retrieve a copy of the KCal::Attendee data stored in the AttendeeData object. ................ r1149879 | link | 2010-07-14 13:53:30 +0000 (Wed, 14 Jul 2010) | 1 line AttendeeData wasn't designed to be used outside of the multiplying line editor, so when passing off the data to other objects pass a copy of the KCal::Attendee data. ................ r1149880 | link | 2010-07-14 13:53:33 +0000 (Wed, 14 Jul 2010) | 1 line Fix typo. This line was flat out wrong. ................ r1149881 | link | 2010-07-14 13:53:35 +0000 (Wed, 14 Jul 2010) | 1 line Emit conflicts changed signal even when there are 0 conflicts. Let the consumer decide how to handle it. ................ r1149882 | link | 2010-07-14 13:53:37 +0000 (Wed, 14 Jul 2010) | 1 line recalculate conflicts when the start end times are changed ................ r1149886 | link | 2010-07-14 14:00:13 +0000 (Wed, 14 Jul 2010) | 1 line Request Response should be checked by default ................ r1149910 | link | 2010-07-14 15:10:54 +0000 (Wed, 14 Jul 2010) | 1 line explain constructor parameters ................ r1149911 | link | 2010-07-14 15:10:57 +0000 (Wed, 14 Jul 2010) | 1 line Fix one linking error for mobile build. ................ r1149912 | link | 2010-07-14 15:10:59 +0000 (Wed, 14 Jul 2010) | 1 line move groupwareintegration.cpp to the incidenceeditors_ng_desktop library, as there doesn't exist a groupware delegate for the mobile version yet. this will cause undefined behavior in the free busy stuff in the mobile app. ................ r1149925 | aholzammer | 2010-07-14 15:30:57 +0000 (Wed, 14 Jul 2010) | 1 line - kde4-config finding changed for wince ................ r1149926 | yurchor | 2010-07-14 15:34:15 +0000 (Wed, 14 Jul 2010) | 1 line Chose->Choose (Thanks to Oliver Delaune for spotting) ................ r1149928 | bbroeksema | 2010-07-14 15:36:00 +0000 (Wed, 14 Jul 2010) | 1 line Build++, quick and dirty approach though ................ r1149965 | asouza | 2010-07-14 17:47:35 +0000 (Wed, 14 Jul 2010) | 2 lines Fix identation. Old habits from kdelibs :) ................ r1149967 | link | 2010-07-14 17:48:18 +0000 (Wed, 14 Jul 2010) | 4 lines Emit a signal when an item is completed in the addressee line edit. This is necessary because the signal editingFinished is emitted when the line edit loses focus, which occurs when focus is given to the completion popup, when in reality the editing hasn't been finished until the completion box is dismissed. CCMAIL: kde-pim@kde.org ................ r1149968 | link | 2010-07-14 17:48:21 +0000 (Wed, 14 Jul 2010) | 1 line Change the internal event handling of the attendee line editor such that a signal is emitted when the attendee data changes, that contains the previous attendee and the new one. ................ r1149969 | link | 2010-07-14 17:48:24 +0000 (Wed, 14 Jul 2010) | 1 line Take advantage of the new attendee editor signal, and dynamically update the conflict resolver as attendees are added by the user. ................ r1149970 | link | 2010-07-14 17:48:26 +0000 (Wed, 14 Jul 2010) | 1 line Add an aboutToBeDeleted() function to the MultiplyingLine interface that is called right before the line is deleted. ................ r1149971 | link | 2010-07-14 17:48:28 +0000 (Wed, 14 Jul 2010) | 1 line Implement the aboutToBeDeleted method in the attendee line, and emit a changed attendee signal. ................ r1149972 | link | 2010-07-14 17:48:31 +0000 (Wed, 14 Jul 2010) | 1 line Fix change handling logic to correctly remove attendees from the conflict resolver as they are deleted from the attendee editor. ................ r1149974 | asouza | 2010-07-14 17:51:47 +0000 (Wed, 14 Jul 2010) | 5 lines For now use KMessageBox for reporting errors on sending for KMail There is an ongoing discussion when notifications should be used instead of KMessageBox'es. For now use the old behavior for reporting errors. ................ r1149976 | asouza | 2010-07-14 17:53:27 +0000 (Wed, 14 Jul 2010) | 4 lines Some clean up on the composerviewbase Remove commented KMessageBox calls. ................ r1149978 | link | 2010-07-14 18:12:38 +0000 (Wed, 14 Jul 2010) | 1 line Turns out akonadi expects the KCal::Attendee's email() field to contain the simple email address. So parse out the required parts and set them. ................ r1149984 | link | 2010-07-14 18:53:38 +0000 (Wed, 14 Jul 2010) | 1 line Emit the datetimes changed signal whenever the datetimes are changed, whether that be the result of the user or programmtic change. ................ r1149985 | link | 2010-07-14 18:53:41 +0000 (Wed, 14 Jul 2010) | 1 line Re-calculate conflicts after removing an attendee. ................ r1149986 | asouza | 2010-07-14 19:01:26 +0000 (Wed, 14 Jul 2010) | 2 lines Some more small cleanups ................ r1150050 | djarvie | 2010-07-14 22:52:55 +0000 (Wed, 14 Jul 2010) | 2 lines Compile ................ r1150068 | djarvie | 2010-07-15 00:00:56 +0000 (Thu, 15 Jul 2010) | 2 lines Implement function to add an Akonadi resource ................ r1150126 | ervin | 2010-07-15 06:51:27 +0000 (Thu, 15 Jul 2010) | 2 lines Make it build with default USE_AKONADI value. ................ r1150129 | vkrause | 2010-07-15 07:01:38 +0000 (Thu, 15 Jul 2010) | 20 lines Merged revisions 1150006 via svnmerge from svn+ssh://vkrause@svn.kde.org/home/kde/branches/KDE/4.5/kdepim ........ r1150006 | tilladam | 2010-07-14 22:28:26 +0200 (Wed, 14 Jul 2010) | 12 lines Avoid initializing the tags list from nepomuk for sizehint calculation. Since the font for each message can be overridden by a tag, and since the font size needs to be known at row height calculation time, the tags list ended up being populated for each item, during message list creation, which, since it's a nepomuk roundtrip or two, was very slow. This change makes the font only take the tag into account when the tags list is already populated. Not perfect, as for non visible items the height might be off, if they have font override tags, but I guess we can live with the consequences. It's rather a fringe feature anyhow. CCBUG: 244503 ........ ................ r1150135 | scripty | 2010-07-15 07:12:19 +0000 (Thu, 15 Jul 2010) | 1 line SVN_SILENT made messages (.desktop file) ................ r1150168 | bbroeksema | 2010-07-15 09:19:02 +0000 (Thu, 15 Jul 2010) | 2 lines Compile with kdelibs 4.5. ................ r1150175 | ervin | 2010-07-15 09:43:49 +0000 (Thu, 15 Jul 2010) | 2 lines Don't depend on deprecated methods from FetchJob. ................ r1150176 | vkrause | 2010-07-15 09:46:28 +0000 (Thu, 15 Jul 2010) | 2 lines filter out all of the useless dbus errors here as well ................ r1150182 | mlaurent | 2010-07-15 10:01:04 +0000 (Thu, 15 Jul 2010) | 2 lines Don't show "check manual check" for virtual resources ................ r1150188 | krake | 2010-07-15 10:05:07 +0000 (Thu, 15 Jul 2010) | 9 lines Merged revisions 1150174 via svnmerge from https://kevin@svn.kde.org/home/kde/branches/KDE/4.5/kdepim ........ r1150174 | krake | 2010-07-15 11:38:03 +0200 (Thu, 15 Jul 2010) | 2 lines Remove trailing space on todo flag string ........ ................ r1150189 | mlaurent | 2010-07-15 10:06:16 +0000 (Thu, 15 Jul 2010) | 2 lines Remove not necessary dbus call ................ r1150196 | lueck | 2010-07-15 10:24:15 +0000 (Thu, 15 Jul 2010) | 1 line typo fix ................ r1150208 | krake | 2010-07-15 11:24:18 +0000 (Thu, 15 Jul 2010) | 9 lines Merged revisions 1150207 via svnmerge from https://kevin@svn.kde.org/home/kde/branches/KDE/4.5/kdepim ........ r1150207 | krake | 2010-07-15 13:17:34 +0200 (Thu, 15 Jul 2010) | 2 lines Fixing access control checks for collections jobs ........ ................ r1150243 | vkrause | 2010-07-15 13:17:59 +0000 (Thu, 15 Jul 2010) | 2 lines Filter out useless compiler warnings on ARM. ................ svn path=/branches/work/kdepim_kcalcore/incidenceeditors/incidenceeditor-ng/; revision=1150265
ad1eaa51