diff --git a/yomichan/__init__.py b/yomi_base/__init__.py
similarity index 100%
rename from yomichan/__init__.py
rename to yomi_base/__init__.py
diff --git a/yomichan/about.py b/yomi_base/about.py
similarity index 100%
rename from yomichan/about.py
rename to yomi_base/about.py
diff --git a/yomichan/anki_host.py b/yomi_base/anki_host.py
similarity index 100%
rename from yomichan/anki_host.py
rename to yomi_base/anki_host.py
diff --git a/yomichan/constants.py b/yomi_base/constants.py
similarity index 100%
rename from yomichan/constants.py
rename to yomi_base/constants.py
diff --git a/yomichan/img/add.png b/yomi_base/img/add.png
similarity index 100%
rename from yomichan/img/add.png
rename to yomi_base/img/add.png
diff --git a/yomichan/img/bullet_add.png b/yomi_base/img/bullet_add.png
similarity index 100%
rename from yomichan/img/bullet_add.png
rename to yomi_base/img/bullet_add.png
diff --git a/yomichan/img/cross.png b/yomi_base/img/cross.png
similarity index 100%
rename from yomichan/img/cross.png
rename to yomi_base/img/cross.png
diff --git a/yomichan/img/email.png b/yomi_base/img/email.png
similarity index 100%
rename from yomichan/img/email.png
rename to yomi_base/img/email.png
diff --git a/yomichan/img/find.png b/yomi_base/img/find.png
similarity index 100%
rename from yomichan/img/find.png
rename to yomi_base/img/find.png
diff --git a/yomichan/img/folder_page.png b/yomi_base/img/folder_page.png
similarity index 100%
rename from yomichan/img/folder_page.png
rename to yomi_base/img/folder_page.png
diff --git a/yomichan/img/information.png b/yomi_base/img/information.png
similarity index 100%
rename from yomichan/img/information.png
rename to yomi_base/img/information.png
diff --git a/yomichan/img/logo32x32.png b/yomi_base/img/logo32x32.png
similarity index 100%
rename from yomichan/img/logo32x32.png
rename to yomi_base/img/logo32x32.png
diff --git a/yomichan/img/logo64x64.png b/yomi_base/img/logo64x64.png
similarity index 100%
rename from yomichan/img/logo64x64.png
rename to yomi_base/img/logo64x64.png
diff --git a/yomichan/img/logo9x9.png b/yomi_base/img/logo9x9.png
similarity index 100%
rename from yomichan/img/logo9x9.png
rename to yomi_base/img/logo9x9.png
diff --git a/yomichan/img/magifier_zoom_out.png b/yomi_base/img/magifier_zoom_out.png
similarity index 100%
rename from yomichan/img/magifier_zoom_out.png
rename to yomi_base/img/magifier_zoom_out.png
diff --git a/yomichan/img/magnifier.png b/yomi_base/img/magnifier.png
similarity index 100%
rename from yomichan/img/magnifier.png
rename to yomi_base/img/magnifier.png
diff --git a/yomichan/img/magnifier_zoom_in.png b/yomi_base/img/magnifier_zoom_in.png
similarity index 100%
rename from yomichan/img/magnifier_zoom_in.png
rename to yomi_base/img/magnifier_zoom_in.png
diff --git a/yomichan/img/page_copy.png b/yomi_base/img/page_copy.png
similarity index 100%
rename from yomichan/img/page_copy.png
rename to yomi_base/img/page_copy.png
diff --git a/yomichan/img/tick.png b/yomi_base/img/tick.png
similarity index 100%
rename from yomichan/img/tick.png
rename to yomi_base/img/tick.png
diff --git a/yomichan/img/world_go.png b/yomi_base/img/world_go.png
similarity index 100%
rename from yomichan/img/world_go.png
rename to yomi_base/img/world_go.png
diff --git a/yomichan/img/wrench.png b/yomi_base/img/wrench.png
similarity index 100%
rename from yomichan/img/wrench.png
rename to yomi_base/img/wrench.png
diff --git a/yomichan/lang/__init__.py b/yomi_base/lang/__init__.py
similarity index 100%
rename from yomichan/lang/__init__.py
rename to yomi_base/lang/__init__.py
diff --git a/yomichan/lang/japanese/__init__.py b/yomi_base/lang/japanese/__init__.py
similarity index 100%
rename from yomichan/lang/japanese/__init__.py
rename to yomi_base/lang/japanese/__init__.py
diff --git a/yomichan/lang/japanese/data/deinflect.dat b/yomi_base/lang/japanese/data/deinflect.dat
similarity index 100%
rename from yomichan/lang/japanese/data/deinflect.dat
rename to yomi_base/lang/japanese/data/deinflect.dat
diff --git a/yomichan/lang/japanese/data/dict-copyright.txt b/yomi_base/lang/japanese/data/dict-copyright.txt
similarity index 100%
rename from yomichan/lang/japanese/data/dict-copyright.txt
rename to yomi_base/lang/japanese/data/dict-copyright.txt
diff --git a/yomichan/lang/japanese/data/dict.sqlite b/yomi_base/lang/japanese/data/dict.sqlite
similarity index 100%
rename from yomichan/lang/japanese/data/dict.sqlite
rename to yomi_base/lang/japanese/data/dict.sqlite
diff --git a/yomichan/lang/japanese/data/kanji-copyright.txt b/yomi_base/lang/japanese/data/kanji-copyright.txt
similarity index 100%
rename from yomichan/lang/japanese/data/kanji-copyright.txt
rename to yomi_base/lang/japanese/data/kanji-copyright.txt
diff --git a/yomichan/lang/japanese/data/kanji.dat b/yomi_base/lang/japanese/data/kanji.dat
similarity index 100%
rename from yomichan/lang/japanese/data/kanji.dat
rename to yomi_base/lang/japanese/data/kanji.dat
diff --git a/yomichan/lang/japanese/data/radicals.dat b/yomi_base/lang/japanese/data/radicals.dat
similarity index 100%
rename from yomichan/lang/japanese/data/radicals.dat
rename to yomi_base/lang/japanese/data/radicals.dat
diff --git a/yomichan/lang/japanese/deinflect.py b/yomi_base/lang/japanese/deinflect.py
similarity index 100%
rename from yomichan/lang/japanese/deinflect.py
rename to yomi_base/lang/japanese/deinflect.py
diff --git a/yomichan/lang/japanese/dictionary.py b/yomi_base/lang/japanese/dictionary.py
similarity index 100%
rename from yomichan/lang/japanese/dictionary.py
rename to yomi_base/lang/japanese/dictionary.py
diff --git a/yomichan/lang/japanese/translate.py b/yomi_base/lang/japanese/translate.py
similarity index 100%
rename from yomichan/lang/japanese/translate.py
rename to yomi_base/lang/japanese/translate.py
diff --git a/yomichan/preference_data.py b/yomi_base/preference_data.py
similarity index 100%
rename from yomichan/preference_data.py
rename to yomi_base/preference_data.py
diff --git a/yomichan/preferences.py b/yomi_base/preferences.py
similarity index 100%
rename from yomichan/preferences.py
rename to yomi_base/preferences.py
diff --git a/yomichan/reader.py b/yomi_base/reader.py
similarity index 99%
rename from yomichan/reader.py
rename to yomi_base/reader.py
index 57437e8..5f0acb7 100644
--- a/yomichan/reader.py
+++ b/yomi_base/reader.py
@@ -20,7 +20,6 @@ import os
import tarfile
from PyQt4 import QtGui, QtCore, uic
from preferences import DialogPreferences
-from preference_data import Preferences
from update import UpdateFinder
from about import DialogAbout
from constants import constants
diff --git a/yomichan/reader_util.py b/yomi_base/reader_util.py
similarity index 94%
rename from yomichan/reader_util.py
rename to yomi_base/reader_util.py
index f421776..d7bb83a 100644
--- a/yomichan/reader_util.py
+++ b/yomi_base/reader_util.py
@@ -18,6 +18,7 @@
import re
from PyQt4 import QtGui
+from util import buildResPath
class Definition:
@@ -144,12 +145,12 @@ def buildDefinitionHtml(definition, factIndex, factQuery):
if definition.conjugations:
conjugation = '<{0}>
'.format(definition.conjugations)
- links = ''.format(factIndex)
+ links = ''.format(factIndex, buildResPath('img/page_copy.png'))
if factQuery:
if factQuery(buildFactMarkupExpression(definition.expression, definition.reading, definition.glossary)):
- links += ''.format(factIndex)
+ links += ''.format(factIndex, buildResPath('img/add.png'))
if factQuery(buildFactMarkupReading(definition.reading, definition.glossary)):
- links += ''.format(factIndex)
+ links += ''.format(factIndex, buildResPath('img/bullet_add.png'))
html = u"""
{0}
diff --git a/yomichan/ui/about.ui b/yomi_base/ui/about.ui
similarity index 100%
rename from yomichan/ui/about.ui
rename to yomi_base/ui/about.ui
diff --git a/yomichan/ui/preferences.ui b/yomi_base/ui/preferences.ui
similarity index 100%
rename from yomichan/ui/preferences.ui
rename to yomi_base/ui/preferences.ui
diff --git a/yomichan/ui/reader.ui b/yomi_base/ui/reader.ui
similarity index 100%
rename from yomichan/ui/reader.ui
rename to yomi_base/ui/reader.ui
diff --git a/yomichan/update.py b/yomi_base/update.py
similarity index 100%
rename from yomichan/update.py
rename to yomi_base/update.py
diff --git a/yomichan/util.py b/yomi_base/util.py
similarity index 100%
rename from yomichan/util.py
rename to yomi_base/util.py
diff --git a/yomichan.py b/yomichan.py
index 8e0def5..97d8915 100755
--- a/yomichan.py
+++ b/yomichan.py
@@ -19,10 +19,10 @@
import sys
from PyQt4 import QtGui, QtCore
-from yomichan.lang import japanese
-from yomichan.util import buildResPath
-from yomichan.preference_data import Preferences
-from yomichan.reader import MainWindowReader
+from yomi_base.lang import japanese
+from yomi_base.util import buildResPath
+from yomi_base.preference_data import Preferences
+from yomi_base.reader import MainWindowReader
class Yomichan:
@@ -44,7 +44,7 @@ class YomichanPlugin(Yomichan):
self.separator.setSeparator(True)
self.action = QtGui.QAction(QtGui.QIcon(buildResPath('img/logo32x32.png')), '&Yomichan...', self.parent)
self.action.setIconVisibleInMenu(True)
- self.parent.connect(self.action, QtCore.SIGNAL('triggered()'), self.onShowRequest)
+ self.action.triggered.connect(self.onShowRequest)
self.anki.addHook('loadDeck', self.onDeckLoad)
self.anki.addHook('deckClosed', self.onDeckClose)
@@ -120,6 +120,7 @@ class YomichanStandalone(Yomichan):
self.languages,
filename=sys.argv[1] if len(sys.argv) >= 2 else None
)
+
self.window.show()
self.application.exec_()
@@ -127,5 +128,5 @@ class YomichanStandalone(Yomichan):
if __name__ == '__main__':
instance = YomichanStandalone()
else:
- from yomichan import anki_host
+ from yomi_base import anki_host
instance = YomichanPlugin()