moving more files

makefile

@@ -1,20 +0,0 @@
-all: \
-	core/resources_rc.py \
-	core/reader_ui.py \
-	core/preferences_ui.py \
-	core/about_ui.py
-
-clean:
-	git clean -f -x
-
-core/resources_rc.py: dev/resources.qrc
-	pyrcc4 $< -o $@
-
-core/reader_ui.py: dev/reader.ui
-	pyuic4 $< -o $@
-
-core/preferences_ui.py: dev/preferences.ui
-	pyuic4 $< -o $@
-
-core/about_ui.py: dev/about.ui
-	pyuic4 $< -o $@

yomichan.pyw

@@ -18,8 +18,8 @@
 
 import sys
 from PyQt4 import QtGui
-from lang import japanese
+from yomichan.lang import japanese
-from core.reader import MainWindowReader
+from yomichan.core.reader import MainWindowReader
 
 
 filename = sys.argv[1] if len(sys.argv) >= 2 else None

yomichan/core/about.py

@@ -24,7 +24,7 @@ from util import buildResPath
 class DialogAbout(QtGui.QDialog):
     def __init__(self, parent):
         QtGui.QDialog.__init__(self, parent)
-        uic.loadUi(buildResPath('ui/about.ui'), self)
+        uic.loadUi(buildResPath('yomichan/ui/about.ui'), self)
 
         text = unicode(self.labelVersion.text())
         text = text.format(constants['version'])

yomichan/core/preferences.py

@@ -23,7 +23,7 @@ from util import buildResPath
 class DialogPreferences(QtGui.QDialog):
     def __init__(self, parent, preferences, anki):
         QtGui.QDialog.__init__(self, parent)
-        uic.loadUi(buildResPath('ui/preferences.ui'), self)
+        uic.loadUi(buildResPath('yomichan/ui/preferences.ui'), self)
 
         self.accepted.connect(self.onAccept)
         self.buttonContentColorFg.clicked.connect(self.onButtonColorFgClicked)

yomichan/core/reader.py

@@ -40,7 +40,7 @@ class MainWindowReader(QtGui.QMainWindow):
 
     def __init__(self, parent=None, languages=None, filename=None, preferences=None, anki=None, closed=None, updated=None):
         QtGui.QMainWindow.__init__(self, parent)
-        uic.loadUi(buildResPath('ui/reader.ui'), self)
+        uic.loadUi(buildResPath('yomichan/ui/reader.ui'), self)
 
         self.textContent.mouseMoveEvent = self.onContentMouseMove
         self.textContent.mousePressEvent = self.onContentMousePress

yomichan_plugin.py

@@ -17,10 +17,10 @@
 
 
 from PyQt4 import QtGui, QtCore
-from lang import japanese
+from yomichan.lang import japanese
-from core import anki_host
+from yomichan.core import anki_host
-from core.preference_data import Preferences
+from yomichan.core.preference_data import Preferences
-from core.reader import MainWindowReader
+from yomichan.core.reader import MainWindowReader
 
 
 class YomichanPlugin: