moving some files around

dev/resources.qrc

@@ -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>

nodist

@@ -1,7 +1,5 @@
 .git
 .gitignore
-dev
-makefile
 nodist
 README
 *.pyc

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>
+ <resources/>
-  <include location="resources.qrc"/>
- </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>

ui/preferences.ui

@@ -343,9 +343,7 @@
    </item>
   </layout>
  </widget>
- <resources>
+ <resources/>
-  <include location="resources.qrc"/>
- </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>

ui/reader.ui

@@ -17,8 +17,8 @@
    <string>Yomichan</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="resources.qrc">
+   <iconset>
-    <normaloff>:/logos/logos/logo32x32.png</normaloff>:/logos/logos/logo32x32.png</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">
+    <iconset>
-     <normaloff>:/images/icons/folder_page.png</normaloff>:/images/icons/folder_page.png</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">
+    <iconset>
-     <normaloff>:/images/icons/cross.png</normaloff>:/images/icons/cross.png</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">
+    <iconset>
-     <normaloff>:/images/icons/wrench.png</normaloff>:/images/icons/wrench.png</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">
+    <iconset>
-     <normaloff>:/images/icons/information.png</normaloff>:/images/icons/information.png</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">
+    <iconset>
-     <normaloff>:/images/icons/magnifier_zoom_in.png</normaloff>:/images/icons/magnifier_zoom_in.png</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">
+    <iconset>
-     <normaloff>:/images/icons/magifier_zoom_out.png</normaloff>:/images/icons/magifier_zoom_out.png</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">
+    <iconset>
-     <normaloff>:/images/icons/magnifier.png</normaloff>:/images/icons/magnifier.png</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">
+    <iconset>
-     <normaloff>:/images/icons/find.png</normaloff>:/images/icons/find.png</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">
+    <iconset>
-     <normaloff>:/images/icons/page_copy.png</normaloff>:/images/icons/page_copy.png</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">
+    <iconset>
-     <normaloff>:/images/icons/world_go.png</normaloff>:/images/icons/world_go.png</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">
+    <iconset>
-     <normaloff>:/images/icons/email.png</normaloff>:/images/icons/email.png</iconset>
+     <normaloff>../img/email.png</normaloff>../img/email.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Feedback...</string>
    </property>
   </action>
  </widget>
- <resources>
+ <resources/>
-  <include location="resources.qrc"/>
- </resources>
  <connections>
   <connection>
    <sender>actionToggleDefinitions</sender>

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
 
 

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