From 5b86e8284a73e794c8472ffb23ffd3aba5d2410c Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 5 Nov 2011 08:55:15 -0700
Subject: [PATCH] moving some files around

---
 dev/resources.qrc                             |  23 --------
 {dev/icons => img}/add.png                    | Bin
 {dev/icons => img}/bullet_add.png             | Bin
 {dev/icons => img}/cross.png                  | Bin
 {dev/icons => img}/email.png                  | Bin
 {dev/icons => img}/find.png                   | Bin
 {dev/icons => img}/folder_page.png            | Bin
 {dev/icons => img}/information.png            | Bin
 {dev/logos => img}/logo32x32.png              | Bin
 {dev/logos => img}/logo64x64.png              | Bin
 {dev/logos => img}/logo9x9.png                | Bin
 {dev/icons => img}/magifier_zoom_out.png      | Bin
 {dev/icons => img}/magnifier.png              | Bin
 {dev/icons => img}/magnifier_zoom_in.png      | Bin
 {dev/icons => img}/page_copy.png              | Bin
 {dev/icons => img}/tick.png                   | Bin
 {dev/icons => img}/world_go.png               | Bin
 {dev/icons => img}/wrench.png                 | Bin
 {languages => lang}/__init__.py               |   0
 {languages => lang}/japanese/__init__.py      |   0
 .../japanese/data/deinflect.dat               |   0
 .../japanese/data/dict-copyright.txt          |   0
 {languages => lang}/japanese/data/dict.sqlite | Bin
 .../japanese/data/kanji-copyright.txt         |   0
 {languages => lang}/japanese/data/kanji.dat   |   0
 .../japanese/data/radicals.dat                |   0
 {languages => lang}/japanese/deinflect.py     |   0
 {languages => lang}/japanese/dictionary.py    |   0
 {languages => lang}/japanese/translate.py     |   0
 nodist                                        |   2 -
 {dev => ui}/about.ui                          |   6 +-
 {dev => ui}/preferences.ui                    |   4 +-
 {dev => ui}/reader.ui                         |  54 +++++++++---------
 yomichan.pyw                                  |   2 +-
 yomichan_plugin.py                            |   2 +-
 35 files changed, 31 insertions(+), 62 deletions(-)
 delete mode 100644 dev/resources.qrc
 rename {dev/icons => img}/add.png (100%)
 rename {dev/icons => img}/bullet_add.png (100%)
 rename {dev/icons => img}/cross.png (100%)
 rename {dev/icons => img}/email.png (100%)
 rename {dev/icons => img}/find.png (100%)
 rename {dev/icons => img}/folder_page.png (100%)
 rename {dev/icons => img}/information.png (100%)
 rename {dev/logos => img}/logo32x32.png (100%)
 rename {dev/logos => img}/logo64x64.png (100%)
 rename {dev/logos => img}/logo9x9.png (100%)
 rename {dev/icons => img}/magifier_zoom_out.png (100%)
 rename {dev/icons => img}/magnifier.png (100%)
 rename {dev/icons => img}/magnifier_zoom_in.png (100%)
 rename {dev/icons => img}/page_copy.png (100%)
 rename {dev/icons => img}/tick.png (100%)
 rename {dev/icons => img}/world_go.png (100%)
 rename {dev/icons => img}/wrench.png (100%)
 rename {languages => lang}/__init__.py (100%)
 rename {languages => lang}/japanese/__init__.py (100%)
 rename {languages => lang}/japanese/data/deinflect.dat (100%)
 rename {languages => lang}/japanese/data/dict-copyright.txt (100%)
 rename {languages => lang}/japanese/data/dict.sqlite (100%)
 rename {languages => lang}/japanese/data/kanji-copyright.txt (100%)
 rename {languages => lang}/japanese/data/kanji.dat (100%)
 rename {languages => lang}/japanese/data/radicals.dat (100%)
 rename {languages => lang}/japanese/deinflect.py (100%)
 rename {languages => lang}/japanese/dictionary.py (100%)
 rename {languages => lang}/japanese/translate.py (100%)
 rename {dev => ui}/about.ui (99%)
 rename {dev => ui}/preferences.ui (99%)
 rename {dev => ui}/reader.ui (87%)

