Permalink
Browse files

Moved all sub-modules to a root package "tikz_editor".

  • Loading branch information...
1 parent dc521f5 commit 5e370681d272abe48fffebdc87ea165534967ce7 @mickael-menu mickael-menu committed May 18, 2012
Showing with 909 additions and 848 deletions.
  1. +2 −2 Makefile
  2. +0 −7 resources/resources.qrc
  3. +6 −38 tikz_editor.pyw
  4. +48 −0 tikz_editor/__init__.py
  5. +4 −4 { → tikz_editor}/controllers/__init__.py
  6. +8 −7 { → tikz_editor}/controllers/about.py
  7. +40 −41 { → tikz_editor}/controllers/app.py
  8. +16 −16 { → tikz_editor}/controllers/document.py
  9. +15 −15 { → tikz_editor}/controllers/documents.py
  10. +22 −17 { → tikz_editor}/controllers/errors.py
  11. +15 −14 { → tikz_editor}/controllers/factory.py
  12. +19 −18 { → tikz_editor}/controllers/preferences.py
  13. +15 −14 { → tikz_editor}/controllers/preview.py
  14. +5 −5 { → tikz_editor}/globals/__init__.py
  15. +4 −4 { → tikz_editor}/globals/actions.py
  16. +6 −6 { → tikz_editor}/globals/defaults.py
  17. +4 −4 { → tikz_editor}/globals/editor.py
  18. +3 −3 { → tikz_editor}/models/__init__.py
  19. +21 −19 { → tikz_editor}/models/document.py
  20. +6 −5 { → tikz_editor}/models/factory.py
  21. +92 −91 { → tikz_editor}/models/preferences.py
  22. +1 −1 { → tikz_editor}/resources/__init__.py
  23. 0 {resources → tikz_editor/resources/html}/about.html
  24. BIN {resources → tikz_editor/resources/images}/icon.icns
  25. BIN {resources → tikz_editor/resources/images}/icon.png
  26. BIN {resources → tikz_editor/resources/images}/icon.pxm
  27. BIN {resources → tikz_editor/resources/images}/icon_about.png
  28. +7 −0 tikz_editor/resources/resources.qrc
  29. +10 −6 { → tikz_editor}/tools/__init__.py
  30. +14 −8 { → tikz_editor}/tools/documentIO/__init__.py
  31. +15 −15 { → tikz_editor}/tools/documentIO/reader.py
  32. +4 −4 { → tikz_editor}/tools/documentIO/tags.py
  33. +8 −8 { → tikz_editor}/tools/documentIO/template.py
  34. +29 −26 { → tikz_editor}/tools/file.py
  35. +3 −3 { → tikz_editor}/tools/latex2image/__init__.py
  36. +22 −22 { → tikz_editor}/tools/latex2image/converter.py
  37. +25 −24 { → tikz_editor}/tools/latex2image/logs_parser.py
  38. +3 −3 { → tikz_editor}/tools/qt/__init__.py
  39. +6 −5 { → tikz_editor}/tools/qt/actions.py
  40. +8 −8 { → tikz_editor}/tools/qt/dialogs.py
  41. +8 −7 { → tikz_editor}/tools/qt/toolbar.py
  42. +11 −9 { → tikz_editor}/tools/temp_dir.py
  43. +3 −3 { → tikz_editor}/views/__init__.py
  44. +11 −10 { → tikz_editor}/views/about.py
  45. +20 −21 { → tikz_editor}/views/document/__init__.py
  46. +18 −17 { → tikz_editor}/views/document/content.py
  47. +18 −17 { → tikz_editor}/views/document/feedback/__init__.py
  48. +12 −10 { → tikz_editor}/views/document/feedback/errors.py
  49. +10 −9 { → tikz_editor}/views/document/feedback/logs.py
  50. +19 −18 { → tikz_editor}/views/document/preview.py
  51. +13 −12 { → tikz_editor}/views/document/properties.py
  52. +74 −73 { → tikz_editor}/views/editor.py
  53. +21 −20 { → tikz_editor}/views/factory.py
  54. +22 −21 { → tikz_editor}/views/preferences/__init__.py
  55. +24 −23 { → tikz_editor}/views/preferences/document.py
  56. +46 −45 { → tikz_editor}/views/preferences/editor.py
  57. +31 −30 { → tikz_editor}/views/preferences/preview.py
  58. +42 −40 { → tikz_editor}/views/preferences/snippets.py
