Index: akregator/Messages.sh
===================================================================
---- akregator/Messages.sh (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ akregator/Messages.sh (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- akregator/Messages.sh (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ akregator/Messages.sh (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -1,3 +1,3 @@
#! /bin/sh
$EXTRACTRC `find . -name "*.rc" -o -name "*.ui" -o -name "*.kcfg"` >> rc.cpp || exit 11
+$XGETTEXT $(find . -name "*.cpp" -o -name "*.h") -o $podir/akregator.pot
Index: akregator/src/subscriptionlistmodel.cpp
===================================================================
---- akregator/src/subscriptionlistmodel.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ akregator/src/subscriptionlistmodel.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- akregator/src/subscriptionlistmodel.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ akregator/src/subscriptionlistmodel.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -447,6 +447,9 @@
{
const TreeNode* const droppedOnNode = qobject_cast<const TreeNode*>( nodeForIndex( parent, m_feedList ) );
const Folder* const destFolder = droppedOnNode->isGroup() ? qobject_cast<const Folder*>( droppedOnNode ) : droppedOnNode->parent();
if ( !destFolder )
return false;
+Index: akregator/configuration/akregator_config_advanced.desktop
+===================================================================
+--- akregator/configuration/akregator_config_advanced.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ akregator/configuration/akregator_config_advanced.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -21,6 +21,7 @@
+ Name[fr]=Avancé
+ Name[ga]=Ardsocruithe
+ Name[gl]=Avanzado
++Name[is]=Nánari stillingar
+ Name[it]=Avanzate
+ Name[ja]=詳細
+ Name[km]=កម្រិតខ្ពស់
Index: libkleo/libkleopatrarc.desktop
===================================================================
---- libkleo/libkleopatrarc.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ libkleo/libkleopatrarc.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- libkleo/libkleopatrarc.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ libkleo/libkleopatrarc.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -288,6 +288,7 @@
Name[it]=Chiavi per le firme qualificate
Name[ja]=適格電子署名用の鍵
Name[nds]=Slötels för pröövt Ünnerschriften
Index: kode/kwsdl/kwsdl_compiler.desktop
===================================================================
---- kode/kwsdl/kwsdl_compiler.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kode/kwsdl/kwsdl_compiler.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kode/kwsdl/kwsdl_compiler.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kode/kwsdl/kwsdl_compiler.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -14,6 +14,7 @@
Name[kk]=KWSDL компиляторы
Name[km]=កម្មវិធីចងក្រង KWSDL
Name[nds]=KWSDL-Kompilerer
Index: kode/kxforms/kxforms.desktop
===================================================================
---- kode/kxforms/kxforms.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kode/kxforms/kxforms.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kode/kxforms/kxforms.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kode/kxforms/kxforms.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -23,6 +23,7 @@
GenericName[kk]=XML пішін өңдегіші
GenericName[km]=កម្មវិធីនិពន្ធសំណុំបែបបទរបស់ XML
GenericName[nds]=XML-Kiekwarkeditor
Index: kleopatra/kwatchgnupg/kwatchgnupgmainwin.cpp
===================================================================
---- kleopatra/kwatchgnupg/kwatchgnupgmainwin.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kleopatra/kwatchgnupg/kwatchgnupgmainwin.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kleopatra/kwatchgnupg/kwatchgnupgmainwin.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kleopatra/kwatchgnupg/kwatchgnupgmainwin.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -105,7 +105,7 @@
void KWatchGnuPGMainWindow::createActions()
connect(action, SIGNAL(triggered()), SLOT( slotClear() ));
Index: kleopatra/kleopatra_import.desktop
===================================================================
---- kleopatra/kleopatra_import.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kleopatra/kleopatra_import.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kleopatra/kleopatra_import.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kleopatra/kleopatra_import.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -16,7 +16,7 @@
Comment[ca]=Gestor de certificats i IGU criptogràfica unificada
Comment[cs]=Správce certifikátů a rozhraní pro šifrování
Comment[el]=Διαχειριστής πιστοποιητικών και GUI ενοποιημένης κρυπτογράφησης
Comment[es]=Gestor de certificados e interfaz gráfica unificada de criptografía
Comment[et]=Sertifikaadihaldur ja ühendatud krüptimise graafiline kasutajaliides
+Index: kleopatra/libkleopatraclient/CMakeLists.txt
+===================================================================
+--- kleopatra/libkleopatraclient/CMakeLists.txt (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kleopatra/libkleopatraclient/CMakeLists.txt (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -1,5 +1,5 @@
+-set( libkleopatraclient_soversion 0.2.1 )
+-set( libkleopatraclient_version ${libkleopatraclient_soversion} )
++set( libkleopatraclient_version "0.2.1" )
++set( libkleopatraclient_soversion "0" )
+
+ add_subdirectory( core )
+ add_subdirectory( gui )
Index: kresources/scalix/kabc/scalix.desktop
===================================================================
---- kresources/scalix/kabc/scalix.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kresources/scalix/kabc/scalix.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kresources/scalix/kabc/scalix.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kresources/scalix/kabc/scalix.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -44,6 +44,7 @@
Comment[it]=Consente l'accesso ai contatti memorizzati su un server Scalix che usa IMAP tramite KMail o Kontact
Comment[ja]=KMail または Kontact 経由で IMAP を使って、Scalix サーバに保存されている連絡先へのアクセスを提供します
Comment[nds]=Stellt mit KMail oder Kontact över IMAP Topgriep op Kontakten op en Scalix-Server praat
Index: kresources/slox/kabc_ox.desktop
===================================================================
---- kresources/slox/kabc_ox.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kresources/slox/kabc_ox.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kresources/slox/kabc_ox.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kresources/slox/kabc_ox.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -57,6 +57,7 @@
Comment[it]=Consente l'accesso ai contatti memorizzati su un server Open-Xchange
Comment[ja]=Open-Xchange サーバに保存されている連絡先へのアクセスを提供します
Comment[lv]=Nodrošina piekļuvi kontaktiem, kas glabājas Open-Xchange serverī.
Comment[nb]=Gir tilgang til kontakter lagret på en Open-Xchange-tjener
Comment[nds]=Stellt Togriep op de op en Open-Xchange-Server wohrten Kontakten praat
+Index: kresources/kolab/shared/kmailconnection.h
+===================================================================
+--- kresources/kolab/shared/kmailconnection.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kresources/kolab/shared/kmailconnection.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -142,6 +142,11 @@
+ private:
+ ResourceKolabBase* mResource;
+ OrgKdeKmailGroupwareInterface* mKmailGroupwareInterface;
++
++ /// The current name of the D-Bus service we're connected to. This is used to remember the old
++ /// service name if KMail gets disconnected, so that we can find out when KMail is started again
++ /// by looking for a newly appeared service with that name.
++ QString mOldServiceName;
+ };
+
+ }
+Index: kresources/kolab/shared/kmailconnection.cpp
+===================================================================
+--- kresources/kolab/shared/kmailconnection.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kresources/kolab/shared/kmailconnection.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -78,6 +78,7 @@
+ }
+ mKmailGroupwareInterface = new OrgKdeKmailGroupwareInterface( dbusService, KMAIL_DBUS_GROUPWARE_PATH,
+ QDBusConnection::sessionBus() );
++ mOldServiceName = mKmailGroupwareInterface->service();
+
+ connect( mKmailGroupwareInterface, SIGNAL(incidenceAdded(QString,QString,uint,int,QString)),
+ SLOT(fromKMailAddIncidence(QString,QString,uint,int,QString)) );
+@@ -280,12 +281,19 @@
+
+ void KMailConnection::dbusServiceOwnerChanged(const QString & service, const QString&, const QString&)
+ {
+- if (mKmailGroupwareInterface && mKmailGroupwareInterface->service() == service)
+- {
+- // Delete the stub so that the next time we need to talk to kmail,
+- // we'll know that we need to start a new one.
+- delete mKmailGroupwareInterface;
+- mKmailGroupwareInterface = 0;
++ // The owner of the D-Bus service we're interested in changed, so either connect or disconnect.
++ if ( mOldServiceName == service && !service.isEmpty() ) {
++ if ( mKmailGroupwareInterface )
++ {
++ // Delete the stub so that the next time we need to talk to kmail,
++ // we'll know that we need to start a new one.
++ delete mKmailGroupwareInterface;
++ mKmailGroupwareInterface = 0;
++ }
++ else {
++ if ( !connectToKMail() )
++ kWarning(5650) << "Could not connect to KMail, even though the D-Bus service just became available!";
++ }
+ }
+ }
+
Index: kresources/akonadi/kabc/akonadi.desktop
===================================================================
---- kresources/akonadi/kabc/akonadi.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kresources/akonadi/kabc/akonadi.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kresources/akonadi/kabc/akonadi.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kresources/akonadi/kabc/akonadi.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -13,6 +13,7 @@
Name[it]=Rubrica indirizzi di Akonadi
Name[ja]=Akonadi アドレス帳
Name[nds]=Akonadi-Adressbook instellen
Index: kresources/featureplan/kcal_resourcefeatureplan.desktop
===================================================================
---- kresources/featureplan/kcal_resourcefeatureplan.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kresources/featureplan/kcal_resourcefeatureplan.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kresources/featureplan/kcal_resourcefeatureplan.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kresources/featureplan/kcal_resourcefeatureplan.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -23,6 +23,7 @@
Name[lt]=XML bruožų planas
Name[lv]=XML iespēju plāns
Name[nds]=XML-Funkschonenplaan
Name[ne]=एक्सएमएल विशेषता योजना
Name[nl]=Functionaliteitsplanning in XML
+Index: kmail/templateparser.cpp
+===================================================================
+--- kmail/templateparser.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/templateparser.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -27,6 +27,8 @@
+ #include "customtemplates_kfg.h"
+ #include "globalsettings_base.h"
+ #include "kmkernel.h"
++#include "partNode.h"
++#include "attachmentcollector.h"
+
+ #include <mimelib/bodypart.h>
+
+@@ -851,37 +853,72 @@
+ }
+ }
+
+- // kDebug(5006) << "Message body:" << body;
++ addProcessedBodyToMessage( body );
++}
+
++
++void TemplateParser::addProcessedBodyToMessage( const QString &body )
++{
+ if ( mAppend ) {
++
++ // ### What happens here if the body is multipart or in some way encoded?
+ QByteArray msg_body = mMsg->body();
+ msg_body.append( body.toUtf8() );
+ mMsg->setBody( msg_body );
+- } else {
++ }
++ else {
+
+- // FIXME: We set the processed template to the first plain text part fo the
+- // message. This will probably break in the following cases:
+- // 1. HTML-only message with attachment (simple multipart/mixed)
+- // 2. Messages with multiple text/plain parts. We only replace the
+- // first part with the processed templates, the other parts stay
+- // the same.
+- // The composer then uses an ObjectTreeParser to get the plain text
+- // of the complete message, which will likely include the other
+- // parts twice.
+- // Possible solution: Set a dummy zero length body for all other
+- // plaintext parts.
+- DwEntity *entityToChange = 0;
+- if ( mMsg->typeStr().toLower() == "multipart" ) {
+- entityToChange = mMsg->findDwBodyPart( "text", "plain" );
+- if ( !entityToChange )
+- kWarning() << "No text/plain part found in this multipart message, "
+- "template parser can not set the text!";
++ // Get the attachments of the original mail
++ partNode *root = partNode::fromMessage( mMsg );
++ KMail::AttachmentCollector ac;
++ ac.setDiveIntoEncryptions( true );
++ ac.setDiveIntoSignatures( true );
++ ac.setDiveIntoMessages( false );
++ ac.collectAttachmentsFrom( root );
++
++ // Now, delete the old content and set the new content, which
++ // is either only the new text or the new text with some attachments.
++ mMsg->deleteBodyParts();
++
++ // If we have no attachment, simply create a text/plain part and
++ // set the processed template text as the body
++ if ( ac.attachments().empty() ) {
++ mMsg->headers().ContentType().FromString( DwString() ); // to get rid of old boundary
++ mMsg->headers().ContentType().Parse();
++ mMsg->headers().ContentType().SetType( DwMime::kTypeText );
++ mMsg->headers().ContentType().SetSubtype( DwMime::kSubtypePlain );
++ mMsg->headers().Assemble();
++ mMsg->setBodyFromUnicode( body );
++ mMsg->assembleIfNeeded();
+ }
+
+- mMsg->setBodyFromUnicode( body, entityToChange );
++ // If we have some attachments, create a multipart/mixed mail and
++ // add the normal body as well as the attachments
++ else
++ {
++ mMsg->headers().ContentType().SetType( DwMime::kTypeMultipart );
++ mMsg->headers().ContentType().SetSubtype( DwMime::kSubtypeMixed );
++ mMsg->headers().ContentType().CreateBoundary( 0 );
++
++ KMMessagePart textPart;
++ textPart.setBodyFromUnicode( body );
++ mMsg->addDwBodyPart( mMsg->createDWBodyPart( &textPart ) );
++ mMsg->assembleIfNeeded();
++
++ foreach( const partNode *attachment, ac.attachments() ) {
++
++ // When adding this body part, make sure to _not_ add the next bodypart
++ // as well, which mimelib would do, therefore creating a mail with many
++ // duplicate attachments (so many that KMail runs out of memory, in fact).
++ // Body::AddBodyPart is very misleading here...
++ attachment->dwPart()->SetNext( 0 );
++
++ mMsg->addDwBodyPart( attachment->dwPart() );
++ mMsg->assembleIfNeeded();
++ }
++ }
+ }
+ }
+-
+ QString TemplateParser::findCustomTemplate( const QString &tmplName )
+ {
+ CTemplates t( tmplName );
Index: kmail/dbusmail.desktop
===================================================================
---- kmail/dbusmail.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/dbusmail.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kmail/dbusmail.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/dbusmail.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -20,6 +20,7 @@
Comment[kk]=DBUS интерфейсті пошта бағдарламасы
Comment[km]=កម្មវិធីសំបុត្រដែលមានចំណុចប្រទាក់ DBUS
Comment[lv]=Pasta programma ar DBUS saskarni
Comment[nb]=E-postprogram med DBUS-grensesnitt
Comment[nds]=Nettpostprogramm mit en D-Bus-Koppelsteed
+Index: kmail/messagelistview/pane.cpp
+===================================================================
+--- kmail/messagelistview/pane.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/messagelistview/pane.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -685,6 +685,7 @@
+ if ( !w )
+ return;
+
++ w->view()->setAllGroupsExpanded( true );
+ w->view()->selectAll();
+ }
+
+Index: kmail/messagelistview/widget.cpp
+===================================================================
+--- kmail/messagelistview/widget.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/messagelistview/widget.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -577,7 +577,7 @@
+ Q_ASSERT( mb );
+
+ selectedSernums.append( mb->getMsgSerNum() );
+- if ( view()->isCurrentlyViewable( ( *it ) ) )
++ if ( view()->isDisplayedWithParentsExpanded( ( *it ) ) )
+ selectedVisibleSernums.append( mb->getMsgSerNum() );
+
+ if ( topmost == 0 )
Index: kmail/messagelistview/storagemodel.cpp
===================================================================
---- kmail/messagelistview/storagemodel.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/messagelistview/storagemodel.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kmail/messagelistview/storagemodel.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/messagelistview/storagemodel.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -87,6 +87,9 @@
connect( mFolder, SIGNAL( msgHeaderChanged( KMFolder * , int ) ),
SLOT( slotMessageHeaderChanged( KMFolder *, int ) ) );
slotFolderClosed();
Index: kmail/messagelistview/core/model.cpp
===================================================================
---- kmail/messagelistview/core/model.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/messagelistview/core/model.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kmail/messagelistview/core/model.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/messagelistview/core/model.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -472,7 +472,7 @@
if ( mStorageModel && column->isSenderOrReceiver() )
Q_ASSERT( it != messagesWithTheSameStrippedSubject->end() );
Q_ASSERT( *it == mi );
+@@ -2216,7 +2272,7 @@
+ if ( applyFilterToSubtree( mi, index( pParent, 0 ) ) )
+ {
+ // mi matched, expand parents (unconditionally)
+- mView->ensureCurrentlyViewable( mi );
++ mView->ensureDisplayedWithParentsExpanded( mi );
+ }
+ }
+ }
@@ -2619,7 +2675,7 @@
int elapsed;
Index: kmail/messagelistview/core/view.cpp
===================================================================
---- kmail/messagelistview/core/view.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/messagelistview/core/view.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kmail/messagelistview/core/view.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/messagelistview/core/view.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -230,6 +230,9 @@
if ( !mTheme )
return;
void View::selectMessageItems( const QList< MessageItem * > &list )
{
QItemSelection selection;
-@@ -2252,46 +2310,12 @@
+@@ -886,7 +944,7 @@
+ Q_ASSERT( static_cast< MessageItem * >( idx.internalPointer() ) == ( *it ) );
+ if ( !selectionModel()->isSelected( idx ) )
+ selection.append( QItemSelectionRange( idx ) );
+- ensureCurrentlyViewable( *it );
++ ensureDisplayedWithParentsExpanded( *it );
+ }
+ if ( !selection.isEmpty() )
+ selectionModel()->select( selection, QItemSelectionModel::Select | QItemSelectionModel::Rows );
+@@ -1105,7 +1163,7 @@
+ // !expand items
+ ( messageTypeFilter == MessageTypeAny ) &&
+ // has unexpanded parents or is itself hidden
+- ( ! isCurrentlyViewable( above ) )
++ ( ! isDisplayedWithParentsExpanded( above ) )
+ ) ||
+ // is hidden
+ isRowHidden( above->parent()->indexOfChildItem( above ), mModel->index( above->parent(), 0 ) )
+@@ -1246,7 +1304,7 @@
+ setFocus();
+
+ if ( it->parent() != mModel->rootItem() )
+- ensureCurrentlyViewable( it );
++ ensureDisplayedWithParentsExpanded( it );
+
+ QModelIndex idx = mModel->index( it, 0 );
+
+@@ -1288,7 +1346,7 @@
+ setFocus();
+
+ if ( it->parent() != mModel->rootItem() )
+- ensureCurrentlyViewable( it );
++ ensureDisplayedWithParentsExpanded( it );
+
+ QModelIndex idx = mModel->index( it, 0 );
+
+@@ -1325,7 +1383,7 @@
+ setFocus();
+
+ if ( it->parent() != mModel->rootItem() )
+- ensureCurrentlyViewable( it );
++ ensureDisplayedWithParentsExpanded( it );
+
+ QModelIndex idx = mModel->index( it, 0 );
+
+@@ -1348,7 +1406,7 @@
+ setFocus();
+
+ if ( it->parent() != mModel->rootItem() )
+- ensureCurrentlyViewable( it );
++ ensureDisplayedWithParentsExpanded( it );
+
+ QModelIndex idx = mModel->index( it, 0 );
+
+@@ -1397,7 +1455,7 @@
+ Q_ASSERT( it != mModel->rootItem() ); // must never happen (obviously)
+
+ setFocus();
+- ensureCurrentlyViewable( it );
++ ensureDisplayedWithParentsExpanded( it );
+
+ QModelIndex idx = mModel->index( it, 0 );
+
+@@ -1458,7 +1516,7 @@
+ viewport()->update();
+ }
+
+-void View::ensureCurrentlyViewable( Item * it )
++void View::ensureDisplayedWithParentsExpanded( Item * it )
+ {
+ Q_ASSERT( it );
+ Q_ASSERT( it->parent() );
+@@ -1486,29 +1544,45 @@
+ }
+ }
+
+-bool View::isCurrentlyViewable( Item * it ) const
++bool View::isDisplayedWithParentsExpanded( Item * it ) const
+ {
+- Q_ASSERT( it );
+- Q_ASSERT( it->parent() );
++ // An item is currently viewable iff
++ // - it is marked as viewable in the item structure (that is, qt knows about its existence)
++ // (and this means that all of its parents are marked as viewable)
++ // - it is not explicitly hidden
++ // - all of its parents are expanded
+
++ if ( !it )
++ return false; // be nice and allow the caller not to care
++
+ if ( !it->isViewable() )
+- return false;
++ return false; // item not viewable (not attacched to the viewable root or qt not yet aware of it)
++
++ // the item and all the parents are marked as viewable.
++
+ if ( isRowHidden( it->parent()->indexOfChildItem( it ), mModel->index( it->parent(), 0 ) ) )
+- return false;
++ return false; // item qt rappresentation explicitly hidden
+
++ // the item (and theoretically all the parents) are not explicitly hidden
++
++ // check the parent chain
++
+ it = it->parent();
+
+- if ( it == mModel->rootItem() )
+- return true;
+-
+ while ( it )
+ {
+- if ( it->parent() == mModel->rootItem() )
+- return true;
++ if ( it == mModel->rootItem() )
++ return true; // parent is root item: ok
++
++ // parent is not root item
++
+ if ( !isExpanded( mModel->index( it, 0 ) ) )
+- return false;
+- it = it->parent();
++ return false; // parent is not expanded (so child not actually visible)
++
++ it = it->parent(); // climb up
+ }
++
++ // parent hierarchy interrupted somewhere
+ return false;
+ }
+
+@@ -2252,46 +2326,12 @@
void View::slotCollapseAllGroups()
{
} // namespace Core
Index: kmail/messagelistview/core/manager.h
===================================================================
---- kmail/messagelistview/core/manager.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/messagelistview/core/manager.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kmail/messagelistview/core/manager.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/messagelistview/core/manager.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -24,8 +24,10 @@
#include "messagelistview/core/sortorder.h"
#include <QList>
void loadConfiguration();
Index: kmail/messagelistview/core/model.h
===================================================================
---- kmail/messagelistview/core/model.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/messagelistview/core/model.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kmail/messagelistview/core/model.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/messagelistview/core/model.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -51,6 +51,7 @@
class Filter;
class GroupHeaderItem;
Index: kmail/messagelistview/core/manager.cpp
===================================================================
---- kmail/messagelistview/core/manager.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/messagelistview/core/manager.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kmail/messagelistview/core/manager.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/messagelistview/core/manager.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -27,8 +27,10 @@
#include "messagelistview/core/configurethemesdialog.h"
#include "messagelistview/core/widgetbase.h"
ConfigureAggregationsDialog::display( requester ? requester->window() : 0, preselectAggregationId );
Index: kmail/messagelistview/core/view.h
===================================================================
---- kmail/messagelistview/core/view.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/messagelistview/core/view.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
-@@ -260,6 +260,14 @@
+--- kmail/messagelistview/core/view.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/messagelistview/core/view.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -159,16 +159,17 @@
+ void setCurrentMessageItem( MessageItem * it );
+
+ /**
+- * Returns true if the specified item is currently viewable.
+- * For 'viewable' here we mean not hidden and with parents expanded.
++ * Returns true if the specified item is currently displayed in the tree
++ * and has all the parents expanded. This means that the user can
++ * see the message (by eventually scrolling the view).
+ */
+- bool isCurrentlyViewable( Item * it ) const;
++ bool isDisplayedWithParentsExpanded( Item * it ) const;
+
+ /**
+- * Makes sure that the specified is currently viewable.
+- * For 'viewable' here we mean not hidden and with parents expanded.
++ * Makes sure that the specified is currently viewable by the user.
++ * This means that the user can see the message (by eventually scrolling the view).
+ */
+- void ensureCurrentlyViewable( Item * it );
++ void ensureDisplayedWithParentsExpanded( Item * it );
+
+ /**
+ * Returns the currently selected MessageItems (bound to current StorageModel).
+@@ -260,6 +261,14 @@
void setAllThreadsExpanded( bool expand );
/**
* messageTypeFilter can be used to limit the selection to
Index: kmail/messagelistview/core/themedelegate.cpp
===================================================================
---- kmail/messagelistview/core/themedelegate.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/messagelistview/core/themedelegate.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kmail/messagelistview/core/themedelegate.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/messagelistview/core/themedelegate.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -65,6 +65,10 @@
void ThemeDelegate::setTheme( const Theme * theme )
{
// const behaviour. So we need the const pointer to avoid compiler complains
Index: kmail/messagelistview/storagemodel.h
===================================================================
---- kmail/messagelistview/storagemodel.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/messagelistview/storagemodel.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kmail/messagelistview/storagemodel.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/messagelistview/storagemodel.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -227,6 +227,11 @@
/**
* Internal handler of KMFolder signal.
void slotMessageHeaderChanged( KMFolder *folder, int idx );
};
+Index: kmail/kleo_util.h
+===================================================================
+--- kmail/kleo_util.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/kleo_util.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -77,5 +77,12 @@
+ return f == Kleo::InlineOpenPGPFormat || f == Kleo::OpenPGPMIMEFormat ;
+ }
+
++static inline bool containsSMIME( unsigned int f ) {
++ return f & (Kleo::SMIMEFormat|Kleo::SMIMEOpaqueFormat) ;
++}
+
++static inline bool containsOpenPGP( unsigned int f ) {
++ return f & (Kleo::OpenPGPMIMEFormat|Kleo::InlineOpenPGPFormat) ;
++}
++
+ #endif // __KDEPIM_KMAIL_KLEO_UTIL_H__
Index: kmail/mainfolderview.cpp
===================================================================
---- kmail/mainfolderview.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/mainfolderview.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kmail/mainfolderview.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/mainfolderview.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -174,6 +174,7 @@
popup->setObjectName( "subMenu" );
bool enabled = (fvi->folder() ? true : false);
Index: kmail/identitylistview.cpp
===================================================================
---- kmail/identitylistview.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/identitylistview.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kmail/identitylistview.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/identitylistview.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -113,7 +113,8 @@
header()->setMovable( false );
setAllColumnsShowFocus( true );
setSelectionMode( SingleSelection ); // ### Extended would be nicer...
setColumnWidth( 0, 175 );
+Index: kmail/kmmessage.h
+===================================================================
+--- kmail/kmmessage.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/kmmessage.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -488,6 +488,12 @@
+ void setNeedsAssembly();
+
+ /**
++ * Assemble the internal message. This is done automatically in most
++ * cases, but sometimes still necessary to call this manually.
++ */
++ void assembleIfNeeded();
++
++ /**
+ * Get or set the 'Content-Transfer-Encoding' header field
+ * The member functions that involve enumerated types (ints)
+ * will work only for well-known encodings.
+@@ -880,6 +886,21 @@
+ /** Delete this message as soon as it no longer in use. */
+ void deleteWhenUnused();
+
++#ifndef NDEBUG
++
++ /**
++ * Dump the internal mimelib message structure to kDebug().
++ * This is useful if there are inconsistencies because of a missing
++ * Parse() or Assemble().
++ *
++ * This function is recursive, pass 0 as level when calling this with
++ * the root entity.
++ *
++ * If entity is 0, the root will be dumped.
++ */
++ void dump( DwEntity *entity = 0, int level = 0 );
++#endif
++
+ private:
+
+ /** Initialization shared by the ctors. */
+@@ -890,7 +911,7 @@
+ QString mDrafts;
+ QString mTemplates;
+ mutable DwMessage* mMsg;
+- mutable bool mNeedsAssembly :1;
++ mutable bool mNeedsAssembly :1;
+ bool mDecodeHTML :1;
+ bool mReadyToShow :1;
+ bool mComplete :1;
Index: kmail/kmail_config_composer.desktop
===================================================================
---- kmail/kmail_config_composer.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/kmail_config_composer.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kmail/kmail_config_composer.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/kmail_config_composer.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -80,6 +80,7 @@
Comment[ja]=メール作成の設定
Comment[km]=ការកំណត់កម្មវិធីតែងសារ
Comment[nds]=Narichteneditor instellen
Index: kmail/kmreaderwin.cpp
===================================================================
---- kmail/kmreaderwin.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/kmreaderwin.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kmail/kmreaderwin.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/kmreaderwin.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -699,7 +699,7 @@
connect( mCopyURLAction, SIGNAL(triggered(bool)), SLOT(slotUrlCopy()) );
ac->addAction( "open_url", mUrlOpenAction );
connect( mUrlOpenAction, SIGNAL(triggered(bool)), SLOT(slotUrlOpen()) );
+Index: kmail/kmmessage.cpp
+===================================================================
+--- kmail/kmmessage.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/kmmessage.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -1145,7 +1145,6 @@
+ KMMessage* KMMessage::createForward( const QString &tmpl /* = QString() */ )
+ {
+ KMMessage* msg = new KMMessage();
+- QString id;
+
+ // If this is a multipart mail or if the main part is only the text part,
+ // Make an identical copy of the mail, minus headers, so attachments are
+@@ -1156,8 +1155,7 @@
+ msg->fromDwString( this->asDwString() );
+ // remember the type and subtype, initFromMessage sets the contents type to
+ // text/plain, via initHeader, for unclear reasons
+- const int type = msg->type();
+- const int subtype = msg->subtype();
++ DwMediaType oldContentType = msg->mMsg->Headers().ContentType();
+
+ msg->sanitizeHeaders();
+
+@@ -1174,12 +1172,14 @@
+ }
+ }
+ msg->mMsg->Assemble();
++ msg->initFromMessage( this );
+
+- msg->initFromMessage( this );
+ //restore type
+- msg->setType( type );
+- msg->setSubtype( subtype );
+- } else if( type() == DwMime::kTypeText && subtype() == DwMime::kSubtypeHtml ) {
++ msg->mMsg->Headers().ContentType().FromString( oldContentType.AsString() );
++ msg->mMsg->Headers().ContentType().Parse();
++ msg->mMsg->Assemble();
++ }
++ else if( type() == DwMime::kTypeText && subtype() == DwMime::kSubtypeHtml ) {
+ // This is non-multipart html mail. Let`s make it text/plain and allow
+ // template parser do the hard job.
+ msg->initFromMessage( this );
+@@ -1187,7 +1187,8 @@
+ msg->setSubtype( DwMime::kSubtypeHtml );
+ msg->mNeedsAssembly = true;
+ msg->cleanupHeader();
+- } else {
++ }
++ else {
+ // This is a non-multipart, non-text mail (e.g. text/calendar). Construct
+ // a multipart/mixed mail and add the original body as an attachment.
+ msg->initFromMessage( this );
+@@ -2495,7 +2496,17 @@
+ mNeedsAssembly = true;
+ }
+
++//-----------------------------------------------------------------------------
++void KMMessage::assembleIfNeeded()
++{
++ Q_ASSERT( mMsg );
+
++ if ( mNeedsAssembly ) {
++ mMsg->Assemble();
++ mNeedsAssembly = false;
++ }
++}
++
+ //-----------------------------------------------------------------------------
+ QByteArray KMMessage::body() const
+ {
+@@ -2653,6 +2664,8 @@
+ }
+
+ entity->Body().FromString( dwResult );
++ entity->Body().Parse();
++
+ mNeedsAssembly = true;
+ }
+
+@@ -4262,3 +4275,26 @@
+ {
+ s->pendingDeletes << this;
+ }
++
++#ifndef NDEBUG
++void KMMessage::dump( DwEntity *entity, int level )
++{
++ if ( !entity )
++ entity = mMsg;
++
++ QString spaces;
++ for ( int i = 1; i <= level; i++ )
++ spaces += " ";
++
++ kDebug() << QString( spaces + "Headers of entity " + entity->partId() + ":" );
++ kDebug() << QString( spaces + entity->Headers().AsString().c_str() );
++ kDebug() << QString( spaces + "Body of entity " + entity->partId() + ":" );
++ kDebug() << QString( spaces + entity->Body().AsString().c_str() );
++
++ DwBodyPart *current = entity->Body().FirstBodyPart();
++ while ( current ) {
++ dump( current, level + 1 );
++ current = current->Next();
++ }
++}
++#endif
Index: kmail/dbusimap.desktop
===================================================================
---- kmail/dbusimap.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/dbusimap.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kmail/dbusimap.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/dbusimap.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -20,6 +20,7 @@
Comment[kk]=DBUS интерфейсті пошта бағдарламасы
Comment[km]=កម្មវិធីសំបុត្រដែលមានចំណុចប្រទាក់ DBUS
Comment[lv]=Pasta programma ar DBUS saskarni
Comment[nb]=E-postprogram med DBUS-grensesnitt
Comment[nds]=Nettpostprogramm mit en D-Bus-Koppelsteed
+Index: kmail/templateparser.h
+===================================================================
+--- kmail/templateparser.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/templateparser.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -47,10 +47,11 @@
+ bool aSmartQuote, bool aallowDecryption,
+ bool aselectionIsBody );
+
+- virtual void process( KMMessage *aorig_msg, KMFolder *afolder = NULL, bool append = false );
++ virtual void process( KMMessage *aorig_msg, KMFolder *afolder = 0, bool append = false );
+ virtual void process( const QString &tmplName, KMMessage *aorig_msg,
+- KMFolder *afolder = NULL, bool append = false );
++ KMFolder *afolder = 0, bool append = false );
+ virtual void processWithTemplate( const QString &tmpl );
++
+ virtual QString findTemplate();
+ virtual QString findCustomTemplate( const QString &tmpl );
+ virtual QString pipe( const QString &cmd, const QString &buf );
+@@ -72,6 +73,17 @@
+ QString mQuoteString;
+ bool mAppend;
+
++ /**
++ * Called by processWithTemplate(). This adds the completely processed body to
++ * the message.
++ *
++ * In append mode, this will simply append the text to the body.
++ *
++ * Otherwise, the content of the old message is deleted and replaced with @p body.
++ * Attachments of the original message are also added back to the new message.
++ */
++ void addProcessedBodyToMessage( const QString &body );
++
+ int parseQuotes( const QString &prefix, const QString &str,
+ QString "e ) const;
+ };
Index: kmail/kmcommands.cpp
===================================================================
---- kmail/kmcommands.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/kmcommands.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kmail/kmcommands.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/kmcommands.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -2937,7 +2937,7 @@
KTemporaryFile *linkFile = new KTemporaryFile();
delete linkFile;
Index: kmail/kmfoldercachedimap.cpp
===================================================================
---- kmail/kmfoldercachedimap.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/kmfoldercachedimap.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kmail/kmfoldercachedimap.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/kmfoldercachedimap.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -202,7 +202,8 @@
/*mHoldSyncs( false ),*/
mFolderRemoved( false ),
serverSyncInternal();
Index: kmail/kmfoldercachedimap.h
===================================================================
---- kmail/kmfoldercachedimap.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/kmfoldercachedimap.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kmail/kmfoldercachedimap.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/kmfoldercachedimap.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -627,12 +627,18 @@
bool mFolderRemoved;
bool mRecurse;
/**
Index: kmail/kmmainwidget.cpp
===================================================================
---- kmail/kmmainwidget.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/kmmainwidget.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kmail/kmmainwidget.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/kmmainwidget.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -1277,6 +1277,7 @@
KMFolderDialog props( folder, folder->parent(), mMainFolderView,
i18n("Properties of Folder %1", folder->label() ) );
updateFolderMenu();
}
+Index: kmail/kmfilteraction.cpp
+===================================================================
+--- kmail/kmfilteraction.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/kmfilteraction.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -1467,91 +1467,30 @@
+ {
+ }
+
+-KMFilterAction::ReturnCode KMFilterActionForward::process( KMMessage *aMsg ) const
++KMFilterAction::ReturnCode KMFilterActionForward::process( KMMessage *msg ) const
+ {
+ if ( mParameter.isEmpty() )
+ return ErrorButGoOn;
+
+ // avoid endless loops when this action is used in a filter
+ // which applies to sent messages
+- if ( KMMessage::addressIsInAddressList( mParameter, QStringList( aMsg->to() ) ) )
++ if ( KMMessage::addressIsInAddressList( mParameter, QStringList( msg->to() ) ) ) {
++ kWarning() << "Attempt to forward to receipient of original message, ignoring.";
+ return ErrorButGoOn;
++ }
+
+- // Create the forwarded message by hand to make forwarding of messages with
+- // attachments work.
+- // Note: This duplicates a lot of code from KMMessage::createForward() and
+- // KMComposeWin::applyChanges().
+- // ### FIXME: Remove the code duplication again.
++ KMMessage *fwdMsg = msg->createForward();
++ fwdMsg->setTo( mParameter );
+
+- KMMessage* msg = new KMMessage;
+-
+- msg->initFromMessage( aMsg );
+-
+- TemplateParser parser( msg, TemplateParser::Forward,
+- aMsg->body(), false, false, false);
+- parser.process( aMsg );
+-
+- QByteArray
+- encoding = KMMsgBase::autoDetectCharset( aMsg->charset(),
+- KMMessage::preferredCharsets(),
+- msg->body() );
+- if( encoding.isEmpty() )
+- encoding = "utf-8";
+- QByteArray str = KMMsgBase::codecForName( encoding )->fromUnicode( msg->body() );
+-
+- msg->setCharset( encoding );
+- msg->setTo( mParameter );
+- msg->setSubject( "Fwd: " + aMsg->subject() );
+-
+- bool isQP = kmkernel->msgSender()->sendQuotedPrintable();
+-
+- if( aMsg->numBodyParts() == 0 )
+- {
+- msg->setAutomaticFields( true );
+- msg->setHeaderField( "Content-Type", "text/plain" );
+- // msg->setCteStr( isQP ? "quoted-printable": "8bit" );
+- QList<int> dummy;
+- msg->setBodyAndGuessCte(str, dummy, !isQP);
+- msg->setCharset( encoding );
+- if( isQP )
+- msg->setBodyEncoded( str );
+- else
+- msg->setBody( str );
++ if ( !kmkernel->msgSender()->send( fwdMsg, KMail::MessageSender::SendLater ) ) {
++ kWarning() << "KMFilterAction: could not forward message (sending failed)";
++ return ErrorButGoOn; // error: couldn't send
+ }
+ else
+- {
+- KMMessagePart bodyPart, msgPart;
++ sendMDN( msg, KMime::MDN::Dispatched );
+
+- msg->removeHeaderField( "Content-Type" );
+- msg->removeHeaderField( "Content-Transfer-Encoding" );
+- msg->setAutomaticFields( true );
+- msg->setBody( "This message is in MIME format.\n\n" );
++ // (the msgSender takes ownership of the message, so don't delete it here)
+
+- bodyPart.setTypeStr( "text" );
+- bodyPart.setSubtypeStr( "plain" );
+- // bodyPart.setCteStr( isQP ? "quoted-printable": "8bit" );
+- QList<int> dummy;
+- bodyPart.setBodyAndGuessCte(str, dummy, !isQP);
+- bodyPart.setCharset( encoding );
+- bodyPart.setBodyEncoded( str );
+- msg->addBodyPart( &bodyPart );
+-
+- for( int i = 0; i < aMsg->numBodyParts(); i++ )
+- {
+- aMsg->bodyPart( i, &msgPart );
+- if( i > 0 || qstricmp( msgPart.typeStr(), "text" ) != 0 )
+- msg->addBodyPart( &msgPart );
+- }
+- }
+- msg->cleanupHeader();
+- msg->link( aMsg, MessageStatus::statusForwarded() );
+-
+- sendMDN( aMsg, KMime::MDN::Dispatched );
+-
+- if ( !kmkernel->msgSender()->send( msg, KMail::MessageSender::SendLater ) ) {
+- kDebug(5006) <<"KMFilterAction: could not forward message (sending failed)";
+- return ErrorButGoOn; // error: couldn't send
+- }
+ return GoOn;
+ }
+
Index: kmail/kmail_view.desktop
===================================================================
---- kmail/kmail_view.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/kmail_view.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kmail/kmail_view.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/kmail_view.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -13,6 +13,7 @@
Name[ja]=KMail ビュー
Name[km]=ទិដ្ឋភាព KMail
Name[nds]=KMail-Ansicht
Index: kmail/configuredialog.cpp
===================================================================
---- kmail/configuredialog.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/configuredialog.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kmail/configuredialog.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/configuredialog.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -2036,14 +2036,16 @@
this, SLOT( slotEmitChanged() ) );
vlay->addLayout( hlay );
Index: kmail/accountmanager.cpp
===================================================================
---- kmail/accountmanager.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/accountmanager.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kmail/accountmanager.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/accountmanager.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -94,6 +94,32 @@
uint id = group.readEntry( "Id", 0 );
KAccount::Type acctType = KAccount::typeForName( group.readEntry( "Type" ) );
if ( accountName.isEmpty() )
accountName = i18n( "Account %1", accountNum++ );
KMAccount *account = create( acctType, accountName, id );
+Index: kmail/keyresolver.cpp
+===================================================================
+--- kmail/keyresolver.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/keyresolver.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -121,7 +121,7 @@
+ return false;
+ const std::vector<GpgME::UserID> uids = key.userIDs();
+ for ( std::vector<GpgME::UserID>::const_iterator it = uids.begin() ; it != uids.end() ; ++it ) {
+- if ( !it->isRevoked() && it->validity() > GpgME::UserID::Marginal )
++ if ( !it->isRevoked() && it->validity() >= GpgME::UserID::Marginal )
+ return true;
+ #if 0
+ else
+@@ -1392,9 +1392,14 @@
+
+
+ std::vector<GpgME::Key> Kleo::KeyResolver::selectKeys( const QString & person, const QString & msg, const std::vector<GpgME::Key> & selectedKeys ) const {
++ const bool opgp = containsOpenPGP( mCryptoMessageFormats );
++ const bool x509 = containsSMIME( mCryptoMessageFormats );
++
+ Kleo::KeySelectionDialog dlg( i18n("Encryption Key Selection"),
+ msg, selectedKeys,
+- Kleo::KeySelectionDialog::ValidEncryptionKeys,
++ Kleo::KeySelectionDialog::ValidEncryptionKeys
++ & ~(opgp ? 0 : Kleo::KeySelectionDialog::OpenPGPKeys)
++ & ~(x509 ? 0 : Kleo::KeySelectionDialog::SMIMEKeys),
+ true, true ); // multi-selection and "remember choice" box
+
+ if ( dlg.exec() != QDialog::Accepted )
+Index: kmail/accountwizard.cpp
+===================================================================
+--- kmail/accountwizard.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/accountwizard.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -420,11 +420,11 @@
+
+ QLabel *AccountWizard::createInfoLabel( const QString &msg )
+ {
+- QLabel *label = new QLabel( msg, this );
++ QLabel *label = new QLabel( msg, this, Qt::Window | Qt::FramelessWindowHint );
+ label->setFrameStyle( QFrame::Panel | QFrame::Raised );
+ label->setLineWidth( 3 );
+ label->resize( fontMetrics().width( msg ) + 20, label->height() * 2 );
+- label->move( width() / 2 - label->width() / 2, height() / 2 - label->height() / 2 );
++ label->move( x() + width() / 2 - label->width() / 2, y() + height() / 2 - label->height() / 2 );
+ label->setAutoFillBackground( true );
+ label->show();
+
Index: kmail/objecttreeparser.cpp
===================================================================
---- kmail/objecttreeparser.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kmail/objecttreeparser.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
-@@ -2099,12 +2099,16 @@
+--- kmail/objecttreeparser.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kmail/objecttreeparser.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -243,6 +243,12 @@
+ node->setProcessed( false, true );
+ }
+
++ // Make sure the whole content is relative, so that nothing is painted over the header
++ // if a malicious message uses absolute positioning.
++ bool isRoot = ( node->parentNode() == 0 );
++ if ( isRoot && mReader )
++ htmlWriter()->queue( "<div style=\"position: relative\">\n" );
++
+ for ( ; node ; node = node->nextSibling() ) {
+ if ( node->processed() )
+ continue;
+@@ -290,6 +296,9 @@
+ if ( showOnlyOneMimePart() )
+ break;
+ }
++
++ if ( isRoot && mReader )
++ htmlWriter()->queue( "</div>\n" );
+ }
+
+ void ObjectTreeParser::defaultHandling( partNode * node, ProcessResult & result ) {
+@@ -424,7 +433,7 @@
+ }
+
+ std::vector<GpgME::Signature> signatures;
+- if ( doCheck )
++ if ( !doCheck )
+ signatures = paramSignatures;
+
+ PartMetaData messagePart;
+@@ -2099,12 +2108,16 @@
if ( auditLog.isEmpty() )
return i18n("No Audit Log available");
}
static QString endVerboseSigstatHeader( const PartMetaData & pmd )
-Index: knode/kncomposerview.cpp
-===================================================================
---- knode/kncomposerview.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ knode/kncomposerview.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
-@@ -93,6 +93,7 @@
- e_dit=new KNComposerEditor(this);
- e_dit->switchToPlainText();
- e_dit->setMinimumHeight(50);
-+ e_dit->setFont(KGlobalSettings::fixedFont());
-
- QVBoxLayout *notL=new QVBoxLayout(e_dit);
- notL->addStretch(1);
+Index: knode/knode.kcfg
+===================================================================
+--- knode/knode.kcfg (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ knode/knode.kcfg (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -353,6 +353,7 @@
+ </entry>
+ <entry name="composerFont" type="Font">
+ <label>Composer</label>
++ <default code="true">KGlobalSettings::fixedFont()</default>
+ </entry>
+ <entry name="groupListFont" type="Font">
+ <label>Group List</label>
+Index: knode/kncomposer.h
+===================================================================
+--- knode/kncomposer.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ knode/kncomposer.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -113,12 +113,17 @@
+ composerResult r_esult;
+ KNLocalArticle *a_rticle;
+ QString s_ignature, u_nwraped;
+- QByteArray c_harset;
+ MessageMode m_ode;
+ bool n_eeds8Bit, // false: fall back to us-ascii
+ v_alidated, // hasValidData was run and found no problems, n_eeds8Bit is valid
+ a_uthorDislikesMailCopies;
+
++ /**
++ Sets the character set to used to encode this message.
++ This also enforces some sanity check.
++ */
++ void setCharset( const QString &charset );
++
+ //edit
+ bool e_xternalEdited;
+ KProcess *e_xternalEditor;
+@@ -215,11 +220,17 @@
+ private:
+ bool mFirstEdit;
+ /**
+- * Temporary hack for bug 169411 stolen from KMail (kmmsgbase.{h,cpp})
+- * Fixes an encoding received by a KDE function and returns the proper,
+- * MIME-compilant encoding name instead.
++ Character set used to encode the out-going message.
++
++ This is going to end in the mime header of the message
++ so it should be a valid encoding as per
++ @link http://www.iana.org/assignments/character-sets IANA character-set encoding @endlink
++ and not be empty; both issue are taken care of by setCharset().
++ See bug #169411, #163524
++
++ As a consequence this can not used directly as input of methods from KCharset.
+ */
+- QByteArray fixEncoding( const QByteArray &encoding );
++ QString mCharset;
+ };
+
+ #if 0
Index: knode/knarticle.cpp
===================================================================
---- knode/knarticle.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ knode/knarticle.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- knode/knarticle.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ knode/knarticle.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -70,8 +70,10 @@
{
// filter out internal headers
else
++it;
}
+Index: knode/kncomposer.cpp
+===================================================================
+--- knode/kncomposer.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ knode/kncomposer.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -719,7 +719,7 @@
+ firstLine = false;
+ }
+
+- if (n_eeds8Bit && (c_harset.toLower()=="us-ascii")) {
++ if (n_eeds8Bit && ( mCharset.toLower()=="us-ascii" )) {
+ KMessageBox::sorry(this, i18n("Your message contains characters which are not included\nin the \"us-ascii\" character set; please choose\na suitable character set from the \"Options\" menu."));
+ return false;
+ }
+@@ -806,7 +806,7 @@
+ a_rticle->date()->setDateTime( KDateTime::currentLocalDateTime() ); //set current date+time
+
+ //Subject
+- a_rticle->subject()->fromUnicodeString(v_iew->s_ubject->text(), c_harset);
++ a_rticle->subject()->fromUnicodeString( v_iew->s_ubject->text(), mCharset.toLatin1() );
+
+ //Newsgroups
+ if (m_ode != mail) {
+@@ -817,7 +817,7 @@
+
+ //To
+ if (m_ode != news) {
+- a_rticle->to()->fromUnicodeString(v_iew->t_o->text(), c_harset);
++ a_rticle->to()->fromUnicodeString( v_iew->t_o->text(), mCharset.toLatin1() );
+ a_rticle->setDoMail(true);
+ } else
+ a_rticle->setDoMail(false);
+@@ -862,22 +862,24 @@
+ //set text
+ if (v_alidated) {
+ if (n_eeds8Bit) {
+- text->contentType()->setCharset(c_harset);
++ text->contentType()->setCharset( mCharset.toLatin1() );
+ if ( knGlobals.settings()->allow8BitBody() )
+ text->contentTransferEncoding()->setEncoding(KMime::Headers::CE8Bit);
+ else
+ text->contentTransferEncoding()->setEncoding(KMime::Headers::CEquPr);
+ } else {
+- text->contentType()->setCharset("us-ascii"); // fall back to us-ascii
++ setCharset( "us-ascii" ); // fall back to us-ascii
++ text->contentType()->setCharset( mCharset.toLatin1() );
+ text->contentTransferEncoding()->setEncoding(KMime::Headers::CE7Bit);
+ }
+ } else { // save as draft
+- text->contentType()->setCharset(c_harset);
+- if (c_harset.toLower()=="us-ascii")
++ text->contentType()->setCharset( mCharset.toLatin1() );
++ if ( mCharset.toLower()=="us-ascii" ) {
+ text->contentTransferEncoding()->setEncoding(KMime::Headers::CE7Bit);
+- else
++ } else {
+ text->contentTransferEncoding()->setEncoding( knGlobals.settings()->allow8BitBody()
+ ? KMime::Headers::CE8Bit : KMime::Headers::CEquPr );
++ }
+ }
+
+ QString tmp = v_iew->e_dit->toWrappedPlainText();
+@@ -902,7 +904,7 @@
+ QString tmpText = tmp;
+ Kpgp::Block block;
+ bool ok=true;
+- QTextCodec *codec=KGlobal::charsets()->codecForName(c_harset, ok);
++ QTextCodec *codec=KGlobal::charsets()->codecForName( mCharset, ok);
+ if(!ok) // no suitable codec found => try local settings and hope the best ;-)
+ codec=KGlobal::locale()->codecForEncoding();
+
+@@ -927,16 +929,25 @@
+ return true;
+ }
+
+-QByteArray KNComposer::fixEncoding( const QByteArray &encoding )
++void KNComposer::setCharset( const QString &charset )
+ {
+- QString returnEncoding = encoding;
+ // According to http://www.iana.org/assignments/character-sets, uppercase is
+ // preferred in MIME headers
+- if ( returnEncoding.toUpper().contains( "ISO " ) ) {
+- returnEncoding = returnEncoding.toUpper();
+- returnEncoding.replace( "ISO ", "ISO-" );
++ mCharset = charset.toUpper();
++
++ // For bug 163524 (Knode sending empty charset)
++ // Placed first so that the logic below also applies to the charset from settings.
++ if ( mCharset.isEmpty() ) {
++ mCharset = knGlobals.settings()->charset();
++ if ( mCharset.isEmpty() ) {
++ mCharset = "UTF-8";
++ }
+ }
+- return returnEncoding.toLatin1();
++
++ // hack for bug 169411 stolen from KMail (kmmsgbase.{h,cpp})
++ if ( mCharset.contains( "ISO " ) ) {
++ mCharset = mCharset.replace( "ISO ", "ISO-" );
++ }
+ }
+
+
+@@ -1001,15 +1012,14 @@
+ v_iew->e_dit->setText(s);
+
+ // initialize the charset select action
+- if(textContent)
+- c_harset=textContent->contentType()->charset();
+- else
+- c_harset = knGlobals.settings()->charset().toLatin1();
++ if(textContent) {
++ setCharset( textContent->contentType()->charset() );
++ } else {
++ setCharset( knGlobals.settings()->charset() );
++ }
+
+- c_harset = fixEncoding(c_harset); // workaround previous wrong configuration
++ a_ctSetCharset->setCurrentItem( a_ctSetCharset->items().indexOf( mCharset ) );
+
+- a_ctSetCharset->setCurrentItem( a_ctSetCharset->items().indexOf( c_harset ) );
+-
+ // initialize the message type select action
+ if (a_rticle->doPost() && a_rticle->doMail())
+ m_ode = news_mail;
+@@ -1036,7 +1046,7 @@
+ {
+ QString temp;
+ bool ok=true;
+- QTextCodec *codec=KGlobal::charsets()->codecForName(c_harset, ok);
++ QTextCodec *codec=KGlobal::charsets()->codecForName( mCharset, ok);
+ QTextStream ts(file);
+ ts.setCodec(codec);
+
+@@ -1278,7 +1288,8 @@
+ if(s.isEmpty())
+ return;
+
+- c_harset = fixEncoding(s.toLatin1());
++ setCharset( s );
++
+ setConfig(true); //adjust fonts
+ }
+
+@@ -1340,7 +1351,7 @@
+ }
+
+ bool ok=true;
+- QTextCodec *codec=KGlobal::charsets()->codecForName(c_harset, ok);
++ QTextCodec *codec=KGlobal::charsets()->codecForName( mCharset, ok );
+
+ QString tmp = v_iew->e_dit->toWrappedPlainText();
+
+@@ -1403,7 +1414,7 @@
+ overwriteDesc = i18n(" INS ");
+
+ statusBar()->changeItem(i18n(" Type: %1 ", typeDesc), 1);
+- statusBar()->changeItem(i18n(" Charset: %1 ", QString( c_harset ) ), 2);
++ statusBar()->changeItem(i18n(" Charset: %1 ", mCharset ), 2);
+ statusBar()->changeItem(overwriteDesc, 3);
+ statusBar()->changeItem(i18n(" Column: %1 ", v_iew->e_dit->columnNumber () + 1), 4);
+ statusBar()->changeItem(i18n(" Line: %1 ", v_iew->e_dit->linePosition() + 1), 5);
Index: dependency-graph.dot
===================================================================
---- dependency-graph.dot (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ dependency-graph.dot (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- dependency-graph.dot (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ dependency-graph.dot (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -48,7 +48,6 @@
"konsolekalendar"[style=filled, fillcolor=lightcyan, URL="konsolekalendar/html/index.html"];
"kontact"[style=filled, fillcolor=lightcyan, URL="kontact/html/index.html"];
"libkdepim"[style=filled, fillcolor=lightyellow, URL="libkdepim/html/index.html"];
Index: doc/kleopatra/index.docbook
===================================================================
---- doc/kleopatra/index.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ doc/kleopatra/index.docbook (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- doc/kleopatra/index.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ doc/kleopatra/index.docbook (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -13,48 +13,6 @@
<!ENTITY dn "<acronym>DN</acronym>">
<example>
Index: doc/ktimetracker/index.docbook
===================================================================
---- doc/ktimetracker/index.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ doc/ktimetracker/index.docbook (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- doc/ktimetracker/index.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ doc/ktimetracker/index.docbook (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -99,12 +99,13 @@
<sect1 id="starting">
<title>Starting &karm;</title>
<listitem><para>Gioele Barabucci <email>gioele@gioelebarabucci.com</email></para></listitem>
Index: doc/kjots/index.docbook
===================================================================
---- doc/kjots/index.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ doc/kjots/index.docbook (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- doc/kjots/index.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ doc/kjots/index.docbook (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -155,12 +155,12 @@
<guimenuitem>Delete Page</guimenuitem></menuchoice>.</para>
is: <keycombo action="simul">&Ctrl;<keycap>M</keycap></keycombo>.</para>
Index: doc/knode/using-morefeatures.docbook
===================================================================
---- doc/knode/using-morefeatures.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ doc/knode/using-morefeatures.docbook (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- doc/knode/using-morefeatures.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ doc/knode/using-morefeatures.docbook (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -644,7 +644,7 @@
the rules which are shown — you have the choice whether to show all
rules or only the rules for a specific <glossterm>newsgroup</glossterm>.</para>
<para>When leaving the editor, or when the
Index: doc/knode/using-firststart.docbook
===================================================================
---- doc/knode/using-firststart.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ doc/knode/using-firststart.docbook (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- doc/knode/using-firststart.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ doc/knode/using-firststart.docbook (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -246,7 +246,7 @@
<para>If this option is activated, the signature file is not handled
as a text file, but as a program. The signature file will be started
+you'll be able to choose a signature by accident or to use fortune to
generate a cool slogan every time.</para>
- </sect3>
-@@ -825,7 +825,7 @@
- it as read.</para>
+ </sect3>
+@@ -825,7 +825,7 @@
+ it as read.</para>
+
+ <para>If <guilabel>Go to next unread thread</guilabel> is
+-checked, &knode; automatically shows the next thread if you mark the
++checked, &knode; automatically shows the next thread if you mark
+ the previous thread as read.</para>
+
+ </sect3>
+@@ -942,7 +942,7 @@
+
+ <para>The <guibutton>Down</guibutton> button does the opposite
+ action: select the filter you just shifted one up and
+-press<guibutton>Down</guibutton> until it reaches its old
++press <guibutton>Down</guibutton> until it reaches its old
+ position.</para>
+
+ <para>With the two buttons <guibutton>Add Separator</guibutton> and
+Index: doc/knode/using-subscribing.docbook
+===================================================================
+--- doc/knode/using-subscribing.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ doc/knode/using-subscribing.docbook (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -184,7 +184,7 @@
+ </tip>
+
+ <para>Unfortunately there is no guarantee that your newsserver is
+-providing all available newsgroups: many newsserver refuse groups
++providing all available newsgroups: many newsservers refuse groups
+ publishing binary attachments; other groups are only available from
+ special servers. &knode; provides you the possibility to use more than
+ one news-server if you want to access alternative servers providing
+@@ -446,7 +446,7 @@
+ <varlistentry>
+ <term><guilabel>From</guilabel></term>
+ <listitem>
+-<para>The <guilabel>From</guilabel> column shows the author, or their
++<para>The <guilabel>From</guilabel> column shows the author, or his
+ e-mail address if the author didn't give a name. You can configure
+ your settings in
+ <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
+@@ -578,7 +578,7 @@
+ <para>You can navigate in articles, display an article and open or
+ close threads with your mouse or keyboard.</para>
+
+-<para>When you select an article with your mouse its entry in the the
++<para>When you select an article with your mouse its entry in the
+ article view gets colored; at the same time the header and body of
+ this article appear in in the article window. If you want to read
+ another article you can use the mouse to select it, or you can use
+Index: doc/kpilot/conduit-sysinfo.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/wizard-connection.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/setup-viewer.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/address-app.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/db-app.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/conduit-knotes.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/conduit-mal.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/wizard-conduits.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/toolbar_backup.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/conduit-popmail-kmail.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/toolbar_hotsync.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/wizard-general.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/memo-app.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/conduit-palmdoc.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/todo-app.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/file-app.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/usage.docbook
+===================================================================
+--- doc/kpilot/usage.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ doc/kpilot/usage.docbook (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -1,12 +1,10 @@
+ <chapter id="using-kpilot">
+-<title>Using &kpilot; Data Viewers and Main Window Interface</title>
++<title>Using &kpilot; Main Window Interface</title>
+
+ <para>
+-This chapter describes the usage of &kpilot;'s main window; as a viewer
+-application for data on the &handheld;, and its menu structure.
+-The main window of &kpilot; also contains
+-the &HotSync;-log, which can be useful when
+-debugging problems.
++This chapter describes the usage of &kpilot;'s main window and its menu
++structure. The main window of &kpilot; also contains the &HotSync;-log, which
++can be useful when debugging problems.
+ </para>
+
+ <para>
+@@ -31,7 +29,7 @@
+ </para>
+
+ <para>
+-The <guimenu>file</guimenu> menu contains the synchronization menu items. Note
++The <guimenu>File</guimenu> menu contains the synchronization menu items. Note
+ that these items do not start the sync process, they only select what the new
+ sync will be. To really start it, you must press the HotSync button on your
+ &PalmPilot;'s cradle (or on the &handheld; itself, when there is no cradle).
+@@ -70,23 +68,6 @@
+ <term>
+ <menuchoice>
+ <guimenu>File</guimenu>
+-<guimenuitem>FastSync</guimenuitem>
+-</menuchoice>
+-</term>
+-<listitem>
+-<para>
+-(not available with all installations)
+-Make the next sync a FastSync. For more information, please check the
+-<link linkend="sync-s">Syncing your &handheld; data</link> section of this
+-handbook.
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term>
+-<menuchoice>
+-<guimenu>File</guimenu>
+ <guimenuitem>FullSync</guimenuitem>
+ </menuchoice>
+ </term>
+@@ -104,56 +85,6 @@
+ <term>
+ <menuchoice>
+ <guimenu>File</guimenu>
+-<guimenuitem>Backup</guimenuitem>
+-</menuchoice>
+-</term>
+-<listitem>
+-<para>
+-Make the next sync a full backup of your &PalmPilot; data. This action can take
+-several minutes. For more information, please check the
+-<link linkend="backup"> Backing up your &handheld; data</link> section of this
+-handbook.
+-</para>
+-<tip>
+-<para>
+-The first thing you should do after starting &kpilot; for
+-the first time is make a full backup.
+-</para>
+-</tip>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term>
+-<menuchoice>
+-<guimenu>File</guimenu>
+-<guimenuitem>Restore</guimenuitem>
+-</menuchoice>
+-</term>
+-<listitem>
+-<para>
+-This copies all the data from a previous backup on your
+-<acronym>PC</acronym> to your &PalmPilot;,
+-replacing whatever data was there.
+-Use this if your &PalmPilot; suffers some from software or hardware failure
+-(or is replaced by a new one). For more information, please check the
+-<link linkend="restore"> Restoring your &handheld; data</link> section of this
+-handbook.
+-</para>
+-<warning>
+-<para>
+-Doing a restore will erase all data on the &PalmPilot;
+-before restoring the information from your
+-<acronym>PC</acronym>!</para>
+-</warning>
+-</listitem>
+-</varlistentry>
+-
+-
+-<varlistentry>
+-<term>
+-<menuchoice>
+-<guimenu>File</guimenu>
+ <guimenuitem>Copy Handheld to PC</guimenuitem>
+ </menuchoice>
+ </term>
+@@ -182,28 +113,10 @@
+ </listitem>
+ </varlistentry>
+
+-
+-<!--
+ <varlistentry>
+ <term>
+ <menuchoice>
+ <guimenu>File</guimenu>
+-<guimenuitem>List Only</guimenuitem>
+-</menuchoice>
+-</term>
+-<listitem>
+-<para>
+-The next sync will only list the databases on your &handheld;, no exchange of
+-data will be performed.
+-</para>
+-</listitem>
+-</varlistentry>
+--->
+-
+-<varlistentry>
+-<term>
+-<menuchoice>
+-<guimenu>File</guimenu>
+ <guimenuitem>Quit</guimenuitem>
+ </menuchoice>
+ </term>
+@@ -268,7 +181,7 @@
+ Displays &kpilot;'s shortcut configuration dialog, allowing you change or create
+ key bindings, which are associations between actions (for example, opening
+ &kpilot;'s configuration dialog) and keys or key combinations (for instance,
+-Ctrl + Shift + a).
++<keycombo action="simul">&Ctrl;&Shift;<keycap>A</keycap></keycombo>).
+ </para>
+ </listitem>
+ </varlistentry>
+@@ -302,36 +215,15 @@
+ <listitem>
+ <para>
+ Displays &kpilot;'s configuration dialog, allowing you to match your hardware
+-with the configuration, so that &kpilot; can talk with your &handheld;, to
+-configure the way &kpilot; synchronizes your &PalmPilot; with your
+-desktop applications (through conduits) and the way it shows the data from your &PalmPilot; in the
+-<link linkend="builtin">built-in viewers</link>. The <link linkend="configure">
+-Configuring &kpilot;</link> chapter of this handbook offers detailed information
+-about these configuration options.
++with the configuration, so that &kpilot; can talk with your &handheld;, and to
++configure the way &kpilot; synchronizes your &PalmPilot; with your desktop
++applications (through conduits). The <link linkend="configure"> Configuring
++&kpilot;</link> chapter of this handbook offers detailed information about these
++configuration options.
+ </para>
+ </listitem>
+ </varlistentry>
+
+-<varlistentry>
+-<term>
+-<menuchoice>
+-<guimenu>Settings</guimenu>
+-<guimenuitem>Configuration Wizard...</guimenuitem>
+-</menuchoice>
+-</term>
+-<listitem>
+-<para>
+-Displays &kpilot;'s configuration wizard dialog. The
+-<link linkend="configwizard">configuration wizard</link> helps you to set up
+-&kpilot; to communicate with the &PalmPilot; and to configure the conduits as
+-a group. It's a great start for new users, and you can always fine-tune your
+-preferences later, using the <link linkend="configure">configure
+-dialog</link>.
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-
+ </variablelist>
+
+
+@@ -360,245 +252,10 @@
+ <para>
+ Selecting one of the built-in applications
+ will cause that application to appear in &kpilot;'s main
+-window.
+-You may use the viewer applications to edit the information, by enabling
+-this option in the <link linkend="page-viewers">database viewer's
+-configuration dialog</link>. The ability to view and edit private records is
+-configurable too.</para>
++window.</para>
+
+-<para>
+-Any changes you make to the &PalmPilot; databases with
+-the built-in applications (such as deleting a memo)
+-do not take effect on the &PalmPilot; until the next HotSync.
+-</para>
+
+-<important><para>
+-If the <guilabel>Make internal viewers editable</guilabel> option is
+-not enabled, the changes in the viewers are not synchronized with your
+-&handheld;, and will be lost. In recent versions of &kpilot; it is not possible
+-enable this option, and therefore, to edit the databases with the viewers.
+-</para></important>
+
+-<sect2 id="todo-app">
+-
+-<title>The Todo Viewer</title>
+-
+-<para>
+-The todo application allows you to view the tasks from your &PalmPilot;,
+-add new tasks and edit or delete existing ones. The changes you made
+-are applied to the &handheld; the next time you &HotSync;.
+-</para>
+-
+-<screenshot>
+-<screeninfo>Todo Viewer Application</screeninfo>
+-<mediaobject>
+-<imageobject><imagedata fileref="todo-app.png" format="PNG"/></imageobject>
+-<textobject><phrase>The Todo Viewer Application</phrase></textobject>
+-<caption><para>The Todo Viewer Application</para></caption>
+-</mediaobject>
+-</screenshot>
+-
+-<para>
+-The todo application has a drop down box
+-for the memo categories defined in the &PalmPilot;.
+-In the screenshot, category <quote>All</quote> is selected.
+-Underneath the drop down box is a list of todo entries, with a check box
+-indicating if they are completed or not. You can click the check box to toggle
+-the todo item between completed and not completed status. Clicking on one of the
+-todo items in the list will display its details in the text box labelled
+-<guilabel>Todo info:</guilabel> to the right.
+-</para>
+-
+-<para>
+-If you have the <guilabel>Make internal viewers editable</guilabel> option
+-enabled in the <link linkend="page-viewers">viewers configuration page</link> you
+-can use the buttons <guibutton>Edit Record...</guibutton>,
+-<guibutton>New Record...</guibutton> and <guibutton>Delete Record</guibutton>
+-to edit the todo data from your &handheld;, and sync the data in the next
+-&HotSync;.</para>
+-
+-<!--
+-<note><para>
+-If you create new todo and decide that
+-you do not want to have it on the &PalmPilot;
+-you must perform a &HotSync; (copying the todo
+-to the &PalmPilot;) and then delete the todo record
+-from the &PalmPilot; or the viewer, and &HotSync; again. It is not possible to
+-delete newly-added records from the built-in applications.
+-</para></note>
+--->
+-
+-<para>
+-The <guibutton>Edit Record...</guibutton> button opens a dialog where you can
+-edit the details of the currently selected todo item, including description,
+-priority and end date. Click the <guibutton>New Record...</guibutton> button to
+-open the same dialog, but instead of editing the current selected record, a new
+-todo will be added to the list. And finally, click the
+-<guibutton>Delete Record</guibutton> button to remove the selected todo record
+-from the list.
+-</para>
+-
+-</sect2>
+-
+-<sect2 id="address-app">
+-<title>The Address Viewer</title>
+-<para>
+-The address viewer lets you view, create, delete and edit addresses
+-from the &PalmPilot;, and synchronize changes back. The addresses can be
+-sorted and viewed in the <guilabel>"Last, first"</guilabel> or <guilabel>"Company,
+-last"</guilabel> format, depending on your
+-<link linkend="page-viewers">viewers configuration.</link>
+-</para>
+-
+-<screenshot>
+-<screeninfo>The Address Viewer Application</screeninfo>
+-<mediaobject>
+-<imageobject><imagedata fileref="address-app.png" format="PNG"/></imageobject>
+-<textobject><phrase>The Address Viewer Application</phrase></textobject>
+-<caption><para>The Address Viewer Application</para></caption>
+-</mediaobject>
+-</screenshot>
+-
+-
+-<para>
+-The address application resembles the todo application;
+-the drop down box, buttons, list and text area function exactly
+-the same, allowing you to select, view and edit an address
+-as on the &PalmPilot;.
+-</para>
+-
+-<para>
+-The <guibutton>Edit Record...</guibutton> dialog allows you to edit the
+-<guilabel>Last Name</guilabel>, <guilabel>First Name</guilabel>,
+-<guilabel>Company</guilabel>, &etc; fields, just as if you where using your
+-&handheld;. Click the <guibutton>New Record...</guibutton> button to
+-open the same dialog, but instead of editing the current selected record, a new
+-address will be added to the list. Click the
+-<guibutton>Delete Record</guibutton> button to remove the selected address
+-from the list.
+-
+-<!--
+-<note><para>
+-If you create new address and decide that
+-you do not want to have it on the &PalmPilot;
+-you must perform a &HotSync; (copying the address
+-to the &PalmPilot;) and then delete the address record
+-from the &PalmPilot; or the viewer, and &HotSync; again. It is not possible to
+-delete newly-added records from the built-in applications.
+-</para></note>
+--->
+-
+-</para>
+-</sect2>
+-
+-
+-<sect2 id="memo-app">
+-
+-<title>The Memo Viewer</title>
+-
+-<para>
+-The memo application allows you to view the memos on your &PalmPilot;,
+-export them to text files, import new ones to be installed the next
+-time you &HotSync;, or edit existing ones.
+-</para>
+-
+-<screenshot>
+-<screeninfo>Memo Viewer Application</screeninfo>
+-<mediaobject>
+-<imageobject><imagedata fileref="memo-app.png" format="PNG"/></imageobject>
+-<textobject><phrase>The Memo Viewer Application</phrase></textobject>
+-<caption><para>The Memo Viewer Application</para></caption>
+-</mediaobject>
+-</screenshot>
+-
+-<para>
+-The memo application has a drop down box
+-for the memo categories defined in the &PalmPilot;.
+-Here category <quote>All</quote> is selected.
+-Underneath the drop down box is a list of memo titles.
+-These are the first lines of the memos, just like
+-in the &PalmPilot; memo application.
+-Clicking on one of the memo titles in the list
+-box will display it in the text box labelled
+-<guilabel>Memo Text:</guilabel> to the right.
+-</para>
+-
+-<para>
+-When a memo is selected, you can use the buttons
+-<guibutton>Export Memo...</guibutton> and
+-<guibutton>Delete Memo</guibutton>
+-to export the selected memo to a file
+-or to delete the selected memo.
+-Exporting a memo requires
+-you to give a filename; the memo
+-is written to that file.
+-Take care not to overwrite existing files with this action.
+-Deleting a memo does not affect the &PalmPilot;
+-until the next &HotSync;.
+-</para>
+-
+-<para>
+-The
+-<guibutton>Import Memo...</guibutton>
+-button allows you to read a text file and
+-add it — as a memo — to the &PalmPilot;.
+-Importing a memo does not take effect until
+-the next &HotSync;.
+-
+-<!--
+-<note><para>
+-If you import a memo and decide that
+-you do not want to have it on the &PalmPilot;
+-you must perform a &HotSync; (copying the memo
+-to the &PalmPilot;) and then delete the memo record
+-from the &PalmPilot; or the viewer, and &HotSync; again. It is not possible to
+-delete newly-added records from the built-in applications.
+-</para></note>
+--->
+-
+-</para>
+-
+-
+-</sect2>
+-
+-<sect2 id="db-app">
+-<title>The Generic DB Viewer</title>
+-
+-<para>
+-In short, databases are all files stored in your &handheld;. A database
+-can be either a record database, which stores dynamic information created by the
+-user (for instance, the addresses or the todo information), or a resource
+-database, which tend to be static (for instance the applications).
+-</para>
+-
+-<para>
+-The Generic DB Viewer is a tool to view and analyze databases stored on
+-your handheld, especially record databases. It helps a lot creating new conduits
+-and to debug existing ones.
+-
+-<warning><para>
+-While it is possible use the database viewer to edit, add and delete records, you
+-should really know what you are doing, otherwise you may damage your data. Use
+-the viewer applications or conduits to edit your &handheld; data instead, in a
+-normal usage scenario.
+-</para></warning>
+-
+-</para>
+-
+-
+-
+-<screenshot>
+-<screeninfo>The Generic DB Viewer</screeninfo>
+-<mediaobject>
+-<imageobject><imagedata fileref="db-app.png" format="PNG"/></imageobject>
+-<textobject><phrase>The Generic DB Viewer</phrase></textobject>
+-<caption><para>The Generic DB Viewer</para></caption>
+-</mediaobject>
+-</screenshot>
+-
+-</sect2>
+-
+-
+ <sect2 id="installer-app">
+ <title>The File Installer</title>
+ <para>
+@@ -616,11 +273,9 @@
+ </para>
+
+ <para>
+-If you are using the &HotSync; Daemon you may drag and
+-drop files or &URL;s
+-onto the docked icon on the toolbar. The file installer application also
+-supports dragging and dropping into the <guilabel>Files to Install:</guilabel>area.
+-Provided <guilabel>Sync Files</guilabel> is checked in the
++The file installer application supports dragging and dropping into
++the <guilabel>Files to Install:</guilabel>area. Provided <guilabel>Sync
++Files</guilabel> is checked in the
+ <link linkend="page-general">settings dialog</link> they
+ will be installed the next time you HotSync.
+ </para>
+Index: doc/kpilot/conduit-memofile.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+
+Zmiany atrybutów dla: doc/kpilot/conduit-memofile.png
+___________________________________________________________________
+Dodane: svn:mime-type
+ + application/octet-stream
+
+Index: doc/kpilot/kpilot.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+
+Zmiany atrybutów dla: doc/kpilot/kpilot.png
+___________________________________________________________________
+Dodane: svn:mime-type
+ + application/octet-stream
+
+Index: doc/kpilot/main-app.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/configuration.docbook
+===================================================================
+--- doc/kpilot/configuration.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ doc/kpilot/configuration.docbook (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -9,9 +9,7 @@
+ need to be configured as well.
+ After that you can use &kpilot;
+ to synchronize your &PalmPilot; with
+-your &kde; desktop or view
+-data from your &PalmPilot; with the
+-<link linkend="builtin">built-in viewers</link>.
++your &kde; desktop.
+ </para>
+
+ <para>
+@@ -57,103 +55,9 @@
+ (<link linkend="general-setup">general</link>
+ and <link linkend="config-conduits">conduits</link>)
+ will be discussed separately.
+-We will begin, however, by taking a look at the
+-<link linkend="configwizard">configuration wizard</link>, which should make most
+-of the
+-general group of configuration options superfluous.
+ </para>
+
+-<sect1 id="configwizard">
+-<title>Using the Wizard</title>
+
+-<para>
+-The configuration wizard helps you to set up &kpilot; to communicate
+-with the &PalmPilot; and to configure the conduits as a group. It's a great
+-start for new users, and you can always fine-tune your preferences later.
+-</para>
+-
+-<para>
+-In the <guilabel>Pilot Info</guilabel> dialog, type your <guilabel>User
+-Name</guilabel>. It
+-should match the one from the &PalmPilot;. Next, type the file name of
+-the <guilabel>Device</guilabel> you will use to connect the &PalmPilot; (The
+-connection can be through a serial port, USB port, infrared, Bluetooth, network
+-or the generic <filename class="devicefile">/dev/pilot</filename> device.)
+-Alternatively, click the
+-<guibutton>Automatically detect handheld and user name...</guibutton>
+-button and press the &HotSync; button on your &handheld;. The Wizard will try
+-to find the correct <guilabel>Device</guilabel> and
+-<guilabel>User Name</guilabel>.
+-</para>
+-
+-<important><para>
+-If the
+-<guilabel>Device</guilabel> does not have the right permissions, the wizard will
+-not be able to find it. Normal users must be able to read/write the correct
+-device. To resolve this issue, please refer to <link
+-linkend="faq-connection"><quote>&kpilot; says <errorname>Can't connect to
+-pilot</errorname></quote>
+-&FAQ; entry</link>, or contact your system administrator.
+-</para></important>
+-
+-
+-<screenshot>
+-<screeninfo>The First Configuring Wizard Dialog</screeninfo>
+-<mediaobject>
+-<imageobject><imagedata fileref="wizard-general.png"
+-format="PNG"/></imageobject>
+-<textobject><phrase>Configuring Wizard: The Pilot Info
+-Dialog</phrase></textobject>
+-<caption><para>Configuring Wizard: The Pilot Info Dialog</para></caption>
+-</mediaobject>
+-</screenshot>
+-
+-<para>
+-Press the &HotSync; button of your &handheld; to probe for the
+-correct <guilabel>Device</guilabel> and <guilabel>User Name</guilabel>.
+-</para>
+-
+-
+-<screenshot>
+-<screeninfo>The Second Configuring Wizard Dialog</screeninfo>
+-<mediaobject>
+-<imageobject><imagedata fileref="wizard-connection.png"
+-format="PNG"/></imageobject>
+-<textobject><phrase>Configuring Wizard: The Autodetection
+-Dialog</phrase></textobject>
+-<caption><para>Configuring Wizard: The Autodetection Dialog</para></caption>
+-</mediaobject>
+-</screenshot>
+-
+-<para>
+-&kpilot; has the ability to sync the data on your &handheld; with
+-applications or files on your <acronym>PC</acronym>. The programs that
+-perform these actions are called conduits. The sync dialog configures
+-all applicable &kpilot; conduits to sync with widely used
+-<acronym>PIM</acronym> suites. You can fine-tune these settings later, from the
+-<menuchoice>
+-<guimenu>Settings</guimenu>
+-<guimenuitem>Configure &kpilot;</guimenuitem>
+-</menuchoice>
+-menu. Please check the <link linkend="config-conduits">conduits
+-configuration</link>
+-section of this document for more information.
+-</para>
+-
+-<screenshot>
+-<screeninfo>The Third Configuring Wizard Dialog</screeninfo>
+-<mediaobject>
+-<imageobject><imagedata fileref="wizard-conduits.png"
+-format="PNG"/></imageobject>
+-<textobject><phrase>Configuring Wizard: The Sync Dialog</phrase></textobject>
+-<caption><para>Configuring Wizard: The Sync Dialog</para></caption>
+-</mediaobject>
+-</screenshot>
+-
+-
+-</sect1>
+-
+-
+ <sect1 id="general-setup">
+ <title>General Setup</title>
+
+@@ -164,7 +68,7 @@
+ you can select a non-standard hardware device,
+ set special encodings for foreign-language &handheld;s,
+ and control how &kpilot; displays your data. There
+-are five items under the <guilabel>General Setup</guilabel>
++are four items under the <guilabel>General Setup</guilabel>
+ heading. You may need to expand the <guilabel>General Setup</guilabel>
+ heading to see them.
+ </para>
+@@ -321,7 +225,7 @@
+ </para>
+
+ <para>
+-&kpilot; interfaces with your &handheld; in two ways: using the
++&kpilot; interfaces with your &handheld; in two ways: using
+ the conduits and the internal viewers. Conduits are plug-in programs which
+ extend the synchronization capabilities of &kpilot;. &kpilot; stores separate copies of
+ the databases and records for conduits, while the internal viewers and backup
+@@ -372,17 +276,6 @@
+
+ <listitem>
+ <para>
+-<guilabel>FastSync</guilabel>: Only synchronize those
+-databases that have conduits, and perform no backup of the data
+-on the &PalmPilot;, reducing greatly the time required for the sync
+-operation. This also means that if something goes wrong with your &PalmPilot;,
+-you may not be able to recover the databases. This is a classic
+-trade-off between speed and safety.
+-</para>
+-</listitem>
+-
+-<listitem>
+-<para>
+ <guilabel>FullSync</guilabel>: run all selected conduits, and sync all
+ databases, reading all records, and performing a full backup. It is the safest
+ option, but takes the longest time to complete, as it will merge all the records
+@@ -407,13 +300,6 @@
+ handheld data to the PC. <emphasis>Use with care, as this option erases the
+ changes you made in your PC since the last sync</emphasis>.
+ </para>
+-<warning>
+-<para>
+-Remember, when &kpilot; does a &HotSync; and runs the conduits,
+-the databases in the internal viewers are <emphasis>not</emphasis>
+-updated. To update the internal viewers, use the FullSync or backup actions.
+-</para>
+-</warning>
+
+ </listitem>
+
+@@ -424,7 +310,7 @@
+
+
+ <varlistentry>
+-<term><guilabel>Do full backup when changing PCs</guilabel></term>
++<term><guilabel>Do full sync when changing PCs</guilabel></term>
+ <listitem>
+ <para>
+ If you &HotSync; your &handheld; with multiple <acronym>PC</acronym>s, the flag
+@@ -435,9 +321,9 @@
+ </para>
+ </listitem>
+ </varlistentry>
+-<!--
++
+ <varlistentry>
+-<term><guilabel>Do not sync when screen saver is active</guilabel></term>
++<term><guilabel>Do not sync when screensaver is active</guilabel></term>
+ <listitem>
+ <para>
+ This is a security feature that prevents the &handheld; from synchronization
+@@ -448,7 +334,7 @@
+ </para>
+ </listitem>
+ </varlistentry>
+--->
++
+ <varlistentry>
+ <term><guilabel>Conflict Resolution</guilabel></term>
+ <listitem>
+@@ -479,14 +365,14 @@
+ copy the values from the <acronym>PC</acronym> to the &handheld;,
+ discarding changes on the &handheld;.
+ </para></listitem>
+-<listitem><para><guilabel>Values From Last Sync (if possible)</guilabel>:
++<listitem><para><guilabel>Values From Last Sync (Not Supported)</guilabel>:
+ &kpilot; stores a backup copy of the information on your &handheld; depending on
+ the synchronization method you selected. If this information is available, use
+ neither
+ the values from the &handheld; nor the PC, but the values from
+ the last sync.
+ </para></listitem>
+-<listitem><para><guilabel>Use Both Entries</guilabel>:
++<listitem><para><guilabel>Use Both Entries (Not Supported)</guilabel>:
+ Create duplicate entries of the conflicting records on both the
+ <acronym>PC</acronym> and
+ &handheld;, one with the value from the <acronym>PC</acronym>, the other with
+@@ -513,7 +399,7 @@
+
+ <para>In short, databases are all files stored in your &handheld;. A database
+ can be either a record database, which stores dynamic information created by the
+-user (for instance, the addresses or the todo information), or a resource
++user (for instance, the addresses or the To-Do information), or a resource
+ database, which tend to be static (for instance the applications).</para>
+
+ <screenshot>
+@@ -606,91 +492,11 @@
+
+ </sect2>
+
+-
+-<sect2 id="page-viewers">
+-<title>Internal Viewers Setup</title>
+-<para>
+-&kpilot; contains <quote>viewers</quote> for
+-presenting information from the &PalmPilot;.
+-These viewers present the databases available on
+-the &PalmPilot; in much the same way that the device
+-itself does. Not all databases have an application-specific
+-viewer, though you can use the generic database viewer for those.
+-The viewers page contains settings for the internal viewers in
+-&kpilot;.
+-These settings change the way in which the data is shown.
+-</para>
+-
+-<screenshot>
+-<screeninfo>Viewers Page</screeninfo>
+-<mediaobject>
+-<imageobject><imagedata fileref="setup-viewer.png" format="PNG"/></imageobject>
+-<textobject><phrase>The Viewers Setup Page</phrase></textobject>
+-<caption><para>The Viewers Setup Page</para></caption>
+-</mediaobject>
+-</screenshot>
+-
+-<variablelist>
+-<varlistentry>
+-<term><guilabel>Make internal viewers editable</guilabel></term>
+-<listitem><para>
+-The internal viewers can be read only or editable. The editable mode allows you
+-to add new records, delete or edit the existing records and sync your
+-modifications back to the &handheld;. Check
+-this box to set the internal viewers to editable mode, uncheck to set them to
+-read
+-only mode.</para>
+-<warning><para>
+-On some &kpilot; versions, it is not possible check this box, and therefore to
+-use the internal viewers as editors.
+-</para></warning>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>Show private records</guilabel></term>
+-<listitem><para>
+-In your &PalmPilot; you can mark some records as <quote>private</quote>. By
+-default, &kpilot; does not display these records on the screen. Check this box
+-if you want to see them.
+-</para></listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>Address Viewer</guilabel></term>
+-<listitem><para>
+-Set there the options for the address internal viewer.
+-
+-<itemizedlist>
+-<listitem><para>
+-<guilabel>Show as "Last, first"</guilabel> or
+-<guilabel>Show as "Company, last"</guilabel>: the order and display of the
+-address records in the address internal viewer can be set to match the
+-&handheld;. Select the option that suits better your personal preferences.
+-</para></listitem>
+-
+-<listitem><para>
+-<guilabel>Use key field</guilabel> Check this box to combine entries with the
+-same last name.
+-</para></listitem>
+-
+-</itemizedlist>
+-
+-</para></listitem>
+-</varlistentry>
+-
+-
+-</variablelist>
+-
+-</sect2>
+-
+-
+-
+ <sect2 id="page-startup-exit">
+ <title>Startup and Exit Behavior Setup</title>
+
+ <para>
+-This pages present options related to the startup and exit of &kpilot; and
++This page presents options related to the startup and exit of &kpilot; and
+ &kpilot; daemon.
+ </para>
+
+@@ -701,7 +507,7 @@
+ be able to sync your &handheld; at anytime, it is important to start the daemon
+ at login, or the opposite, if you want to be able to sync only when &kpilot; is
+ running, you have to stop the daemon on exit. The last option is especially
+-usefull if you have other applications that use the same port as &kpilot;.
++useful if you have other applications that use the same port as &kpilot;.
+ </para>
+
+
+@@ -727,7 +533,7 @@
+ <itemizedlist>
+ <listitem>
+ <para>
+-<guilabel>Start daemon at login</guilabel>:
++<guilabel>Start KPilot at login</guilabel>:
+ By checking this, a link to
+ the daemon is placed in your autostart folder
+ and will be started automatically. Note that this is not normally
+@@ -738,7 +544,7 @@
+
+ <listitem>
+ <para>
+-<guilabel>Show daemon in panel</guilabel>:
++<guilabel>Show KPilot in system tray</guilabel>:
+ Check this box to instruct the daemon to place a &kpilot; icon
+ <guiicon>
+ <inlinemediaobject>
+@@ -780,10 +586,8 @@
+ <listitem>
+ <para>
+ <anchor id="stopdaemononexit"/>
+-<guilabel>Stop daemon on exit</guilabel>: Setting this option will cause the
+-daemon to exit when you quit &kpilot;, leaving the device port free for other
+-&PalmPilot;-synchronization tools such as <application>malsync</application>
+-</para>
++<guilabel>Stop KPilot's system tray application on exit</guilabel>: Setting this option will cause the
++daemon to exit when you quit &kpilot;.</para>
+ </listitem>
+ </itemizedlist>
+ </para>
+@@ -831,229 +635,81 @@
+ <variablelist>
+
+ <varlistentry>
+-<term><guilabel>KNotes / Memos</guilabel></term>
++<term><guilabel>Install Files</guilabel></term>
+ <listitem>
+ <para>
+-Synchronizes the Memo Pad application with &knotes;.
++Allows &kpilot; to install files and databases onto your &PalmPilot;.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+-<term><guilabel>Notepad</guilabel></term>
++<term><guilabel>Calendar</guilabel></term>
+ <listitem>
+ <para>
+-Exports the free hand notes of the &handheld;'s Notepad application as pictures
+-to the PC.
++Synchronizes the Datebook application with &korganizer;.
+ </para>
+ </listitem>
+ </varlistentry>
+
+-
+ <varlistentry>
+-<term><guilabel>Time Synchronization</guilabel></term>
++<term><guilabel>To-Do</guilabel></term>
+ <listitem>
+ <para>
+-Sets the &handheld;'s time to that of the desktop machine.
+-Useful for keeping the clock of the &handheld; accurate.
++Synchronizes the To-Do list application with &korganizer;.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+-<term><guilabel>Calendar (KOrganizer)</guilabel></term>
++<term><guilabel>Contacts</guilabel></term>
+ <listitem>
+ <para>
+-Synchronizes the Datebook application with &korganizer; or with an
+-iCalendar file of
+-your choice.
++Synchronizes the Addressbook application with &kaddressbook;.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+-<term><guilabel>Palm DOC</guilabel></term>
++<term><guilabel>Time Synchronization</guilabel></term>
+ <listitem>
+ <para>
+-Automatically converts and installs text files in the &PalmPilot;
+-DOC format, so you can read the text files with most DOC-capable
+-applications on the &handheld;.
++Sets the &handheld;'s time to that of the desktop machine.
++Useful for keeping the clock of the &handheld; accurate.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+-<term><guilabel>Addressbook</guilabel></term>
++<term><guilabel>Memo File</guilabel></term>
+ <listitem>
+ <para>
+-Synchronizes the Address application with &kaddressbook; or with a vCard file of
+-your choice.
++Synchronizes the Memo Pad application with a directory and files on your computer.
+ </para>
+ </listitem>
+ </varlistentry>
+
+-<varlistentry>
+-<term><guilabel>System Information</guilabel></term>
+-<listitem>
+-<para>
+-Writes information about your &handheld;, (such as OS version,
+-RAM available, and the list of databases) to a file. Useful mostly for
+-debugging purposes.
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>ToDo's (KOrganizer)</guilabel></term>
+-<listitem>
+-<para>
+-Synchronizes the Todo list application with &korganizer; or with a iCalendar
+-file of
+-your choice.
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>MAL (AvantGo) Conduit</guilabel></term>
+-<listitem>
+-<para>
+-Synchronizes your &handheld; with the &AvantGo; server. The &AvantGo; server
+-offers general content (news, guides, stock quotes, &etc;) in a format that is
+-suitable for reading in a &handheld;. To use this conduit, you need to register,
+-subscribe
+-the channels you select and install the &AvantGo; software on your &handheld;.
+-</para></listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>Mail</guilabel></term>
+-<listitem>
+-<para>
+-Sends mail written on the &handheld; through &kmail;.
+-There is no provision for receiving mail, however.
+-</para>
+-</listitem>
+-</varlistentry>
+-
+ </variablelist>
+
++<sect2 id="install-cond">
++<title>Install Files Conduit Setup</title>
+
+-<sect2 id="conduit-knotes">
+-<title>&knotes; Conduit Setup</title>
+-
+ <para>
+-The &knotes; Conduit is a partial replacement for the built-in <link
+-linkend="builtin">memo application</link>. It keeps the notes you write
+-with &knotes; synchronized with the memos you write on your &PalmPilot;.
++The Install Files Conduit installs any &PalmPilot; database that has been added
++to &kpilot;'s File Install window onto the &handheld;. No additional
++configuration is required for this conduit.
+ </para>
+
+-<para>
+-Setting up the &knotes; conduit is very simple.
+-</para>
+-
+-<screenshot>
+-<screeninfo>&knotes; Conduit Setup</screeninfo>
+-<mediaobject>
+-<imageobject>
+-<imagedata fileref="conduit-knotes.png" format="PNG"/>
+-</imageobject>
+-<textobject>
+-<phrase>&knotes; Conduit Setup</phrase>
+-</textobject>
+-<caption>
+-<para>&knotes; Conduit Setup</para>
+-</caption>
+-</mediaobject>
+-</screenshot>
+-
+-<para>
+-In the <guilabel>General</guilabel> Tab there are two configuration options:
+-
+-<variablelist>
+-
+-<varlistentry>
+-<term><guilabel>Delete KNote when Pilot memo is deleted</guilabel></term>
+-<listitem>
+-<para>
+-Uncheck this box if you wish to maintain the note on &knotes; even if the
+-correspondent memo was deleted on the &handheld; memo application.
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>Suppress delete-confirmation in KNotes</guilabel></term>
+-<listitem>
+-<para>
+-If the <guilabel>Delete KNote when Pilot memo is deleted</guilabel> box is
+-checked, you may check this box to automatically delete the notes that
+-correspond to a deleted memo, without confirmation.
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-</variablelist>
+-
+-<note>
+-<para>
+-By default, the options <quote>delete knote</quote> and <quote>suppress
+-delete-confirmation</quote> are turned <emphasis>off</emphasis>, so that notes
+-will accumulate on your PC.
+-</para>
+-</note>
+-
+-</para>
+ </sect2>
+
+-<sect2 id="notepad-cond">
+-<title>Notepad Conduit Setup</title>
+-
+-<para>
+-The Notepad Conduit exports the free hand notes of the &handheld;'s Notepad
+-application as pictures to the desktop. To set the folder to which the pictures
+-should be exported, either enter it in the <guilabel>Output</guilabel> edit
+-box or select it clicking the file picker button.
+-</para>
+-
+-</sect2>
+-
+-<sect2 id="time-cond">
+-<title>Time Synchronization Conduit Setup</title>
+-
+-<para>
+-The Time Synchronization Conduit syncs the &handheld;'s time to that of the
+-desktop
+-machine. It is useful for keeping the clock of the &handheld; accurate. There
+-are really no configuration options other that enabling and disabling the
+-conduit, as currently only one direction for the synchronization is enabled,
+-you can only <guilabel>Set the handheld time from the time on the PC</guilabel>,
+-and not <guilabel>Set the PC time from the time on the handheld</guilabel>.
+-</para>
+-
+-
+-<note>
+-<para>
+-&PalmOS; Version 3.25 and 3.3 do not support setting the &handheld; system time.
+-For these systems, the conduit will be simply skipped.
+-</para>
+-</note>
+-
+-</sect2>
+-
+ <sect2 id="vcal-cond">
+ <title>Calendar Conduit Setup</title>
+
+ <para>
+-This conduit will synchronize your &PalmPilot; with &korganizer; and &kontact;
+-or to an iCalendar file of your choice. In the latter case, the conduit will
+-need the filename of the calendar file (this will usually be a file that ends in
+-<literal role="extension">.ics</literal>) to sync with, of if it uses the
+-standard &korganizer; iCalendar file, it will be under the <filename
+-class="directory">$KDEHOME/share/apps/korganizer/</filename> folder, where the
+-<filename class="directory">$KDEHOME</filename> environment variable (typically
+-<filename class="directory">/home/user/.kde/</filename>) points to the folder
+-that contains your configuration and data for the &kde; applications.
++This conduit will synchronize your &PalmPilot; calendar application with &korganizer; and &kontact;
++by using Akonadi. Before you can use this conduit, you must configure Akonadi to
++have a resource for the calendar that you wish to synchronize with. Once you've
++done that, you can select that resource for synchronization use here.
+ </para>
+
+ <screenshot>
+@@ -1071,350 +727,47 @@
+ </mediaobject>
+ </screenshot>
+
+-<para>
+-In the <guilabel>General</guilabel> page, you can set the calendar options.
+-</para>
+-
+-<variablelist>
+-
+-<varlistentry>
+-<term><guilabel>Calendar Destination</guilabel></term>
+-<listitem>
+-<para>
+-Choose between synchronizing with the <guilabel>Standard Calendar</guilabel>,
+-or in other words, the &korganizer; standard calendar or with a
+-<guilabel>Calendar file</guilabel> of your choice, that you must either
+-write in the <guilabel>Calendar file</guilabel> edit box or select using the
+-file picker.
+-</para>
+-
+-<warning>
+-<para>
+-You can use the calendar conduit with any application that accepts a file in
+-the iCalendar format as a resource. However, some applications, like Evolution,
+-do not handle the synchronization gracefully while they are open. As a rule of
+-thumb, quit these applications before synchronizing, otherwise you will lose
+-data. There is no need to take these precautions when syncing with &korganizer;
+-or &kontact;.
+-</para>
+-</warning>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>Store archived records in the KDE calendar</guilabel></term>
+-<listitem>
+-<para>
+-Check this box to save a copy of the archived records from your
+-&handheld; on the <acronym>PC</acronym>, in order to keep a history of
+-past appointments in you &kde; desktop as well.
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-</variablelist>
+-
+-<para>
+-In the <guilabel>Conflicts</guilabel> page, you can set the calendar options,
+-overriding &kpilot;'s general settings for conflict resolution when you are
+-using this conduit. For a detailed description of the different conflict
+-resolution possibilities available, please refer to the <link
+-linkend="page-hotsync">HotSync Setup section</link> of this handbook.
+-</para>
+-
+ </sect2>
+
++<sect2 id="todo-cond">
++<title>To-Do Conduit Setup</title>
+
+-<sect2 id="conduit-palmdoc">
+-<title>Palm DOC Conduit Setup</title>
+-
+ <para>
+-The Palm DOC conduit converts text files in your <acronym>PC</acronym> from and
+-to
+-databases in Palm DOC format in the &PalmPilot;. You can use any Palm DOC reader
+-to view these files on your &PalmPilot;.
++This conduit will synchronize your &PalmPilot; To Do List application with
++&korganizer; and &kontact;, through Akonadi. Before you can use this conduit,
++you must configure Akonadi to have a resource for the To-Do file that you wish
++to synchronize with. Once you've done that, you can select that resource for
++synchronization use here.
+ </para>
+
+ <screenshot>
+-<screeninfo>Palm DOC Conduit Setup</screeninfo>
++<screeninfo>The To-Do Conduit Setup Dialog</screeninfo>
+ <mediaobject>
+-<imageobject><imagedata fileref="conduit-palmdoc.png"
+-format="PNG"/></imageobject>
+-<textobject><phrase>Palm DOC Conduit Setup</phrase></textobject>
+-<caption><para>Palm DOC Conduit Setup</para></caption>
++<imageobject><imagedata fileref="conduit-todo.png" format="PNG"/></imageobject>
++<textobject><phrase>To-Do Conduit Setup</phrase></textobject>
++<caption><para>To-Do Conduit Setup</para></caption>
+ </mediaobject>
+ </screenshot>
+
+-<important><para>
+-After changing the Palm DOC conduit configuration, you have to restart &kpilot;
+-to let the changes you made take effect.
+-</para></important>
+-
+-<para>
+-In the <guilabel>General</guilabel> page, you can set the location of the text
+-documents in your computer and the direction of the synchronization.
+-</para>
+-
+-<variablelist>
+-
+-<varlistentry>
+-<term><guilabel>Text files:</guilabel></term>
+-<listitem><para>
+-Type on the text box or use the file picker to select the location of the folder
+-that the Palm DOC conduit uses as the place for the text files it will sync
+-with the &handheld;. There, you may place the text documents you want install or
+-synchronize to the <acronym>PDA</acronym>, and find the text documents created
+-from Palm DOC
+-databases in your &handheld;.
+-<important><para>
+-The file name has to end in <literal role="extension">.txt</literal> for the
+-conduit to recognize it as text. If the file is not recognized as text, it will
+-be ignored by the conduit. Also, the text has to be in an encoding that is
+-compatible with your &handheld; encoding. Therefore, if the text file has
+-characters that are not being correctly recognized by the Palm DOC reader in
+-your &handheld;, try opening the file a text editor, like &kwrite;, and saving
+-it in an compatible text encoding using the <guilabel>Save As..</guilabel>
+-dialog, or set the encoding in the <guilabel>PC -> Handheld</guilabel> tab.
+-</para></important>
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>Local copy:</guilabel></term>
+-<listitem><para>
+-If you want to save a copy of the Palm DOC databases from your &handheld; in
+-your computer, check the <guilabel>Local copy:</guilabel> box and
+-type on the text box or use the file picker to select the location of the folder
+-where these databases will be saved.
+-</para></listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>Synchronization Mode</guilabel></term>
+-<listitem><para>
+-The Palm DOC conduit has the ability to sync from and to the &handheld;,
+-automatically converting the text files to Palm DOC databases and vice versa.
+-The <guilabel>Sync only PC to PDA</guilabel> option will convert all text files
+-located in the folder you selected above to Palm DOC databases and install them
+-in your &handheld;.
+-The <guilabel>Sync only PDA to PC</guilabel> option will convert all Palm DOC
+-databases from your &handheld; to files and install them in the
+-folder you selected above. Finally, The <guilabel>Sync all</guilabel> option
+-allows the synchronization to work in both directions.
+-
+-<note><para>
+-When both the text file and the Palm DOC database are modified, you cannot merge
+-the modifications, you have to choose one of the versions, losing the changes
+-in one of them.
+-</para></note>
+-</para></listitem>
+-</varlistentry>
+-
+-</variablelist>
+-
+-<para>
+-In the <guilabel>PC -> Handheld</guilabel> page, you can configure the Palm DOC
+-compression and bookmarks settings to use when converting from text files to
+-Palm DOC databases.
+-</para>
+-
+-<variablelist>
+-
+-<varlistentry>
+-<term><guilabel>Compress</guilabel></term>
+-<listitem><para>
+-Palm DOC documents can be compressed, saving considerable amounts
+-of available memory in your &handheld;. Most Palm DOC readers support
+-compressed documents, but if you use a reader or editor that is not compatible
+-with compression (for instance, the Sied editor), you will not be able to read
+-or edit the compressed Palm DOC documents created by this conduit.
+-Therefore, check this box to save &handheld; memory, but uncheck it if you have
+-compatibility problems with compressed Palm DOC in your favorite editor or
+-reader.
+-</para></listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>Convert bookmarks</guilabel></term>
+-<listitem><para>
+-The Palm DOC format has a provision for bookmark records. Bookmarks allow you to
+-easily jump to selected parts of the document, making browsing long documents
+-easier. Check this box to allow the Palm DOC conduit to create bookmark records.
+-To create them, the conduit has to know the location in the text and the name of
+-the bookmark. There are three supported ways to let the conduit know the
+-location and name of the bookmark: from inline tags in the text, from tags at
+-the end of the text and from a <literal role="extension">.bmk</literal> bookmark
+-file. To make the creation of bookmarks effective, you have to check at least
+-one of these boxes below.
+-</para></listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>Inline tags in text</guilabel></term>
+-<listitem><para>
+-Convert tags in the format <* <replaceable>BookmarkName</replaceable> *>
+-located inside the text to Palm DOC bookmarks, where the location of the
+-tag in the text will be converted to the bookmark location and the
+-<replaceable>BookmarkName</replaceable> text inside the tag will be converted to
+-the name of the bookmark in the Palm DOC format. The tag will be removed from
+-the resulting Palm DOC document, leaving the text clean.
+-This is a very easy and intuitive way to create bookmarks
+-in your Palm DOC documents.
+-</para></listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>Tags at end of text</guilabel></term>
+-<listitem><para>
+-Convert tags in the format <<replaceable>BookmarkName</replaceable>>
+-located in the end of the text to Palm DOC bookmarks. Whenever the
+-<replaceable>BookmarkName</replaceable> text appears in the text, the conduit
+-will generate a the bookmark in the resulting Palm DOC document pointing to it.
+-The tag will then be removed from the resulting Palm DOC document, leaving the
+-text clean. This is a simple way to create repetitive bookmarks, like one for
+-each <quote>Chapter</quote> in your Palm DOC documents.
+-</para></listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>Regular expressions in .bmk file</guilabel></term>
+-<listitem><para>
+-This is the most complex but the most powerful way to create bookmarks.
+-The method involves using regular expressions (QRegExp) in a file
+-<filename>TextName.bmk</filename>, where <filename>TextName.txt</filename> is
+-the filename of the text, to search the text for bookmarks. See the
+-<ulink
+-url="http://reinhold.kainhofer.com/Linux/KPilot/bmkSpecification.txt">
+-documentation</ulink>
+-for an in-depth description of the bmk file format.
+-</para></listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>Encoding</guilabel></term>
+-<listitem><para>
+-Set here the encoding of your &handheld;. &kpilot; will convert the text
+-document to this encoding when exporting the file to the &handheld;.
+-</para></listitem>
+-</varlistentry>
+-
+-</variablelist>
+-
+-<para>
+-In the <guilabel>Handheld -> PC</guilabel> page, you can configure bookmarks
+-settings to use when converting from Palm DOC databases to text files.
+-</para>
+-
+-<variablelist>
+-
+-<varlistentry>
+-<term><guilabel>Convert Bookmarks</guilabel></term>
+-<listitem>
+-<para>
+-The Palm DOC format has a provision for bookmark records. Bookmarks allow you to
+-easily jump to selected parts of the document, making browsing long documents
+-easier. The Palm DOC conduit can convert Palm DOC
+-bookmark records to a format that is readable in your computer, either as
+-a separate file or as tags in the middle of the text file. Select
+-<guilabel>Do not convert bookmarks</guilabel> if you want to ignore the Palm DOC
+-bookmarks, resulting in a text that is clean from bookmark tags.</para>
+-
+-<para>
+-The <guilabel>Convert into .bm file</guilabel> options also result in a clean
+-text file, as the bookmarks are converted to a separate file in the bmk format,
+-as described <ulink
+-url="http://reinhold.kainhofer.com/Linux/KPilot/bmkSpecification.txt">here</ulink>. The file is saved with a <literal role="extension">.bm</literal>
+-extension to avoid conflicts with <literal role="extension">.bmk</literal> files
+-created previously.</para>
+-
+-<para>Finally, the <guilabel>Convert as inline tags</guilabel> option creates
+-inline tags inside the resulting text file form <*
+-<replaceable>BookmarkName</replaceable> *> placing each tag in the place that
+-was previously referenced by the bookmark, and using the bookmark name as the
+-<replaceable>BookmarkName</replaceable> text inside the tag. Now you You can
+-edit the bookmark name, move it or delete it and convert back to Palm DOC, as
+-you wish.
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>Do not convert, if text unchanged (only
+-bookmarks)</guilabel></term>
+-<listitem>
+-<para>
+-If you check this box, only changes in the text will trigger conversions from
+-Palm DOC to text files. In other words, changes in the bookmarks only will not
+-result in updates for the text files in your computer.
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-</variablelist>
+-
+-<para>
+-In the <guilabel>Conflicts</guilabel> page, you can configure how the conduit
+-deals with files that changed both in the computer and the &handheld;.
+-</para>
+-
+-<variablelist>
+-
+-<varlistentry>
+-<term><guilabel>Conflict Resolution</guilabel></term>
+-<listitem><para>
+-The Palm DOC conduit does not feature merging the modifications when a text is
+-changed both in the &handheld; and in the computer. Therefore, the choice is
+-between working with the files out of sync, or discarding the changes in one of
+-them. The <guilabel>No resolution</guilabel> option will avoid synchronizing
+-texts with conflicts, the <guilabel>PDA overrides</guilabel> option will
+-overwrite the computer text file version in case of conflict,
+-the <guilabel>PC overrides</guilabel> will do the same, but the other way
+-around,
+-and the <guilabel>Ask the user</guilabel> option will bring a dialog to let the
+-user decide on a file by file, case by case basis.
+-</para></listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>Always show resolution dialog, even when there are no
+-conflicts</guilabel></term>
+-<listitem><para>
+-This option will always bring the conflict resolution dialog, even if there is
+-no conflicts to solve. The advantage is that you can keep track of all the files
+-that are being covered by the conduit.
+-</para></listitem>
+-</varlistentry>
+-
+-</variablelist>
+-
+-
+ </sect2>
+
+
+ <sect2 id="conduit-kaddressbook">
+-<title>&kaddressbook; Conduit Setup</title>
++<title>Contacs Conduit Setup</title>
+
+ <para>
+-This conduit will synchronize your &PalmPilot; with the &kde; address book or to
+-a vCard file of your choice. In the latter case, the conduit will need the
+-filename of the
+-vCard file (this will usually be a file that ends in <literal
+-role="extension">.vcf</literal>) to sync with, of if it uses the standard
+-&kde; address book file, it will be under the
+-<filename class="directory">$KDEHOME/share/apps/kabc/</filename>
+-folder, where the <filename class="directory">$KDEHOME</filename> environment
+-variable (typically <filename class="directory">/home/Login Name/.kde/</filename>)
+-points to the folder that contains your configuration and data for the &kde;
+-applications.
++This conduit will synchronize your &PalmPilot; with the &kde; address book
++through Akonadi. Before you can use this conduit, you must configure Akonadi to
++have a resource for the address book file that you wish to synchronize with. Once
++you've done that, you can select that resource for synchronization use here.
+ </para>
+
+ <screenshot>
+-<screeninfo>The &kaddressbook; Conduit Setup Dialog</screeninfo>
++<screeninfo>The Contacts Conduit Setup Dialog</screeninfo>
+ <mediaobject>
+ <imageobject><imagedata fileref="setup-address.png" format="PNG"/></imageobject>
+-<textobject><phrase>&kaddressbook; Conduit Setup</phrase></textobject>
+-<caption><para>&kaddressbook; Conduit Setup</para></caption>
++<textobject><phrase>Contacts Conduit Setup</phrase></textobject>
++<caption><para>Contacts Conduit Setup</para></caption>
+ </mediaobject>
+ </screenshot>
+
+@@ -1423,40 +776,6 @@
+ options.
+ </para>
+
+-<variablelist>
+-
+-<varlistentry>
+-<term><guilabel>Sync Destination</guilabel></term>
+-<listitem><para>
+-Choose between synchronizing with the <guilabel>Standard address book</guilabel>,
+-or in other words, the &kde; standard address book or with a
+-<guilabel>vCard file</guilabel> of your choice, that you must either
+-write in the <guilabel>vCard file</guilabel> edit box or select using the
+-file picker.
+-</para>
+-<warning><para>
+-You can use the address book conduit with any application that accepts a file in
+-the vCard format as a resource. However, some applications may not handle
+-the synchronization gracefully while they are open. As a rule of thumb,
+-quit these applications before synchronizing, otherwise you may lose data.
+-There is no need to take these precautions when syncing with the &kde; address
+-book.
+-</para></warning>
+-</listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>Store archived records in the KDE address book</guilabel></term>
+-<listitem><para>
+-The &handheld; offers an option to archive deleted addresses in your desktop.
+-If that option is selected, check this box to keep the deleted addresses from
+-your &handheld; in your <acronym>PC</acronym> address book. These addresses will
+-be no longer synchronized with your handheld.
+-</para></listitem>
+-</varlistentry>
+-
+-</variablelist>
+-
+ <para>
+ In the <guilabel>Conflicts</guilabel> page, you can set the address book conduit
+ options, overriding &kpilot;'s general settings for conflict resolution when
+@@ -1525,7 +844,7 @@
+ other &kde; address book fields, you can set them as you like. You can use them
+ to store a <guilabel>URL</guilabel>, a <guilabel>IM Address</guilabel>,
+ the <guilabel>Birthdate</guilabel> of your contact or the obvious:
+-<guilabel>Store as Costume Field</guilabel>.
++<guilabel>Store as Custom Field</guilabel>.
+ </para>
+
+ <para>
+@@ -1541,243 +860,57 @@
+
+ </sect2>
+
+-<sect2 id="sysinfo-cond">
+-<title>System Information Conduit Setup</title>
+
+-<para>
+-This conduit generates a page with your &handheld; information. Some info about
+-your &kde;, &kpilot; and Pilot-Link version is included as well. The available
+-output formats are &HTML;, text or custom template. The conduit
+-output and in special, the debug output section of the output may help the
+-developers track down bugs.
+-</para>
+
++<sect2 id="time-cond">
++<title>Time Synchronization Conduit Setup</title>
+
+-<screenshot>
+-<screeninfo>The System Information Conduit Setup Dialog</screeninfo>
+-<mediaobject>
+-<imageobject><imagedata fileref="conduit-sysinfo.png"
+-format="PNG"/></imageobject>
+-<textobject><phrase>System Information Conduit Setup</phrase></textobject>
+-<caption><para>System Information Conduit Setup</para></caption>
+-</mediaobject>
+-</screenshot>
+-
+ <para>
+-In the <guilabel>General</guilabel> page, you can set the output location and
+-format.
++The Time Synchronization Conduit syncs the &handheld;'s time to that of the
++desktop
++machine. It is useful for keeping the clock of the &handheld; accurate. There
++are really no configuration options other that enabling and disabling the
++conduit, as currently only one direction for the synchronization is enabled,
++you can only <guilabel>Set the handheld time from the time on the PC</guilabel>,
++and not <guilabel>Set the PC time from the time on the handheld</guilabel>.
+ </para>
+
+-<variablelist>
+
+-<varlistentry>
+-<term><guilabel>Output File</guilabel></term>
+-<listitem><para>
+-Write in the edit box or use the file picker to select the location and file
+-name of the output file where the &handheld; system information will be written.
+-</para></listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>Type of Output</guilabel></term>
+-<listitem><para>
+-Choose between <guilabel>HTML</guilabel>, <guilabel>Text file</guilabel> (plain
+-text),
+-or a selectable <guilabel>Custom template</guilabel>. To create a custom
+-template, you can
+-use the default template as a reference.
+-</para></listitem>
+-</varlistentry>
+-
+-</variablelist>
+-
++<note>
+ <para>
+-In the <guilabel>Parts Included</guilabel> page, you can set which parts will be
+-included in the output, one by one, by checking or unchecking them in the
+-<guilabel>Output Type</guilabel> list.
++&PalmOS; Version 3.25 and 3.3 do not support setting the &handheld; system time.
++For these systems, the conduit will be simply skipped.
+ </para>
++</note>
+
+ </sect2>
+
++<sect2 id="memofile-cond">
++<title>Memo File Conduit Setup</title>
+
+-<sect2 id="todo-cond">
+-<title>Todo Conduit Setup</title>
+-
+ <para>
+-This conduit will synchronize your &PalmPilot; To Do List application with
+-&korganizer; and &kontact;, or to an iCalendar file of your choice.
+-The configuration dialog looks and behaves exactly the same as the configuration
+-dialog for the <link linkend="vcal-cond">Calendar Conduit</link>. The only
+-difference is that instead of synchronizing the Calendar, you will be syncing
+-the To Do List.
++This conduit will synchronize your &PalmPilot; Memo Pad application with a
++directory and files on your computer. This conduit will create a directory for
++each category that your &PalmPilot; Memos uses, and within each of those
++directories will be the plain text files that contain the contents of your
++memos. To set the top level folder to which your Memos will be synchronized
++with, either enter it in the <guilabel>Memos directory</guilabel> edit box or
++select it clicking the directory picker button.
+ </para>
+
+ <screenshot>
+-<screeninfo>The Calendar Conduit Setup Dialog</screeninfo>
++<screeninfo>The Memo File Conduit Setup Dialog</screeninfo>
+ <mediaobject>
+-<imageobject><imagedata fileref="conduit-vcal.png" format="PNG"/></imageobject>
+-<textobject><phrase>Calendar Conduit Setup</phrase></textobject>
+-<caption><para>Calendar Conduit Setup</para></caption>
++<imageobject><imagedata fileref="conduit-memofile.png" format="PNG"/></imageobject>
++<textobject><phrase>Memo File Conduit Setup</phrase></textobject>
++<caption><para>Memo File Conduit Setup</para></caption>
+ </mediaobject>
+ </screenshot>
+
+-</sect2>
+
+-<sect2 id="mal-cond">
+-<title>MAL (AvantGo) Conduit Setup</title>
+-
+-<para>
+-The MAL (&AvantGo;) Conduit synchronizes your &handheld; with the &AvantGo;
+-server.
+-This conduit is based on
+-<ulink url="http://jasonday.home.att.net/code/libmal/libmal.html">Jason Day's
+-libmal</ulink>.
+-The &AvantGo; server offers general content (news, guides, stock quotes, &etc;)
+-in a format that is suitable for reading in a &handheld;. To use this conduit,
+-you need to register to a service provider, for instance,
+-<ulink url="http://www.avantgo.com">AvantGo.com</ulink>, subscribe
+-the channels you select and install the &AvantGo; software on your &handheld;,
+-and configure the software on your handheld to find the MAL server.
+-</para>
+-
+-<para>
+-The installation software for the &handheld; client is usually only available
+-for &Microsoft; &Windows;, if you
+-do not have access to a windows computer, you can try installing the databases
+-available in the <ulink url="http://www.tomw.org/malsync/">MalSync
+-Homepage</ulink>,
+-with different versions, one for <trademark>PalmOS</trademark> 5 and other for
+-older <trademark>PalmOS</trademark>s.
+-</para>
+-
+-<para>
+-To configure the software on your handheld to find the MAL server, open the
+-AGConnect application in your &handheld;, click <guilabel>Settings...</guilabel>
+-and enter your MAL server address, the <guilabel>User Name</guilabel> and
+-<guilabel>Password</guilabel> you got while registering. The
+-&AvantGo; server address is
+-<userinput>sync.avantgo.com</userinput>, and its port is
+-<userinput>80</userinput>. On some installations, you should use the MobileLink
+-instead of the AGConnect application on your &handheld;.
+-</para>
+-
+-<screenshot>
+-<screeninfo>The MAL (AvantGo) Conduit Setup Dialog</screeninfo>
+-<mediaobject>
+-<imageobject><imagedata fileref="conduit-mal.png" format="PNG"/></imageobject>
+-<textobject><phrase>MAL (AvantGo) Conduit Setup</phrase></textobject>
+-<caption><para>MAL (AvantGo) Conduit Setup</para></caption>
+-</mediaobject>
+-</screenshot>
+-
+-<para>
+-In the <guilabel>General</guilabel> page, you can set the synchronization
+-frequency options. It can be set for <guilabel>Every Sync</guilabel>,
+-<guilabel>Once per Hour</guilabel>, <guilabel>Once a Day</guilabel>,
+-<guilabel>Once a Week</guilabel> or <guilabel>Once a Month</guilabel>.
+-The conduit only runs when you hit &HotSync; on your &handheld;, so
+-<guilabel>Once per Hour</guilabel>, for instance, really means that
+-&kpilot; will only try to synchronize with the MAL servers if it is more than an
+-hour since the last MAL sync.
+-</para>
+-
+-<para>
+-The MAL conduit can work through a proxy server. In the
+-<guilabel>Proxy</guilabel>
+-page, you can set the proxy settings.
+-</para>
+-
+-<variablelist>
+-
+-<varlistentry>
+-<term><guilabel>Proxy Type</guilabel></term>
+-<listitem><para>
+-If you connect the Internet directly, select <guilabel>No proxy</guilabel>,
+-requiring no further configuration. But if you use a <guilabel>HTTP
+-proxy</guilabel>
+-or a <guilabel>SOCKS proxy</guilabel>, select it, to enable the rest of the
+-dialog and to make the conduit use it to connect the MAL server.
+-</para></listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>Server Information</guilabel></term>
+-<listitem><para>
+-Write in the <guilabel>Server Name</guilabel> dropdown box the address of the
+-proxy server to use, in the form <userinput>foo.bar.com</userinput>, not
+-<userinput>http://foo.bar.com</userinput> or
+-<userinput>http://foo.bar.com:8080</userinput>.
+-</para>
+-<para>
+-Check the box <guilabel>Custom port:</guilabel> if your proxy uses a non
+-standard
+-port, and enter the correct port number.
+-</para>
+-<para>
+-In the <guilabel>No proxy for</guilabel> edit box, you may enter the list of MAL
+-servers that do not need the use of a proxy, separated by commas. For instance,
+-<userinput>localhost,lan</userinput>.
+-</para>
+-<para>
+-If your proxy require authentication, enter your <guilabel>User name</guilabel>
+-and <guilabel>Password</guilabel> in the respective edit boxes.
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-</variablelist>
+-
+-<para>In the <guilabel>MAL Server</guilabel> page, you can set the MAL server
+-address and settings. Currently, you can only configure this settings using
+-the &handheld; MobileLink or AGConnect applications, so this page is
+-disabled.</para>
+-
+ </sect2>
+
+-<sect2 id="popmail-cond">
+-<title>Mail Conduit Setup</title>
+
+-<para>
+-This conduit allows you to send mail using a transport.
+-The configuration of the Mail Conduit is fairly simple.
+-</para>
+-<screenshot>
+-<screeninfo>Setting up the Mail Conduit</screeninfo>
+-<mediaobject>
+-<imageobject><imagedata fileref="conduit-popmail-kmail.png"
+-format="PNG"/></imageobject>
+-<textobject><phrase>The Mail Conduit Setup Dialog</phrase></textobject>
+-<caption><para>The Mail Conduit Conduit Setup Dialog</para></caption>
+-</mediaobject>
+-</screenshot>
+-<para>
+-There are two tabs in the setup dialog for the Mail Conduit,
+-one for Sending mail and one for the credits of the mail conduit.
+-</para>
+-
+-<para>
+-Depending on which send method you choose,
+-different fields will be activated in the remainder of the
+-tab, allowing you to enter the necessary information.
+-Currently, the only method available is <guilabel>Using KMail</guilabel>,
+-which has a very simple configuration.
+-</para>
+-
+-<para>
+-Your email address can be entered in the <guilabel>Email
+-Address:</guilabel> field. This is the email address that goes in the
+-<quote>From:</quote> line in outgoing mail. If you enter a file name in
+-the <guilabel>Signature File</guilabel> field then that file will be
+-appended to each outgoing mail as a signature.
+-</para>
+-
+-<para>
+-When sending mail through &kmail;, &kpilot; automatically places it in
+-your &kmail; outbox. &kmail; saves mail in the outbox until you request
+-that those pieces of mail are <emphasis>really</emphasis> sent.
+-</para>
+-
+-</sect2>
+ </sect1>
+
+ </chapter>
+Index: doc/kpilot/faq.docbook
+===================================================================
+--- doc/kpilot/faq.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ doc/kpilot/faq.docbook (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -334,53 +334,5 @@
+ </sect1>
+
+
+-<sect1>
+-<title>&kpilot;'s &DCOP; interface</title>
+
+-<qandaset>
+-
+-<qandaentry>
+-<question>
+-<para>What does &kpilot; use &DCOP; for?</para>
+-</question>
+-<answer><para>
+-The daemon and &kpilot; communicate using &DCOP;
+-for several purposes: logging messages, changing the &HotSync;
+-type, and exchanging configuration information.
+-</para></answer>
+-</qandaentry>
+-
+-<qandaentry><question>
+-<para>Which &DCOP; interfaces are there?</para></question>
+-
+-<answer><para>
+-The daemon has two important interfaces:
+-<interface>LogIface</interface>
+-and
+-<interface>KPilotDaemonIface
+-</interface>.
+-The <interface>LogIface</interface>
+-interface is used to record messages in the sync log
+-on the &handheld;, and is rarely used.
+-The <interface>KPilotDaemonIface</interface>
+-is the more important &DCOP; interface,
+-and is used to control the kind of &HotSync; that
+-&kpilot; will do.
+-</para></answer>
+-</qandaentry>
+-
+-<qandaentry><question><para>
+-How can I tell the daemon to perform a specific kind of &HotSync;?</para></question>
+-<answer><para>
+-There are three &DCOP; functions that control what kind
+-of &HotSync;
+-the daemon will do next:
+-<function></function>
+-<function></function>
+-</para></answer>
+-</qandaentry>
+-</qandaset>
+-
+-</sect1>
+-
+ </chapter>
+Index: doc/kpilot/index.docbook
+===================================================================
+--- doc/kpilot/index.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ doc/kpilot/index.docbook (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -2,7 +2,7 @@
+ <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
+ "dtd/kdex.dtd" [
+ <!ENTITY kappname "&kpilot;">
+-<!ENTITY kpilotver "4.4.6">
++<!ENTITY kpilotver "5.2.1">
+ <!ENTITY package "kdepim">
+ <!ENTITY USB "<acronym>USB</acronym>">
+ <!ENTITY PalmOS '<trademark class="registered">Palm OS</trademark>'>
+@@ -10,7 +10,6 @@
+ <!ENTITY Sony '<trademark class="registered">Sony</trademark>'>
+ <!ENTITY Clie "<productname><trademark>Clie</trademark></productname>">
+ <!ENTITY FreeBSD '<trademark class="registered">FreeBSD</trademark>'>
+-<!ENTITY AvantGo '<trademark class="registered">AvantGo</trademark>'>
+ <!ENTITY handheld "handheld">
+ <!ENTITY configuring-kpilot SYSTEM "configuration.docbook">
+ <!ENTITY using-kpilot SYSTEM "usage.docbook">
+@@ -22,7 +21,7 @@
+
+ <!--
+ From LW: http://www.palm.com/about/trademark.html According to this,
+- we have have overspecified some of the tradmarks... feel free to
++ we have have overspecified some of the trademarks... feel free to
+ adjust if you think this is the case.
+ -->
+
+@@ -74,7 +73,7 @@
+
+ <legalnotice>&FDLNotice;</legalnotice>
+
+-<date>2004-06-27</date>
++<date>2009-03-14</date>
+ <releaseinfo>&kpilotver;</releaseinfo>
+
+ <abstract>
+@@ -160,13 +159,11 @@
+ your &handheld;.
+ Configuration settings are described at length in
+ the <link linkend="configure">section on configuring &kpilot;</link>.
+-For the impatient, the <link linkend="configwizard">configuration wizard</link>
+-can set up most things for you.
+ </para>
+
+ <para>
+-Once &kpilot; is configured, you should make a <link
+-linkend="backup">backup</link> of your &handheld; first. That is to be on the
++Once &kpilot; is configured, you should make a
++backup of your &handheld; first. That is to be on the
+ safe side. Once that is done, you can just leave the &kpilot; daemon running in
+ the system tray, and all you need to do is press the &HotSync; button, and
+ changes in the &handheld; data and the &kde; applications will be <link
+@@ -175,14 +172,6 @@
+ </para>
+
+ <para>
+-If you want to <link linkend="page-viewers">examine</link> the
+-data stored on your &handheld;, the built in <link
+-linkend="page-viewers">viewers</link> can be used. This allows you to view
+-memos, addresses, &etc;. There is a generic hexadecimal database viewer for
+-advanced use.
+-</para>
+-
+-<para>
+ Finally, &kpilot; can be used to <link linkend="installer-app">install</link>
+ new programs and databases on your &handheld;.
+ </para>
+Index: doc/kpilot/setup-conduit.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/daemon-menu.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/setup-startup-exit.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/sync.docbook
+===================================================================
+--- doc/kpilot/sync.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ doc/kpilot/sync.docbook (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -2,16 +2,14 @@
+ <title>Syncing your &handheld; with a PC</title>
+
+ <para>
+-This chapter describes the synchronization process
+-that &kpilot; uses, focusing on the &kpilot; daemon functionality.
+-You may sync your &handheld; using the <link linkend="builtin">internal
+-viewers</link> and / or <link linkend="conduits">conduits</link>, depending
+-on your personal preferences. Conduits allow external applications to interface
+-with the data on your &handheld;.
++This chapter describes the synchronization process that &kpilot; uses, focusing
++on the &kpilot; daemon functionality. You may sync your &handheld; using
++the <link linkend="conduits">conduits</link>. Conduits allow external
++applications to interface with the data on your &handheld;.
+ </para>
- <para>If <guilabel>Go to next unread thread</guilabel> is
--checked, &knode; automatically shows the next thread if you mark the
-+checked, &knode; automatically shows the next thread if you mark
- the previous thread as read.</para>
+ <para>
+-It is a good idea to make a <link linkend="backup">backup</link>
++It is a good idea to make a backup
+ of your &handheld; regularly. Other than making backups, it should rarely be
+ necessary to do anything other than drop your &handheld; on the cradle and press
+ the &HotSync; button. The &kpilot; daemon icon in the system tray will flash
+@@ -30,7 +28,7 @@
- </sect3>
-@@ -942,7 +942,7 @@
- <para>The <guibutton>Down</guibutton> button does the opposite
- action: select the filter you just shifted one up and
--press<guibutton>Down</guibutton> until it reaches its old
-+press <guibutton>Down</guibutton> until it reaches its old
- position.</para>
+ <para>
+-To which type of sync &kpilot; will perform next, you can use the main
++To set which type of sync &kpilot; will perform next, you can use the main
+ application
+ <link linkend="menu-file">
+ <menuchoice>
+@@ -64,31 +62,10 @@
+ </para></listitem>
- <para>With the two buttons <guibutton>Add Separator</guibutton> and
-Index: doc/knode/using-subscribing.docbook
-===================================================================
---- doc/knode/using-subscribing.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ doc/knode/using-subscribing.docbook (.../branches/KDE/4.2/kdepim) (wersja 940158)
-@@ -184,7 +184,7 @@
- </tip>
+ <listitem><para>
+-<guilabel>FastSync (once)</guilabel>: only sync those
+-databases that have conduits.
+-</para></listitem>
+-
+-<listitem><para>
+ <guilabel>FullSync (once)</guilabel>: the safest option, but
+ takes the longest time to complete.
+ </para></listitem>
- <para>Unfortunately there is no guarantee that your newsserver is
--providing all available newsgroups: many newsserver refuse groups
-+providing all available newsgroups: many newsservers refuse groups
- publishing binary attachments; other groups are only available from
- special servers. &knode; provides you the possibility to use more than
- one news-server if you want to access alternative servers providing
-@@ -446,7 +446,7 @@
- <varlistentry>
- <term><guilabel>From</guilabel></term>
- <listitem>
--<para>The <guilabel>From</guilabel> column shows the author, or their
-+<para>The <guilabel>From</guilabel> column shows the author, or his
- e-mail address if the author didn't give a name. You can configure
- your settings in
- <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
-@@ -578,7 +578,7 @@
- <para>You can navigate in articles, display an article and open or
- close threads with your mouse or keyboard.</para>
+-<listitem><para>
+-<guilabel>Backup (once)</guilabel>: copy all the data from the &handheld; to the
+-<acronym>PC</acronym>.
+-</para></listitem>
+-
+-<listitem><para>
+-<guilabel>Restore from Backup (once)</guilabel>: copy the data from a previous backup from the PC to the
+-&handheld;, erasing the data previously held there.
+-
+-<warning><para>
+-Use the restore functionality with care, as you can lose all the new
+-data entered on the &handheld; since the last backup.
+-</para></warning>
+-</para>
+-</listitem>
+-
+ <listitem>
+ <para>
+ <guilabel>Copy Handheld to PC (once)</guilabel>: run all conduits and
+@@ -128,83 +105,17 @@
--<para>When you select an article with your mouse its entry in the the
-+<para>When you select an article with your mouse its entry in the
- article view gets colored; at the same time the header and body of
- this article appear in in the article window. If you want to read
- another article you can use the mouse to select it, or you can use
-Index: doc/kpilot/faq.docbook
-===================================================================
---- doc/kpilot/faq.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ doc/kpilot/faq.docbook (.../branches/KDE/4.2/kdepim) (wersja 940158)
-@@ -334,7 +334,7 @@
- </sect1>
+ </para>
+
+-<sect1 id="backup">
+-<title>Backing up your &handheld; data</title>
+
+-<para>
+-On every backup, &kpilot; stores a copy of all your &handheld; data under the
+-<filename class="directory">$KDEHOME/share/apps/kpilot/DBBackup/User Name/</filename>
+-folder, allowing you to restore that copy later, if needed. The
+-<filename class="directory">$KDEHOME</filename> environment variable
+-(typically <filename class="directory">/home/Login Name/.kde/</filename>)
+-points to the folder that contains your configuration and data for the &kde;
+-applications.</para>
+-
+-<para>
+-It is a good idea to backup your data often. To perform a backup, you can click
+-the
+-<menuchoice>
+-<guisubmenu>Next Sync</guisubmenu>
+-<guimenuitem>Backup</guimenuitem>
+-</menuchoice>
+-on the &kpilot; daemon icon popup menu or the
+-<menuchoice>
+-<guimenu>File</guimenu>
+-<guimenuitem>Backup</guimenuitem>
+-</menuchoice>
+-menu item on the main &kpilot; application menu in order
+-to make the next sync a backup. Then, just press the &HotSync; button.
+-</para>
+-
+-</sect1>
+-
+-<sect1 id="restore">
+-<title>Restoring Your &handheld; Data</title>
+-
+-<para>
+-The restore operation consist of transferring all the data previously saved on
+-the <acronym>PC</acronym> to the &handheld;, effectively erasing all the new
+-data held by the device by returning it to a previous state.
+-<warning><para>
+-Use the restore functionality with care, as you can lose all the new
+-data entered on the &handheld; since the last backup.
+-</para></warning>
+-</para>
+-
+-<para>
+-The data saved on the last backup is located on the <filename class="directory">$KDEHOME/share/apps/kpilot/DBBackup/User Name/</filename>
+-folder. The <filename class="directory">$KDEHOME</filename> environment variable
+-(typically <filename class="directory">/home/Login Name/.kde/</filename>)
+-points to the folder that contains your configuration and data for the &kde;
+-applications.</para>
+-
+-<para>
+-The most common use for the restore functionality is to recover from a hardware
+-or software failure on the device.
+-The restore function can be accessed from the
+-main &kpilot; application, and from the &kpilot; daemon. be careful, as
+-restoring the data is not a common operation. In order
+-to restore the data at the next sync, click the
+-<menuchoice>
+-<guimenu>File</guimenu>
+-<guimenuitem>Restore</guimenuitem>
+-</menuchoice>
+-menu item, then press the &HotSync; button.
+-</para>
+-
+-</sect1>
+-
+-
+ <sect1 id="sync-s">
+ <title>Selecting the Synchronization Type</title>
+ <para>
+-There are three ways to sync your &handheld;, <guilabel>HotSync</guilabel>,
+-<guilabel>FastSync</guilabel> or <guilabel>FullSync</guilabel>.
++There are two ways to sync your &handheld;, <guilabel>HotSync</guilabel>,
++or <guilabel>FullSync</guilabel>.
+ </para>
--<sect1>
-+<sect1 id="faq-dcop">
- <title>&kpilot;'s &DCOP; interface</title>
+ <para>
+-When you press the &HotSync; button on your &handheld;, &kpilot;'s will run the
++When you press the &HotSync; button on your &handheld;, &kpilot; will run the
+ default sync operation (usually a <guilabel>HotSync</guilabel>). You can select
+ the default sync operation in the <link linkend="page-hotsync">&HotSync;
+ configure dialog</link>. Alternatively, you can click one of the sync options on
+@@ -279,150 +190,6 @@
+ </mediaobject>
+ </screenshot>
+
+-<para>
+-The <guilabel>Conduits</guilabel> tree in the configuration dialog
+-collects all the installed conduits available.
+-The conduits can be enabled and disabled
+-by clicking on the check box to the left of the conduit's name.
+-Conduits can have an extensive configuration of
+-their own, and may be supplied by third parties.
+-Most of the conduits require some initial configuration, so it is strongly
+-recommended to check the
+-<link linkend="config-conduits">section detailing the default conduits
+-configuration</link> before using them.
+-</para>
+-
+-
+-<para>
+-The default conduits are the following:
+-</para>
+-
+-
+-<variablelist>
+-
+-<varlistentry>
+-<term><guilabel>KNotes / Memos</guilabel></term>
+-<listitem><para>
+-Synchronizes the Memo Pad application with &knotes;.
+-
+-<important><para>
+-The conduit only synchronizes the Memo Pad data if &knotes; is running. If you
+-want to enable this functionality, please remember to start &knotes; first, or
+-check if it is already running (tip: look for the &knotes; icon in the system tray).
+-</para></important>
+-
+-</para></listitem>
+-</varlistentry>
+-
+-
+-<varlistentry>
+-<term><guilabel>Notepad</guilabel></term>
+-<listitem>
+-<para>
+-Exports the free hand notes of the &handheld;'s Notepad application as pictures
+-to the PC.
+-</para>
+-</listitem>
+-</varlistentry>
+-
+-
+-<varlistentry>
+-<term><guilabel>Time Synchronization</guilabel></term>
+-<listitem><para>
+-Sets the &handheld;'s time to that of the desktop machine.
+-Useful for keeping the clock of the &handheld; accurate.
+-</para></listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>Calendar (KOrganizer)</guilabel></term>
+-<listitem><para>
+-Synchronizes the Datebook application with &korganizer; or with a iCalendar file of
+-your choice.
+-</para></listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>Palm DOC</guilabel></term>
+-<listitem><para>
+-Automatically converts, installs and sync text files in the &PalmPilot;
+-DOC format, so you can read the text files with most DOC-capable
+-applications on the &handheld;. There are many free or open source Palm
+-DOC readers, and some Palm DOC editors for your handheld.</para>
+-<para>
+-Any plain text file can be easily converted. For instance, you can download and
+-convert the public domain books provided by the <ulink url="http://www.gutenberg.net">
+-Gutenberg Project</ulink> and read them in your &handheld;.
+-</para></listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>Addressbook</guilabel></term>
+-<listitem><para>
+-Synchronizes the Address application with &kaddressbook; or with a vCard file of
+-your choice.
+-</para></listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>System Information</guilabel></term>
+-<listitem><para>
+-Writes information about your &handheld;, (such as OS version,
+-RAM available, and the list of databases) to a file. Useful mostly for
+-debugging purposes.
+-</para></listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>ToDo's (KOrganizer)</guilabel></term>
+-<listitem><para>
+-Synchronizes the Todo list application with &korganizer; or with a iCalendar file of
+-your choice.
+-</para></listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>MAL (AvantGo) Conduit</guilabel></term>
+-<listitem><para>
+-Synchronizes your &handheld; with the &AvantGo; server. The &AvantGo; server
+-offers general content (news, guides, stock quotes, &etc;) in a format that is
+-suitable for reading in a &handheld;. To use this conduit, you need to register, subscribe
+-the channels you select and install the &AvantGo; software on your &handheld;.
+-</para></listitem>
+-</varlistentry>
+-
+-
+-<varlistentry>
+-<term><guilabel>Mail</guilabel></term>
+-<listitem><para>
+-Sends mail written on the &handheld; through &kmail;.
+-There is no provision for receiving mail, however.
+-</para></listitem>
+-</varlistentry>
+-
+-<varlistentry>
+-<term><guilabel>Perl</guilabel></term>
+-<term><guilabel>Python</guilabel></term>
+-<term><guilabel>NULL</guilabel></term>
+-<listitem><para>
+-These conduits are intended as a programming demonstration,
+-and serve no practical purpose during a &HotSync;.
+-They are not normally listed, but you may see them on some systems.
+-</para></listitem>
+-</varlistentry>
+-
+-</variablelist>
+-
+-<screenshot>
+-<screeninfo>The Conduit Setup Dialog</screeninfo>
+-<mediaobject>
+-<imageobject><imagedata fileref="setup-conduit.png" format="PNG"/></imageobject>
+-<textobject><phrase>The Conduit Setup Dialog</phrase></textobject>
+-<caption><para>The Conduit Setup Dialog</para></caption>
+-</mediaobject>
+-</screenshot>
+-
+-
+ </sect1>
- <qandaset>
+ <sect1 id="conflicts">
+@@ -431,7 +198,7 @@
+ <para>
+ Data records can be changed both on the &handheld; and
+ on the <acronym>PC</acronym>. If one record has incompatible changes
+-in both the &handheld; and the <acronym>PC</acronym>, (such as
++in both the &handheld; and the <acronym>PC</acronym> (such as
+ changing a phone number in different ways on both sides),
+ the conflicting change needs to be resolved so
+ that both the &handheld; and the <acronym>PC</acronym> are in sync again.
+Index: doc/kpilot/conduit-todo.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+
+Zmiany atrybutów dla: doc/kpilot/conduit-todo.png
+___________________________________________________________________
+Dodane: svn:mime-type
+ + application/octet-stream
+
+Index: doc/kpilot/sidebar.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/setup-general.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/setup-items.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/setup-address.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/setup-dbspecial.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/setup-hotsync.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/setup-tabs.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
+Index: doc/kpilot/conduit-vcal.png
+===================================================================
+Nie można wyświetlić: plik binarny.
+svn:mime-type = application/octet-stream
Index: doc/kalarm/index.docbook
===================================================================
---- doc/kalarm/index.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ doc/kalarm/index.docbook (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- doc/kalarm/index.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ doc/kalarm/index.docbook (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -261,20 +261,10 @@
</listitem>
Index: doc/kaddressbook/index.docbook
===================================================================
---- doc/kaddressbook/index.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ doc/kaddressbook/index.docbook (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- doc/kaddressbook/index.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ doc/kaddressbook/index.docbook (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -544,8 +544,8 @@
<para>The Photo will be shown in the contact preview and in the Icon view mode. However the Logo picture will only be shown in Icon view and only if there's no photo available.</para>
<para>To reset a photo or logo simply click on it with the &RMB; and select <guilabel>Reset</guilabel>.</para>
<varlistentry>
Index: doc/korganizer/index.docbook
===================================================================
---- doc/korganizer/index.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ doc/korganizer/index.docbook (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- doc/korganizer/index.docbook (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ doc/korganizer/index.docbook (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -454,7 +454,7 @@
</procedure>
<para>You can get a detailed description of the to-do window in <link
Index: kalarm/kalarm.h
===================================================================
---- kalarm/kalarm.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kalarm/kalarm.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kalarm/kalarm.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kalarm/kalarm.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -23,7 +23,7 @@
#undef QT3_SUPPORT
Index: kalarm/mainwindow.cpp
===================================================================
---- kalarm/mainwindow.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kalarm/mainwindow.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kalarm/mainwindow.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kalarm/mainwindow.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -51,6 +51,7 @@
#include <QDropEvent>
#include <QResizeEvent>
#include <kmenubar.h>
#include <ktoolbar.h>
+@@ -167,7 +168,7 @@
+ connect(resources, SIGNAL(signalErrorMessage(const QString&)), SLOT(showErrorMessage(const QString&)));
+
+ // Create the alarm list widget
+- mListFilterModel = new AlarmListFilterModel(EventListModel::alarms());
++ mListFilterModel = new AlarmListFilterModel(EventListModel::alarms(), this);
+ mListFilterModel->setStatusFilter(mShowArchived ? static_cast<KCalEvent::Status>(KCalEvent::ACTIVE | KCalEvent::ARCHIVED) : KCalEvent::ACTIVE);
+ mListView = new AlarmListView(WINDOW_NAME, mSplitter);
+ mListView->setModel(mListFilterModel);
@@ -518,7 +519,10 @@
mActionFindPrev = KStandardAction::findPrev(mListView, SLOT(slotFindPrev()), actions);
KStandardAction::selectAll(mListView, SLOT(selectAll()), actions);
}
Index: kalarm/Changelog
===================================================================
---- kalarm/Changelog (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kalarm/Changelog (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kalarm/Changelog (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kalarm/Changelog (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -1,6 +1,9 @@
KAlarm Change Log
- Fix possible crash on alarm refresh, or removal or disabling of a resource.
Index: kalarm/kalarmapp.cpp
===================================================================
---- kalarm/kalarmapp.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kalarm/kalarmapp.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kalarm/kalarmapp.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kalarm/kalarmapp.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -1021,7 +1021,6 @@
void KAlarmApp::removeWindow(TrayWindow*)
{
}
/******************************************************************************
+Index: kalarm/lib/spinbox2.cpp
+===================================================================
+--- kalarm/lib/spinbox2.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kalarm/lib/spinbox2.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -1,7 +1,7 @@
+ /*
+ * spinbox2.cpp - spin box with extra pair of spin buttons (for Qt 3)
+ * Program: kalarm
+- * Copyright © 2001-2008 by David Jarvie <djarvie@kde.org>
++ * Copyright © 2001-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
+@@ -527,12 +527,13 @@
+ =============================================================================*/
+
+ SpinMirror::SpinMirror(ExtraSpinBox* spinbox, SpinBox* mainspin, QWidget* parent)
+- : QGraphicsView(new QGraphicsScene, parent),
++ : QGraphicsView(parent),
+ mSpinbox(spinbox),
+ mMainSpinbox(mainspin),
+ mReadOnly(false),
+ mMirrored(false)
+ {
++ setScene(new QGraphicsScene(this));
+ setAttribute(Qt::WA_Hover);
+ setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
Index: kalarm/resources/resourcelocaldir.cpp
===================================================================
---- kalarm/resources/resourcelocaldir.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kalarm/resources/resourcelocaldir.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kalarm/resources/resourcelocaldir.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kalarm/resources/resourcelocaldir.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -1,8 +1,8 @@
/*
* resourcelocaldir.cpp - KAlarm local directory calendar resource
}
Index: kalarm/resources/resourcelocalwidget.cpp
===================================================================
---- kalarm/resources/resourcelocalwidget.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kalarm/resources/resourcelocalwidget.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kalarm/resources/resourcelocalwidget.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kalarm/resources/resourcelocalwidget.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -40,6 +40,7 @@
QLabel* label = new QLabel(i18nc("@label:textbox", "Location:"), this);
layout->addWidget(label, 1, 0);
Index: kalarm/resources/resourcelocaldir.h
===================================================================
---- kalarm/resources/resourcelocaldir.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kalarm/resources/resourcelocaldir.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kalarm/resources/resourcelocaldir.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kalarm/resources/resourcelocaldir.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -1,7 +1,7 @@
/*
* resourcelocaldir.h - KAlarm local directory alarm calendar resource
bool mDirReadOnly; // directory is read-only
};
+Index: kalarm/resources/alarmresources.cpp
+===================================================================
+--- kalarm/resources/alarmresources.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kalarm/resources/alarmresources.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -458,9 +458,13 @@
+
+ void AlarmResources::remap(AlarmResource* resource)
+ {
+- for (ResourceMap::Iterator it = mResourceMap.begin(); it != mResourceMap.end(); ++it)
++ for (ResourceMap::Iterator it = mResourceMap.begin(); it != mResourceMap.end(); )
++ {
+ if (it.value() == resource)
+- mResourceMap.erase(it);
++ it = mResourceMap.erase(it);
++ else
++ ++it;
++ }
+ Event::List events = resource->rawEvents();
+ for (int i = 0, end = events.count(); i < end; ++i)
+ mResourceMap[events[i]] = resource;
Index: kalarm/resources/kalarm_manager.desktop
===================================================================
---- kalarm/resources/kalarm_manager.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kalarm/resources/kalarm_manager.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kalarm/resources/kalarm_manager.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kalarm/resources/kalarm_manager.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -18,6 +18,7 @@
Name[kk]=Ескертулер
Name[km]=ជូនដំណឹង
Name[lv]=Atgādinājumi
Name[nb]=Varslinger
Name[ne]=संसूचक
+Index: kalarm/editdlg.cpp
+===================================================================
+--- kalarm/editdlg.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kalarm/editdlg.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -150,6 +150,7 @@
+ mTemplate(Template),
+ mDesiredReadOnly(false),
+ mReadOnly(false),
++ mShowingMore(true),
+ mSavedEvent(0)
+ {
+ init(0, getResource);
+@@ -172,6 +173,7 @@
+ mTemplate(Template),
+ mDesiredReadOnly(readOnly),
+ mReadOnly(readOnly),
++ mShowingMore(true),
+ mSavedEvent(0)
+ {
+ init(event, getResource);
Index: kalarm/traywindow.h
===================================================================
---- kalarm/traywindow.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kalarm/traywindow.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kalarm/traywindow.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kalarm/traywindow.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -1,7 +1,7 @@
/*
* traywindow.h - the KDE system tray applet
QString tooltipAlarmText() const;
Index: kalarm/traywindow.cpp
===================================================================
---- kalarm/traywindow.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kalarm/traywindow.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kalarm/traywindow.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kalarm/traywindow.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -39,6 +39,7 @@
#include <QToolTip>
#include <QMouseEvent>
{
Index: Mainpage.dox
===================================================================
---- Mainpage.dox (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ Mainpage.dox (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- Mainpage.dox (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ Mainpage.dox (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -30,8 +30,6 @@
* - <a href="kmail/html/index.html"><b>kmail</b></a>
* (<a href="kmail/html/classes.html">classes</a>)\n
* (<a href="knode/html/classes.html">classes</a>)\n
Index: kaddressbook/printing/kabentrypainter.cpp
===================================================================
---- kaddressbook/printing/kabentrypainter.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kaddressbook/printing/kabentrypainter.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kaddressbook/printing/kabentrypainter.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kaddressbook/printing/kabentrypainter.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -220,8 +220,10 @@
y += fmBody.lineSpacing() / 2;
rect = painter->boundingRect( Ruler1, y, Width-Ruler1, Height,
Index: kaddressbook/printing/detailledstyle.cpp
===================================================================
---- kaddressbook/printing/detailledstyle.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kaddressbook/printing/detailledstyle.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kaddressbook/printing/detailledstyle.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kaddressbook/printing/detailledstyle.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -215,7 +215,6 @@
QPrinter *printer = wizard()->printer();
}
Index: kaddressbook/xxport/vcard_xxport.desktop
===================================================================
---- kaddressbook/xxport/vcard_xxport.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kaddressbook/xxport/vcard_xxport.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kaddressbook/xxport/vcard_xxport.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kaddressbook/xxport/vcard_xxport.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -30,7 +30,7 @@
Name[lt]=KAB vCard XXPort priedas
Name[lv]=KAB vCard XXPort spraudnis
Name[nl]=KAB vCard XXPort-plugin
Index: kaddressbook/xxport/pab_xxport.desktop
===================================================================
---- kaddressbook/xxport/pab_xxport.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kaddressbook/xxport/pab_xxport.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kaddressbook/xxport/pab_xxport.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kaddressbook/xxport/pab_xxport.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -27,7 +27,7 @@
Name[lt]=KAB MS Exchange asmeninės adresų knygelės XXPort priedas
Name[lv]=KAB MS Exchange personīgo adrešu grāmatu XXPort spraudnis
Name[nl]=KAB MS Exchange Personal Addressbook XXPort-plugin
Index: kaddressbook/editors/cryptosettings.desktop
===================================================================
---- kaddressbook/editors/cryptosettings.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kaddressbook/editors/cryptosettings.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kaddressbook/editors/cryptosettings.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kaddressbook/editors/cryptosettings.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -7,7 +7,7 @@
Name[ca]=Preferències de criptografia
Name[cs]=Nastavení šifrování
Name[es]=Preferencias de cifrado
Index: CMakeLists.txt
===================================================================
---- CMakeLists.txt (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ CMakeLists.txt (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- CMakeLists.txt (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ CMakeLists.txt (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -89,15 +89,6 @@
macro_log_feature(X11_Xscreensaver_FOUND "X11 screensaver extension" "X Window Screen Saver Development Library" "http://xorg.freedesktop.org" FALSE "" "Required for building the KTimeTracker Program")
endif(X11_FOUND)
Index: libkholidays/holidays/holiday_se
===================================================================
---- libkholidays/holidays/holiday_se (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ libkholidays/holidays/holiday_se (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- libkholidays/holidays/holiday_se (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ libkholidays/holidays/holiday_se (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -23,8 +23,8 @@
:Before 2005
:black "Nationaldagen" black on 6.6
black "1. Advent" on sunday before 24.12 minus 21 days
Index: ktimetracker/timetrackerwidget.cpp
===================================================================
---- ktimetracker/timetrackerwidget.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ ktimetracker/timetrackerwidget.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- ktimetracker/timetrackerwidget.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ ktimetracker/timetrackerwidget.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -692,6 +692,7 @@
dialog->addPage( storagePage, i18n( "Storage" ), "system-file-manager" );
}
Index: ktimetracker/kcmconfigs/ktimetrackerconfig.desktop
===================================================================
---- ktimetracker/kcmconfigs/ktimetrackerconfig.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ ktimetracker/kcmconfigs/ktimetrackerconfig.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- ktimetracker/kcmconfigs/ktimetrackerconfig.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ ktimetracker/kcmconfigs/ktimetrackerconfig.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -35,7 +35,7 @@
Comment[ko]=KTimeTracker 설정
Comment[lt]=Konfigūruoti ktimetracker
Comment[nn]=Set opp KTidtakar
Index: kjots/Kjots.desktop
===================================================================
---- kjots/Kjots.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kjots/Kjots.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kjots/Kjots.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kjots/Kjots.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -20,7 +20,7 @@
GenericName[ja]=メモ帳
GenericName[km]=កម្មវិធីទទួលចំណាំ
GenericName[nds]=Notizenprogramm
Index: kjots/kjotspart.desktop
===================================================================
---- kjots/kjotspart.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kjots/kjotspart.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kjots/kjotspart.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kjots/kjotspart.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -1,5 +1,6 @@
[Desktop Entry]
Name=KJotsPart
Name[pl]=Moduł Notatek
Index: README
===================================================================
---- README (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ README (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- README (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ README (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -22,7 +22,6 @@
* kaddressbook: The KDE addressbook application.
* kmail: the KDE mail client
Index: libkdepim/utils.cpp
===================================================================
---- libkdepim/utils.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ libkdepim/utils.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- libkdepim/utils.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ libkdepim/utils.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -57,7 +57,7 @@
static PPERF_INSTANCE_DEFINITION NextInstance( PPERF_INSTANCE_DEFINITION PerfInst )
if ( foundProcessName == processName ) {
Index: kpilot/Messages.sh
===================================================================
---- kpilot/Messages.sh (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kpilot/Messages.sh (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kpilot/Messages.sh (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kpilot/Messages.sh (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -1,2 +1,3 @@
#! /usr/bin/env bash
+$EXTRACTRC `find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp
$XGETTEXT `find . -name \*.cc -o -name \*.cpp -o -name \*.h` -o $podir/kpilot.pot
Index: kpilot/conduits/notepadconduit/notepad-conduit.desktop
===================================================================
---- kpilot/conduits/notepadconduit/notepad-conduit.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kpilot/conduits/notepadconduit/notepad-conduit.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kpilot/conduits/notepadconduit/notepad-conduit.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kpilot/conduits/notepadconduit/notepad-conduit.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -47,7 +47,7 @@
Comment[lt]=Šis kanalas padaro NotePad piešinių atsargines kopijas į vietinį aplanką.
Comment[lv]=Šī ķēde saglabā piezīmju zīmējumu rezerves kopijas datora mapē.
Comment[nl]=Dit conduit maakt een backup van de notitie-aantekeningen naar een lokale map.
Index: kpilot/conduits/sysinfoconduit/sysinfo_conduit.desktop
===================================================================
---- kpilot/conduits/sysinfoconduit/sysinfo_conduit.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kpilot/conduits/sysinfoconduit/sysinfo_conduit.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kpilot/conduits/sysinfoconduit/sysinfo_conduit.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kpilot/conduits/sysinfoconduit/sysinfo_conduit.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -26,7 +26,7 @@
Comment[lt]=Šis kanalas įrašo informaciją apie Jūsų delninuką ir sinchronizavimą į failą.
Comment[lv]=Šī ķēde ieraksta failā informācijau par jūsu pārnēsājamo ierīci un tās sinhronizāciju.
Comment[nl]=Dit conduit slaat informatie over uw handheld en de synchronisatie op in een bestand.
Index: kpilot/conduits/memofileconduit/memofile-conduit.desktop
===================================================================
---- kpilot/conduits/memofileconduit/memofile-conduit.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kpilot/conduits/memofileconduit/memofile-conduit.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kpilot/conduits/memofileconduit/memofile-conduit.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kpilot/conduits/memofileconduit/memofile-conduit.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -5,7 +5,7 @@
+ Name[ca]=Fitxer de notes
+ Name[cs]=Soubor s poznámkou
+ Name[da]=Memo-fil
+-Name[de]=Memo Datei
++Name[de]=Notizdatei
+ Name[el]=Αρχείο υπομνήματος
+ Name[eo]=Memo-dosiero
+ Name[es]=Archivo Memo
+@@ -53,7 +53,7 @@
+ Comment[ca]=Aquest conducte sincronitza les notes de l'agenda electrònica amb un directori local.
+ Comment[cs]=Toto propojení synchronizuje vaše poznámky v PDA s lokálním adresářem.
+ Comment[da]=Denne kanal synkroniserer dine håndholdte memoer med en lokal mappe.
+-Comment[de]=Abgleich der Memos von Taschencomputer und einem lokalen Ordner
++Comment[de]=Abgleich der Notizen von Taschencomputer und einem lokalen Ordner
+ Comment[el]=Αυτός ο σύνδεσμος συγχρονίζει τα υπομνήματα του υπολογιστή παλάμης σας με έναν τοπικό κατάλογο.
+ Comment[eo]=Tiu kanalo sinkronigas viajn poŝkomputil-memoojn kun loka dosierujo.
+ Comment[es]=Este conducto sincroniza las memos de la agenda electrónica con un directorio local.
@@ -74,7 +74,7 @@
Comment[lt]=Šis kanalas sinchronizuoja Jūsų užrašus su vietiniu aplanku.
Comment[lv]=Šī ķēde sinhronizē jūsu rokas datora piezīmes ar mapi datorā.
Comment[nl]=Dit conduit synchroniseert de memo's van uw handheld met een lokale map.
Index: kpilot/conduits/timeconduit/time_conduit.desktop
===================================================================
---- kpilot/conduits/timeconduit/time_conduit.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kpilot/conduits/timeconduit/time_conduit.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kpilot/conduits/timeconduit/time_conduit.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kpilot/conduits/timeconduit/time_conduit.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -29,7 +29,7 @@
Comment[lv]=Šī ķēde uzstāda jūsu rokas datora pulksteni, izmantojot datora pulksteni.
Comment[mk]=Овој канал го поставува времето на рачниот уред според времето на компјутерот.
Comment[nl]=Dit conduit stelt de tijd van uw handheld in aan de hand van de pc-klok.
Index: kpilot/conduits/memofile/kpilot-conduit-memofile.desktop
===================================================================
---- kpilot/conduits/memofile/kpilot-conduit-memofile.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kpilot/conduits/memofile/kpilot-conduit-memofile.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kpilot/conduits/memofile/kpilot-conduit-memofile.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kpilot/conduits/memofile/kpilot-conduit-memofile.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -5,7 +5,7 @@
+ Name[ca]=Fitxer de notes
+ Name[cs]=Soubor s poznámkou
+ Name[da]=Memo-fil
+-Name[de]=Memo Datei
++Name[de]=Notizdatei
+ Name[el]=Αρχείο υπομνήματος
+ Name[eo]=Memo-dosiero
+ Name[es]=Archivo Memo
+@@ -53,7 +53,7 @@
+ Comment[ca]=Aquest conducte sincronitza les notes de l'agenda electrònica amb un directori local.
+ Comment[cs]=Toto propojení synchronizuje vaše poznámky v PDA s lokálním adresářem.
+ Comment[da]=Denne kanal synkroniserer dine håndholdte memoer med en lokal mappe.
+-Comment[de]=Abgleich der Memos von Taschencomputer und einem lokalen Ordner
++Comment[de]=Abgleich der Notizen von Taschencomputer und einem lokalen Ordner
+ Comment[el]=Αυτός ο σύνδεσμος συγχρονίζει τα υπομνήματα του υπολογιστή παλάμης σας με έναν τοπικό κατάλογο.
+ Comment[eo]=Tiu kanalo sinkronigas viajn poŝkomputil-memoojn kun loka dosierujo.
+ Comment[es]=Este conducto sincroniza las memos de la agenda electrónica con un directorio local.
@@ -74,7 +74,7 @@
Comment[lt]=Šis kanalas sinchronizuoja Jūsų užrašus su vietiniu aplanku.
Comment[lv]=Šī ķēde sinhronizē jūsu rokas datora piezīmes ar mapi datorā.
Comment[nl]=Dit conduit synchroniseert de memo's van uw handheld met een lokale map.
Index: kpilot/conduits/keyringconduit/kpilot-conduit-keyring.desktop
===================================================================
---- kpilot/conduits/keyringconduit/kpilot-conduit-keyring.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kpilot/conduits/keyringconduit/kpilot-conduit-keyring.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kpilot/conduits/keyringconduit/kpilot-conduit-keyring.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kpilot/conduits/keyringconduit/kpilot-conduit-keyring.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -15,7 +15,7 @@
Comment[km]=conduit syncs នេះមូលដ្ឋានទិន្នន័យ keyring របស់ឧបករណ៍យួរដៃជាមួយមូលដ្ឋានទិន្នន័យដែលបានផ្ទុកនៅក្នុងកុំព្យូទ័រ ។
Comment[lt]=Šis kanalas sinchronizuoja delninuko raktų rato duomenų bazę su duomenų baze, esančia pc.
Comment[nn]=Denne koplinga synkroniserer den handhaldne nøkkelringdatabasen med ein database lagra på maskina.
Index: kpilot/conduits/todo/kpilot-conduit-todo.desktop
===================================================================
---- kpilot/conduits/todo/kpilot-conduit-todo.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kpilot/conduits/todo/kpilot-conduit-todo.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kpilot/conduits/todo/kpilot-conduit-todo.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kpilot/conduits/todo/kpilot-conduit-todo.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -13,7 +13,7 @@
Comment[ja]=このコンジットはハンドヘルドの To-Do データベースを Akonadi の To-Do コレクションと同期させます。
Comment[km]=conduit syncs នេះជាមូលដ្ឋានទិន្នន័យការងារត្រូវធ្វើជាមួយនឹងការប្រមូលផ្ដុំការងារត្រូវធ្វើរបស់ Akonadi ។
Name[nds]=Opgaav
Index: kpilot/conduits/calendar/calendarconduit.cc
===================================================================
---- kpilot/conduits/calendar/calendarconduit.cc (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kpilot/conduits/calendar/calendarconduit.cc (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kpilot/conduits/calendar/calendarconduit.cc (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kpilot/conduits/calendar/calendarconduit.cc (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -205,6 +205,11 @@
}
else
QDateTime pcDtEnd = pcEvent->dtEnd().dateTime().toLocalTime();
Index: kpilot/conduits/null/null-conduit.desktop
===================================================================
---- kpilot/conduits/null/null-conduit.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kpilot/conduits/null/null-conduit.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kpilot/conduits/null/null-conduit.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kpilot/conduits/null/null-conduit.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -43,7 +43,7 @@
Comment[lv]=Šī ķēde nedara neko.
Comment[mk]=Овој канал не прави ништо.
Comment[nl]=Dit conduit doet niets.
Index: kpilot/conduits/contacts/kpilot-conduit-contacts.desktop
===================================================================
---- kpilot/conduits/contacts/kpilot-conduit-contacts.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kpilot/conduits/contacts/kpilot-conduit-contacts.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kpilot/conduits/contacts/kpilot-conduit-contacts.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kpilot/conduits/contacts/kpilot-conduit-contacts.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -14,7 +14,7 @@
Comment[ja]=このコンジットはハンドヘルドのアドレス帳データベースを Akonadi のコレクションと同期させます。
Comment[km]=conduit syncs នេះជាមូលដ្ឋានសៀវភៅអាសយដ្ឋានឧបករណ៍យួរដៃដែលមានបណ្ដុំ Akonadi ។
Comment[nn]=Denne koplinga synkroniserer den handhaldne adressedatabasen med ei Akonadi-samling.
Index: kpilot/kpilot/kpilotconduit.desktop
===================================================================
---- kpilot/kpilot/kpilotconduit.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kpilot/kpilot/kpilotconduit.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kpilot/kpilot/kpilotconduit.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kpilot/kpilot/kpilotconduit.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -31,7 +31,7 @@
Comment[lv]=KPilot ķēde
Comment[mk]=Канал за КПилот
Comment[nds]=KPilot-Kanaal (Synkroniseren)
Comment[ne]=केडीई पाइलट कन्ड्युट
Comment[nn]=KPilot-kopling
+Index: kpilot/kpilot/config_dialog.cc
+===================================================================
+--- kpilot/kpilot/config_dialog.cc (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kpilot/kpilot/config_dialog.cc (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -452,7 +452,7 @@
+ return;
+ }
+
+- WARNINGKPILOT << "library: " << libraryName << " version: " << loader.pluginVersion();
++ DEBUGKPILOT << "library: " << libraryName << " version: " << loader.pluginVersion();
+ if (Pilot::PLUGIN_API > loader.pluginVersion())
+ {
+ WARNINGKPILOT << "Old conduit library found.";
Index: kpilot/Documentation/base-conduit-template/kpilot-conduit-contacts.desktop
===================================================================
---- kpilot/Documentation/base-conduit-template/kpilot-conduit-contacts.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kpilot/Documentation/base-conduit-template/kpilot-conduit-contacts.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kpilot/Documentation/base-conduit-template/kpilot-conduit-contacts.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kpilot/Documentation/base-conduit-template/kpilot-conduit-contacts.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -15,7 +15,7 @@
Comment[km]=conduit syncs នេះមូលដ្ឋានទិន្នន័យ keyring របស់ឧបករណ៍យួរដៃជាមួយមូលដ្ឋានទិន្នន័យដែលបានផ្ទុកនៅក្នុងកុំព្យូទ័រ ។
Comment[lt]=Šis kanalas sinchronizuoja delninuko raktų rato duomenų bazę su duomenų baze, esančia pc.
Comment[nn]=Denne koplinga synkroniserer den handhaldne nøkkelringdatabasen med ein database lagra på maskina.
Index: kpilot/Documentation/base-conduit-template/contacts-conduit.desktop
===================================================================
---- kpilot/Documentation/base-conduit-template/contacts-conduit.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kpilot/Documentation/base-conduit-template/contacts-conduit.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kpilot/Documentation/base-conduit-template/contacts-conduit.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kpilot/Documentation/base-conduit-template/contacts-conduit.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -14,7 +14,7 @@
Comment[ja]=このコンジットはハンドヘルドのアドレス帳を PC のデータベースと同期させます。
Comment[km]=conduit syncs នេះជាសៀវភៅអាសយដ្ឋានដែលមានទិន្នន័យបានផ្ទុកនៅក្នុងកុំព្យូទ័រ ។
Comment[nn]=Denne koplinga synkroniserer den handhaldne adresseboka med ein database lagra på maskina.
Index: kontact/plugins/akregator/akregator.setdlg
===================================================================
---- kontact/plugins/akregator/akregator.setdlg (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/akregator/akregator.setdlg (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/akregator/akregator.setdlg (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/akregator/akregator.setdlg (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -66,6 +66,7 @@
Comment[ja]=フィードリーダー
Comment[km]=កម្មវិធីអានមតិព័ត៌មាន
Comment[nds]=Mellenstroom-Kieker
Index: kontact/plugins/planner/planner.setdlg
===================================================================
---- kontact/plugins/planner/planner.setdlg (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/planner/planner.setdlg (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/planner/planner.setdlg (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/planner/planner.setdlg (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -12,6 +12,7 @@
Name[ja]=スケジュール帳
Name[km]=កម្មវិធីធ្វើគម្រោង
Comment[nds]=Planer-Översicht
Index: kontact/plugins/planner/kcmplanner.desktop
===================================================================
---- kontact/plugins/planner/kcmplanner.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/planner/kcmplanner.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/planner/kcmplanner.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/planner/kcmplanner.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -24,6 +24,7 @@
Name[ja]=スケジュール帳
Name[km]=កម្មវិធីធ្វើគម្រោង
Comment[nds]=Planner inrichten
Index: kontact/plugins/planner/plannerplugin.desktop
===================================================================
---- kontact/plugins/planner/plannerplugin.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/planner/plannerplugin.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/planner/plannerplugin.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/planner/plannerplugin.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -26,6 +26,7 @@
Name[ja]=スケジュール帳
Name[km]=កម្មវិធីធ្វើគម្រោង
Comment[nds]=Planner-Moduul
Index: kontact/plugins/knode/knode.setdlg
===================================================================
---- kontact/plugins/knode/knode.setdlg (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/knode/knode.setdlg (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/knode/knode.setdlg (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/knode/knode.setdlg (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -24,6 +24,7 @@
Comment[kk]=Пошта компоненті
Comment[km]=មាសភាគរបស់ Usenet
Comment[nds]=Usenet-Komponent
Index: kontact/plugins/specialdates/kcmsdsummary.desktop
===================================================================
---- kontact/plugins/specialdates/kcmsdsummary.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/specialdates/kcmsdsummary.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/specialdates/kcmsdsummary.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/specialdates/kcmsdsummary.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -30,6 +30,7 @@
Name[kk]=Болашақ ерекше күндер
Name[km]=កាលបរិច្ឆេទពិសេសដែលនឹងកើតឡើង
Comment[nds]=De Översicht för anstahn besünner Daten instellen
Index: kontact/plugins/kmobiletools/kmobiletools.setdlg
===================================================================
---- kontact/plugins/kmobiletools/kmobiletools.setdlg (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/kmobiletools/kmobiletools.setdlg (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/kmobiletools/kmobiletools.setdlg (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/kmobiletools/kmobiletools.setdlg (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -16,6 +16,7 @@
Name[ja]=携帯電話
Name[km]=ទូរស័ព្ទចល័ត
Comment[nds]=Mobiltelefoon-Komponent
Index: kontact/plugins/kmobiletools/kmobiletools.desktop
===================================================================
---- kontact/plugins/kmobiletools/kmobiletools.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/kmobiletools/kmobiletools.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/kmobiletools/kmobiletools.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/kmobiletools/kmobiletools.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -27,6 +27,7 @@
Comment[ja]=KMobileTools プラグイン
Comment[km]=កម្មវិធីជំនួយរបស់ KMmobileTools
Name[nds]=Mobiltelefonen
Index: kontact/plugins/knotes/knotes_part.h
===================================================================
---- kontact/plugins/knotes/knotes_part.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/knotes/knotes_part.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/knotes/knotes_part.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/knotes/knotes_part.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -92,6 +92,7 @@
KNotesResourceManager *mManager;
#endif
Index: kontact/plugins/knotes/knotes.setdlg
===================================================================
---- kontact/plugins/knotes/knotes.setdlg (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/knotes/knotes.setdlg (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/knotes/knotes.setdlg (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/knotes/knotes.setdlg (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -14,6 +14,7 @@
Name[ja]=ポップアップメモ
Name[km]=ចំណាំលេចឡើង
Comment[nds]=Opduknotiz-Komponent
Index: kontact/plugins/knotes/knotes_part.cpp
===================================================================
---- kontact/plugins/knotes/knotes_part.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/knotes/knotes_part.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/knotes/knotes_part.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/knotes/knotes_part.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -382,12 +382,14 @@
void KNotesPart::renameNote()
void KNotesPart::slotOnCurrentChanged( Q3IconViewItem * )
Index: kontact/plugins/knotes/knotesplugin.desktop
===================================================================
---- kontact/plugins/knotes/knotesplugin.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/knotes/knotesplugin.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/knotes/knotesplugin.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/knotes/knotesplugin.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -84,6 +84,7 @@
Name[ja]=ポップアップメモ
Name[km]=ចំណាំលេចឡើង
Name[nds]=Opduk-Notizen
Index: kontact/plugins/knotes/knotes_part_p.h
===================================================================
---- kontact/plugins/knotes/knotes_part_p.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/knotes/knotes_part_p.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/knotes/knotes_part_p.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/knotes/knotes_part_p.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -155,7 +155,7 @@
hbl->addWidget( mTitleEdit, 1, Qt::AlignVCenter );
Index: kontact/plugins/knotes/knotetip.cpp
===================================================================
---- kontact/plugins/knotes/knotetip.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/knotes/knotetip.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/knotes/knotetip.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/knotes/knotetip.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -31,6 +31,7 @@
*/
Index: kontact/plugins/ktimetracker/ktimetracker.setdlg
===================================================================
---- kontact/plugins/ktimetracker/ktimetracker.setdlg (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/ktimetracker/ktimetracker.setdlg (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/ktimetracker/ktimetracker.setdlg (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/ktimetracker/ktimetracker.setdlg (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -14,6 +14,7 @@
Name[ja]=タイムトラッカー
Name[km]=កម្មវិធីតាមដានពេលវេលា
Comment[nds]=Tietlogbook-Komponent
Index: kontact/plugins/ktimetracker/ktimetracker_plugin.desktop
===================================================================
---- kontact/plugins/ktimetracker/ktimetracker_plugin.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/ktimetracker/ktimetracker_plugin.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/ktimetracker/ktimetracker_plugin.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/ktimetracker/ktimetracker_plugin.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -29,6 +29,7 @@
Comment[ja]=タイムトラッカープラグイン
Comment[km]=កម្មវិធីជំនួយ TimeTracker
Name[nds]=Tietlogbook
Index: kontact/plugins/kjots/kjots_plugin.desktop
===================================================================
---- kontact/plugins/kjots/kjots_plugin.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/kjots/kjots_plugin.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/kjots/kjots_plugin.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/kjots/kjots_plugin.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -62,6 +62,7 @@
Name[ja]=メモ帳
Name[km]=សៀវភៅចំណាំ
Name[nds]=Notizböker
Index: kontact/plugins/kjots/kjots.setdlg
===================================================================
---- kontact/plugins/kjots/kjots.setdlg (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/kjots/kjots.setdlg (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/kjots/kjots.setdlg (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/kjots/kjots.setdlg (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -13,6 +13,7 @@
Name[ja]=メモ帳
Name[km]=សៀវភៅចំណាំ
Comment[nds]=Notizbook-Komponent
Index: kontact/plugins/korganizer/kcmapptsummary.desktop
===================================================================
---- kontact/plugins/korganizer/kcmapptsummary.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/korganizer/kcmapptsummary.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/korganizer/kcmapptsummary.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/korganizer/kcmapptsummary.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -28,6 +28,7 @@
Name[kk]=Болашақ оқиғалар
Name[km]=ព្រឹត្តិការណ៍ដែលនឹងកើតឡើង
Comment[nds]=De Översicht för anstahn Begeefnissen instellen
Index: kontact/plugins/korganizer/kcmtodosummary.desktop
===================================================================
---- kontact/plugins/korganizer/kcmtodosummary.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/korganizer/kcmtodosummary.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/korganizer/kcmtodosummary.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/korganizer/kcmtodosummary.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -28,6 +28,7 @@
Name[kk]=Кейінге қалдырылған жоспарлар
Name[km]=ការងារត្រូវធ្វើដែលមិនទាន់សម្រេច
Comment[nds]=De Översicht för anstahn Opgaven instellen
Index: kontact/plugins/kmail/summarywidget.cpp
===================================================================
---- kontact/plugins/kmail/summarywidget.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/kmail/summarywidget.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/kmail/summarywidget.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/kmail/summarywidget.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -88,9 +88,13 @@
{
// check whether we need to update the message counts
}
Index: kontact/plugins/kmail/kcmkmailsummary.desktop
===================================================================
---- kontact/plugins/kmail/kcmkmailsummary.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/kmail/kcmkmailsummary.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/kmail/kcmkmailsummary.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/kmail/kcmkmailsummary.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -31,6 +31,7 @@
Name[kk]=Жаңа хабарламалар
Name[km]=សារថ្មី
Name[nds]=Nieg Narichten
Index: kontact/plugins/summary/kcmkontactsummary.desktop
===================================================================
---- kontact/plugins/summary/kcmkontactsummary.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/summary/kcmkontactsummary.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/summary/kcmkontactsummary.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/summary/kcmkontactsummary.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -26,6 +26,7 @@
Name[ja]=要約
Name[km]=សេចក្ដីសង្ខេប
Comment[nds]=Tosamenfaten utsöken
Index: kontact/plugins/newsticker/kcmkontactknt.desktop
===================================================================
---- kontact/plugins/newsticker/kcmkontactknt.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ kontact/plugins/newsticker/kcmkontactknt.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- kontact/plugins/newsticker/kcmkontactknt.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ kontact/plugins/newsticker/kcmkontactknt.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -30,6 +30,7 @@
Name[kk]=Ақпарлар
Name[km]=មតិព័ត៌មាន
Name[nds]=Mellenströöm
Index: knotes/knotes_export.h
===================================================================
---- knotes/knotes_export.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ knotes/knotes_export.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- knotes/knotes_export.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ knotes/knotes_export.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -1,40 +0,0 @@
-/* This file is part of the KDE project
- Copyright (C) 2007 David Faure <faure@kde.org>
-#endif
Index: knotes/knotesnetrecv.h
===================================================================
---- knotes/knotesnetrecv.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ knotes/knotesnetrecv.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- knotes/knotesnetrecv.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ knotes/knotesnetrecv.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -45,22 +45,22 @@
public:
KNotesNetworkReceiver( QTcpSocket * );
Index: knotes/resourcenotes.h
===================================================================
---- knotes/resourcenotes.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ knotes/resourcenotes.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- knotes/resourcenotes.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ knotes/resourcenotes.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -36,8 +36,6 @@
#include <kcal/alarm.h>
#include <kresources/resource.h>
namespace KCal {
Index: knotes/knotesapp.h
===================================================================
---- knotes/knotesapp.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ knotes/knotesapp.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
-@@ -57,79 +57,80 @@
+--- knotes/knotesapp.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ knotes/knotesapp.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -57,80 +57,83 @@
public:
KNotesApp();
~KNotesApp();
private slots:
void acceptConnection();
void saveNotes();
++ void saveNotes( const QString & uid );
void updateNoteActions();
void updateNetworkListener();
void updateStyle();
+ KAction *m_findAction;
+
QDomDocument m_noteGUI;
++ QString m_noteUidModify;
};
+ #endif
Index: knotes/knote.cpp
===================================================================
---- knotes/knote.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ knotes/knote.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- knotes/knote.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ knotes/knote.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -31,7 +31,6 @@
#include <QVBoxLayout>
#include <QDesktopWidget>
createActions();
buildGui();
-@@ -122,6 +120,7 @@
+@@ -117,11 +115,20 @@
+ delete m_config;
+ }
+
++void KNote::changeJournal(KCal::Journal *journal)
++{
++ m_journal = journal;
++ m_editor->setText( m_journal->description() );
++ m_label->setText( m_journal->summary() );
++ updateLabelAlignment();
+
++}
++
+ // -------------------- public slots -------------------- //
void KNote::slotKill( bool force )
{
if ( !force &&
( KMessageBox::warningContinueCancel( this,
i18n( "<qt>Do you really want to delete note <b>%1</b>?</qt>",
-@@ -130,20 +129,19 @@
+@@ -130,27 +137,26 @@
KGuiItem( i18n( "&Delete" ), "edit-delete" ),
KStandardGuiItem::cancel(),
"ConfirmDeleteNote" ) != KMessageBox::Continue ) ) {
emit sigKillNote( m_journal );
}
-@@ -160,7 +158,7 @@
+
+ // -------------------- public member functions -------------------- //
+
+-void KNote::saveData()
++void KNote::saveData( bool update )
+ {
+ m_journal->setSummary( m_label->text() );
+ m_journal->setDescription( m_editor->text() );
+@@ -160,9 +166,11 @@
m_config->bgColor().name() );
m_journal->setCustomProperty( "KNotes", "RichText",
m_config->richText() ? "true" : "false" );
-
+- emit sigDataChanged();
+
- emit sigDataChanged();
++ if(update) {
++ emit sigDataChanged(m_journal->uid());
m_editor->document()->setModified( false );
++ }
}
-@@ -175,7 +173,7 @@
+
+ void KNote::saveConfig() const
+@@ -175,7 +183,7 @@
m_config->setHeight( 0 );
}
m_config->setPosition( pos() );
#ifdef Q_WS_X11
NETWinInfo wm_client( QX11Info::display(), winId(),
QX11Info::appRootWindow(), NET::WMDesktop );
-@@ -184,7 +182,7 @@
+@@ -184,7 +192,7 @@
m_config->setDesktop( wm_client.desktop() );
}
#endif
// actually store the config on disk
m_config->writeConfig();
}
-@@ -208,7 +206,7 @@
+@@ -208,7 +216,7 @@
{
m_label->setText( name );
updateLabelAlignment();
if ( m_editor ) { // not called from CTOR?
saveData();
}
-@@ -218,25 +216,25 @@
+@@ -218,25 +226,25 @@
NET::WMDesktop );
note_win.setName( name.toUtf8() );
#endif
m_find->setData( m_editor->toPlainText() );
slotFindNext();
}
-@@ -244,13 +242,13 @@
+@@ -244,13 +252,13 @@
void KNote::slotFindNext()
{
// TODO: honor FindBackwards
QTextCursor c = m_editor->textCursor(); //doesn't return by reference, so we use setTextCursor
c.clearSelection();
m_editor->setTextCursor( c );
-@@ -258,7 +256,7 @@
+@@ -258,7 +266,7 @@
disconnect( m_find, 0, this, 0 );
emit sigFindFinished();
} else {
show();
#ifdef Q_WS_X11
KWindowSystem::setCurrentDesktop( KWindowSystem::windowInfo( winId(),
-@@ -284,31 +282,33 @@
+@@ -284,31 +292,33 @@
void KNote::slotRename()
{
actionCollection()->action( "edit_undo" )->setEnabled( !readOnly &&
m_editor->document()->isUndoAvailable() );
actionCollection()->action( "edit_redo" )->setEnabled( !readOnly &&
-@@ -317,7 +317,8 @@
+@@ -317,7 +327,8 @@
m_editor->textCursor().hasSelection() );
actionCollection()->action( "edit_paste" )->setEnabled( !readOnly );
actionCollection()->action( "edit_clear" )->setEnabled( !readOnly );
updateFocus();
}
-@@ -331,11 +332,11 @@
+@@ -331,11 +342,11 @@
m_config->setDesktop( wm_client.desktop() );
}
#endif
// just hide the note so it's still available from the dock window
hide();
}
-@@ -348,12 +349,14 @@
+@@ -348,12 +359,14 @@
void KNote::slotSetAlarm()
{
-
+
if ( dlg.exec() == QDialog::Accepted ) {
- emit sigDataChanged();
+- emit sigDataChanged();
++ emit sigDataChanged(noteId());
}
+ m_blockEmitDataChanged = false;
}
void KNote::slotPreferences()
-@@ -362,7 +365,7 @@
+@@ -362,7 +375,7 @@
if ( KNoteConfigDlg::showDialog( noteId() ) ) {
return;
}
// create a new preferences dialog...
KNoteConfigDlg *dialog = new KNoteConfigDlg( m_config, name(), this, noteId() );
connect( dialog, SIGNAL( settingsChanged( const QString & ) ) , this,
-@@ -374,16 +377,18 @@
-
- void KNote::slotSend()
- {
-+ m_blockEmitDataChanged = true;
+@@ -377,13 +390,13 @@
// pop up dialog to get the IP
KNoteHostDlg hostDlg( i18n( "Send \"%1\"", name() ), this );
bool ok = ( hostDlg.exec() == QDialog::Accepted );
-
+
-+ m_blockEmitDataChanged = false;
if ( !ok ) { // handle cancel
return;
}
if ( !port ) { // not specified, use default
port = KNotesGlobalConfig::port();
}
-@@ -392,9 +397,9 @@
+@@ -392,9 +405,9 @@
KMessageBox::sorry( this, i18n( "The host cannot be empty." ) );
return;
}
KNotesNetworkSender *sender = new KNotesNetworkSender(
KSocketFactory::connectToHost( "knotes", host, port ) );
sender->setSenderId( KNotesGlobalConfig::senderID() );
-@@ -404,9 +409,9 @@
+@@ -404,9 +417,9 @@
void KNote::slotMail()
{
// get the mail action command
KProcess mail;
foreach ( const QString& cmd, cmd_list ) {
if ( cmd == "%f" ) {
-@@ -417,7 +422,7 @@
+@@ -417,7 +430,7 @@
mail << cmd;
}
}
if ( !mail.startDetached() ) {
KMessageBox::sorry( this, i18n( "Unable to start the mail process." ) );
}
-@@ -440,35 +445,37 @@
+@@ -440,35 +453,37 @@
void KNote::slotSaveAs()
{
// TODO: where to put pdf file support? In the printer??!??!
-
-+
++ m_blockEmitDataChanged = true;
QCheckBox *convert = 0;
-
+
if ( file.open( QIODevice::WriteOnly ) ) {
QTextStream stream( &file );
if ( convert && !convert->isChecked() ) {
-@@ -477,6 +484,7 @@
+@@ -477,6 +492,7 @@
stream << m_editor->toPlainText();
}
}
}
void KNote::slotPopupActionToDesktop( int id )
-@@ -494,15 +502,15 @@
+@@ -494,15 +510,15 @@
m_editor->setTextFont( m_config->font() );
m_editor->setTabStop( m_config->tabSize() );
m_editor->setAutoIndentMode( m_config->autoIndent() );
updateLayout();
slotUpdateShowInTaskbar();
}
-@@ -567,20 +575,20 @@
+@@ -567,20 +583,20 @@
NET::DesktopNames );
NETWinInfo wm_client( QX11Info::display(), winId(),
QX11Info::appRootWindow(), NET::WMDesktop );
if ( wm_client.desktop() == NETWinInfo::OnAllDesktops ) {
m_toDesktop->setCurrentItem( 0 );
} else {
-@@ -595,13 +603,13 @@
+@@ -595,13 +611,13 @@
void KNote::buildGui()
{
m_menu = dynamic_cast<KMenu*>( factory.container( "note_context", this ) );
m_editor->setContextMenu( dynamic_cast<KMenu *>(
factory.container( "note_edit", this ) ) );
-@@ -624,12 +632,12 @@
+@@ -618,18 +634,18 @@
+
+ action = new KAction( KIcon( "document-new" ), i18n( "New" ), this );
+ actionCollection()->addAction( "new_note", action );
+- connect( action, SIGNAL( triggered( bool ) ), SIGNAL( sigRequestNewNote() ) );
++ connect( action, SIGNAL( triggered( bool ) ), SLOT( slotRequestNewNote() ) );
+
+ action = new KAction( KIcon( "edit-rename" ), i18n( "Rename..." ), this );
actionCollection()->addAction( "rename_note", action );
connect( action, SIGNAL( triggered( bool ) ), SLOT( slotRename() ) );
action = new KAction( KIcon( "window-close" ), i18n( "Hide" ), this );
actionCollection()->addAction( "hide_note", action );
-@@ -638,8 +646,8 @@
+@@ -638,8 +654,8 @@
action = new KAction( KIcon( "edit-delete" ), i18n( "Delete" ), this );
actionCollection()->addAction( "delete_note", action );
action = new KAction( KIcon( "knotes_date" ), i18n( "Insert Date" ), this );
actionCollection()->addAction( "insert_date", action );
connect( action, SIGNAL( triggered( bool ) ), SLOT( slotInsDate() ) );
-@@ -648,7 +656,7 @@
+@@ -648,7 +664,7 @@
this );
actionCollection()->addAction( "set_alarm", action );
connect( action, SIGNAL( triggered( bool ) ), SLOT( slotSetAlarm() ) );
action = new KAction( KIcon( "network-wired" ), i18n( "Send..." ), this );
actionCollection()->addAction( "send_note", action );
connect( action, SIGNAL( triggered( bool ) ), SLOT( slotSend() ) );
-@@ -667,20 +675,20 @@
+@@ -667,20 +683,20 @@
action = new KAction( KIcon( "configure" ), i18n( "Preferences..." ), this );
actionCollection()->addAction( "configure_note", action );
connect( action, SIGNAL( triggered( bool ) ), SLOT( slotPreferences() ) );
#ifdef Q_WS_X11
m_toDesktop = new KSelectAction( i18n( "To Desktop" ), this );
actionCollection()->addAction( "to_desktop", m_toDesktop );
-@@ -689,7 +697,7 @@
+@@ -689,7 +705,7 @@
connect( m_toDesktop->menu(), SIGNAL( aboutToShow() ),
SLOT( slotUpdateDesktopActions() ) );
#endif
// invisible action to walk through the notes to make this configurable
action = new KAction( i18n( "Walk Through Notes" ), this );
actionCollection()->addAction( "walk_notes", action );
-@@ -705,18 +713,18 @@
+@@ -705,18 +721,18 @@
{
// load style configuration
KConfigGroup styleGroup( m_kwinConf, "Style" );
// create header label
m_label = new QLabel( this );
headerLayout->addWidget( m_label );
-@@ -730,9 +738,9 @@
+@@ -730,9 +746,9 @@
// connected at this stage yet
m_button = new KNoteButton( "knotes_close", this );
headerLayout->addWidget( m_button );
m_noteLayout->addItem( headerLayout );
}
-@@ -741,7 +749,7 @@
+@@ -741,9 +757,17 @@
m_editor = new KNoteEdit( actionCollection(), this );
m_noteLayout->addWidget( m_editor );
m_editor->installEventFilter( this ); // receive focus events for modified
+ setFocusProxy( m_editor );
}
++
++void KNote::slotRequestNewNote()
++{
++ //Be sure to save before to request a new note
++ saveData();
++ emit sigRequestNewNote();
++}
++
void KNote::createNoteFooter()
-@@ -751,22 +759,22 @@
+ {
+ if ( m_tool ) {
+@@ -751,22 +775,22 @@
m_tool->setFixedHeight( 24 );
m_tool->setToolButtonStyle( Qt::ToolButtonIconOnly );
}
// if there was just a way of making KComboBox adhere the toolbar height...
if ( m_tool ) {
foreach ( KComboBox *combo, m_tool->findChildren<KComboBox *>() ) {
-@@ -783,17 +791,17 @@
+@@ -783,17 +807,17 @@
// the config file location
QString configFile = KGlobal::dirs()->saveLocation( "appdata", "notes/" );
configFile += m_journal->uid();
if ( newNote ) {
// until kdelibs provides copying of KConfigSkeletons (KDE 3.4)
KNotesGlobalConfig *globalConfig = KNotesGlobalConfig::self();
-@@ -801,14 +809,14 @@
+@@ -801,14 +825,14 @@
m_config->setFgColor( globalConfig->fgColor() );
m_config->setWidth( globalConfig->width() );
m_config->setHeight( globalConfig->height() );
m_config->setDesktop( globalConfig->desktop() );
m_config->setHideNote( globalConfig->hideNote() );
m_config->setPosition( globalConfig->position() );
-@@ -816,26 +824,25 @@
+@@ -816,26 +840,25 @@
m_config->setRememberDesktop( globalConfig->rememberDesktop() );
m_config->setKeepAbove( globalConfig->keepAbove() );
m_config->setKeepBelow( globalConfig->keepBelow() );
// let KWin do the placement if the position is illegal--at least 10 pixels
// of a note need to be visible
const QPoint& position = m_config->position();
-@@ -844,7 +851,7 @@
+@@ -844,7 +867,7 @@
if ( desk.intersects( QRect( position, QSize( width, height ) ) ) ) {
move( position ); // do before calling show() to avoid flicker
}
// config items in the journal have priority
QString property = m_journal->customProperty( "KNotes", "FgColor" );
if ( !property.isNull() ) {
-@@ -853,7 +860,7 @@
+@@ -853,7 +876,7 @@
m_journal->setCustomProperty( "KNotes", "FgColor",
m_config->fgColor().name() );
}
property = m_journal->customProperty( "KNotes", "BgColor" );
if ( !property.isNull() ) {
m_config->setBgColor( QColor( property ) );
-@@ -868,26 +875,26 @@
+@@ -868,26 +891,26 @@
m_journal->setCustomProperty( "KNotes", "RichText",
m_config->richText() ? "true" : "false" );
}
// because KWin forgets about that for hidden windows
#ifdef Q_WS_X11
if ( desktop == NETWinInfo::OnAllDesktops ) {
-@@ -895,10 +902,10 @@
+@@ -895,10 +918,10 @@
}
#endif
}
if ( m_config->keepAbove() ) {
m_keepAbove->setChecked( true );
} else if ( m_config->keepBelow() ) {
-@@ -908,7 +915,7 @@
+@@ -908,7 +931,7 @@
m_keepBelow->setChecked( false );
}
slotUpdateKeepAboveBelow();
// HACK: update the icon color - again after showing the note, to make kicker
// aware of the new colors
KIconEffect effect;
-@@ -925,6 +932,7 @@
+@@ -925,6 +948,7 @@
#ifdef Q_WS_X11
KWindowSystem::setIcons( winId(), icon, miniIcon );
#endif
}
void KNote::toDesktop( int desktop )
-@@ -932,7 +940,7 @@
+@@ -932,7 +956,7 @@
if ( desktop == 0 ) {
return;
}
#ifdef Q_WS_X11
if ( desktop == NETWinInfo::OnAllDesktops ) {
KWindowSystem::setOnAllDesktops( winId(), true );
-@@ -945,45 +953,45 @@
+@@ -945,45 +969,45 @@
void KNote::setColor( const QColor &fg, const QColor &bg )
{
QPalette p = palette();
// update the icon color
KIconEffect effect;
QPixmap icon = effect.apply( qApp->windowIcon().pixmap(
-@@ -1018,11 +1026,11 @@
+@@ -1018,11 +1042,11 @@
{
if ( hasFocus() ) {
m_button->show();
setGeometry( x(), y(), width(), height() + m_tool->height() );
}
} else if ( m_tool && !m_tool->isHidden() ) {
-@@ -1033,7 +1041,7 @@
+@@ -1033,7 +1057,7 @@
} else {
m_button->hide();
m_grip->hide();
if ( m_tool && !m_tool->isHidden() ) {
m_tool->hide();
setGeometry( x(), y(), width(), height() - m_tool->height() );
-@@ -1092,7 +1100,7 @@
+@@ -1092,7 +1116,7 @@
if ( m_config->readOnly() ) {
return;
}
const QMimeData *md = e->mimeData();
if ( md->hasColor() ) {
QColor bg = qvariant_cast<QColor>( md->colorData() );
-@@ -1119,26 +1127,27 @@
+@@ -1119,26 +1143,27 @@
dragEnterEvent( static_cast<QDragEnterEvent *>( ev ) );
return true;
}
XUngrabPointer( QX11Info::display(), QX11Info::appTime() );
NETRootInfo wm_root( QX11Info::display(), NET::WMMoveResize );
wm_root.moveResizeRequest( winId(), e->globalX(), e->globalY(),
-@@ -1146,7 +1155,7 @@
+@@ -1146,7 +1171,7 @@
#endif
return true;
}
if ( ev->type() == QEvent::MouseButtonRelease ) {
#ifdef Q_WS_X11
NETRootInfo wm_root( QX11Info::display(), NET::WMMoveResize );
-@@ -1155,10 +1164,10 @@
+@@ -1155,10 +1180,10 @@
#endif
return false;
}
if ( o == m_editor ) {
if ( ev->type() == QEvent::FocusOut ) {
QFocusEvent *fe = static_cast<QFocusEvent *>( ev );
-@@ -1166,16 +1175,18 @@
+@@ -1166,16 +1191,18 @@
fe->reason() != Qt::MouseFocusReason ) {
updateFocus();
if ( isModified() ) {
Index: knotes/knoteslegacy.cpp
===================================================================
---- knotes/knoteslegacy.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ knotes/knoteslegacy.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- knotes/knoteslegacy.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ knotes/knoteslegacy.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -71,9 +71,9 @@
bool converted = false;
input.setCodec( "UTF-8" );
Index: knotes/knotesnetrecv.cpp
===================================================================
---- knotes/knotesnetrecv.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ knotes/knotesnetrecv.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- knotes/knotesnetrecv.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ knotes/knotesnetrecv.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -58,18 +58,18 @@
QString date =
KGlobal::locale()->formatDateTime( QDateTime::currentDateTime(),
#include "knotesnetrecv.moc"
Index: knotes/knoteedit.h
===================================================================
---- knotes/knoteedit.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ knotes/knoteedit.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- knotes/knoteedit.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ knotes/knoteedit.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -51,7 +51,6 @@
QString text() const;
void setTabStop( int tabs );
void setAutoIndentMode( bool newmode );
+@@ -80,7 +79,8 @@
+
+ void textIncreaseIndent();
+ void textDecreaseIndent();
+-
++ void setTextFontSize( int );
++
+ protected:
+ virtual void contextMenuEvent( QContextMenuEvent * );
+ virtual void dragEnterEvent( QDragEnterEvent * );
Index: knotes/knotesapp.cpp
===================================================================
---- knotes/knotesapp.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ knotes/knotesapp.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- knotes/knotesapp.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ knotes/knotesapp.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -69,25 +69,25 @@
{
setCaption( i18n( "Configure Shortcuts" ) );
}
}
-@@ -291,7 +297,7 @@
+@@ -291,9 +297,9 @@
foreach ( KNote *note, m_notes ) {
// workaround to BUG 149116
note->hide();
-
+
note->show();
- note->setFocus();
+- note->setFocus();
++ //note->setFocus();
}
+ }
+
@@ -336,11 +342,11 @@
QMap<QString, QString> KNotesApp::notes() const
{
if ( toChange ) {
toChange->setShortcuts( action->shortcuts() );
}
-@@ -542,7 +548,7 @@
- note->saveData();
+@@ -531,6 +537,7 @@
+
+ void KNotesApp::slotNoteKilled( KCal::Journal *journal )
+ {
++ m_noteUidModify.clear();
+ m_manager->deleteNote( journal );
+ saveNotes();
+ }
+@@ -539,10 +546,10 @@
+ {
+ foreach ( KNote *note, m_notes ) {
+ if ( note->isModified() ) {
+- note->saveData();
++ note->saveData(false);
}
}
-
saveConfigs();
kapp->quit();
}
-@@ -564,7 +570,7 @@
+@@ -562,9 +569,18 @@
+
+ void KNotesApp::createNote( KCal::Journal *journal )
{
++ if( journal->uid() == m_noteUidModify)
++ {
++ KNote *note = m_notes.value( m_noteUidModify );
++ if ( note )
++ note->changeJournal(journal);
++
++ return;
++ }
++ m_noteUidModify = journal->uid();
KNote *newNote = new KNote( m_noteGUI, journal, 0 );
m_notes.insert( newNote->noteId(), newNote );
-
connect( newNote, SIGNAL( sigRequestNewNote() ),
SLOT( newNote() ) );
connect( newNote, SIGNAL( sigShowNextNote() ),
-@@ -579,7 +585,7 @@
+@@ -573,13 +589,13 @@
+ SLOT( slotNoteKilled( KCal::Journal * ) ) );
+ connect( newNote, SIGNAL( sigNameChanged() ),
+ SLOT( updateNoteActions() ) );
+- connect( newNote, SIGNAL( sigDataChanged() ),
+- SLOT( saveNotes() ) );
++ connect( newNote, SIGNAL( sigDataChanged(const QString &) ),
++ SLOT( saveNotes(const QString &) ) );
+ connect( newNote, SIGNAL( sigColorChanged() ),
SLOT( updateNoteActions() ) );
connect( newNote, SIGNAL( sigFindFinished() ),
SLOT( slotFindNext() ) );
// don't call this during startup for each and every loaded note
if ( m_alarm ) {
updateNoteActions();
-@@ -601,7 +607,7 @@
+@@ -588,6 +604,10 @@
+
+ void KNotesApp::killNote( KCal::Journal *journal )
+ {
++ if(m_noteUidModify == journal->uid())
++ {
++ return;
++ }
+ // this kills the KNote object
+ KNote *note = m_notes.take( journal->uid() );
+ if ( note )
+@@ -597,11 +617,17 @@
+ }
+ }
+
++void KNotesApp::saveNotes( const QString & uid )
++{
++ m_noteUidModify = uid;
++ saveNotes();
++}
++
+ void KNotesApp::acceptConnection()
{
// Accept the connection and make KNotesNetworkReceiver do the job
QTcpSocket *s = m_listener->nextPendingConnection();
if ( s ) {
KNotesNetworkReceiver *recv = new KNotesNetworkReceiver( s );
connect( recv,
-@@ -644,18 +650,26 @@
+@@ -644,18 +670,26 @@
1,
note->palette().color( note->backgroundRole() ),
false );
plugActionList( "notes", m_noteActions );
}
-@@ -665,7 +679,7 @@
+@@ -665,7 +699,7 @@
m_listener=0;
delete m_publisher;
m_publisher=0;
if ( KNotesGlobalConfig::receiveNotes() ) {
// create the socket and start listening for connections
m_listener=KSocketFactory::listen( "knotes" , QHostAddress::Any,
-@@ -683,7 +697,7 @@
+@@ -683,7 +717,7 @@
#warning FIXME!
#endif
// KNote::setStyle( KNotesGlobalConfig::style() );
}
Index: knotes/knotesalarm.cpp
===================================================================
---- knotes/knotesalarm.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ knotes/knotesalarm.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- knotes/knotesalarm.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ knotes/knotesalarm.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -48,9 +48,9 @@
{
setObjectName( name );
if ( !notes.isEmpty() ) {
KMessageBox::informationList( 0,
i18n( "The following notes triggered "
+Index: knotes/resourcemanager.cpp
+===================================================================
+--- knotes/resourcemanager.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ knotes/resourcemanager.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -122,8 +122,8 @@
+ KRES::Manager<ResourceNotes>::ActiveIterator it;
+ for ( it = m_manager->activeBegin(); it != m_manager->activeEnd(); ++it ) {
+ KCal::Alarm::List list = ( *it )->alarms( from, to );
+- KCal::Alarm::List::Iterator it;
+- for ( it = list.begin(); it != list.end(); ++it ) {
++ KCal::Alarm::List::ConstIterator it;
++ for ( it = list.constBegin(); it != list.constEnd(); ++it ) {
+ result.append( *it );
+ }
+ }
Index: knotes/knotes_manager.desktop
===================================================================
---- knotes/knotes_manager.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ knotes/knotes_manager.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- knotes/knotes_manager.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ knotes/knotes_manager.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -32,6 +32,7 @@
Name[lv]=Piezīmes
Name[mk]=Белешки
Name[nl]=Notities
Index: knotes/knote.h
===================================================================
---- knotes/knote.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ knotes/knote.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
-@@ -53,7 +53,7 @@
+--- knotes/knote.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ knotes/knote.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -53,10 +53,10 @@
{
Q_OBJECT
public:
- KNote( QDomDocument buildDoc, KCal::Journal *journal, QWidget *parent = 0 );
+ KNote( const QDomDocument& buildDoc, KCal::Journal *journal, QWidget *parent = 0 );
~KNote();
+-
+- void saveData();
++ void changeJournal(KCal::Journal *);
++ void saveData(bool update = true);
+ void saveConfig() const;
- void saveData();
-@@ -69,10 +69,11 @@
+ QString noteId() const;
+@@ -69,15 +69,16 @@
void find( KFind* kfind );
bool isModified() const;
signals:
void sigRequestNewNote();
void sigShowNextNote();
+ void sigNameChanged();
+- void sigDataChanged();
++ void sigDataChanged(const QString &);
+ void sigColorChanged();
+ void sigKillNote( KCal::Journal * );
+
@@ -97,7 +98,6 @@
private slots:
void slotRename();
void slotSend();
void slotMail();
-@@ -160,6 +160,7 @@
+@@ -121,6 +121,7 @@
+ void slotKeepAbove();
+ void slotKeepBelow();
+
++ void slotRequestNewNote();
+ private:
+ void buildGui();
+ void createActions();
+@@ -160,6 +161,7 @@
KToggleAction *m_keepBelow;
KSharedConfig::Ptr m_kwinConf;
#endif
Index: knotes/knoteedit.cpp
===================================================================
---- knotes/knoteedit.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ knotes/knoteedit.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- knotes/knoteedit.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ knotes/knoteedit.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -178,7 +178,7 @@
pix.fill( Qt::black ); // just a dummy, gets updated before widget is shown
m_textColor = new KAction( i18n( "Text Color..." ), this );
connect( m_textColor, SIGNAL( triggered( bool ) ), SLOT( slotTextColor() ) );
m_textFont = new KFontAction( i18n( "Text Font" ), this );
-@@ -235,13 +235,6 @@
- setTextFormat( f );
+@@ -189,7 +189,7 @@
+ m_textSize = new KFontSizeAction( i18n( "Text Size" ), this );
+ actions->addAction( "format_size", m_textSize );
+ connect( m_textSize, SIGNAL( fontSizeChanged( int ) ),
+- this, SLOT( setFontWeight ( int ) ) );
++ this, SLOT( setTextFontSize( int ) ) );
+
+ // QTextEdit connections
+ connect( this, SIGNAL( currentCharFormatChanged( const QTextCharFormat & ) ),
+@@ -230,16 +230,13 @@
+
+ void KNoteEdit::setTextFont( const QFont &font )
+ {
+- QTextCharFormat f;
+- f.setFont( font );
+- setTextFormat( f );
++ setCurrentFont( font );
}
-void KNoteEdit::setTextColor( const QColor &color )
--{
++
++void KNoteEdit::setTextFontSize( int size )
+ {
- QTextCharFormat f;
- f.setForeground( QBrush( color ) );
- setTextFormat( f );
--}
--
++ setFontPointSize( size );
+ }
+
void KNoteEdit::setTabStop( int tabs )
- {
- QFontMetrics fm( font() );
-@@ -427,7 +420,9 @@
+@@ -427,7 +424,9 @@
}
insertPlainText( ( *it ).prettyUrl() );
}
}
void KNoteEdit::keyPressEvent( QKeyEvent *e )
-@@ -462,7 +457,7 @@
+@@ -462,7 +461,7 @@
{
// font changes
m_textFont->setFont( f.fontFamily() );
m_textBold->setChecked( f.font().bold() );
m_textItalic->setChecked( f.fontItalic() );
+Index: akonadi/tray/akonaditray.desktop
+===================================================================
+--- akonadi/tray/akonaditray.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ akonadi/tray/akonaditray.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -23,6 +23,7 @@
+ GenericName[fr]=Utilitaire miniature Akonadi
+ GenericName[ga]=Uirlis Tráidire Akonadi
+ GenericName[gl]=Utilidade de Bandexa de Akonadi
++GenericName[is]=Akonadi kerfisbakkatól
+ GenericName[it]=Utilità del vassoio di sistema di Akonadi
+ GenericName[ja]=Akonadi システムトレイユーティリティ
+ GenericName[km]=ឧបករណ៍ប្រើប្រាស់ថាសប្រព័ន្ធរបស់ Akonadi
+Index: akonadi/resources/vcard/vcardresource.desktop
+===================================================================
+--- akonadi/resources/vcard/vcardresource.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ akonadi/resources/vcard/vcardresource.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -10,6 +10,7 @@
+ Name[fr]=Fichier VCard
+ Name[ga]=Comhad v-Chárta
+ Name[gl]=Ficheiro de VCard
++Name[is]=VCard spjaldskrá
+ Name[it]=File vCard
+ Name[ja]=VCard ファイル
+ Name[km]=ឯកសារ VCard
+@@ -42,6 +43,7 @@
+ Comment[fr]=Charge des données depuis un fichier au format VCard
+ Comment[ga]=Breiseán a luchtaíonn sonraí ó chomhad v-Chárta
+ Comment[gl]=Carrega datos desde un ficheiro VCard
++Comment[is]=Hleður inn gögnum úr VCard spjaldskrá
+ Comment[it]=Caricare dati da un file vCard
+ Comment[ja]=VCard ファイルからデータを読み込みます
+ Comment[km]=ផ្ទុកទិន្នន័យពីឯកសារ VCard
Index: akonadi/resources/localbookmarks/localbookmarksresource.desktop
===================================================================
---- akonadi/resources/localbookmarks/localbookmarksresource.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ akonadi/resources/localbookmarks/localbookmarksresource.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- akonadi/resources/localbookmarks/localbookmarksresource.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ akonadi/resources/localbookmarks/localbookmarksresource.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -14,6 +14,7 @@
Name[km]=ចំណាំមូលដ្ឋាន
Name[ko]=로컬 책갈피
Name[nds]=Lokaalleestekens
Name[nl]=Lokale bladwijzers
Name[nn]=Lokalbokmerke
+Index: akonadi/resources/vcarddir/vcarddirresource.desktop
+===================================================================
+--- akonadi/resources/vcarddir/vcarddirresource.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ akonadi/resources/vcarddir/vcarddirresource.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -10,6 +10,7 @@
+ Name[fr]=Dossier VCard
+ Name[ga]=Comhadlann v-Chárta
+ Name[gl]=Directorio de VCard
++Name[is]=Mappa fyrir VCard spjaldskrár
+ Name[it]=Cartella vCard
+ Name[ja]=VCard ディレクトリ
+ Name[km]=ថត VCard
+@@ -43,6 +44,7 @@
+ Comment[fr]=Charge des données depuis un dossier contenant des fichiers VCard
+ Comment[ga]=Gníomhaire a luchtaíonn sonraí ó chomhadlann ina bhfuil v-Chártaí
+ Comment[gl]=Carregar datos desde un cartafol con VCards
++Comment[is]=Hleður inn gögnum úr möppu með VCard spjaldskrám
+ Comment[it]=Caricare dati da una cartella con file vCard
+ Comment[ja]=VCard のディレクトリからデータを読み込みます
+ Comment[km]=ផ្ទុកទីន្នន័យពីថតដែលមាន VCards
Index: MAINTAINERS
===================================================================
---- MAINTAINERS (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ MAINTAINERS (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- MAINTAINERS (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ MAINTAINERS (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -7,13 +7,11 @@
Lutz Rogowski <lutz@klaralvdalens-datakonsult.se>
kfile-plugins ?
kresources ?
Index: korganizer/koeditorgeneralevent.h
===================================================================
---- korganizer/koeditorgeneralevent.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koeditorgeneralevent.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koeditorgeneralevent.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koeditorgeneralevent.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -70,7 +70,7 @@
*/
void readEvent( Event *event, bool tmpl = false );
bool validateInput();
Index: korganizer/koattendeeeditor.cpp
===================================================================
---- korganizer/koattendeeeditor.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koattendeeeditor.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koattendeeeditor.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koattendeeeditor.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -304,7 +304,7 @@
}
}
// TODO: Don't take a string and split it up... Is there a better way?
Index: korganizer/history.cpp
===================================================================
---- korganizer/history.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/history.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/history.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/history.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -105,7 +105,7 @@
void History::addEntry( Entry *entry )
truncate();
Index: korganizer/koeditorgeneraltodo.cpp
===================================================================
---- korganizer/koeditorgeneraltodo.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koeditorgeneraltodo.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koeditorgeneraltodo.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koeditorgeneraltodo.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -304,6 +304,7 @@
mDueDateEdit->setDate( QDate::currentDate() );
mDueTimeEdit->setTime( QTime::currentTime() );
QString tmpStr;
Index: korganizer/koeditorgeneral.cpp
===================================================================
---- korganizer/koeditorgeneral.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koeditorgeneral.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koeditorgeneral.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koeditorgeneral.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -327,6 +327,8 @@
{
KPIM::CategorySelectDialog *categoryDialog =
void KOEditorGeneral::setSummary( const QString &text )
Index: korganizer/koeventeditor.cpp
===================================================================
---- korganizer/koeventeditor.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koeventeditor.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koeventeditor.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koeventeditor.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -66,6 +66,16 @@
}
}
}
Index: korganizer/koeditorfreebusy.cpp
===================================================================
---- korganizer/koeditorfreebusy.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koeditorfreebusy.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
-@@ -760,7 +760,7 @@
+--- korganizer/koeditorfreebusy.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koeditorfreebusy.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -424,8 +424,15 @@
+ clearAttendees();
+
+ KDateTime::Spec timeSpec = KOPrefs::instance()->timeSpec();
++ QDateTime endDateTime = incidence->dtEnd().toTimeSpec( timeSpec ).dateTime();
++
++ // in kcal, all day events have an inclusive dtEnd()
++ if ( incidence->allDay() ) {
++ endDateTime = endDateTime.addDays( 1 );
++ }
++
+ setDateTimes( incidence->dtStart().toTimeSpec( timeSpec ).dateTime(),
+- incidence->dtEnd().toTimeSpec( timeSpec ).dateTime() );
++ endDateTime );
+ mIsOrganizer = KOPrefs::instance()->thatIsMe( incidence->organizer().email() );
+ updateStatusSummary();
+ clearSelection();
+@@ -760,7 +767,7 @@
dialog.exec();
}
{
incidence->clearAttendees();
QVector<FreeBusyItem*> toBeDeleted;
-@@ -804,7 +804,7 @@
+@@ -804,7 +811,7 @@
}
}
qDeleteAll( toBeDeleted );
Index: korganizer/koattendeeeditor.h
===================================================================
---- korganizer/koattendeeeditor.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koattendeeeditor.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koattendeeeditor.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koattendeeeditor.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -56,7 +56,7 @@
virtual void insertAttendee( KCal::Attendee *attendee, bool fetchFB = true ) = 0;
void cancelAttendeeIncidence( KCal::Incidence *incidence );
Index: korganizer/dbuscalendar.desktop
===================================================================
---- korganizer/dbuscalendar.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/dbuscalendar.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/dbuscalendar.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/dbuscalendar.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -35,6 +35,7 @@
Comment[kk]=D-BUS интерфейсті Ұйымдастырғыш
Comment[km]=កម្មវិធីរៀបចំដែលមានចំណុចប្រទាក់ D-BUS
Comment[nds]=En Daagpleger mit en D-Bus-Koppelsteed
Index: korganizer/koeditorgeneral.h
===================================================================
---- korganizer/koeditorgeneral.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koeditorgeneral.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koeditorgeneral.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koeditorgeneral.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -88,7 +88,7 @@
void readIncidence( Incidence *incidence );
bool validateInput();
Index: korganizer/koeventeditor.h
===================================================================
---- korganizer/koeventeditor.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koeventeditor.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koeventeditor.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koeventeditor.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -95,7 +95,7 @@
/**
Write event settings to event object
Event *mEvent;
Index: korganizer/koeditorgeneralevent.cpp
===================================================================
---- korganizer/koeditorgeneralevent.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koeditorgeneralevent.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koeditorgeneralevent.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koeditorgeneralevent.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -432,9 +432,9 @@
readIncidence( event );
}
QTime tmpTime;
Index: korganizer/koeditorattachments.h
===================================================================
---- korganizer/koeditorattachments.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koeditorattachments.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koeditorattachments.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koeditorattachments.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -104,7 +104,7 @@
/** Read event object and setup widgets accordingly */
void readIncidence( KCal::Incidence * );
Index: korganizer/korgac/alarmdialog.cpp
===================================================================
---- korganizer/korgac/alarmdialog.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/korgac/alarmdialog.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/korgac/alarmdialog.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/korgac/alarmdialog.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -413,8 +413,17 @@
// FIXME: Check whether this should be done for all multiple alarms
if ( alarm->type() == Alarm::Procedure ) {
Phonon::MediaObject *player =
Index: korganizer/interfaces/calendar/calendarplugin.desktop
===================================================================
---- korganizer/interfaces/calendar/calendarplugin.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/interfaces/calendar/calendarplugin.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/interfaces/calendar/calendarplugin.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/interfaces/calendar/calendarplugin.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -14,8 +14,9 @@
Name[ja]=カレンダープラグインインターフェース
Name[km]=ប្រតិទិនកម្មវិធីជំនួយប្រតិទិន
Comment[nl]=Agendaplugin
Index: korganizer/interfaces/calendar/calendardecoration.desktop
===================================================================
---- korganizer/interfaces/calendar/calendardecoration.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/interfaces/calendar/calendardecoration.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/interfaces/calendar/calendardecoration.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/interfaces/calendar/calendardecoration.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -14,8 +14,9 @@
Name[ja]=カレンダー装飾インターフェース
Name[km]=ចំណុចប្រទាក់តុបតែងប្រតិទិន
Comment[nl]=Agendadecoratieplugin
Index: korganizer/kotodoeditor.cpp
===================================================================
---- korganizer/kotodoeditor.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/kotodoeditor.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/kotodoeditor.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/kotodoeditor.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -62,6 +62,16 @@
emit dialogClose( mTodo );
}
Index: korganizer/koeditorgeneraljournal.cpp
===================================================================
---- korganizer/koeditorgeneraljournal.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koeditorgeneraljournal.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koeditorgeneraljournal.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koeditorgeneraljournal.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -176,7 +176,7 @@
setCategories( journal->categories() );
}
if ( mRichDescription->isChecked() ) {
Index: korganizer/koeditordetails.cpp
===================================================================
---- korganizer/koeditordetails.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koeditordetails.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koeditordetails.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koeditordetails.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -281,7 +281,7 @@
emit updateAttendeeSummary( mListView->childCount() );
}
qDeleteAll( toBeDeleted );
Index: korganizer/koeditorfreebusy.h
===================================================================
---- korganizer/koeditorfreebusy.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koeditorfreebusy.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koeditorfreebusy.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koeditorfreebusy.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -60,7 +60,7 @@
void clearAttendees();
void cancelReload();
Index: korganizer/kodaymatrix.cpp
===================================================================
---- korganizer/kodaymatrix.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/kodaymatrix.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/kodaymatrix.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/kodaymatrix.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -289,8 +289,10 @@
!( recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur ) ) {
}
Index: korganizer/koeditorrecurrence.cpp
===================================================================
---- korganizer/koeditorrecurrence.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koeditorrecurrence.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koeditorrecurrence.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koeditorrecurrence.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -1407,7 +1407,7 @@
mExceptions->setDates( incidence->recurrence()->exDates() );
}
if ( incidence->recurs() ) {
Index: korganizer/kotodoeditor.h
===================================================================
---- korganizer/kotodoeditor.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/kotodoeditor.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/kotodoeditor.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/kotodoeditor.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -82,7 +82,7 @@
void readTodo( Todo *todo, bool tmpl = false );
Todo *mTodo;
Index: korganizer/filtereditdialog.cpp
===================================================================
---- korganizer/filtereditdialog.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/filtereditdialog.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/filtereditdialog.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/filtereditdialog.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -292,6 +292,8 @@
if ( !mCategorySelectDialog ) {
connect( mCategorySelectDialog, SIGNAL(editCategories()),
Index: korganizer/views/monthview/monthgraphicsitems.cpp
===================================================================
---- korganizer/views/monthview/monthgraphicsitems.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/views/monthview/monthgraphicsitems.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/views/monthview/monthgraphicsitems.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/views/monthview/monthgraphicsitems.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -164,7 +164,10 @@
QPainterPath MonthGraphicsItem::shape() const
// TODO: remove this method.
Index: korganizer/views/todoview/kotodomodel.cpp
===================================================================
---- korganizer/views/todoview/kotodomodel.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/views/todoview/kotodomodel.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/views/todoview/kotodomodel.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/views/todoview/kotodomodel.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -800,8 +800,10 @@
if ( role == Qt::EditRole ) {
switch ( index.column() ) {
todo->setPriority( value.toInt() );
Index: korganizer/views/todoview/kotodoview.cpp
===================================================================
---- korganizer/views/todoview/kotodoview.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/views/todoview/kotodoview.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/views/todoview/kotodoview.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/views/todoview/kotodoview.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -233,6 +233,8 @@
}
connect( mPercentageCompletedPopupMenu, SIGNAL(triggered(QAction *)),
KOTodoView::~KOTodoView()
Index: korganizer/views/whatsnextview/kowhatsnextview.cpp
===================================================================
---- korganizer/views/whatsnextview/kowhatsnextview.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/views/whatsnextview/kowhatsnextview.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/views/whatsnextview/kowhatsnextview.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/views/whatsnextview/kowhatsnextview.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -104,10 +104,10 @@
Event::List events;
kil.loadIcon( "view-calendar-day", KIconLoader::NoGroup, 22,
Index: korganizer/views/timespentview/kotimespentview.cpp
===================================================================
---- korganizer/views/timespentview/kotimespentview.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/views/timespentview/kotimespentview.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/views/timespentview/kotimespentview.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/views/timespentview/kotimespentview.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -79,16 +79,62 @@
QMap<QString, int> secondsSpent;
Index: korganizer/views/agendaview/koagendaview.cpp
===================================================================
---- korganizer/views/agendaview/koagendaview.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/views/agendaview/koagendaview.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/views/agendaview/koagendaview.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/views/agendaview/koagendaview.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -1244,8 +1244,15 @@
}
if ( todo ) {
Index: korganizer/views/agendaview/koagendaitem.cpp
===================================================================
---- korganizer/views/agendaview/koagendaitem.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/views/agendaview/koagendaitem.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/views/agendaview/koagendaitem.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/views/agendaview/koagendaitem.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -879,16 +879,7 @@
QColor textColor = getTextColor( bgColor );
p.setPen( textColor );
int singleLineHeight = fm.boundingRect( mLabelText ).height();
Index: korganizer/kojournaleditor.h
===================================================================
---- korganizer/kojournaleditor.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/kojournaleditor.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/kojournaleditor.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/kojournaleditor.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -97,7 +97,7 @@
void readJournal( Journal *journal, bool tmpl = false );
private:
Journal *mJournal;
+Index: korganizer/timelabels.cpp
+===================================================================
+--- korganizer/timelabels.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/timelabels.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
+@@ -203,6 +203,14 @@
+ //testline
+ //p->drawLine(0,0,0,contentsHeight());
+ while ( y < cy + ch + mCellHeight ) {
++ QPen pen;
++ if ( cell < 0 || cell >= 24 ) {
++ pen.setColor( QColor( 150, 150, 150 ) );
++ } else {
++ pen.setColor( palette().color( QPalette::WindowText ) );
++ }
++ p->setPen( pen );
++
+ // hour, full line
+ p->drawLine( cx, int( y ), cw + 2, int( y ) );
+
+@@ -224,14 +232,6 @@
+ }
+ }
+
+- QPen pen;
+- if ( cell < 0 || cell >= 24 ) {
+- pen.setColor( QColor( 150, 150, 150 ) );
+- } else {
+- pen.setColor( QPalette::Text );
+- }
+- p->setPen( pen );
+-
+ // center and draw the time label
+ int timeWidth = fm.width( hour );
+ int offset = startW - timeWidth - tw2 -1 ;
Index: korganizer/koeditordetails.h
===================================================================
---- korganizer/koeditordetails.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koeditordetails.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koeditordetails.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koeditordetails.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -95,7 +95,7 @@
void readIncidence( Incidence * );
bool validateInput();
Index: korganizer/koeditorrecurrence.h
===================================================================
---- korganizer/koeditorrecurrence.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koeditorrecurrence.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koeditorrecurrence.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koeditorrecurrence.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -314,7 +314,7 @@
void readIncidence( Incidence * );
bool validateInput();
Index: korganizer/calendarview.cpp
===================================================================
---- korganizer/calendarview.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/calendarview.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/calendarview.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/calendarview.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -145,8 +145,6 @@
mDateNavigator->setObjectName( "CalendarView::DateNavigator" );
switch( km ) {
Index: korganizer/koeditorgeneraltodo.h
===================================================================
---- korganizer/koeditorgeneraltodo.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koeditorgeneraltodo.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koeditorgeneraltodo.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koeditorgeneraltodo.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -65,7 +65,7 @@
void readTodo( Todo *todo, bool tmpl = false );
bool validateInput();
Index: korganizer/kojournaleditor.cpp
===================================================================
---- korganizer/kojournaleditor.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/kojournaleditor.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/kojournaleditor.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/kojournaleditor.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -136,7 +136,7 @@
if ( mJournal ) {
Index: korganizer/koeditorattachments.cpp
===================================================================
---- korganizer/koeditorattachments.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koeditorattachments.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koeditorattachments.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koeditorattachments.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -775,7 +775,7 @@
}
}
Index: korganizer/koincidenceeditor.cpp
===================================================================
---- korganizer/koincidenceeditor.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koincidenceeditor.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koincidenceeditor.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koincidenceeditor.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -86,8 +86,13 @@
{
}
KPageDialog::slotButtonClicked( button );
Index: korganizer/resourceview.cpp
===================================================================
---- korganizer/resourceview.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/resourceview.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/resourceview.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/resourceview.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -308,6 +308,8 @@
connect( mDeleteButton, SIGNAL( clicked() ), SLOT( removeResource() ) );
connect( mEditButton, SIGNAL( clicked() ), SLOT( editResource() ) );
Index: korganizer/koeventpopupmenu.cpp
===================================================================
---- korganizer/koeventpopupmenu.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koeventpopupmenu.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koeventpopupmenu.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koeventpopupmenu.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -103,6 +103,7 @@
}
for ( it = mRecurrenceItems.begin(); it != mRecurrenceItems.end(); ++it ) {
} else {
Index: korganizer/koeventviewer.cpp
===================================================================
---- korganizer/koeventviewer.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koeventviewer.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koeventviewer.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koeventviewer.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -46,6 +46,7 @@
{
mIncidence = 0;
KOEventViewer::~KOEventViewer()
Index: korganizer/kcmconfigs/korganizer_configtime.desktop
===================================================================
---- korganizer/kcmconfigs/korganizer_configtime.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/kcmconfigs/korganizer_configtime.desktop (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/kcmconfigs/korganizer_configtime.desktop (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/kcmconfigs/korganizer_configtime.desktop (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -29,6 +29,7 @@
Name[ja]=日付と時間
Name[km]=កាលបរិច្ឆេទ និងពេលវេលា
Name[nds]=Tiet un Datum
Index: korganizer/incidencechanger.cpp
===================================================================
---- korganizer/incidencechanger.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/incidencechanger.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/incidencechanger.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/incidencechanger.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -314,21 +314,22 @@
// for group cheduling. Each implementation could then just do what
// it wants with the event. If no groupware is used,use the null
}
Index: korganizer/koeditorgeneraljournal.h
===================================================================
---- korganizer/koeditorgeneraljournal.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koeditorgeneraljournal.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koeditorgeneraljournal.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koeditorgeneraljournal.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -69,7 +69,7 @@
/** Read journal object and setup widgets accordingly */
void readJournal( Journal *, bool tmpl = false );
bool validateInput();
Index: korganizer/koeditoralarms.cpp
===================================================================
---- korganizer/koeditoralarms.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koeditoralarms.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koeditoralarms.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koeditoralarms.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -199,6 +199,7 @@
connect( this, SIGNAL(okClicked()), SLOT(slotOk()) );
connect( this, SIGNAL(applyClicked()), SLOT(slotApply()) );
}
Index: korganizer/koincidenceeditor.h
===================================================================
---- korganizer/koincidenceeditor.h (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koincidenceeditor.h (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koincidenceeditor.h (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koincidenceeditor.h (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -133,6 +133,11 @@
void readDesignerFields( Incidence *i );
void writeDesignerFields( Incidence *i );
Index: korganizer/koprefsdialog.cpp
===================================================================
---- korganizer/koprefsdialog.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 940158)
-+++ korganizer/koprefsdialog.cpp (.../branches/KDE/4.2/kdepim) (wersja 940158)
+--- korganizer/koprefsdialog.cpp (.../tags/KDE/4.2.1/kdepim) (wersja 942069)
++++ korganizer/koprefsdialog.cpp (.../branches/KDE/4.2/kdepim) (wersja 942069)
@@ -220,8 +220,14 @@
QGridLayout *regionalLayout = new QGridLayout( regionalPage );
regionalLayout->setSpacing( KDialog::spacingHint() );
projects / packages / kde4-kdepim.git / commitdiff