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

List:       kde-commits
Subject:    KDE/kdeedu/kwordquiz/src
From:       Peter Hedlund <peter () peterandlinda ! com>
Date:       2008-01-25 21:21:47
Message-ID: 1201296107.753722.21771.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 766439 by hedlund:

FEATURE: Now possible to configure if a vocabulary document should be opened in the \
editor or directly as a quiz. The end of cheating...

 M  +3 -1      CMakeLists.txt  
 M  +14 -0     kwordquiz.cpp  
 M  +10 -0     kwordquiz.kcfg  
 M  +5 -1      kwordquizprefs.cpp  
 M  +3 -1      kwordquizprefs.h  
 A             prefgeneral.cpp   [License: LGPL (v2)]
 A             prefgeneral.h   [License: LGPL (v2)]
 A             prefgeneralbase.ui  


--- trunk/KDE/kdeedu/kwordquiz/src/CMakeLists.txt #766438:766439
@@ -17,6 +17,7 @@
    multipleview.cpp 
    kwqquiz.cpp 
    wqscore.cpp 
+   prefgeneral.cpp
    prefeditor.cpp 
    prefquiz.cpp
    dlgrc.cpp 
@@ -42,7 +43,8 @@
    prefquizbase.ui
    dlgrcbase.ui 
    prefcharacterbase.ui 
-   prefcardappearancebase.ui )
+   prefcardappearancebase.ui
+   prefgeneralbase.ui )
 
 kde4_add_kcfg_files(kwordquiz_SRCS prefs.kcfgc documentsettings.kcfgc)
 
--- trunk/KDE/kdeedu/kwordquiz/src/kwordquiz.cpp #766438:766439
@@ -571,6 +571,20 @@
       fileOpenRecent->addUrl(url);
       slotModeActionGroupTriggered(m_modeActionGroup->checkedAction());
       m_undoStack->clear();
+      switch (Prefs::startSession()) {
+        case Prefs::EnumStartSession::Flashcard:
+          slotQuizFlash();
+          break;
+        case Prefs::EnumStartSession::MultipleChoice:
+          slotQuizMultiple();
+          break;
+        case Prefs::EnumStartSession::QA:
+          slotQuizQA();
+          break;
+        default:
+          slotQuizEditor();
+          break;
+      }
     }
     else
       KMessageBox::error(this, KEduVocDocument::errorDescription(result));
--- trunk/KDE/kdeedu/kwordquiz/src/kwordquiz.kcfg #766438:766439
@@ -15,6 +15,16 @@
       <label>Toggle display of the search bar.</label>
       <default>true</default>
     </entry>
+    <entry name="StartSession" type="Enum">
+      <label>Type of session to use when opening files</label>
+      <choices>
+        <choice name="Editor"/>
+        <choice name="Flashcard"/>
+        <choice name="MultipleChoice"/>
+        <choice name="QA"/>
+      </choices>
+      <default>Editor</default>
+    </entry>
   </group>
   <group name="Editor">
     <entry name="ColumnTitles1" type="StringList">
--- trunk/KDE/kdeedu/kwordquiz/src/kwordquizprefs.cpp #766438:766439
@@ -2,7 +2,7 @@
                           kwordquizprefs.cpp  -  description
                              -------------------
     begin                : Sun Aug 18 2002
-    copyright            : (C) 2002-2007 by Peter Hedlund
+    copyright            : (C) 2002-2008 by Peter Hedlund
     email                : peter.hedlund@kdemail.net
  ***************************************************************************/
 
@@ -30,6 +30,7 @@
 #include <kcolorbutton.h>
 #include <kfontrequester.h>
 
+#include "prefgeneral.h"
 #include "prefeditor.h"
 #include "prefquiz.h"
 #include "prefcharacter.h"
@@ -40,6 +41,9 @@
 {
   m_config = config;
 
+  m_prefGeneral = new PrefGeneral(0);
+  addPage(m_prefGeneral, i18nc("@title:group general settings", "General"), \
"kwordquiz", i18n("General Settings"), true); +
   m_prefEditor = new PrefEditor(0);
   addPage(m_prefEditor, i18nc("@title:group editor settings", "Editor"), "editor", \
i18n("Editor Settings"), true);  
--- trunk/KDE/kdeedu/kwordquiz/src/kwordquizprefs.h #766438:766439
@@ -2,7 +2,7 @@
                           kwordquizprefs.h  -  description
                              -------------------
     begin                : Sun Aug 18 2002
-    copyright            : (C) 2002-2007 by Peter Hedlund
+    copyright            : (C) 2002-2008 by Peter Hedlund
     email                : peter.hedlund@kdemail.net
  ***************************************************************************/
 
@@ -24,6 +24,7 @@
   *@author Peter Hedlund
 */
 
+class PrefGeneral;
 class PrefEditor;
 class PrefQuiz;
 class PrefCharacter;
@@ -44,6 +45,7 @@
   bool isDefault();
 
 private:
+  PrefGeneral *m_prefGeneral;
   PrefEditor *m_prefEditor;
   PrefQuiz *m_prefQuiz;
   PrefCharacter* m_prefCharacter;


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