diff --git a/dev/resources.qrc b/dev/resources.qrc
deleted file mode 100644
index 4546352..0000000
--- a/dev/resources.qrc
+++ /dev/null
@@ -1,23 +0,0 @@
-<RCC>
-  <qresource prefix="images">
-    <file>icons/email.png</file>
-    <file>icons/world_go.png</file>
-    <file>icons/tick.png</file>
-    <file>icons/add.png</file>
-    <file>icons/bullet_add.png</file>
-    <file>icons/page_copy.png</file>
-    <file>icons/add.png</file>
-    <file>icons/cross.png</file>
-    <file>icons/find.png</file>
-    <file>icons/folder_page.png</file>
-    <file>icons/information.png</file>
-    <file>icons/magifier_zoom_out.png</file>
-    <file>icons/magnifier_zoom_in.png</file>
-    <file>icons/magnifier.png</file>
-    <file>icons/wrench.png</file>
-  </qresource>
-  <qresource prefix="logos">
-    <file>logos/logo32x32.png</file>
-    <file>logos/logo64x64.png</file>
-  </qresource>
-</RCC>
diff --git a/dev/icons/add.png b/img/add.png
similarity index 100%
rename from dev/icons/add.png
rename to img/add.png
diff --git a/dev/icons/bullet_add.png b/img/bullet_add.png
similarity index 100%
rename from dev/icons/bullet_add.png
rename to img/bullet_add.png
diff --git a/dev/icons/cross.png b/img/cross.png
similarity index 100%
rename from dev/icons/cross.png
rename to img/cross.png
diff --git a/dev/icons/email.png b/img/email.png
similarity index 100%
rename from dev/icons/email.png
rename to img/email.png
diff --git a/dev/icons/find.png b/img/find.png
similarity index 100%
rename from dev/icons/find.png
rename to img/find.png
diff --git a/dev/icons/folder_page.png b/img/folder_page.png
similarity index 100%
rename from dev/icons/folder_page.png
rename to img/folder_page.png
diff --git a/dev/icons/information.png b/img/information.png
similarity index 100%
rename from dev/icons/information.png
rename to img/information.png
diff --git a/dev/logos/logo32x32.png b/img/logo32x32.png
similarity index 100%
rename from dev/logos/logo32x32.png
rename to img/logo32x32.png
diff --git a/dev/logos/logo64x64.png b/img/logo64x64.png
similarity index 100%
rename from dev/logos/logo64x64.png
rename to img/logo64x64.png
diff --git a/dev/logos/logo9x9.png b/img/logo9x9.png
similarity index 100%
rename from dev/logos/logo9x9.png
rename to img/logo9x9.png
diff --git a/dev/icons/magifier_zoom_out.png b/img/magifier_zoom_out.png
similarity index 100%
rename from dev/icons/magifier_zoom_out.png
rename to img/magifier_zoom_out.png
diff --git a/dev/icons/magnifier.png b/img/magnifier.png
similarity index 100%
rename from dev/icons/magnifier.png
rename to img/magnifier.png
diff --git a/dev/icons/magnifier_zoom_in.png b/img/magnifier_zoom_in.png
similarity index 100%
rename from dev/icons/magnifier_zoom_in.png
rename to img/magnifier_zoom_in.png
diff --git a/dev/icons/page_copy.png b/img/page_copy.png
similarity index 100%
rename from dev/icons/page_copy.png
rename to img/page_copy.png
diff --git a/dev/icons/tick.png b/img/tick.png
similarity index 100%
rename from dev/icons/tick.png
rename to img/tick.png
diff --git a/dev/icons/world_go.png b/img/world_go.png
similarity index 100%
rename from dev/icons/world_go.png
rename to img/world_go.png
diff --git a/dev/icons/wrench.png b/img/wrench.png
similarity index 100%
rename from dev/icons/wrench.png
rename to img/wrench.png
diff --git a/languages/__init__.py b/lang/__init__.py
similarity index 100%
rename from languages/__init__.py
rename to lang/__init__.py
diff --git a/languages/japanese/__init__.py b/lang/japanese/__init__.py
similarity index 100%
rename from languages/japanese/__init__.py
rename to lang/japanese/__init__.py
diff --git a/languages/japanese/data/deinflect.dat b/lang/japanese/data/deinflect.dat
similarity index 100%
rename from languages/japanese/data/deinflect.dat
rename to lang/japanese/data/deinflect.dat
diff --git a/languages/japanese/data/dict-copyright.txt b/lang/japanese/data/dict-copyright.txt
similarity index 100%
rename from languages/japanese/data/dict-copyright.txt
rename to lang/japanese/data/dict-copyright.txt
diff --git a/languages/japanese/data/dict.sqlite b/lang/japanese/data/dict.sqlite
similarity index 100%
rename from languages/japanese/data/dict.sqlite
rename to lang/japanese/data/dict.sqlite
diff --git a/languages/japanese/data/kanji-copyright.txt b/lang/japanese/data/kanji-copyright.txt
similarity index 100%
rename from languages/japanese/data/kanji-copyright.txt
rename to lang/japanese/data/kanji-copyright.txt
diff --git a/languages/japanese/data/kanji.dat b/lang/japanese/data/kanji.dat
similarity index 100%
rename from languages/japanese/data/kanji.dat
rename to lang/japanese/data/kanji.dat
diff --git a/languages/japanese/data/radicals.dat b/lang/japanese/data/radicals.dat
similarity index 100%
rename from languages/japanese/data/radicals.dat
rename to lang/japanese/data/radicals.dat
diff --git a/languages/japanese/deinflect.py b/lang/japanese/deinflect.py
similarity index 100%
rename from languages/japanese/deinflect.py
rename to lang/japanese/deinflect.py
diff --git a/languages/japanese/dictionary.py b/lang/japanese/dictionary.py
similarity index 100%
rename from languages/japanese/dictionary.py
rename to lang/japanese/dictionary.py
diff --git a/languages/japanese/translate.py b/lang/japanese/translate.py
similarity index 100%
rename from languages/japanese/translate.py
rename to lang/japanese/translate.py
diff --git a/nodist b/nodist
index 1f7d5a8..c7e7b99 100644
--- a/nodist
+++ b/nodist
@@ -1,7 +1,5 @@
 .git
 .gitignore
-dev
-makefile
 nodist
 README
 *.pyc
diff --git a/dev/about.ui b/ui/about.ui
similarity index 99%
rename from dev/about.ui
rename to ui/about.ui
index e21dc34..25a364f 100644
--- a/dev/about.ui
+++ b/ui/about.ui
@@ -22,7 +22,7 @@
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap resource="resources.qrc">:/logos/logos/logo64x64.png</pixmap>
+        <pixmap>../img/logo64x64.png</pixmap>
        </property>
       </widget>
      </item>
@@ -814,9 +814,7 @@ Public License instead of this License.  But first, please read
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="resources.qrc"/>
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
diff --git a/dev/preferences.ui b/ui/preferences.ui
similarity index 99%
rename from dev/preferences.ui
rename to ui/preferences.ui
index a34a167..42b14e5 100644
--- a/dev/preferences.ui
+++ b/ui/preferences.ui
@@ -343,9 +343,7 @@
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="resources.qrc"/>
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
diff --git a/dev/reader.ui b/ui/reader.ui
similarity index 87%
rename from dev/reader.ui
rename to ui/reader.ui
index 4316ca3..42335ee 100644
--- a/dev/reader.ui
+++ b/ui/reader.ui
@@ -17,8 +17,8 @@
    <string>Yomichan</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="resources.qrc">
-    <normaloff>:/logos/logos/logo32x32.png</normaloff>:/logos/logos/logo32x32.png</iconset>
+   <iconset>
+    <normaloff>../img/logo32x32.png</normaloff>../img/logo32x32.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QHBoxLayout" name="horizontalLayout">
@@ -40,7 +40,7 @@
      <x>0</x>
      <y>0</y>
      <width>900</width>
-     <height>25</height>
+     <height>23</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -206,8 +206,8 @@
   </widget>
   <action name="actionOpen">
    <property name="icon">
-    <iconset resource="resources.qrc">
-     <normaloff>:/images/icons/folder_page.png</normaloff>:/images/icons/folder_page.png</iconset>
+    <iconset>
+     <normaloff>../img/folder_page.png</normaloff>../img/folder_page.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Open...</string>
@@ -224,8 +224,8 @@
   </action>
   <action name="actionQuit">
    <property name="icon">
-    <iconset resource="resources.qrc">
-     <normaloff>:/images/icons/cross.png</normaloff>:/images/icons/cross.png</iconset>
+    <iconset>
+     <normaloff>../img/cross.png</normaloff>../img/cross.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Quit</string>
@@ -242,8 +242,8 @@
   </action>
   <action name="actionPreferences">
    <property name="icon">
-    <iconset resource="resources.qrc">
-     <normaloff>:/images/icons/wrench.png</normaloff>:/images/icons/wrench.png</iconset>
+    <iconset>
+     <normaloff>../img/wrench.png</normaloff>../img/wrench.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Preferences...</string>
@@ -257,8 +257,8 @@
   </action>
   <action name="actionAbout">
    <property name="icon">
-    <iconset resource="resources.qrc">
-     <normaloff>:/images/icons/information.png</normaloff>:/images/icons/information.png</iconset>
+    <iconset>
+     <normaloff>../img/information.png</normaloff>../img/information.png</iconset>
    </property>
    <property name="text">
     <string>&amp;About...</string>
@@ -275,8 +275,8 @@
   </action>
   <action name="actionZoomIn">
    <property name="icon">
-    <iconset resource="resources.qrc">
-     <normaloff>:/images/icons/magnifier_zoom_in.png</normaloff>:/images/icons/magnifier_zoom_in.png</iconset>
+    <iconset>
+     <normaloff>../img/magnifier_zoom_in.png</normaloff>../img/magnifier_zoom_in.png</iconset>
    </property>
    <property name="text">
     <string>Zoom &amp;in</string>
@@ -290,8 +290,8 @@
   </action>
   <action name="actionZoomOut">
    <property name="icon">
-    <iconset resource="resources.qrc">
-     <normaloff>:/images/icons/magifier_zoom_out.png</normaloff>:/images/icons/magifier_zoom_out.png</iconset>
+    <iconset>
+     <normaloff>../img/magifier_zoom_out.png</normaloff>../img/magifier_zoom_out.png</iconset>
    </property>
    <property name="text">
     <string>Zoom &amp;out</string>
@@ -305,8 +305,8 @@
   </action>
   <action name="actionZoomReset">
    <property name="icon">
-    <iconset resource="resources.qrc">
-     <normaloff>:/images/icons/magnifier.png</normaloff>:/images/icons/magnifier.png</iconset>
+    <iconset>
+     <normaloff>../img/magnifier.png</normaloff>../img/magnifier.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Reset</string>
@@ -323,8 +323,8 @@
   </action>
   <action name="actionFind">
    <property name="icon">
-    <iconset resource="resources.qrc">
-     <normaloff>:/images/icons/find.png</normaloff>:/images/icons/find.png</iconset>
+    <iconset>
+     <normaloff>../img/find.png</normaloff>../img/find.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Find...</string>
@@ -377,8 +377,8 @@
   </action>
   <action name="actionCopyDefinition">
    <property name="icon">
-    <iconset resource="resources.qrc">
-     <normaloff>:/images/icons/page_copy.png</normaloff>:/images/icons/page_copy.png</iconset>
+    <iconset>
+     <normaloff>../img/page_copy.png</normaloff>../img/page_copy.png</iconset>
    </property>
    <property name="text">
     <string>Copy &amp;definition</string>
@@ -397,8 +397,8 @@
   </action>
   <action name="actionHomepage">
    <property name="icon">
-    <iconset resource="resources.qrc">
-     <normaloff>:/images/icons/world_go.png</normaloff>:/images/icons/world_go.png</iconset>
+    <iconset>
+     <normaloff>../img/world_go.png</normaloff>../img/world_go.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Homepage...</string>
@@ -428,17 +428,15 @@
   </action>
   <action name="actionFeedback">
    <property name="icon">
-    <iconset resource="resources.qrc">
-     <normaloff>:/images/icons/email.png</normaloff>:/images/icons/email.png</iconset>
+    <iconset>
+     <normaloff>../img/email.png</normaloff>../img/email.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Feedback...</string>
    </property>
   </action>
  </widget>
- <resources>
-  <include location="resources.qrc"/>
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>actionToggleDefinitions</sender>
diff --git a/yomichan.pyw b/yomichan.pyw
index f5c8042..868f870 100755
--- a/yomichan.pyw
+++ b/yomichan.pyw
@@ -18,7 +18,7 @@
 
 import sys
 from PyQt4 import QtGui
-from languages import japanese
+from lang import japanese
 from core.reader import MainWindowReader
 
 
diff --git a/yomichan_plugin.py b/yomichan_plugin.py
index d1e2849..315aed5 100644
--- a/yomichan_plugin.py
+++ b/yomichan_plugin.py
@@ -17,7 +17,7 @@
 
 
 from PyQt4 import QtGui, QtCore
-from languages import japanese
+from lang import japanese
 from core import anki_host
 from core.preference_data import Preferences
 from core.reader import MainWindowReader