From 9ad64af0f48b8526bee167f13bbc8b8f6e7f11aa Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sat, 5 Nov 2011 09:52:44 -0700 Subject: [PATCH] moving more files --- makefile | 20 ------------------ yomichan.pyw | 4 ++-- __init__.py => yomichan/__init__.py | 0 {core => yomichan/core}/__init__.py | 0 {core => yomichan/core}/about.py | 2 +- {core => yomichan/core}/anki_host.py | 0 {core => yomichan/core}/constants.py | 0 {core => yomichan/core}/preference_data.py | 0 {core => yomichan/core}/preferences.py | 2 +- {core => yomichan/core}/reader.py | 2 +- {core => yomichan/core}/reader_util.py | 0 {core => yomichan/core}/resources_rc.py | 0 {core => yomichan/core}/update.py | 0 {core => yomichan/core}/util.py | 0 {img => yomichan/img}/add.png | Bin {img => yomichan/img}/bullet_add.png | Bin {img => yomichan/img}/cross.png | Bin {img => yomichan/img}/email.png | Bin {img => yomichan/img}/find.png | Bin {img => yomichan/img}/folder_page.png | Bin {img => yomichan/img}/information.png | Bin {img => yomichan/img}/logo32x32.png | Bin {img => yomichan/img}/logo64x64.png | Bin {img => yomichan/img}/logo9x9.png | Bin {img => yomichan/img}/magifier_zoom_out.png | Bin {img => yomichan/img}/magnifier.png | Bin {img => yomichan/img}/magnifier_zoom_in.png | Bin {img => yomichan/img}/page_copy.png | Bin {img => yomichan/img}/tick.png | Bin {img => yomichan/img}/world_go.png | Bin {img => yomichan/img}/wrench.png | Bin {lang => yomichan/lang}/__init__.py | 0 {lang => yomichan/lang}/japanese/__init__.py | 0 .../lang}/japanese/data/deinflect.dat | 0 .../lang}/japanese/data/dict-copyright.txt | 0 .../lang}/japanese/data/dict.sqlite | Bin .../lang}/japanese/data/kanji-copyright.txt | 0 .../lang}/japanese/data/kanji.dat | 0 .../lang}/japanese/data/radicals.dat | 0 {lang => yomichan/lang}/japanese/deinflect.py | 0 .../lang}/japanese/dictionary.py | 0 {lang => yomichan/lang}/japanese/translate.py | 0 {ui => yomichan/ui}/about.ui | 0 {ui => yomichan/ui}/preferences.ui | 0 {ui => yomichan/ui}/reader.ui | 0 yomichan_plugin.py | 8 +++---- 46 files changed, 9 insertions(+), 29 deletions(-) delete mode 100644 makefile rename __init__.py => yomichan/__init__.py (100%) rename {core => yomichan/core}/__init__.py (100%) rename {core => yomichan/core}/about.py (94%) rename {core => yomichan/core}/anki_host.py (100%) rename {core => yomichan/core}/constants.py (100%) rename {core => yomichan/core}/preference_data.py (100%) rename {core => yomichan/core}/preferences.py (98%) rename {core => yomichan/core}/reader.py (99%) rename {core => yomichan/core}/reader_util.py (100%) rename {core => yomichan/core}/resources_rc.py (100%) rename {core => yomichan/core}/update.py (100%) rename {core => yomichan/core}/util.py (100%) rename {img => yomichan/img}/add.png (100%) rename {img => yomichan/img}/bullet_add.png (100%) rename {img => yomichan/img}/cross.png (100%) rename {img => yomichan/img}/email.png (100%) rename {img => yomichan/img}/find.png (100%) rename {img => yomichan/img}/folder_page.png (100%) rename {img => yomichan/img}/information.png (100%) rename {img => yomichan/img}/logo32x32.png (100%) rename {img => yomichan/img}/logo64x64.png (100%) rename {img => yomichan/img}/logo9x9.png (100%) rename {img => yomichan/img}/magifier_zoom_out.png (100%) rename {img => yomichan/img}/magnifier.png (100%) rename {img => yomichan/img}/magnifier_zoom_in.png (100%) rename {img => yomichan/img}/page_copy.png (100%) rename {img => yomichan/img}/tick.png (100%) rename {img => yomichan/img}/world_go.png (100%) rename {img => yomichan/img}/wrench.png (100%) rename {lang => yomichan/lang}/__init__.py (100%) rename {lang => yomichan/lang}/japanese/__init__.py (100%) rename {lang => yomichan/lang}/japanese/data/deinflect.dat (100%) rename {lang => yomichan/lang}/japanese/data/dict-copyright.txt (100%) rename {lang => yomichan/lang}/japanese/data/dict.sqlite (100%) rename {lang => yomichan/lang}/japanese/data/kanji-copyright.txt (100%) rename {lang => yomichan/lang}/japanese/data/kanji.dat (100%) rename {lang => yomichan/lang}/japanese/data/radicals.dat (100%) rename {lang => yomichan/lang}/japanese/deinflect.py (100%) rename {lang => yomichan/lang}/japanese/dictionary.py (100%) rename {lang => yomichan/lang}/japanese/translate.py (100%) rename {ui => yomichan/ui}/about.ui (100%) rename {ui => yomichan/ui}/preferences.ui (100%) rename {ui => yomichan/ui}/reader.ui (100%) diff --git a/makefile b/makefile deleted file mode 100644 index dcf0eba..0000000 --- a/makefile +++ /dev/null @@ -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 $@ diff --git a/yomichan.pyw b/yomichan.pyw index 868f870..7fa5f63 100755 --- a/yomichan.pyw +++ b/yomichan.pyw @@ -18,8 +18,8 @@ import sys from PyQt4 import QtGui -from lang import japanese -from core.reader import MainWindowReader +from yomichan.lang import japanese +from yomichan.core.reader import MainWindowReader filename = sys.argv[1] if len(sys.argv) >= 2 else None diff --git a/__init__.py b/yomichan/__init__.py similarity index 100% rename from __init__.py rename to yomichan/__init__.py diff --git a/core/__init__.py b/yomichan/core/__init__.py similarity index 100% rename from core/__init__.py rename to yomichan/core/__init__.py diff --git a/core/about.py b/yomichan/core/about.py similarity index 94% rename from core/about.py rename to yomichan/core/about.py index 50653a9..a78371d 100644 --- a/core/about.py +++ b/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']) diff --git a/core/anki_host.py b/yomichan/core/anki_host.py similarity index 100% rename from core/anki_host.py rename to yomichan/core/anki_host.py diff --git a/core/constants.py b/yomichan/core/constants.py similarity index 100% rename from core/constants.py rename to yomichan/core/constants.py diff --git a/core/preference_data.py b/yomichan/core/preference_data.py similarity index 100% rename from core/preference_data.py rename to yomichan/core/preference_data.py diff --git a/core/preferences.py b/yomichan/core/preferences.py similarity index 98% rename from core/preferences.py rename to yomichan/core/preferences.py index 63b5e16..8a76076 100644 --- a/core/preferences.py +++ b/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) diff --git a/core/reader.py b/yomichan/core/reader.py similarity index 99% rename from core/reader.py rename to yomichan/core/reader.py index d20a1eb..02bbc4b 100644 --- a/core/reader.py +++ b/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 diff --git a/core/reader_util.py b/yomichan/core/reader_util.py similarity index 100% rename from core/reader_util.py rename to yomichan/core/reader_util.py diff --git a/core/resources_rc.py b/yomichan/core/resources_rc.py similarity index 100% rename from core/resources_rc.py rename to yomichan/core/resources_rc.py diff --git a/core/update.py b/yomichan/core/update.py similarity index 100% rename from core/update.py rename to yomichan/core/update.py diff --git a/core/util.py b/yomichan/core/util.py similarity index 100% rename from core/util.py rename to yomichan/core/util.py diff --git a/img/add.png b/yomichan/img/add.png similarity index 100% rename from img/add.png rename to yomichan/img/add.png diff --git a/img/bullet_add.png b/yomichan/img/bullet_add.png similarity index 100% rename from img/bullet_add.png rename to yomichan/img/bullet_add.png diff --git a/img/cross.png b/yomichan/img/cross.png similarity index 100% rename from img/cross.png rename to yomichan/img/cross.png diff --git a/img/email.png b/yomichan/img/email.png similarity index 100% rename from img/email.png rename to yomichan/img/email.png diff --git a/img/find.png b/yomichan/img/find.png similarity index 100% rename from img/find.png rename to yomichan/img/find.png diff --git a/img/folder_page.png b/yomichan/img/folder_page.png similarity index 100% rename from img/folder_page.png rename to yomichan/img/folder_page.png diff --git a/img/information.png b/yomichan/img/information.png similarity index 100% rename from img/information.png rename to yomichan/img/information.png diff --git a/img/logo32x32.png b/yomichan/img/logo32x32.png similarity index 100% rename from img/logo32x32.png rename to yomichan/img/logo32x32.png diff --git a/img/logo64x64.png b/yomichan/img/logo64x64.png similarity index 100% rename from img/logo64x64.png rename to yomichan/img/logo64x64.png diff --git a/img/logo9x9.png b/yomichan/img/logo9x9.png similarity index 100% rename from img/logo9x9.png rename to yomichan/img/logo9x9.png diff --git a/img/magifier_zoom_out.png b/yomichan/img/magifier_zoom_out.png similarity index 100% rename from img/magifier_zoom_out.png rename to yomichan/img/magifier_zoom_out.png diff --git a/img/magnifier.png b/yomichan/img/magnifier.png similarity index 100% rename from img/magnifier.png rename to yomichan/img/magnifier.png diff --git a/img/magnifier_zoom_in.png b/yomichan/img/magnifier_zoom_in.png similarity index 100% rename from img/magnifier_zoom_in.png rename to yomichan/img/magnifier_zoom_in.png diff --git a/img/page_copy.png b/yomichan/img/page_copy.png similarity index 100% rename from img/page_copy.png rename to yomichan/img/page_copy.png diff --git a/img/tick.png b/yomichan/img/tick.png similarity index 100% rename from img/tick.png rename to yomichan/img/tick.png diff --git a/img/world_go.png b/yomichan/img/world_go.png similarity index 100% rename from img/world_go.png rename to yomichan/img/world_go.png diff --git a/img/wrench.png b/yomichan/img/wrench.png similarity index 100% rename from img/wrench.png rename to yomichan/img/wrench.png diff --git a/lang/__init__.py b/yomichan/lang/__init__.py similarity index 100% rename from lang/__init__.py rename to yomichan/lang/__init__.py diff --git a/lang/japanese/__init__.py b/yomichan/lang/japanese/__init__.py similarity index 100% rename from lang/japanese/__init__.py rename to yomichan/lang/japanese/__init__.py diff --git a/lang/japanese/data/deinflect.dat b/yomichan/lang/japanese/data/deinflect.dat similarity index 100% rename from lang/japanese/data/deinflect.dat rename to yomichan/lang/japanese/data/deinflect.dat diff --git a/lang/japanese/data/dict-copyright.txt b/yomichan/lang/japanese/data/dict-copyright.txt similarity index 100% rename from lang/japanese/data/dict-copyright.txt rename to yomichan/lang/japanese/data/dict-copyright.txt diff --git a/lang/japanese/data/dict.sqlite b/yomichan/lang/japanese/data/dict.sqlite similarity index 100% rename from lang/japanese/data/dict.sqlite rename to yomichan/lang/japanese/data/dict.sqlite diff --git a/lang/japanese/data/kanji-copyright.txt b/yomichan/lang/japanese/data/kanji-copyright.txt similarity index 100% rename from lang/japanese/data/kanji-copyright.txt rename to yomichan/lang/japanese/data/kanji-copyright.txt diff --git a/lang/japanese/data/kanji.dat b/yomichan/lang/japanese/data/kanji.dat similarity index 100% rename from lang/japanese/data/kanji.dat rename to yomichan/lang/japanese/data/kanji.dat diff --git a/lang/japanese/data/radicals.dat b/yomichan/lang/japanese/data/radicals.dat similarity index 100% rename from lang/japanese/data/radicals.dat rename to yomichan/lang/japanese/data/radicals.dat diff --git a/lang/japanese/deinflect.py b/yomichan/lang/japanese/deinflect.py similarity index 100% rename from lang/japanese/deinflect.py rename to yomichan/lang/japanese/deinflect.py diff --git a/lang/japanese/dictionary.py b/yomichan/lang/japanese/dictionary.py similarity index 100% rename from lang/japanese/dictionary.py rename to yomichan/lang/japanese/dictionary.py diff --git a/lang/japanese/translate.py b/yomichan/lang/japanese/translate.py similarity index 100% rename from lang/japanese/translate.py rename to yomichan/lang/japanese/translate.py diff --git a/ui/about.ui b/yomichan/ui/about.ui similarity index 100% rename from ui/about.ui rename to yomichan/ui/about.ui diff --git a/ui/preferences.ui b/yomichan/ui/preferences.ui similarity index 100% rename from ui/preferences.ui rename to yomichan/ui/preferences.ui diff --git a/ui/reader.ui b/yomichan/ui/reader.ui similarity index 100% rename from ui/reader.ui rename to yomichan/ui/reader.ui diff --git a/yomichan_plugin.py b/yomichan_plugin.py index 315aed5..e801d88 100644 --- a/yomichan_plugin.py +++ b/yomichan_plugin.py @@ -17,10 +17,10 @@ from PyQt4 import QtGui, QtCore -from lang import japanese -from core import anki_host -from core.preference_data import Preferences -from core.reader import MainWindowReader +from yomichan.lang import japanese +from yomichan.core import anki_host +from yomichan.core.preference_data import Preferences +from yomichan.core.reader import MainWindowReader class YomichanPlugin: