From b6e7188bdf50aa895ee7e0081edd88c1b268d1fa Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Tue, 25 Dec 2012 13:24:53 -0800 Subject: [PATCH] reverting back to static layout since windows sucks --- ...efinition.png => icon_copy_definition.png} | Bin ui/reader.ui | 2 +- ui/resources.qrc | 2 +- yomi_base/about.py | 4 +- yomi_base/gen/about_ui.py | 2 +- yomi_base/gen/preferences_ui.py | 2 +- yomi_base/gen/reader_ui.py | 4 +- yomi_base/gen/resources_rc.py | 122 +++++++++--------- yomi_base/preferences.py | 4 +- yomi_base/reader.py | 4 +- yomi_base/reader_util.py | 7 +- yomi_base/util.py | 25 ---- yomichan.py | 3 +- 13 files changed, 77 insertions(+), 104 deletions(-) rename ui/img/{icon_action_copy_definition.png => icon_copy_definition.png} (100%) delete mode 100644 yomi_base/util.py diff --git a/ui/img/icon_action_copy_definition.png b/ui/img/icon_copy_definition.png similarity index 100% rename from ui/img/icon_action_copy_definition.png rename to ui/img/icon_copy_definition.png diff --git a/ui/reader.ui b/ui/reader.ui index 99b1927..6d77858 100644 --- a/ui/reader.ui +++ b/ui/reader.ui @@ -387,7 +387,7 @@ - :/img/img/icon_action_copy_definition.png:/img/img/icon_action_copy_definition.png + :/img/img/icon_copy_definition.png:/img/img/icon_copy_definition.png Copy &definition diff --git a/ui/resources.qrc b/ui/resources.qrc index 53e26fe..9ab985c 100644 --- a/ui/resources.qrc +++ b/ui/resources.qrc @@ -1,8 +1,8 @@ img/icon_action_about.png - img/icon_action_copy_definition.png img/icon_action_feedback.png + img/icon_copy_definition.png img/icon_action_find.png img/icon_action_homepage.png img/icon_action_open.png diff --git a/yomi_base/about.py b/yomi_base/about.py index 4119eff..f7cedae 100644 --- a/yomi_base/about.py +++ b/yomi_base/about.py @@ -18,10 +18,10 @@ from PyQt4 import QtGui from constants import constants -from gen import about +from gen import about_ui -class DialogAbout(QtGui.QDialog, about.Ui_DialogAbout): +class DialogAbout(QtGui.QDialog, about_ui.Ui_DialogAbout): def __init__(self, parent): QtGui.QDialog.__init__(self, parent) self.setupUi(self) diff --git a/yomi_base/gen/about_ui.py b/yomi_base/gen/about_ui.py index db8590d..f4af663 100644 --- a/yomi_base/gen/about_ui.py +++ b/yomi_base/gen/about_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'ui/about.ui' # -# Created: Tue Dec 25 13:09:53 2012 +# Created: Tue Dec 25 13:23:04 2012 # by: PyQt4 UI code generator 4.9.6 # # WARNING! All changes made in this file will be lost! diff --git a/yomi_base/gen/preferences_ui.py b/yomi_base/gen/preferences_ui.py index da991e4..0782236 100644 --- a/yomi_base/gen/preferences_ui.py +++ b/yomi_base/gen/preferences_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'ui/preferences.ui' # -# Created: Tue Dec 25 13:09:53 2012 +# Created: Tue Dec 25 13:23:04 2012 # by: PyQt4 UI code generator 4.9.6 # # WARNING! All changes made in this file will be lost! diff --git a/yomi_base/gen/reader_ui.py b/yomi_base/gen/reader_ui.py index 4c236ec..302261b 100644 --- a/yomi_base/gen/reader_ui.py +++ b/yomi_base/gen/reader_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'ui/reader.ui' # -# Created: Tue Dec 25 13:09:53 2012 +# Created: Tue Dec 25 13:23:04 2012 # by: PyQt4 UI code generator 4.9.6 # # WARNING! All changes made in this file will be lost! @@ -174,7 +174,7 @@ class Ui_MainWindowReader(object): self.actionToggleDefinitions.setObjectName(_fromUtf8("actionToggleDefinitions")) self.actionCopyDefinition = QtGui.QAction(MainWindowReader) icon9 = QtGui.QIcon() - icon9.addPixmap(QtGui.QPixmap(_fromUtf8(":/img/img/icon_action_copy_definition.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon9.addPixmap(QtGui.QPixmap(_fromUtf8(":/img/img/icon_copy_definition.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.actionCopyDefinition.setIcon(icon9) self.actionCopyDefinition.setIconVisibleInMenu(True) self.actionCopyDefinition.setObjectName(_fromUtf8("actionCopyDefinition")) diff --git a/yomi_base/gen/resources_rc.py b/yomi_base/gen/resources_rc.py index 030423e..3441bbc 100644 --- a/yomi_base/gen/resources_rc.py +++ b/yomi_base/gen/resources_rc.py @@ -2,7 +2,7 @@ # Resource object code # -# Created: Tue Dec 25 13:09:54 2012 +# Created: Tue Dec 25 13:23:04 2012 # by: The Resource Compiler for PyQt (Qt v4.8.4) # # WARNING! All changes made in this file will be lost! @@ -208,50 +208,6 @@ qt_resource_data = "\ \xb2\xa8\x63\xcf\xe2\x9a\xb2\x8f\xf8\xaf\x7c\x03\x6d\xbb\xfd\xe1\ \x1e\xb2\x45\xb5\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ \ -\x00\x00\x02\x97\ -\x89\ -\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\ -\x00\x00\x00\x04\x67\x41\x4d\x41\x00\x00\xaf\xc8\x37\x05\x8a\xe9\ -\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\x74\x77\x61\x72\x65\ -\x00\x41\x64\x6f\x62\x65\x20\x49\x6d\x61\x67\x65\x52\x65\x61\x64\ -\x79\x71\xc9\x65\x3c\x00\x00\x02\x29\x49\x44\x41\x54\x38\xcb\x75\ -\xd3\x3d\x68\x54\x41\x14\x86\xe1\xf7\xcc\xcc\xdd\x6c\xb2\x6e\x76\ -\x15\x7f\x82\x92\x42\x30\x49\x25\x56\x41\x8b\x18\x51\x8b\x14\x9a\ -\x4a\x1b\x41\x30\xa5\x28\x5a\x89\xa0\x9d\xa0\xb1\xb0\x97\x60\x21\ -\x04\xac\xb4\x4e\x27\x12\x13\x51\x12\x0c\xa8\x65\x88\x69\x92\x88\ -\x24\xb8\xc6\xb8\xff\x77\xee\x1c\x8b\xbb\x82\x92\xdd\xd3\x4c\x33\ -\xe7\x63\xce\x33\x33\x32\x76\xef\xc3\xcb\xde\x7c\x74\xcc\x18\x8a\ -\x8a\x26\x20\x88\x2a\x0d\xaf\x95\x9d\x6a\xf3\x79\xb3\x54\x7a\x36\ -\x3f\x35\x5e\xa7\x43\xc9\xe5\x47\x8b\x9f\x5e\xdd\x1f\xce\x6d\x96\ -\x83\x15\x20\xa8\x12\x27\x01\x67\x61\x7a\x61\x9b\xa5\xc5\x8d\x37\ -\xdf\xd7\x37\x6e\xcf\x3d\xbd\x50\x6d\x17\x60\x8c\x48\x4f\xa9\xaa\ -\x76\x65\x4b\xf9\xfa\x23\xb0\xbc\x99\xf0\x79\x3d\x66\x4f\x97\x63\ -\x64\xa8\xc8\xe8\x48\xff\xb9\xdc\xfe\xc2\xdd\x4e\x27\x30\x0a\x62\ -\x05\xb2\x0e\x32\x56\xc8\x58\x21\x9b\x31\x6c\x6e\xd7\x18\xda\x0b\ -\x13\x27\x0b\xf4\xf7\xf5\x5c\xed\x14\xe0\x00\x44\x20\xb2\xa0\x0a\ -\x6a\x85\xac\x33\xcc\x2e\xff\x3e\xda\xf0\x1e\xef\x03\xc7\x07\x0f\ -\x71\x6b\xfa\x4b\x45\x82\xca\x4e\xdd\xaf\xaf\xad\xd5\x5f\x34\x4b\ -\xa5\x27\xf3\x53\xe3\x35\xa7\x80\x20\x58\x63\x5a\x2a\x4a\x08\x4a\ -\x23\x8e\xb9\x7e\xf6\x30\x5b\xe5\x40\x6a\xd3\xd7\xd3\xb2\x19\x98\ -\x5e\xd8\x7e\xb0\xb4\xb8\x31\x3c\x7a\x63\xe6\x8a\x53\x85\x90\x76\ -\x22\x04\xac\x40\xc6\x19\x92\x44\xf9\x59\x55\x56\xb6\x14\x63\x94\ -\xd8\x07\x76\x6a\x9e\x33\x83\xdd\x8c\x0c\x15\xc9\x65\xcc\xc5\x99\ -\xd7\xe5\xc7\x4e\x55\x11\xc0\x19\x30\x62\x08\x0a\x56\x40\x49\xd7\ -\xac\x4b\x67\x14\xfd\xd7\x26\xe2\xc4\xc1\x02\xb3\x73\x5d\x37\x0d\ -\x6a\x48\x82\x6f\x7f\xc7\x2d\x1b\x27\xe0\x5a\x36\xab\x25\xe1\xdd\ -\x6a\x83\x5f\x35\x25\x72\x06\x27\x6a\x6d\xc3\x97\x81\xe2\x7f\xcd\ -\x9d\x6c\xe8\xb2\x88\x11\xac\xb5\x28\xe0\xe2\x66\xa3\x12\x99\x7c\ -\xae\x90\x8d\x51\x05\x23\x82\x48\x9a\xd0\xce\x46\x54\x09\x41\x10\ -\x11\x54\xc1\xf9\x44\xbf\x5d\x9b\xfc\x78\xa0\xe9\x29\x80\xd6\x20\ -\xed\xce\x17\x2c\x13\xa7\x8f\xec\xb2\x31\x01\xc8\x40\xb7\x03\x55\ -\xc5\xcd\x4c\x9e\x1a\x6b\x37\xff\xa5\x87\x4b\x71\x12\xbc\x6b\x3d\ -\x95\x5d\x15\xd4\x43\x10\x4c\xc7\x4f\xa2\xd6\xa5\x36\xed\xab\xe1\ -\xcb\x48\x30\xe2\x3a\x6d\xa8\xd6\xea\xa5\xc8\xe4\xf7\xed\xb2\x21\ -\x1d\xd2\x9a\x5e\x82\xfa\xa6\xa8\x6a\xdb\x80\xf3\x77\xde\xbf\xb5\ -\x46\x06\xc0\xf4\x81\x56\xfe\xda\xb4\x58\x25\x68\x52\x2e\xe4\xa2\ -\xee\x3f\x17\x97\xff\x1b\x29\xed\xa4\x7a\x00\x00\x00\x00\x49\x45\ -\x4e\x44\xae\x42\x60\x82\ \x00\x00\x02\x81\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ @@ -401,6 +357,50 @@ qt_resource_data = "\ \xb0\x10\x9f\x93\xc9\xcb\xf3\xa3\x71\x30\x5a\x54\x8c\x5a\x30\x5a\ \x54\x8c\x88\xa2\x62\x14\x0c\x3c\x00\x00\xa8\x90\x18\x2c\xda\xaa\ \x1f\x7c\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ +\x00\x00\x02\x97\ +\x89\ +\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ +\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\ +\x00\x00\x00\x04\x67\x41\x4d\x41\x00\x00\xaf\xc8\x37\x05\x8a\xe9\ +\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\x74\x77\x61\x72\x65\ +\x00\x41\x64\x6f\x62\x65\x20\x49\x6d\x61\x67\x65\x52\x65\x61\x64\ +\x79\x71\xc9\x65\x3c\x00\x00\x02\x29\x49\x44\x41\x54\x38\xcb\x75\ +\xd3\x3d\x68\x54\x41\x14\x86\xe1\xf7\xcc\xcc\xdd\x6c\xb2\x6e\x76\ +\x15\x7f\x82\x92\x42\x30\x49\x25\x56\x41\x8b\x18\x51\x8b\x14\x9a\ +\x4a\x1b\x41\x30\xa5\x28\x5a\x89\xa0\x9d\xa0\xb1\xb0\x97\x60\x21\ +\x04\xac\xb4\x4e\x27\x12\x13\x51\x12\x0c\xa8\x65\x88\x69\x92\x88\ +\x24\xb8\xc6\xb8\xff\x77\xee\x1c\x8b\xbb\x82\x92\xdd\xd3\x4c\x33\ +\xe7\x63\xce\x33\x33\x32\x76\xef\xc3\xcb\xde\x7c\x74\xcc\x18\x8a\ +\x8a\x26\x20\x88\x2a\x0d\xaf\x95\x9d\x6a\xf3\x79\xb3\x54\x7a\x36\ +\x3f\x35\x5e\xa7\x43\xc9\xe5\x47\x8b\x9f\x5e\xdd\x1f\xce\x6d\x96\ +\x83\x15\x20\xa8\x12\x27\x01\x67\x61\x7a\x61\x9b\xa5\xc5\x8d\x37\ +\xdf\xd7\x37\x6e\xcf\x3d\xbd\x50\x6d\x17\x60\x8c\x48\x4f\xa9\xaa\ +\x76\x65\x4b\xf9\xfa\x23\xb0\xbc\x99\xf0\x79\x3d\x66\x4f\x97\x63\ +\x64\xa8\xc8\xe8\x48\xff\xb9\xdc\xfe\xc2\xdd\x4e\x27\x30\x0a\x62\ +\x05\xb2\x0e\x32\x56\xc8\x58\x21\x9b\x31\x6c\x6e\xd7\x18\xda\x0b\ +\x13\x27\x0b\xf4\xf7\xf5\x5c\xed\x14\xe0\x00\x44\x20\xb2\xa0\x0a\ +\x6a\x85\xac\x33\xcc\x2e\xff\x3e\xda\xf0\x1e\xef\x03\xc7\x07\x0f\ +\x71\x6b\xfa\x4b\x45\x82\xca\x4e\xdd\xaf\xaf\xad\xd5\x5f\x34\x4b\ +\xa5\x27\xf3\x53\xe3\x35\xa7\x80\x20\x58\x63\x5a\x2a\x4a\x08\x4a\ +\x23\x8e\xb9\x7e\xf6\x30\x5b\xe5\x40\x6a\xd3\xd7\xd3\xb2\x19\x98\ +\x5e\xd8\x7e\xb0\xb4\xb8\x31\x3c\x7a\x63\xe6\x8a\x53\x85\x90\x76\ +\x22\x04\xac\x40\xc6\x19\x92\x44\xf9\x59\x55\x56\xb6\x14\x63\x94\ +\xd8\x07\x76\x6a\x9e\x33\x83\xdd\x8c\x0c\x15\xc9\x65\xcc\xc5\x99\ +\xd7\xe5\xc7\x4e\x55\x11\xc0\x19\x30\x62\x08\x0a\x56\x40\x49\xd7\ +\xac\x4b\x67\x14\xfd\xd7\x26\xe2\xc4\xc1\x02\xb3\x73\x5d\x37\x0d\ +\x6a\x48\x82\x6f\x7f\xc7\x2d\x1b\x27\xe0\x5a\x36\xab\x25\xe1\xdd\ +\x6a\x83\x5f\x35\x25\x72\x06\x27\x6a\x6d\xc3\x97\x81\xe2\x7f\xcd\ +\x9d\x6c\xe8\xb2\x88\x11\xac\xb5\x28\xe0\xe2\x66\xa3\x12\x99\x7c\ +\xae\x90\x8d\x51\x05\x23\x82\x48\x9a\xd0\xce\x46\x54\x09\x41\x10\ +\x11\x54\xc1\xf9\x44\xbf\x5d\x9b\xfc\x78\xa0\xe9\x29\x80\xd6\x20\ +\xed\xce\x17\x2c\x13\xa7\x8f\xec\xb2\x31\x01\xc8\x40\xb7\x03\x55\ +\xc5\xcd\x4c\x9e\x1a\x6b\x37\xff\xa5\x87\x4b\x71\x12\xbc\x6b\x3d\ +\x95\x5d\x15\xd4\x43\x10\x4c\xc7\x4f\xa2\xd6\xa5\x36\xed\xab\xe1\ +\xcb\x48\x30\xe2\x3a\x6d\xa8\xd6\xea\xa5\xc8\xe4\xf7\xed\xb2\x21\ +\x1d\xd2\x9a\x5e\x82\xfa\xa6\xa8\x6a\xdb\x80\xf3\x77\xde\xbf\xb5\ +\x46\x06\xc0\xf4\x81\x56\xfe\xda\xb4\x58\x25\x68\x52\x2e\xe4\xa2\ +\xee\x3f\x17\x97\xff\x1b\x29\xed\xa4\x7a\x00\x00\x00\x00\x49\x45\ +\x4e\x44\xae\x42\x60\x82\ \x00\x00\x02\x62\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ @@ -645,11 +645,6 @@ qt_resource_name = "\ \x00\x69\ \x00\x63\x00\x6f\x00\x6e\x00\x5f\x00\x61\x00\x63\x00\x74\x00\x69\x00\x6f\x00\x6e\x00\x5f\x00\x7a\x00\x6f\x00\x6f\x00\x6d\x00\x5f\ \x00\x6f\x00\x75\x00\x74\x00\x2e\x00\x70\x00\x6e\x00\x67\ -\x00\x1f\ -\x01\x89\x78\x27\ -\x00\x69\ -\x00\x63\x00\x6f\x00\x6e\x00\x5f\x00\x61\x00\x63\x00\x74\x00\x69\x00\x6f\x00\x6e\x00\x5f\x00\x63\x00\x6f\x00\x70\x00\x79\x00\x5f\ -\x00\x64\x00\x65\x00\x66\x00\x69\x00\x6e\x00\x69\x00\x74\x00\x69\x00\x6f\x00\x6e\x00\x2e\x00\x70\x00\x6e\x00\x67\ \x00\x18\ \x05\x74\x18\x87\ \x00\x69\ @@ -673,6 +668,11 @@ qt_resource_name = "\ \x0a\xb8\x02\x67\ \x00\x69\ \x00\x63\x00\x6f\x00\x6e\x00\x5f\x00\x6c\x00\x6f\x00\x67\x00\x6f\x00\x5f\x00\x33\x00\x32\x00\x2e\x00\x70\x00\x6e\x00\x67\ +\x00\x18\ +\x09\xb5\x02\x07\ +\x00\x69\ +\x00\x63\x00\x6f\x00\x6e\x00\x5f\x00\x63\x00\x6f\x00\x70\x00\x79\x00\x5f\x00\x64\x00\x65\x00\x66\x00\x69\x00\x6e\x00\x69\x00\x74\ +\x00\x69\x00\x6f\x00\x6e\x00\x2e\x00\x70\x00\x6e\x00\x67\ \x00\x1b\ \x0d\xf3\xfe\xc7\ \x00\x69\ @@ -704,21 +704,21 @@ qt_resource_struct = "\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x10\x00\x00\x00\x03\ -\x00\x00\x00\xfa\x00\x00\x00\x00\x00\x01\x00\x00\x0b\xa0\ \x00\x00\x00\xc4\x00\x00\x00\x00\x00\x01\x00\x00\x09\x0b\ \x00\x00\x00\x90\x00\x00\x00\x00\x00\x01\x00\x00\x06\x5f\ \x00\x00\x00\x3c\x00\x00\x00\x00\x00\x01\x00\x00\x03\x0e\ -\x00\x00\x02\x62\x00\x00\x00\x00\x00\x01\x00\x00\x19\x4b\ -\x00\x00\x02\x90\x00\x00\x00\x00\x00\x01\x00\x00\x1a\x6d\ -\x00\x00\x01\x3e\x00\x00\x00\x00\x00\x01\x00\x00\x0e\x3b\ -\x00\x00\x02\xc6\x00\x00\x00\x00\x00\x01\x00\x00\x1e\x21\ -\x00\x00\x02\xfa\x00\x00\x00\x00\x00\x01\x00\x00\x21\x02\ -\x00\x00\x01\xdc\x00\x00\x00\x00\x00\x01\x00\x00\x15\xdf\ +\x00\x00\x02\x54\x00\x00\x00\x00\x00\x01\x00\x00\x19\x4b\ +\x00\x00\x02\x82\x00\x00\x00\x00\x00\x01\x00\x00\x1a\x6d\ +\x00\x00\x00\xfa\x00\x00\x00\x00\x00\x01\x00\x00\x0b\xa0\ +\x00\x00\x02\xb8\x00\x00\x00\x00\x00\x01\x00\x00\x1e\x21\ +\x00\x00\x02\xec\x00\x00\x00\x00\x00\x01\x00\x00\x21\x02\ +\x00\x00\x01\x98\x00\x00\x00\x00\x00\x01\x00\x00\x13\x44\ +\x00\x00\x01\xe2\x00\x00\x00\x00\x00\x01\x00\x00\x14\x4a\ \x00\x00\x00\x6a\x00\x00\x00\x00\x00\x01\x00\x00\x05\xa5\ -\x00\x00\x01\xae\x00\x00\x00\x00\x00\x01\x00\x00\x13\x2b\ -\x00\x00\x02\x00\x00\x00\x00\x00\x00\x01\x00\x00\x16\x52\ -\x00\x00\x01\x74\x00\x00\x00\x00\x00\x01\x00\x00\x10\xc0\ -\x00\x00\x02\x26\x00\x00\x00\x00\x00\x01\x00\x00\x16\xe5\ +\x00\x00\x01\x6a\x00\x00\x00\x00\x00\x01\x00\x00\x10\x90\ +\x00\x00\x01\xbc\x00\x00\x00\x00\x00\x01\x00\x00\x13\xb7\ +\x00\x00\x01\x30\x00\x00\x00\x00\x00\x01\x00\x00\x0e\x25\ +\x00\x00\x02\x18\x00\x00\x00\x00\x00\x01\x00\x00\x16\xe5\ \x00\x00\x00\x0c\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ " diff --git a/yomi_base/preferences.py b/yomi_base/preferences.py index 1e75844..f580d1f 100644 --- a/yomi_base/preferences.py +++ b/yomi_base/preferences.py @@ -17,10 +17,10 @@ from PyQt4 import QtGui, QtCore -from gen import preferences +from gen import preferences_ui -class DialogPreferences(QtGui.QDialog, preferences.Ui_DialogPreferences): +class DialogPreferences(QtGui.QDialog, preferences_ui.Ui_DialogPreferences): def __init__(self, parent, preferences, anki): QtGui.QDialog.__init__(self, parent) self.setupUi(self) diff --git a/yomi_base/reader.py b/yomi_base/reader.py index 82f263c..cffa118 100644 --- a/yomi_base/reader.py +++ b/yomi_base/reader.py @@ -23,11 +23,11 @@ from preferences import DialogPreferences from update import UpdateFinder from about import DialogAbout from constants import constants -from gen import reader +from gen import reader_ui import reader_util -class MainWindowReader(QtGui.QMainWindow, reader.Ui_MainWindowReader): +class MainWindowReader(QtGui.QMainWindow, reader_ui.Ui_MainWindowReader): class State: def __init__(self): self.filename = unicode() diff --git a/yomi_base/reader_util.py b/yomi_base/reader_util.py index 9f20dbc..6c89d2c 100644 --- a/yomi_base/reader_util.py +++ b/yomi_base/reader_util.py @@ -18,7 +18,6 @@ import re from PyQt4 import QtGui -from util import buildResPath class Definition: @@ -149,12 +148,12 @@ def buildDefinitionHtml(definition, factIndex, factQuery): if definition.conjugations: conjugation = '<{0}>
'.format(definition.conjugations) - links = ''.format(factIndex, buildResPath('img/page_copy.png')) + links = ''.format(factIndex) if factQuery: if factQuery(buildFactMarkupExpression(definition.expression, definition.reading, definition.glossary)): - links += ''.format(factIndex, buildResPath('img/icon_add_expression.png')) + links += ''.format(factIndex) if factQuery(buildFactMarkupReading(definition.reading, definition.glossary)): - links += ''.format(factIndex, buildResPath('img/icon_add_reading.png')) + links += ''.format(factIndex) html = u""" {0} diff --git a/yomi_base/util.py b/yomi_base/util.py deleted file mode 100644 index e068090..0000000 --- a/yomi_base/util.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (C) 2011 Alex Yatskov -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -import sys -import os.path - - -def buildResPath(relative): - directory = os.path.split(__file__)[0] - return os.path.join(directory, relative) diff --git a/yomichan.py b/yomichan.py index 788880e..1d9e293 100755 --- a/yomichan.py +++ b/yomichan.py @@ -20,7 +20,6 @@ import sys from PyQt4 import QtGui, QtCore 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 @@ -45,7 +44,7 @@ class YomichanPlugin(Yomichan): separator.setSeparator(True) self.anki.addUiAction(separator) - action = QtGui.QAction(QtGui.QIcon(buildResPath('img/icon_logo_32.png')), '&Yomichan...', self.parent) + action = QtGui.QAction(QtGui.QIcon(':/img/img/icon_logo_32.png'), '&Yomichan...', self.parent) action.setIconVisibleInMenu(True) action.triggered.connect(self.onShowRequest) self.anki.addUiAction(action)