View
@@ -15,9 +15,9 @@
PYRCC = pyrcc4
-all: resources/__init__.py
+all: tikz_editor/resources/__init__.py
# Builds the resources module using PyQt's pyrcc4.
# see: http://www.riverbankcomputing.co.uk/static/Docs/PyQt4/html/resources.html
-resources/__init__.py: resources/resources.qrc
+tikz_editor/resources/__init__.py: tikz_editor/resources/resources.qrc
$(PYRCC) -o $@ $<
View
@@ -1,7 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
- <qresource>
- <file>icon_about.png</file>
- <file>about.html</file>
- </qresource>
-</RCC>
View
@@ -1,53 +1,21 @@
#!/usr/bin/env python
# Copyright 2012 (C) Mickael Menu <mickael.menu@gmail.com>
-#
+#
# 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 2 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 <http://www.gnu.org/licenses/>.
-import os
-import sys
-import atexit # necessary for pyinstaller deployment
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+import tikz_editor
-from controllers import ControllerFactory
-from tools import isMacintoshComputer
-import globals
-
-__version__ = globals.VERSION
-__author__ = globals.AUTHORS
-def main():
- app = QApplication(sys.argv)
- app.setOrganizationName(globals.ORGANIZATION_NAME)
- app.setOrganizationDomain(globals.ORGANIZATION_DOMAIN)
- app.setApplicationName(globals.APPLICATION_NAME)
-
- if isMacintoshComputer():
- # add /opt/local/bin to PATH to find pdflatex binary -- useful for Mac plateform using Macports
- os.environ['PATH'] = os.environ.get('PATH', '/usr/bin') + ':/opt/local/bin'
- app.setQuitOnLastWindowClosed(False)
-
- app_controller = ControllerFactory.createAppController()
-
- args = app.arguments()[1:]
- if len(args) > 0:
- for file_path in args:
- app_controller.open(file_path)
- else:
- app_controller.new()
-
- app.exec_()
- app_controller.quit()
-
-main()
+if __name__ == '__main__':
+ tikz_editor.start()
View
@@ -0,0 +1,48 @@
+# Copyright 2012 (C) Mickael Menu <mickael.menu@gmail.com>
+#
+# 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 2 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 <http://www.gnu.org/licenses/>.
+
+import os
+import sys
+import atexit # necessary for pyinstaller deployment
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
+
+from tikz_editor.controllers import ControllerFactory
+from tikz_editor.tools import isMacintoshComputer
+import tikz_editor.globals as globals
+
+
+def start():
+ app = QApplication(sys.argv)
+ app.setOrganizationName(globals.ORGANIZATION_NAME)
+ app.setOrganizationDomain(globals.ORGANIZATION_DOMAIN)
+ app.setApplicationName(globals.APPLICATION_NAME)
+
+ if isMacintoshComputer():
+ # add /opt/local/bin to PATH to find pdflatex binary -- useful for Mac plateform using Macports
+ os.environ['PATH'] = os.environ.get('PATH', '/usr/bin') + ':/opt/local/bin'
+ app.setQuitOnLastWindowClosed(False)
+
+ app_controller = ControllerFactory.createAppController()
+
+ args = app.arguments()[1:]
+ if len(args) > 0:
+ for file_path in args:
+ app_controller.open(file_path)
+ else:
+ app_controller.new()
+
+ app.exec_()
+ app_controller.quit()
@@ -1,18 +1,18 @@
# Copyright 2012 (C) Mickael Menu <mickael.menu@gmail.com>
-#
+#
# 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 2 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 <http://www.gnu.org/licenses/>.
from factory import ControllerFactory
-__all__ = ['ControllerFactory']
+__all__ = ['ControllerFactory']
@@ -1,22 +1,23 @@
# Copyright 2012 (C) Mickael Menu <mickael.menu@gmail.com>
-#
+#
# 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 2 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 <http://www.gnu.org/licenses/>.
from PyQt4.QtCore import *
-import resources
-from tools import File
+import tikz_editor.resources
+from tikz_editor.tools import File
+
class AboutController(QObject):
"""
@@ -26,12 +27,12 @@ def __init__(self):
super(AboutController, self).__init__()
self.view = None
self.app_controller = None
-
+
def initController(self):
self.view.setImage(":/icon_about.png")
self.view.setInfoHTML(File.readContentFromFilePath(":/about.html"))
@pyqtSlot()
def showAbout(self):
self.view.show()
- self.view.raise_()
+ self.view.raise_()
Oops, something went wrong.

0 comments on commit 5e37068

Please sign in to comment.