Rename wordTypeLesson -> wordTypeContainer in KEduVocDocument.

Add a parameter to the LessonModel constructor to determine its type.
Call WordTypeDockWidget::setDocument from ParleyApp::updateDocument() to display the word types.
CCMAIL:pete@pmurdoch.com

svn path=/branches/work/kdeedu_parley/libkdeedu/; revision=740300

diff --git a/keduvocdocument/keduvocdocument.cpp b/keduvocdocument/keduvocdocument.cpp
index dbf63ec05af5bfc6c6b5396db71b7d119afab7cd..043762fb86319e5713cbcde18725acabb22b7b2c 100644 (file)
--- a/keduvocdocument/keduvocdocument.cpp
+++ b/keduvocdocument/keduvocdocument.cpp
@@ -55,8 +55,9 @@ public:
     KEduVocDocumentPrivate( KEduVocDocument* qq )
             : q( qq )
     {
-        m_rootLesson = 0;
-        m_wordTypeLesson = 0;
+        m_lessonContainer = 0;
+        m_wordTypeContainer = 0;
+        m_leitnerContainer = 0;
         init();
     }
 
@@ -95,8 +96,9 @@ public:
       */
     QString                   m_category;
 
-    KEduVocLesson * m_rootLesson;
-    KEduVocLesson * m_wordTypeLesson;
+    KEduVocLesson * m_lessonContainer;
+    KEduVocLesson * m_wordTypeContainer;
+    KEduVocLesson * m_leitnerContainer;
 
     KEduVocWordType           m_wordTypes;
 };
