[Kde-pim] KDE/kdepim

[Stephen Kelly]

SVN commit 1090867 by skelly:

Merge KJots application and plasmoid from akonadi-ports into trunk where development will continue.

This is still very much a work in progress.

CCMAIL: kde-pim at kde.org
BUG: 162268
BUG: 175073
BUG: 183576
BUG: 195606



 M  +6 -1      CMakeLists.txt  
 A             cmake/modules/FindGrantlee.cmake   branches/work/akonadi-ports/kdepim/cmake/modules/FindGrantlee.cmake#1035244
 M  +44 -11    kjots/CMakeLists.txt  
 M  +6 -7      kjots/KJotsMain.cpp  
 M  +2 -2      kjots/KJotsMain.h  
 D             kjots/flatcollectionproxymodel.cpp  
 D             kjots/flatcollectionproxymodel.h  
 M  +27 -10    kjots/kjotsbookmarks.cpp  
 M  +5 -5      kjots/kjotsbookmarks.h  
 M  +4 -38     kjots/kjotsbrowser.cpp  
 M  +1 -10     kjots/kjotsbrowser.h  
 M  +89 -19    kjots/kjotsedit.cpp  
 M  +11 -9     kjots/kjotsedit.h  
 M  +20 -18    kjots/kjotslinkdialog.cpp  
 M  +2 -5      kjots/kjotslinkdialog.h  
 A             kjots/kjotsmodel.cpp   branches/work/akonadi-ports/kdepim/kjots/kjotsmodel.cpp#1035208 [License: LGPL (v2+)]
 A             kjots/kjotsmodel.h   branches/work/akonadi-ports/kdepim/kjots/kjotsmodel.h#1035208 [License: LGPL (v2+)]
 M  +3 -2      kjots/kjotspart.cpp  
 M  +2 -2      kjots/kjotspart.h  
 A             kjots/kjotstreeview.cpp   branches/work/akonadi-ports/kdepim/kjots/kjotstreeview.cpp#1041745 [License: LGPL (v2+)]
 A             kjots/kjotstreeview.h   branches/work/akonadi-ports/kdepim/kjots/kjotstreeview.h#1041745 [License: LGPL (v2+)]
 A             kjots/kjotswidget.cpp   branches/work/akonadi-ports/kdepim/kjots/kjotswidget.cpp#1035259 [License: LGPL (v2+)]
 A             kjots/kjotswidget.h   branches/work/akonadi-ports/kdepim/kjots/kjotswidget.h#1035259 [License: LGPL (v2+)]
 M  +4 -1      kjots/knowitimporter.cpp  
 M  +1 -3      kjots/knowitimporter.h  
 A             kjots/note.cpp   branches/work/akonadi-ports/kdepim/kjots/note.cpp#1045747 [License: LGPL (v2+)]
 A             kjots/note.h   branches/work/akonadi-ports/kdepim/kjots/note.h#1045747 [License: LGPL (v2+)]
 A             kjots/plasmoid (directory)   branches/work/akonadi-ports/kdepim/kjots/plasmoid#1040650
 M  +11 -1     kjots/plasmoid/CMakeLists.txt  
 A             kjots/plasmoid/akonotes_applet.ui   branches/work/akonadi-ports/kdepim/kjots/plasmoid/akonotes_applet.ui#1041125
 A             kjots/plasmoid/akonotes_list.desktop   branches/work/akonadi-ports/kdepim/kjots/plasmoid/akonotes_list.desktop#1045747
 A             kjots/plasmoid/akonotes_note.desktop   branches/work/akonadi-ports/kdepim/kjots/plasmoid/akonotes_note.desktop#1045747
 A             kjots/plasmoid/akonotes_noteapplet.cpp   branches/work/akonadi-ports/kdepim/kjots/plasmoid/akonotes_noteapplet.cpp#1045747 [License: LGPL (v2+)]
 A             kjots/plasmoid/akonotes_noteapplet.h   branches/work/akonadi-ports/kdepim/kjots/plasmoid/akonotes_noteapplet.h#1045747 [License: LGPL (v2+)]
 A             kjots/plasmoid/akonotes_noteslistapplet.cpp   branches/work/akonadi-ports/kdepim/kjots/plasmoid/akonotes_noteslistapplet.cpp#1045747 [License: LGPL (v2+)]
 A             kjots/plasmoid/akonotes_noteslistapplet.h   branches/work/akonadi-ports/kdepim/kjots/plasmoid/akonotes_noteslistapplet.h#1045747 [License: LGPL (v2+)]
 A             kjots/plasmoid/plasmatreeview.cpp   branches/work/akonadi-ports/kdepim/kjots/plasmoid/plasmatreeview.cpp#1045747 [License: LGPL (v2+)]
 A             kjots/plasmoid/plasmatreeview.h   branches/work/akonadi-ports/kdepim/kjots/plasmoid/plasmatreeview.h#1045747 [License: LGPL (v2+)]
 A             kjots/plasmoid/stickynote.svgz   branches/work/akonadi-ports/kdepim/kjots/plasmoid/stickynote.svgz#1045747
 A             kjots/themes (directory)   branches/work/akonadi-ports/kdepim/kjots/themes#1040526


http://websvn.kde.org/?view=rev&revision=1090867
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/