diff --git a/yomi_base/reader.py b/yomi_base/reader.py index a9adca0..e68b7ce 100644 --- a/yomi_base/reader.py +++ b/yomi_base/reader.py @@ -552,7 +552,18 @@ class MainWindowReader(QtGui.QMainWindow, gen.reader_ui.Ui_MainWindowReader): def importWordList(self, words): - pass + self.state.vocabDefs = list() + self.state.kanjiDefs = list() + + for word in words: + if self.dockVocab.isVisible(): + self.state.vocabDefs += self.language.dictionary.findTerm(word) + + if self.dockKanji.isVisible(): + self.state.kanjiDefs += self.language.findCharacters(word) + + self.updateVocabDefs() + self.updateKanjiDefs() def setStatus(self, status): diff --git a/yomi_base/reader_util.py b/yomi_base/reader_util.py index 131bfc6..1cce7a6 100644 --- a/yomi_base/reader_util.py +++ b/yomi_base/reader_util.py @@ -174,7 +174,7 @@ def buildVocabDef(definition, index, query): reading = u'[{0}]
'.format(definition['reading']) rules = unicode() - if len(definition['rules']) > 0: + if definition.get('rules'): rules = ' < '.join(definition['rules']) rules = '({0})
'.format(rules)