@@ -107,14 +109,14 @@ KEduVocDocument::KEduVocDocumentPrivate::~KEduVocDocumentPrivate()
 
 void KEduVocDocument::KEduVocDocumentPrivate::init()
 {
-    if ( m_rootLesson ) {
-        delete m_rootLesson;
+    if ( m_lessonContainer ) {
+        delete m_lessonContainer;
     }
-    m_rootLesson = new KEduVocLesson("root");
-    if ( m_wordTypeLesson ) {
-        delete m_wordTypeLesson;
+    m_lessonContainer = new KEduVocLesson("root");
+    if ( m_wordTypeContainer ) {
+        delete m_wordTypeContainer;
     }
-    m_wordTypeLesson = new KEduVocLesson(i18n( "Word types" ));
+    m_wordTypeContainer = new KEduVocLesson(i18n( "Word types" ));
 
     m_tenseDescriptions.clear();
     m_identifiers.clear();
@@ -675,7 +677,7 @@ void KEduVocDocument::removeIdentifier( int index )
 {
     if ( index < d->m_identifiers.size() && index >= 0 ) {
         d->m_identifiers.removeAt( index );
-        d->m_rootLesson->removeTranslation( index );
+        d->m_lessonContainer->removeTranslation( index );
     }
 }
 
@@ -715,13 +717,17 @@ kDebug() << "appendIdentifier: " << i << id.name() << id.locale();
 
 KEduVocLesson * KEduVocDocument::lesson()
 {
-    return d->m_rootLesson;
+    return d->m_lessonContainer;
 }
 
+KEduVocLesson * KEduVocDocument::wordTypeContainer()
+{
+    return d->m_wordTypeContainer;
+}
 
-KEduVocLesson * KEduVocDocument::wordTypeLesson()
+KEduVocLesson * KEduVocDocument::leitnerContainer()
 {
-    return d->m_wordTypeLesson;
+    return d->m_leitnerContainer;
 }
 
 
@@ -739,16 +745,16 @@ void KEduVocDocument::setUrl( const KUrl& url )
 
 QString KEduVocDocument::title() const
 {
-    if ( d->m_rootLesson->name().isEmpty() )
+    if ( d->m_lessonContainer->name().isEmpty() )
         return d->m_url.fileName();
     else
-        return d->m_rootLesson->name();
+        return d->m_lessonContainer->name();
 }
 
 
 void KEduVocDocument::setTitle( const QString & title )
 {
-    d->m_rootLesson->setName(title.simplified());
+    d->m_lessonContainer->setName(title.simplified());
 }
 
 

diff --git a/keduvocdocument/keduvocdocument.h b/keduvocdocument/keduvocdocument.h
index 6f4866b8b02f78f1916c016dbd72ad74a0f83817..4aa3c6cd361fd982504b49d1bc5e75807082f7e0 100644 (file)
--- a/keduvocdocument/keduvocdocument.h
+++ b/keduvocdocument/keduvocdocument.h
@@ -340,7 +340,9 @@ public:
      */
     KEduVocLesson * lesson();
 
-    KEduVocLesson * wordTypeLesson();
+    KEduVocLesson * wordTypeContainer();
+
+    KEduVocLesson * leitnerContainer();
 
     // *** file format specific methods ***
 

diff --git a/keduvocdocument/keduvockvtml2reader.cpp b/keduvocdocument/keduvockvtml2reader.cpp
index be6b0f0b28bfeeb5fa0b99dee553f3bbc8f11890..e27079a1d857d8041fb1f99606f00fcb2779b14a 100644 (file)
--- a/keduvocdocument/keduvockvtml2reader.cpp
+++ b/keduvocdocument/keduvockvtml2reader.cpp
@@ -316,7 +316,7 @@ QString wordTypeString = typeElement.text();
 typeElement = currentElement.firstChildElement( KVTML_SUBTYPENAME );
 QString childWordTypeString = typeElement.text();
 
-KEduVocLesson* typeLesson = m_doc->wordTypeLesson()->childLesson(wordTypeString);
+KEduVocLesson* typeLesson = m_doc->wordTypeContainer()->childLesson(wordTypeString);
 if(!childWordTypeString.isEmpty()) {
     typeLesson = typeLesson->childLesson(childWordTypeString);
 }
@@ -547,8 +547,8 @@ bool KEduVocKvtml2Reader::readTypes( QDomElement &typesElement )
         }
         m_doc->wordTypes().addType( mainTypeName, specialType );
 
-        KEduVocLesson * wordTypeLesson = new KEduVocLesson(mainTypeName, m_doc->wordTypeLesson());
-        m_doc->wordTypeLesson()->appendChildLesson(wordTypeLesson);
+        KEduVocLesson * wordTypeContainer = new KEduVocLesson(mainTypeName, m_doc->wordTypeContainer());
+        m_doc->wordTypeContainer()->appendChildLesson(wordTypeContainer);
 
         // iterate sub type elements <subwordtypedefinition>
         QDomElement currentSubTypeElement = currentTypeElement.firstChildElement( KVTML_SUBWORDTYPEDEFINITION );
@@ -573,8 +573,8 @@ bool KEduVocKvtml2Reader::readTypes( QDomElement &typesElement )
                                             specialSubType );
             currentSubTypeElement = currentSubTypeElement.nextSiblingElement( KVTML_SUBWORDTYPEDEFINITION );
 
-            KEduVocLesson * subWordTypeLesson = new KEduVocLesson(subTypeName, wordTypeLesson);
-            wordTypeLesson->appendChildLesson(subWordTypeLesson);
+            KEduVocLesson * subWordTypeLesson = new KEduVocLesson(subTypeName, wordTypeContainer);
+            wordTypeContainer->appendChildLesson(subWordTypeLesson);
 
         }
         currentTypeElement = currentTypeElement.nextSiblingElement( KVTML_WORDTYPEDEFINITION );

diff --git a/keduvocdocument/keduvockvtml2writer.cpp b/keduvocdocument/keduvockvtml2writer.cpp
index 8b930e1106d5233dc888a5f5d158e25cbccc2b65..5c8af09a0b02e72dde3287256b0a9199b78d759e 100644 (file)
--- a/keduvocdocument/keduvockvtml2writer.cpp
+++ b/keduvocdocument/keduvockvtml2writer.cpp
@@ -366,10 +366,10 @@ bool KEduVocKvtml2Writer::writeTranslation( QDomElement &translationElement, KEd
         translationElement.appendChild( wordTypeElement );
         //<typename>noun</typename>
 
-        if(translation->wordType()->parent() == m_doc->wordTypeLesson()) {
+        if(translation->wordType()->parent() == m_doc->wordTypeContainer()) {
             wordTypeElement.appendChild( newTextElement( KVTML_TYPENAME, translation->wordType()->name() ) );
         } else {
-            if(translation->wordType()->parent()->parent() == m_doc->wordTypeLesson()) {
+            if(translation->wordType()->parent()->parent() == m_doc->wordTypeContainer()) {
                 wordTypeElement.appendChild( newTextElement( KVTML_TYPENAME, translation->wordType()->parent()->name() ) );
             // <subwordtype>male</subwordtype>
                 wordTypeElement.appendChild( newTextElement( KVTML_SUBTYPENAME, translation->wordType()->name() ) );