From 1de49a4cd92477a304e847e05b8dec498f8fe0dd Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Sat, 15 Dec 2007 16:14:30 +0000 Subject: [PATCH] Drag and drop of lessons should work now. svn path=/branches/work/kdeedu_parley/libkdeedu/; revision=748816 --- keduvocdocument/keduvoccontainer.cpp | 14 +------------- keduvocdocument/keduvoccontainer.h | 1 - keduvocdocument/keduvocwordtype.cpp | 15 ++++++++++++++- keduvocdocument/keduvocwordtype.h | 2 ++ 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/keduvocdocument/keduvoccontainer.cpp b/keduvocdocument/keduvoccontainer.cpp index ba877f4..8e5d1c1 100644 --- a/keduvocdocument/keduvoccontainer.cpp +++ b/keduvocdocument/keduvoccontainer.cpp @@ -203,23 +203,11 @@ void KEduVocContainer::setImageUrl(const KUrl &url) d->m_imageUrl = url; } -KEduVocContainer * KEduVocContainer::childOfType(KEduVocContainer::EnumContainerType type) -{ - if(containerType()==type) { - return this; - } - foreach(KEduVocContainer* child, childContainers()) { - KEduVocContainer* result = child->childOfType(type); - if(result) { - return result; - } - } - return 0; -} void KEduVocContainer::insertChildContainer(int row, KEduVocContainer * child) { d->m_childContainers.insert(row, child); + child->d->m_parentContainer = this; } diff --git a/keduvocdocument/keduvoccontainer.h b/keduvocdocument/keduvoccontainer.h index 0de1ec0..28d04da 100644 --- a/keduvocdocument/keduvoccontainer.h +++ b/keduvocdocument/keduvoccontainer.h @@ -111,7 +111,6 @@ public: */ void setContainerType(KEduVocContainer::EnumContainerType type); - KEduVocContainer* childOfType(KEduVocContainer::EnumContainerType type); /** get the image url for this container if it exists */ KUrl imageUrl(); diff --git a/keduvocdocument/keduvocwordtype.cpp b/keduvocdocument/keduvocwordtype.cpp index 1c48278..74c50f6 100644 --- a/keduvocdocument/keduvocwordtype.cpp +++ b/keduvocdocument/keduvocwordtype.cpp @@ -101,4 +101,17 @@ KEduVocWordType::EnumWordType KEduVocWordType::wordType() const return d->m_wordType; } - +///@todo provide a function to find a certain word type container... used for "make this a noun" buttons +// KEduVocContainer * KEduVocContainer::childOfType(KEduVocContainer::EnumContainerType type) +// { +// if(containerType()==type) { +// return this; +// } +// foreach(KEduVocContainer* child, childContainers()) { +// KEduVocContainer* result = child->childOfType(type); +// if(result) { +// return result; +// } +// } +// return 0; +// } diff --git a/keduvocdocument/keduvocwordtype.h b/keduvocdocument/keduvocwordtype.h index 7c9d4e3..a8c9b6b 100644 --- a/keduvocdocument/keduvocwordtype.h +++ b/keduvocdocument/keduvocwordtype.h @@ -60,6 +60,8 @@ public: KEduVocWordType::EnumWordType wordType() const; +// KEduVocContainer* childOfType(KEduVocContainer::EnumContainerType type); + KEduVocTranslation * translation(int row); /** get a list of all entries in the lesson */ -- 2.47.3