[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.3/kdeedu/parley/src/editor
From:       Daniel Laidig <d.laidig () gmx ! de>
Date:       2009-07-20 21:06:19
Message-ID: 1248123979.938608.18135.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1000115 by laidig:

remove leitner dock widget, which is currently broken (only committed in 4.3 branch)

 M  +20 -20    editor.cpp  
 M  +3 -3      editor.h  


--- branches/KDE/4.3/kdeedu/parley/src/editor/editor.cpp #1000114:1000115
@@ -27,8 +27,8 @@
 #include "vocabulary/containermodel.h"
 #include "vocabulary/lessonmodel.h"
 #include "vocabulary/wordtypemodel.h"
-#include "vocabulary/leitnerview.h"
-#include "vocabulary/leitnermodel.h"
+//#include "vocabulary/leitnerview.h"
+//#include "vocabulary/leitnermodel.h"
 
 #include "entry-dialogs/multiplechoicewidget.h"
 #include "entry-dialogs/comparisonwidget.h"
@@ -101,7 +101,7 @@
 
     m_lessonModel->setDocument(m_mainWindow->parleyDocument()->document());
     m_wordTypeModel->setDocument(m_mainWindow->parleyDocument()->document());
-    m_leitnerModel->setDocument(m_mainWindow->parleyDocument()->document());
+//    m_leitnerModel->setDocument(m_mainWindow->parleyDocument()->document());
 
     if (!m_mainWindow->parleyDocument()->document()) {
         return;
@@ -112,7 +112,7 @@
     m_wordTypeView->expandToDepth(0);
 
     // the top level container of this model only holds the others
-    m_leitnerView->setRootIndex(m_leitnerModel->index(0,0));
+//    m_leitnerView->setRootIndex(m_leitnerModel->index(0,0));
 
     connect(m_mainWindow->parleyDocument()->document(), SIGNAL(docModified(bool)), \
m_mainWindow, SLOT(slotUpdateWindowCaption()));  connect(m_vocabularyModel, \
SIGNAL(documentChanged(KEduVocDocument*)), @@ -189,27 +189,27 @@
         m_wordTypeView, SLOT(setTranslation(KEduVocExpression*, int)));
 
 // Leitner boxes dock
-    QDockWidget* leitnerDockWidget = new QDockWidget(i18n("Grade Boxes"), this);
-    leitnerDockWidget->setObjectName( "LeitnerDock" );
-    m_leitnerView = new LeitnerView(this);
-    leitnerDockWidget->setWidget(m_leitnerView);
-    addDockWidget( Qt::LeftDockWidgetArea, leitnerDockWidget );
-    m_dockWidgets.append(leitnerDockWidget);
+//    QDockWidget* leitnerDockWidget = new QDockWidget(i18n("Grade Boxes"), this);
+//    leitnerDockWidget->setObjectName( "LeitnerDock" );
+//    m_leitnerView = new LeitnerView(this);
+//    leitnerDockWidget->setWidget(m_leitnerView);
+//    addDockWidget( Qt::LeftDockWidgetArea, leitnerDockWidget );
+//    m_dockWidgets.append(leitnerDockWidget);
 
-    m_leitnerModel = new LeitnerModel(this);
-    leitnerDockWidget->setVisible(false);
-    actionCollection()->addAction("show_leitner_dock", \
leitnerDockWidget->toggleViewAction()); +//    m_leitnerModel = new \
LeitnerModel(this); +//    leitnerDockWidget->setVisible(false);
+//    actionCollection()->addAction("show_leitner_dock", \
leitnerDockWidget->toggleViewAction());  
-    m_leitnerView->setModel(m_leitnerModel);
+//    m_leitnerView->setModel(m_leitnerModel);
 
-    connect(m_leitnerView, SIGNAL(selectedLeitnerBoxChanged(KEduVocLeitnerBox*)),
-        m_vocabularyModel, SLOT(setLeitnerBox(KEduVocLeitnerBox*)));
+//    connect(m_leitnerView, SIGNAL(selectedLeitnerBoxChanged(KEduVocLeitnerBox*)),
+//        m_vocabularyModel, SLOT(setLeitnerBox(KEduVocLeitnerBox*)));
 
-    connect(m_leitnerView, SIGNAL(signalShowContainer(KEduVocContainer*)),
-        m_vocabularyModel, SLOT(showContainer(KEduVocContainer*)));
+//    connect(m_leitnerView, SIGNAL(signalShowContainer(KEduVocContainer*)),
+//        m_vocabularyModel, SLOT(showContainer(KEduVocContainer*)));
 
-    connect(m_vocabularyView, SIGNAL(translationChanged(KEduVocExpression*, int)),
-        m_leitnerView, SLOT(setTranslation(KEduVocExpression*, int)));
+//    connect(m_vocabularyView, SIGNAL(translationChanged(KEduVocExpression*, int)),
+//        m_leitnerView, SLOT(setTranslation(KEduVocExpression*, int)));
 
 // Conjugations
     QDockWidget *conjugationDock = new QDockWidget(i18n("Conjugation"), this);
--- branches/KDE/4.3/kdeedu/parley/src/editor/editor.h #1000114:1000115
@@ -30,7 +30,7 @@
 class VocabularyFilter;
 class LessonView;
 class WordTypeView;
-class LeitnerView;
+//class LeitnerView;
 class LessonModel;
 class WordTypeModel;
 class LeitnerModel;
@@ -133,8 +133,8 @@
     WordTypeView *m_wordTypeView;
     WordTypeModel *m_wordTypeModel;
 
-    LeitnerView *m_leitnerView;
-    LeitnerModel *m_leitnerModel;
+//    LeitnerView *m_leitnerView;
+//    LeitnerModel *m_leitnerModel;
 
     friend class ParleyDocument;
     friend class Scripting::Parley;


[prev in list] [next in list] [prev in thread] [next in thread]