Implemented Copy/Cut/Paste, delete, 'blank words', column width.

Added support for the generator in the document class.

svn path=/branches/work/kwordquiz/src/keduvocdocument.h; revision=431250

diff --git a/kwordquiz/keduvocdocument.cpp b/kwordquiz/keduvocdocument.cpp
index 8a8bfb0bbf52f36e770232c1ae789a5f1806773c..d5f976be5f4a0f011d44253f2ca5029b29c0d806 100644 (file)
--- a/kwordquiz/keduvocdocument.cpp
+++ b/kwordquiz/keduvocdocument.cpp
@@ -67,12 +67,11 @@ void KEduVocDocument::getVersion(int &, int &, int &)
 
 void KEduVocDocument::Init ()
 {
-
-//TODO setVersion (QString::fromUtf8(KVOCTRAIN_VERSION_STRING));
   lesson_descr.clear();
   type_descr.clear();
   tense_descr.clear();
   langs.clear();
+  sort_lang.clear();
   extraSizehints.clear();
   sizehints.clear();
   vocabulary.clear();
@@ -81,8 +80,6 @@ void KEduVocDocument::Init ()
   unknown_attr = false;
   unknown_elem = false;
   sort_lesson = false;
-  for (int i = 0; i < (int) langs.size(); i++)
-    sort_lang.push_back(false);
   setCurrentLesson (0);
   queryorg = "";
   querytrans = "";
@@ -179,7 +176,7 @@ bool KEduVocDocument::open(const KURL& url, bool append)
 }
 
 
-bool KEduVocDocument::saveAs(QObject *parent, const KURL & url, FileType ft)
+bool KEduVocDocument::saveAs(QObject *parent, const KURL & url, FileType ft, const QString & generator)
 {
   connect( this, SIGNAL(progressChanged(KEduVocDocument*,int)), parent, SLOT(slotProgress(KEduVocDocument*,int)) );
 
@@ -218,7 +215,7 @@ bool KEduVocDocument::saveAs(QObject *parent, const KURL & url, FileType ft)
     switch (ft) {
       case kvtml: {
         KEduVocKvtmlWriter kvtmlWriter(&f);
-        saved = kvtmlWriter.writeDoc(this);
+        saved = kvtmlWriter.writeDoc(this, generator);
       }
       break;
 

diff --git a/kwordquiz/keduvocdocument.h b/kwordquiz/keduvocdocument.h
index 38e620273bb2c5ddf7915180d94bc7280314582b..35ca42ebe0e47a5afa816ec72307e38963097e65 100644 (file)
--- a/kwordquiz/keduvocdocument.h
+++ b/kwordquiz/keduvocdocument.h
@@ -438,7 +438,7 @@ class KEduVocDocument : public QObject
    * @param url     if url is empty (or NULL) actual name is preserved
    * @result         true if successful
    */
-  bool saveAs(QObject *parent, const KURL & url, FileType ft);
+  bool saveAs(QObject *parent, const KURL & url, FileType ft, const QString & generator);
 
   /** returns count of entries
    */

diff --git a/kwordquiz/keduvockvtmlwriter.cpp b/kwordquiz/keduvockvtmlwriter.cpp
index 435b78c65c50d4f837b75d3690237ce31ed86cfa..3a5c7ced79e250c14c49ced6bb6fc749b4b752a7 100644 (file)
--- a/kwordquiz/keduvockvtmlwriter.cpp
+++ b/kwordquiz/keduvockvtmlwriter.cpp
@@ -573,7 +573,7 @@ bool KEduVocKvtmlWriter::saveOptionsKvtMl(QDomDocument &domDoc, QDomElement &dom
 }
 
 
-bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc)
+bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator)
 {
   bool first_expr = true;
 
@@ -647,7 +647,7 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc)
 
   domElementKvtml.setAttribute(KV_ENCODING, (QString)"UTF-8");
 
-  domElementKvtml.setAttribute(KV_GENERATOR, (QString) "kwordquiz");// TODO EPT KVD_VERS_PREFIX KVOCTRAIN_VERSION_STRING);
+  domElementKvtml.setAttribute(KV_GENERATOR, generator);
   domElementKvtml.setAttribute(KV_COLS, m_doc->numLangs() );
   domElementKvtml.setAttribute(KV_LINES, m_doc->numEntries() );
   

diff --git a/kwordquiz/keduvockvtmlwriter.h b/kwordquiz/keduvockvtmlwriter.h
index ca1f1f6f8e46f152b673b59fd3ccf374a149fa94..00a1ebd13320e754f93ffc124677cf74846c5b7f 100644 (file)
--- a/kwordquiz/keduvockvtmlwriter.h
+++ b/kwordquiz/keduvockvtmlwriter.h
@@ -70,7 +70,7 @@ public:
   KEduVocKvtmlWriter(QFile *file);
   ~KEduVocKvtmlWriter();
 
-  bool writeDoc(KEduVocDocument *doc);
+  bool writeDoc(KEduVocDocument *doc, const QString &generator);
 
   bool saveLessonKvtMl (QDomDocument &domDoc, QDomElement &domElementParent);
   bool saveTypeNameKvtMl (QDomDocument &domDoc, QDomElement &domElementParent);