From 47e327bbe0c5d7f1c0c4df2b6076f2e3e480697a Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Tue, 25 Dec 2012 12:59:38 -0800 Subject: [PATCH] more moving --- {yomi_base/img => img}/icon_action_about.png | Bin .../img => img}/icon_action_copy_definition.png | Bin {yomi_base/img => img}/icon_action_feedback.png | Bin {yomi_base/img => img}/icon_action_find.png | Bin {yomi_base/img => img}/icon_action_homepage.png | Bin {yomi_base/img => img}/icon_action_open.png | Bin {yomi_base/img => img}/icon_action_preferences.png | Bin {yomi_base/img => img}/icon_action_quit.png | Bin {yomi_base/img => img}/icon_action_zoom_in.png | Bin {yomi_base/img => img}/icon_action_zoom_out.png | Bin {yomi_base/img => img}/icon_action_zoom_reset.png | Bin {yomi_base/img => img}/icon_add_expression.png | Bin {yomi_base/img => img}/icon_add_reading.png | Bin {yomi_base/img => img}/icon_logo_32.png | Bin {yomi_base/img => img}/icon_logo_64.png | Bin {yomi_base/img => img}/icon_logo_9.png | Bin {yomi_base/ui => ui}/about.ui | 0 {yomi_base/ui => ui}/preferences.ui | 0 {yomi_base/ui => ui}/reader.ui | 0 yomi_base/about.py | 3 +-- yomi_base/{ui_gen => gen}/__init__.py | 0 yomi_base/{ui_gen => gen}/about.py | 4 ++-- yomi_base/{ui_gen => gen}/preferences.py | 4 ++-- yomi_base/{ui_gen => gen}/reader.py | 2 +- yomi_base/preferences.py | 3 +-- yomi_base/reader.py | 3 +-- 26 files changed, 8 insertions(+), 11 deletions(-) rename {yomi_base/img => img}/icon_action_about.png (100%) rename {yomi_base/img => img}/icon_action_copy_definition.png (100%) rename {yomi_base/img => img}/icon_action_feedback.png (100%) rename {yomi_base/img => img}/icon_action_find.png (100%) rename {yomi_base/img => img}/icon_action_homepage.png (100%) rename {yomi_base/img => img}/icon_action_open.png (100%) rename {yomi_base/img => img}/icon_action_preferences.png (100%) rename {yomi_base/img => img}/icon_action_quit.png (100%) rename {yomi_base/img => img}/icon_action_zoom_in.png (100%) rename {yomi_base/img => img}/icon_action_zoom_out.png (100%) rename {yomi_base/img => img}/icon_action_zoom_reset.png (100%) rename {yomi_base/img => img}/icon_add_expression.png (100%) rename {yomi_base/img => img}/icon_add_reading.png (100%) rename {yomi_base/img => img}/icon_logo_32.png (100%) rename {yomi_base/img => img}/icon_logo_64.png (100%) rename {yomi_base/img => img}/icon_logo_9.png (100%) rename {yomi_base/ui => ui}/about.ui (100%) rename {yomi_base/ui => ui}/preferences.ui (100%) rename {yomi_base/ui => ui}/reader.ui (100%) rename yomi_base/{ui_gen => gen}/__init__.py (100%) rename yomi_base/{ui_gen => gen}/about.py (99%) rename yomi_base/{ui_gen => gen}/preferences.py (99%) rename yomi_base/{ui_gen => gen}/reader.py (99%) diff --git a/yomi_base/img/icon_action_about.png b/img/icon_action_about.png similarity index 100% rename from yomi_base/img/icon_action_about.png rename to img/icon_action_about.png diff --git a/yomi_base/img/icon_action_copy_definition.png b/img/icon_action_copy_definition.png similarity index 100% rename from yomi_base/img/icon_action_copy_definition.png rename to img/icon_action_copy_definition.png diff --git a/yomi_base/img/icon_action_feedback.png b/img/icon_action_feedback.png similarity index 100% rename from yomi_base/img/icon_action_feedback.png rename to img/icon_action_feedback.png diff --git a/yomi_base/img/icon_action_find.png b/img/icon_action_find.png similarity index 100% rename from yomi_base/img/icon_action_find.png rename to img/icon_action_find.png diff --git a/yomi_base/img/icon_action_homepage.png b/img/icon_action_homepage.png similarity index 100% rename from yomi_base/img/icon_action_homepage.png rename to img/icon_action_homepage.png diff --git a/yomi_base/img/icon_action_open.png b/img/icon_action_open.png similarity index 100% rename from yomi_base/img/icon_action_open.png rename to img/icon_action_open.png diff --git a/yomi_base/img/icon_action_preferences.png b/img/icon_action_preferences.png similarity index 100% rename from yomi_base/img/icon_action_preferences.png rename to img/icon_action_preferences.png diff --git a/yomi_base/img/icon_action_quit.png b/img/icon_action_quit.png similarity index 100% rename from yomi_base/img/icon_action_quit.png rename to img/icon_action_quit.png diff --git a/yomi_base/img/icon_action_zoom_in.png b/img/icon_action_zoom_in.png similarity index 100% rename from yomi_base/img/icon_action_zoom_in.png rename to img/icon_action_zoom_in.png diff --git a/yomi_base/img/icon_action_zoom_out.png b/img/icon_action_zoom_out.png similarity index 100% rename from yomi_base/img/icon_action_zoom_out.png rename to img/icon_action_zoom_out.png diff --git a/yomi_base/img/icon_action_zoom_reset.png b/img/icon_action_zoom_reset.png similarity index 100% rename from yomi_base/img/icon_action_zoom_reset.png rename to img/icon_action_zoom_reset.png diff --git a/yomi_base/img/icon_add_expression.png b/img/icon_add_expression.png similarity index 100% rename from yomi_base/img/icon_add_expression.png rename to img/icon_add_expression.png diff --git a/yomi_base/img/icon_add_reading.png b/img/icon_add_reading.png similarity index 100% rename from yomi_base/img/icon_add_reading.png rename to img/icon_add_reading.png diff --git a/yomi_base/img/icon_logo_32.png b/img/icon_logo_32.png similarity index 100% rename from yomi_base/img/icon_logo_32.png rename to img/icon_logo_32.png diff --git a/yomi_base/img/icon_logo_64.png b/img/icon_logo_64.png similarity index 100% rename from yomi_base/img/icon_logo_64.png rename to img/icon_logo_64.png diff --git a/yomi_base/img/icon_logo_9.png b/img/icon_logo_9.png similarity index 100% rename from yomi_base/img/icon_logo_9.png rename to img/icon_logo_9.png diff --git a/yomi_base/ui/about.ui b/ui/about.ui similarity index 100% rename from yomi_base/ui/about.ui rename to ui/about.ui diff --git a/yomi_base/ui/preferences.ui b/ui/preferences.ui similarity index 100% rename from yomi_base/ui/preferences.ui rename to ui/preferences.ui diff --git a/yomi_base/ui/reader.ui b/ui/reader.ui similarity index 100% rename from yomi_base/ui/reader.ui rename to ui/reader.ui diff --git a/yomi_base/about.py b/yomi_base/about.py index 5ffbf39..4119eff 100644 --- a/yomi_base/about.py +++ b/yomi_base/about.py @@ -18,8 +18,7 @@ from PyQt4 import QtGui from constants import constants -from util import buildResPath -from ui_gen import about +from gen import about class DialogAbout(QtGui.QDialog, about.Ui_DialogAbout): diff --git a/yomi_base/ui_gen/__init__.py b/yomi_base/gen/__init__.py similarity index 100% rename from yomi_base/ui_gen/__init__.py rename to yomi_base/gen/__init__.py diff --git a/yomi_base/ui_gen/about.py b/yomi_base/gen/about.py similarity index 99% rename from yomi_base/ui_gen/about.py rename to yomi_base/gen/about.py index c2c68c6..1ffea81 100644 --- a/yomi_base/ui_gen/about.py +++ b/yomi_base/gen/about.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '../ui/about.ui' +# Form implementation generated from reading ui file 'ui/about.ui' # -# Created: Tue Dec 25 12:28:41 2012 +# Created: Tue Dec 25 12:57:05 2012 # by: PyQt4 UI code generator 4.9.6 # # WARNING! All changes made in this file will be lost! diff --git a/yomi_base/ui_gen/preferences.py b/yomi_base/gen/preferences.py similarity index 99% rename from yomi_base/ui_gen/preferences.py rename to yomi_base/gen/preferences.py index f137a3a..e25cc6a 100644 --- a/yomi_base/ui_gen/preferences.py +++ b/yomi_base/gen/preferences.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '../ui/preferences.ui' +# Form implementation generated from reading ui file 'ui/preferences.ui' # -# Created: Tue Dec 25 12:28:19 2012 +# Created: Tue Dec 25 12:57:05 2012 # by: PyQt4 UI code generator 4.9.6 # # WARNING! All changes made in this file will be lost! diff --git a/yomi_base/ui_gen/reader.py b/yomi_base/gen/reader.py similarity index 99% rename from yomi_base/ui_gen/reader.py rename to yomi_base/gen/reader.py index 6c6f816..ee4d214 100644 --- a/yomi_base/ui_gen/reader.py +++ b/yomi_base/gen/reader.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'ui/reader.ui' # -# Created: Tue Dec 25 12:50:48 2012 +# Created: Tue Dec 25 12:57:05 2012 # by: PyQt4 UI code generator 4.9.6 # # WARNING! All changes made in this file will be lost! diff --git a/yomi_base/preferences.py b/yomi_base/preferences.py index e1918b6..1e75844 100644 --- a/yomi_base/preferences.py +++ b/yomi_base/preferences.py @@ -17,8 +17,7 @@ from PyQt4 import QtGui, QtCore -from util import buildResPath -from ui_gen import preferences +from gen import preferences class DialogPreferences(QtGui.QDialog, preferences.Ui_DialogPreferences): diff --git a/yomi_base/reader.py b/yomi_base/reader.py index 12e4792..82f263c 100644 --- a/yomi_base/reader.py +++ b/yomi_base/reader.py @@ -23,8 +23,7 @@ from preferences import DialogPreferences from update import UpdateFinder from about import DialogAbout from constants import constants -from util import buildResPath -from ui_gen import reader +from gen import reader import reader_util