From 89eb05e28026ac27e76b18d46997ac090523d4b9 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Fri, 4 Nov 2011 08:52:37 -0700 Subject: [PATCH] organizing files better --- mangle/about.py | 2 +- mangle/book.py | 2 +- mangle/{resource => }/img/add_directory.png | Bin mangle/{resource => }/img/add_file.png | Bin mangle/{resource => }/img/banner_about.png | Bin mangle/{resource => }/img/export_book.png | Bin mangle/{resource => }/img/file_new.png | Bin mangle/{resource => }/img/file_open.png | Bin mangle/{resource => }/img/remove_files.png | Bin mangle/{resource => }/img/save_file.png | Bin mangle/{resource => }/img/shift_down.png | Bin mangle/{resource => }/img/shift_up.png | Bin mangle/options.py | 2 +- mangle/{resource => }/ui/about.ui | 0 mangle/{resource => }/ui/book.ui | 0 mangle/{resource => }/ui/options.ui | 0 16 files changed, 3 insertions(+), 3 deletions(-) rename mangle/{resource => }/img/add_directory.png (100%) rename mangle/{resource => }/img/add_file.png (100%) rename mangle/{resource => }/img/banner_about.png (100%) rename mangle/{resource => }/img/export_book.png (100%) rename mangle/{resource => }/img/file_new.png (100%) rename mangle/{resource => }/img/file_open.png (100%) rename mangle/{resource => }/img/remove_files.png (100%) rename mangle/{resource => }/img/save_file.png (100%) rename mangle/{resource => }/img/shift_down.png (100%) rename mangle/{resource => }/img/shift_up.png (100%) rename mangle/{resource => }/ui/about.ui (100%) rename mangle/{resource => }/ui/book.ui (100%) rename mangle/{resource => }/ui/options.ui (100%) diff --git a/mangle/about.py b/mangle/about.py index c255e66..c2af64b 100644 --- a/mangle/about.py +++ b/mangle/about.py @@ -22,4 +22,4 @@ from PyQt4 import QtGui, uic class DialogAbout(QtGui.QDialog): def __init__(self, parent): QtGui.QDialog.__init__(self, parent) - uic.loadUi(util.buildResPath('mangle/resource/ui/about.ui'), self) + uic.loadUi(util.buildResPath('mangle/ui/about.ui'), self) diff --git a/mangle/book.py b/mangle/book.py index 18cd30c..7dbc2c7 100644 --- a/mangle/book.py +++ b/mangle/book.py @@ -112,7 +112,7 @@ class MainWindowBook(QtGui.QMainWindow): def __init__(self, filename=None): QtGui.QMainWindow.__init__(self) - uic.loadUi(util.buildResPath('mangle/resource/ui/book.ui'), self) + uic.loadUi(util.buildResPath('mangle/ui/book.ui'), self) self.listWidgetFiles.setContextMenuPolicy(QtCore.Qt.CustomContextMenu) self.actionFileNew.triggered.connect(self.onFileNew) self.actionFileOpen.triggered.connect(self.onFileOpen) diff --git a/mangle/resource/img/add_directory.png b/mangle/img/add_directory.png similarity index 100% rename from mangle/resource/img/add_directory.png rename to mangle/img/add_directory.png diff --git a/mangle/resource/img/add_file.png b/mangle/img/add_file.png similarity index 100% rename from mangle/resource/img/add_file.png rename to mangle/img/add_file.png diff --git a/mangle/resource/img/banner_about.png b/mangle/img/banner_about.png similarity index 100% rename from mangle/resource/img/banner_about.png rename to mangle/img/banner_about.png diff --git a/mangle/resource/img/export_book.png b/mangle/img/export_book.png similarity index 100% rename from mangle/resource/img/export_book.png rename to mangle/img/export_book.png diff --git a/mangle/resource/img/file_new.png b/mangle/img/file_new.png similarity index 100% rename from mangle/resource/img/file_new.png rename to mangle/img/file_new.png diff --git a/mangle/resource/img/file_open.png b/mangle/img/file_open.png similarity index 100% rename from mangle/resource/img/file_open.png rename to mangle/img/file_open.png diff --git a/mangle/resource/img/remove_files.png b/mangle/img/remove_files.png similarity index 100% rename from mangle/resource/img/remove_files.png rename to mangle/img/remove_files.png diff --git a/mangle/resource/img/save_file.png b/mangle/img/save_file.png similarity index 100% rename from mangle/resource/img/save_file.png rename to mangle/img/save_file.png diff --git a/mangle/resource/img/shift_down.png b/mangle/img/shift_down.png similarity index 100% rename from mangle/resource/img/shift_down.png rename to mangle/img/shift_down.png diff --git a/mangle/resource/img/shift_up.png b/mangle/img/shift_up.png similarity index 100% rename from mangle/resource/img/shift_up.png rename to mangle/img/shift_up.png diff --git a/mangle/options.py b/mangle/options.py index b791098..f5794e2 100644 --- a/mangle/options.py +++ b/mangle/options.py @@ -24,7 +24,7 @@ class DialogOptions(QtGui.QDialog): def __init__(self, parent, book): QtGui.QDialog.__init__(self, parent) - uic.loadUi(util.buildResPath('mangle/resource/ui/options.ui'), self) + uic.loadUi(util.buildResPath('mangle/ui/options.ui'), self) self.accepted.connect(self.onAccept) self.book = book diff --git a/mangle/resource/ui/about.ui b/mangle/ui/about.ui similarity index 100% rename from mangle/resource/ui/about.ui rename to mangle/ui/about.ui diff --git a/mangle/resource/ui/book.ui b/mangle/ui/book.ui similarity index 100% rename from mangle/resource/ui/book.ui rename to mangle/ui/book.ui diff --git a/mangle/resource/ui/options.ui b/mangle/ui/options.ui similarity index 100% rename from mangle/resource/ui/options.ui rename to mangle/ui/options.ui