By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] patch proposal to extend the knotes interface and fix for the LAST-MODIFIED field in knotes and kontact notes part

tdepim_kontact+knotes.patch (text/plain), 13.88 KB, created by deloptes on 2016-09-20 08:47:51 CDT

(hide)

Description: patch proposal to extend the knotes interface and fix for the LAST-MODIFIED field in knotes and kontact notes part

Filename:

MIME Type:

Creator: deloptes

Created: 2016-09-20 08:47:51 CDT

Size: 13.88 KB

patch

obsolete

>diff --git a/../tmp/tdepim/knotes/KNotesAppIface.h b/knotes/KNotesAppIface.h >index ad24a58..4d42ac7 100644 >--- a/../tmp/tdepim/knotes/KNotesAppIface.h >+++ b/knotes/KNotesAppIface.h >@@ -33,6 +33,7 @@ > #define __KNotesAppIface_h__ > > #include <tqstring.h> >+#include <tqdatetime.h> > #include <tqmap.h> > > #include <dcopobject.h> >@@ -82,6 +83,12 @@ k_dcop: > virtual TQMap<TQString,TQString> notes() const = 0; > > /** >+ * Get the last modified time of a note >+ * @return the last modified as a TQDateTime >+ */ >+ virtual TQDateTime getLastModified( const TQString& noteId ) const = 0; >+ >+ /** > * Changes the title/name of a note. > * @param noteId the id of the note to be modified > * @param newName the new title >diff --git a/../tmp/tdepim/knotes/KNotesIface.h b/knotes/KNotesIface.h >index 1fba186..5481a47 100644 >--- a/../tmp/tdepim/knotes/KNotesIface.h >+++ b/knotes/KNotesIface.h >@@ -23,6 +23,7 @@ > #define __KNotesIface_h__ > > #include <tqstring.h> >+#include <tqdatetime.h> > #include <tqmap.h> > > #include <dcopobject.h> >@@ -98,6 +99,13 @@ k_dcop: > * @return the body as a TQString > */ > virtual TQString text( const TQString& noteId ) const = 0; >+ >+ /** >+ * Get the last modified time of a note >+ * @return the last modified as a TQDateTime >+ */ >+ virtual TQDateTime getLastModified( const TQString& noteId ) const = 0; >+ > }; > > #endif >diff --git a/../tmp/tdepim/knotes/knote.cpp b/knotes/knote.cpp >index 4f70848..2273feb 100644 >--- a/../tmp/tdepim/knotes/knote.cpp >+++ b/knotes/knote.cpp >@@ -153,6 +153,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * > m_label->setLineWidth( 0 ); > m_label->installEventFilter( this ); // receive events (for dragging & action menu) > setName( m_journal->summary() ); // don't worry, no signals are connected at this stage yet >+ m_lastmodified = m_journal->lastModified(); > > m_button = new KNoteButton( "knotes_close", this ); > connect( m_button, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotClose()) ); >@@ -383,6 +384,7 @@ void KNote::changeJournal(KCal::Journal *journal) > m_journal = journal; > m_editor->setText( m_journal->description() ); > m_label->setText( m_journal->summary() ); >+ m_lastmodified = m_journal->lastModified(); > updateLabelAlignment(); > } > >@@ -425,12 +427,20 @@ void KNote::saveData(bool update) > { > m_journal->setSummary( m_label->text() ); > m_journal->setDescription( m_editor->text() ); >+ >+ m_lastmodified = TQDateTime::currentDateTime(); >+// this will be set when saving the journal >+// m_journal->setLastModified(m_lastmodified); >+ > m_journal->setCustomProperty( "KNotes", "FgColor", m_config->fgColor().name() ); > m_journal->setCustomProperty( "KNotes", "BgColor", m_config->bgColor().name() ); > m_journal->setCustomProperty( "KNotes", "RichText", m_config->richText() ? "true" : "false" ); >+ >+// kdDebug(5500) << "KNote::saveData(lastModified) : " << m_journal->lastModified() << endl; >+ > if(update) { >- emit sigDataChanged( noteId() ); >- m_editor->setModified( false ); >+ emit sigDataChanged( noteId() ); >+ m_editor->setModified( false ); > } > } > >@@ -453,6 +463,16 @@ TQString KNote::noteId() const > return m_journal->uid(); > } > >+TQDateTime KNote::getLastModified() const >+{ >+ return m_lastmodified; >+} >+ >+void KNote::setJournalLastModified(const TQDateTime &dt) >+{ >+ m_journal->setLastModified(dt); >+} >+ > TQString KNote::name() const > { > return m_label->text(); >@@ -1363,6 +1383,7 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev ) > fe->reason() != TQFocusEvent::Mouse ) { > updateFocus(); > if ( isModified() ) { >+// kdDebug(5500) << "KNote::eventFilter() modified true" << endl; > saveConfig(); > if ( !m_blockEmitDataChanged ) > saveData(); >diff --git a/../tmp/tdepim/knotes/knote.h b/knotes/knote.h >index 43444b9..65d0ea7 100644 >--- a/../tmp/tdepim/knotes/knote.h >+++ b/knotes/knote.h >@@ -63,6 +63,17 @@ public: > > TQString noteId() const; > >+ /** >+ * Get the last modification date of a note >+ * @return the last modification date as a TQDateTime >+ */ >+ TQDateTime getLastModified() const; >+ >+ /** >+ * Set the last modified field in the journal >+ */ >+ void setJournalLastModified( const TQDateTime& dt ); >+ > TQString name() const; > TQString text() const; > TQString plainText() const; >@@ -164,6 +175,7 @@ private: > > KNoteConfig *m_config; > KCal::Journal *m_journal; >+ TQDateTime m_lastmodified; > > KFind *m_find; > >diff --git a/../tmp/tdepim/knotes/knotesapp.cpp b/knotes/knotesapp.cpp >index 5cc2635..7a2d0f6 100644 >--- a/../tmp/tdepim/knotes/knotesapp.cpp >+++ b/knotes/knotesapp.cpp >@@ -342,6 +342,17 @@ TQMap<TQString,TQString> KNotesApp::notes() const > return notes; > } > >+TQDateTime KNotesApp::getLastModified( const TQString& id ) const >+{ >+ KNote* note = m_noteList[id]; >+ TQDateTime d; >+ if ( note ) >+ d = note->getLastModified(); >+ if (!d.isValid()) >+ d.setTime_t(0); >+ return d; >+} >+ > TQString KNotesApp::name( const TQString& id ) const > { > KNote* note = m_noteList[id]; >@@ -644,7 +655,7 @@ void KNotesApp::createNote( KCal::Journal *journal ) > > return; > } >- m_noteUidModify = journal->uid(); >+ m_noteUidModify = journal->uid(); > KNote *newNote = new KNote( m_noteGUI, journal, 0, journal->uid().utf8() ); > m_noteList.insert( newNote->noteId(), newNote ); > >@@ -698,6 +709,12 @@ void KNotesApp::saveNotes( const TQString & uid ) > void KNotesApp::saveNotes() > { > KNotesGlobalConfig::writeConfig(); >+// set the LAST-MODIFIED field before saving >+// if the note was changed, it was updated >+// else set the old value >+ TQDictIterator<KNote> it( m_noteList ); >+ for ( ; *it; ++it ) >+ (*it)->setJournalLastModified((*it)->getLastModified()); > m_manager->save(); > } > >diff --git a/../tmp/tdepim/knotes/knotesapp.h b/knotes/knotesapp.h >index 0888e20..7fcfc4c 100644 >--- a/../tmp/tdepim/knotes/knotesapp.h >+++ b/knotes/knotesapp.h >@@ -81,6 +81,12 @@ public: > > TQMap<TQString,TQString> notes() const; > >+ /** >+ * Get the last modified time of a note >+ * @return the last modified as a TQDateTime >+ */ >+ TQDateTime getLastModified( const TQString& noteId ) const; >+ > int width( const TQString& noteId ) const; > int height( const TQString& noteId ) const; > >@@ -150,6 +156,7 @@ private: > KNetwork::TDEServerSocket *m_listener; > > TQDict<KNote> m_noteList; >+ > KNoteActionList m_noteActions; > > KFind *m_find; >diff --git a/../tmp/tdepim/knotes/resourcemanager.cpp b/knotes/resourcemanager.cpp >index 4ede5b8..1169aee 100644 >--- a/../tmp/tdepim/knotes/resourcemanager.cpp >+++ b/knotes/resourcemanager.cpp >@@ -103,9 +103,13 @@ bool KNotesResourceManager::addNewNote( KCal::Journal *journal ) > void KNotesResourceManager::registerNote( ResourceNotes *resource, > KCal::Journal *journal ) > { >+ // preserve the lastmodified field >+ TQDateTime dt = journal->lastModified(); > // TODO: only emit the signal if the journal is new? > m_resourceMap.insert( journal->uid(), resource ); > emit sigRegisteredNote( journal ); >+ journal->setLastModified(dt); >+// kdDebug(5500) << "KNotesResourceManager::registerNote " << journal->uid() << " " << journal->lastModified() << endl; > } > > void KNotesResourceManager::deleteNote( KCal::Journal *journal ) >diff --git a/../tmp/tdepim/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp >index 02a4028..e336e45 100644 >--- a/../tmp/tdepim/kontact/plugins/knotes/knotes_part.cpp >+++ b/kontact/plugins/knotes/knotes_part.cpp >@@ -96,8 +96,15 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name ) > connect( mManager, TQT_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ), > this, TQT_SLOT( killNote( KCal::Journal* ) ) ); > >+ > // read the notes > mManager->load(); >+ >+ TQDictIterator<KNotesIconViewItem> it( mNoteList ); >+ for ( ; it; ++it ) >+ mNotesRevisionList.insert( >+ static_cast<KNotesIconViewItem *>( it )->journal()->uid(), >+ static_cast<KNotesIconViewItem *>( it )->journal()->lastModified()); > } > > KNotesPart::~KNotesPart() >@@ -190,7 +197,9 @@ TQString KNotesPart::newNote( const TQString& name, const TQString& text ) > } > > mManager->addNewNote( journal ); >- mManager->save(); >+ mNotesRevisionList.insert(journal->uid(), TQDateTime::currentDateTime()); >+// mManager->save(); >+ saveAll(); > > KNotesIconViewItem *note = mNoteList[ journal->uid() ]; > mNotesView->ensureItemVisible( note ); >@@ -222,11 +231,24 @@ void KNotesPart::killNote( const TQString& id, bool force ) > || force ) > ) > { >+ mNotesRevisionList.remove(id); > mManager->deleteNote( mNoteList[id]->journal() ); >- mManager->save(); >+// mManager->save(); >+ saveAll(); > } > } > >+void KNotesPart::saveAll() >+{ >+ >+ TQDictIterator<KNotesIconViewItem> it( mNoteList ); >+ for ( ; *it; ++it ) >+ (*it)->journal()->setLastModified(mNotesRevisionList[(*it)->journal()->uid()]) ; >+// kdDebug(5500) << "KNotesPart::saveAll() : " << (*it)->journal()->lastModified().toString() << endl; >+ >+ mManager->save(); >+} >+ > TQString KNotesPart::name( const TQString& id ) const > { > KNotesIconViewItem *note = mNoteList[ id ]; >@@ -250,7 +272,9 @@ void KNotesPart::setName( const TQString& id, const TQString& newName ) > KNotesIconViewItem *note = mNoteList[ id ]; > if ( note ) { > note->setText( newName ); >- mManager->save(); >+ mNotesRevisionList.replace(id, TQDateTime::currentDateTime()); >+// mManager->save(); >+ saveAll(); > } > } > >@@ -259,7 +283,9 @@ void KNotesPart::setText( const TQString& id, const TQString& newText ) > KNotesIconViewItem *note = mNoteList[ id ]; > if ( note ) { > note->journal()->setDescription( newText ); >- mManager->save(); >+ mNotesRevisionList.replace(id, TQDateTime::currentDateTime()); >+// mManager->save(); >+ saveAll(); > } > } > >@@ -274,6 +300,18 @@ TQMap<TQString, TQString> KNotesPart::notes() const > return notes; > } > >+TQDateTime KNotesPart::getLastModified( const TQString& noteId ) const >+{ >+ >+// KNotesIconViewItem *note = mNoteList[noteId]; >+// TQDateTime d = mNotesRevisionList[noteId].value(); >+// if ( note ) >+// d = note->journal()->lastModified(); >+// if (!d.isValid()) >+// d.setTime_t(0); >+ return mNotesRevisionList[noteId]; >+ >+} > > // private stuff > >@@ -304,10 +342,11 @@ void KNotesPart::killSelectedNotes() > TQPtrListIterator<KNotesIconViewItem> kniviIt( items ); > while ( (knivi = *kniviIt) ) { > ++kniviIt; >+ mNotesRevisionList.remove(knivi->journal()->uid()); > mManager->deleteNote( knivi->journal() ); > } >- >- mManager->save(); >+// mManager->save(); >+ saveAll(); > } > } > >@@ -358,11 +397,13 @@ void KNotesPart::createNote( KCal::Journal *journal ) > if ( property.isNull() ) > journal->setCustomProperty( "KNotes", "RichText", "true" ); > >+ mNotesRevisionList.insert( journal->uid(), TQDateTime::currentDateTime()); > mNoteList.insert( journal->uid(), new KNotesIconViewItem( mNotesView, journal ) ); > } > > void KNotesPart::killNote( KCal::Journal *journal ) > { >+ mNotesRevisionList.remove( journal->uid()); > mNoteList.remove( journal->uid() ); > } > >@@ -380,7 +421,9 @@ void KNotesPart::editNote( TQIconViewItem *item ) > if ( mNoteEditDlg->exec() == TQDialog::Accepted ) { > item->setText( mNoteEditDlg->title() ); > journal->setDescription( mNoteEditDlg->text() ); >- mManager->save(); >+ mNotesRevisionList.replace(journal->uid(),TQDateTime::currentDateTime()); >+// mManager->save(); >+ saveAll(); > } > } > >@@ -392,8 +435,13 @@ void KNotesPart::renameNote() > > void KNotesPart::renamedNote( TQIconViewItem* ) > { >- if ( mOldName != mNotesView->currentItem()->text() ) >- mManager->save(); >+ if ( mOldName != mNotesView->currentItem()->text() ) { >+ mNotesRevisionList.replace( >+ static_cast<KNotesIconViewItem *>( mNotesView->currentItem() )->journal()->uid(), >+ TQDateTime::currentDateTime()); >+// mManager->save(); >+ saveAll(); >+ } > } > > void KNotesPart::slotOnCurrentChanged( TQIconViewItem* ) >diff --git a/../tmp/tdepim/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h >index 023a78b..0b7a091 100644 >--- a/../tmp/tdepim/kontact/plugins/knotes/knotes_part.h >+++ b/kontact/plugins/knotes/knotes_part.h >@@ -72,6 +72,9 @@ class KNotesPart : public KParts::ReadOnlyPart, virtual public KNotesIface > > TQMap<TQString, TQString> notes() const; > >+ TQDateTime getLastModified( const TQString& id ) const; >+ void saveAll(); >+ > private slots: > void createNote( KCal::Journal *journal ); > void killNote( KCal::Journal *journal ); >@@ -97,7 +100,8 @@ class KNotesPart : public KParts::ReadOnlyPart, virtual public KNotesIface > > KNotesResourceManager *mManager; > TQDict<KNotesIconViewItem> mNoteList; >- TQString mOldName; >+ TQMap<TQString, TQDateTime> mNotesRevisionList;; >+ TQString mOldName; > }; > > #endif >diff --git a/../tmp/tdepim/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp >index fceeb65..b1cb914 100644 >--- a/../tmp/tdepim/kontact/plugins/knotes/knotes_plugin.cpp >+++ b/kontact/plugins/knotes/knotes_plugin.cpp >@@ -70,9 +70,10 @@ const TDEAboutData *KNotesPlugin::aboutData() > mAboutData = new TDEAboutData( "knotes", I18N_NOOP( "Notes Management" ), > "0.5", I18N_NOOP( "Notes Management" ), > TDEAboutData::License_GPL_V2, >- "(c) 2003-2004 The Kontact developers" ); >- mAboutData->addAuthor( "Michael Brade", "Current Maintainer", "brade@kde.org" ); >+ "(c) 2003-2016 The Kontact developers" ); >+ mAboutData->addAuthor( "Michael Brade", "", "brade@kde.org" ); > mAboutData->addAuthor( "Tobias Koenig", "", "tokoe@kde.org" ); >+ mAboutData->addAuthor( "Emanoil Kotsev", "Bug fixing", "deloptes@yahoo.com" ); > } > > return mAboutData; View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]