LoadQuizContext.rb in jldrill-0.6.0.1

- old
+ new

@@ -1,9 +1,11 @@
+# encoding: utf-8
 require 'Context/Context'
 require 'Context/Bridge'
 require 'jldrill/model/Config'
 require 'jldrill/model/items/JEDictionary'
+require 'jldrill/model/items/CEDictionary'
 require 'jldrill/contexts/LoadFileContext'
 require 'jldrill/contexts/GetFilenameContext'
 require 'jldrill/contexts/LoadQuizFromEdictContext.rb'
 
 module JLDrill
@@ -15,12 +17,11 @@
 		def initialize(viewBridge)
 			super(viewBridge)
             @loadFileContext = LoadFileContext.new(@viewBridge)
             @getFilenameContext = GetFilenameContext.new(@viewBridge)
             # Set the initial directory to the quiz Data dir
-			@getFilenameContext.directory = File.join(JLDrill::Config::DATA_DIR,
-                                                      "quiz")
+			@getFilenameContext.directory = Config::resolveDataFile(Config::QUIZ_DIR)
             @loadQuizFromEdictContext = LoadQuizFromEdictContext.new(@viewBridge)
             @filename = nil
 		end
 
         def createViews
@@ -34,11 +35,15 @@
         def exitLoadQuizContext
             self.exit
         end
 
         def loadAsEdict(quiz, filename)
-            edict = JEDictionary.new
+            if quiz.options.language == "Chinese"
+                edict = CEDictionary.new
+            else
+                edict = JEDictionary.new
+            end
             @loadFileContext.onExit do
                 @loadQuizFromEdictContext.onExit do
                     exitLoadQuizContext
                 end
                 @loadQuizFromEdictContext.enter(self, quiz, edict)
@@ -49,9 +54,17 @@
         def loadAsQuiz(quiz, filename)
             @loadFileContext.onExit do
                 exitLoadQuizContext
             end
             @loadFileContext.enter(self, quiz, filename)
+        end
+
+        def startLongEvent()
+            @parent.startLongEvent()
+        end
+
+        def stopLongEvent()
+            @parent.stopLongEvent()
         end
 
         def enter(parent, quiz, filename=nil)
             super(parent)
             if filename.nil?