Permalink
Browse files

Merge branch 'feature/pep8' into develop

  • Loading branch information...
2 parents da871ef + f288d8a commit 66f45f08d9d723787f1191989f8b0dda84b412ce @KelSolaar committed May 12, 2014
Showing with 31,442 additions and 32,444 deletions.
  1. +12 −28 bin/Umbra
  2. +227 −204 docs/help/Umbra_Manual.html
  3. +10 −9 docs/sphinx/source/conf.py
  4. +6 −6 docs/sphinx/source/index.rst
  5. +59 −59 docs/sphinx/source/resources/pages/api.rst
  6. +58 −71 setup.py
  7. +10 −15 umbra/__init__.py
  8. +0 −156 umbra/components/addons/projectsExplorer/models.py
  9. +0 −1,233 umbra/components/addons/projectsExplorer/projectsExplorer.py
  10. +0 −168 umbra/components/addons/projectsExplorer/views.py
  11. 0 umbra/components/addons/{projectsExplorer → projects_explorer}/__init__.py
  12. +139 −0 umbra/components/addons/projects_explorer/models.py
  13. +1,211 −0 umbra/components/addons/projects_explorer/projects_explorer.py
  14. +3 −3 ...components/addons/{projectsExplorer/projectsExplorer.rc → projects_explorer/projects_explorer.rc}
  15. 0 umbra/components/addons/{projectsExplorer → projects_explorer}/ui/Projects_Explorer.ui
  16. +148 −0 umbra/components/addons/projects_explorer/views.py
  17. +0 −728 umbra/components/addons/tcpClientUi/tcpClientUi.py
  18. +0 −651 umbra/components/addons/tcpServerUi/tcpServerUi.py
  19. 0 umbra/components/addons/{tcpClientUi → tcp_client_ui}/__init__.py
  20. +709 −0 umbra/components/addons/tcp_client_ui/tcp_client_ui.py
  21. +3 −3 umbra/components/addons/{tcpClientUi/tcpClientUi.rc → tcp_client_ui/tcp_client_ui.rc}
  22. 0 umbra/components/addons/{tcpClientUi → tcp_client_ui}/ui/TCP_Client_Ui.ui
  23. 0 umbra/components/addons/{tcpServerUi → tcp_server_ui}/__init__.py
  24. +631 −0 umbra/components/addons/tcp_server_ui/tcp_server_ui.py
  25. +3 −3 umbra/components/addons/{tcpServerUi/tcpServerUi.rc → tcp_server_ui/tcp_server_ui.rc}
  26. 0 umbra/components/addons/{tcpServerUi → tcp_server_ui}/ui/TCP_Server_Ui.ui
  27. +0 −92 umbra/components/addons/traceUi/models.py
  28. +0 −164 umbra/components/addons/traceUi/nodes.py
  29. +0 −640 umbra/components/addons/traceUi/traceUi.py
  30. +0 −170 umbra/components/addons/traceUi/views.py
  31. 0 umbra/components/addons/{traceUi → trace_ui}/__init__.py
  32. +78 −0 umbra/components/addons/trace_ui/models.py
  33. +144 −0 umbra/components/addons/trace_ui/nodes.py
  34. +620 −0 umbra/components/addons/trace_ui/trace_ui.py
  35. +2 −2 umbra/components/addons/{traceUi/traceUi.rc → trace_ui/trace_ui.rc}
  36. 0 umbra/components/addons/{traceUi → trace_ui}/ui/Trace_Ui.ui
  37. +150 −0 umbra/components/addons/trace_ui/views.py
  38. +0 −1,172 umbra/components/factory/componentsManagerUi/componentsManagerUi.py
  39. +0 −90 umbra/components/factory/componentsManagerUi/models.py
  40. +0 −291 umbra/components/factory/componentsManagerUi/nodes.py
  41. +0 −224 umbra/components/factory/componentsManagerUi/views.py
  42. 0 umbra/components/factory/{componentsManagerUi → components_manager_ui}/__init__.py
  43. +1,173 −0 umbra/components/factory/components_manager_ui/components_manager_ui.py
  44. +2 −2 ...ory/{componentsManagerUi/componentsManagerUi.rc → components_manager_ui/components_manager_ui.rc}
  45. +76 −0 umbra/components/factory/components_manager_ui/models.py
  46. +269 −0 umbra/components/factory/components_manager_ui/nodes.py
  47. BIN umbra/components/factory/{componentsManagerUi → components_manager_ui}/resources/Activated.png
  48. BIN umbra/components/factory/{componentsManagerUi → components_manager_ui}/resources/Deactivated.png
  49. BIN ...a/components/factory/{componentsManagerUi → components_manager_ui}/resources/Default_Category.png
  50. BIN ...a/components/factory/{componentsManagerUi → components_manager_ui}/resources/QObject_Category.png
  51. BIN ...a/components/factory/{componentsManagerUi → components_manager_ui}/resources/QWidget_Category.png
  52. 0 umbra/components/factory/{componentsManagerUi → components_manager_ui}/ui/Components_Manager_Ui.ui
  53. +204 −0 umbra/components/factory/components_manager_ui/views.py
  54. +0 −385 umbra/components/factory/preferencesManager/preferencesManager.py
  55. 0 umbra/components/factory/{preferencesManager → preferences_manager}/__init__.py
  56. +366 −0 umbra/components/factory/preferences_manager/preferences_manager.py
  57. +2 −2 ...s/factory/{preferencesManager/preferencesManager.rc → preferences_manager/preferences_manager.rc}
  58. 0 umbra/components/factory/{preferencesManager → preferences_manager}/ui/Preferences_Manager.ui
  59. +0 −674 umbra/components/factory/scriptEditor/editor.py
  60. +0 −219 umbra/components/factory/scriptEditor/editorStatus.py
  61. +0 −1,216 umbra/components/factory/scriptEditor/models.py
  62. +0 −685 umbra/components/factory/scriptEditor/nodes.py
  63. +0 −3,800 umbra/components/factory/scriptEditor/scriptEditor.py
  64. +0 −488 umbra/components/factory/scriptEditor/searchAndReplace.py
  65. +0 −1,450 umbra/components/factory/scriptEditor/searchInFiles.py
  66. +0 −262 umbra/components/factory/scriptEditor/views.py
  67. +0 −487 umbra/components/factory/scriptEditor/workers.py
  68. 0 umbra/components/factory/{scriptEditor → script_editor}/__init__.py
  69. +658 −0 umbra/components/factory/script_editor/editor.py
  70. +200 −0 umbra/components/factory/script_editor/editor_status.py
  71. +1,195 −0 umbra/components/factory/script_editor/models.py
  72. +642 −0 umbra/components/factory/script_editor/nodes.py
  73. +3,793 −0 umbra/components/factory/script_editor/script_editor.py
  74. +2 −2 umbra/components/factory/{scriptEditor/scriptEditor.rc → script_editor/script_editor.rc}
  75. +471 −0 umbra/components/factory/script_editor/search_and_replace.py
  76. +1,443 −0 umbra/components/factory/script_editor/search_in_files.py
  77. 0 umbra/components/factory/{scriptEditor → script_editor}/ui/Editor_Status.ui
  78. +10 −2 umbra/components/factory/{scriptEditor → script_editor}/ui/Script_Editor.ui
  79. 0 umbra/components/factory/{scriptEditor → script_editor}/ui/Search_And_Replace.ui
  80. 0 umbra/components/factory/{scriptEditor → script_editor}/ui/Search_In_Files.ui
  81. +236 −0 umbra/components/factory/script_editor/views.py
  82. +470 −0 umbra/components/factory/script_editor/workers.py
  83. +2,031 −2,035 umbra/engine.py
  84. +137 −129 umbra/exceptions.py
  85. +174 −188 umbra/globals/constants.py
  86. +0 −117 umbra/globals/runtimeGlobals.py
  87. +106 −0 umbra/globals/runtime_globals.py
  88. +0 −253 umbra/globals/uiConstants.py
  89. +245 −0 umbra/globals/ui_constants.py
  90. +31 −44 umbra/launcher.py
  91. +0 −599 umbra/managers/actionsManager.py
  92. +581 −0 umbra/managers/actions_manager.py
  93. +0 −455 umbra/managers/fileSystemEventsManager.py
  94. +434 −0 umbra/managers/file_system_events_manager.py
  95. +0 −518 umbra/managers/layoutsManager.py
  96. +501 −0 umbra/managers/layouts_manager.py
  97. +0 −477 umbra/managers/notificationsManager.py
  98. +458 −0 umbra/managers/notifications_manager.py
  99. +0 −462 umbra/managers/patchesManager.py
  100. +443 −0 umbra/managers/patches_manager.py
  101. +280 −299 umbra/preferences.py
  102. +74 −91 umbra/processing.py
  103. +779 −785 umbra/reporter.py
  104. +3 −3 umbra/resources/grammars/C_C++/C_C++.grc
  105. +3 −3 umbra/resources/grammars/Python/Python.grc
  106. +2 −2 umbra/resources/grammars/Text/Text.grc
  107. +91 −86 umbra/resources/htmls/Invalid_Link.html
  108. +12 −12 umbra/resources/layouts/Default_Layouts.rc
  109. +9 −17 umbra/resources/patches/001_dummy.py
  110. +22 −22 umbra/resources/preferences/Default_Settings.rc
  111. +3 −3 umbra/resources/styles/Darwin_FullScreen_styleSheet.qss
  112. +3 −3 umbra/resources/styles/Darwin_styleSheet.qss
  113. +3 −3 umbra/resources/styles/Linux_FullScreen_styleSheet.qss
  114. +3 −3 umbra/resources/styles/Linux_styleSheet.qss
  115. +3 −3 umbra/resources/styles/Windows_FullScreen_styleSheet.qss
  116. +3 −3 umbra/resources/styles/Windows_styleSheet.qss
  117. +32 −38 umbra/tests/tests.py
  118. +0 −98 umbra/tests/testsUmbra/testsExceptions.py
  119. +0 −312 umbra/tests/testsUmbra/testsGlobals/testsConstants.py
  120. +0 −110 umbra/tests/testsUmbra/testsGlobals/testsRuntimeGlobals.py
  121. +0 −386 umbra/tests/testsUmbra/testsGlobals/testsUiConstants.py
  122. 0 umbra/tests/{testsUmbra → tests_umbra}/__init__.py
  123. +88 −0 umbra/tests/tests_umbra/tests_exceptions.py
  124. 0 umbra/tests/{testsUmbra/testsGlobals → tests_umbra/tests_globals}/__init__.py
  125. +300 −0 umbra/tests/tests_umbra/tests_globals/tests_constants.py
  126. +98 −0 umbra/tests/tests_umbra/tests_globals/tests_runtime_globals.py
  127. +374 −0 umbra/tests/tests_umbra/tests_globals/tests_ui_constants.py
  128. +4 −13 umbra/tests/utilities.py
  129. +318 −319 umbra/ui/common.py
  130. +107 −127 umbra/ui/completers.py
  131. +145 −167 umbra/ui/delegates.py
  132. +413 −437 umbra/ui/highlighters.py
  133. +0 −311 umbra/ui/inputAccelerators.py
  134. +304 −0 umbra/ui/input_accelerators.py
  135. +238 −247 umbra/ui/languages.py
  136. +707 −723 umbra/ui/models.py
  137. +373 −395 umbra/ui/nodes.py
  138. +126 −140 umbra/ui/themes.py
  139. +448 −465 umbra/ui/views.py
  140. +0 −163 umbra/ui/visualAccelerators.py
  141. +152 −0 umbra/ui/visual_accelerators.py
  142. +412 −428 umbra/ui/widgets/active_QLabel.py
  143. +260 −279 umbra/ui/widgets/active_QLabelsCollection.py
  144. +548 −552 umbra/ui/widgets/application_QToolBar.py
  145. +987 −1,002 umbra/ui/widgets/basic_QPlainTextEdit.py
  146. +1,241 −1,263 umbra/ui/widgets/codeEditor_QPlainTextEdit.py
  147. +140 −158 umbra/ui/widgets/delayed_QSplashScreen.py
  148. +0 −161 umbra/ui/widgets/messageBox.py
  149. +148 −0 umbra/ui/widgets/message_box.py
  150. +821 −835 umbra/ui/widgets/notification_QLabel.py
  151. +450 −462 umbra/ui/widgets/search_QLineEdit.py
  152. +224 −243 umbra/ui/widgets/variable_QPushButton.py
  153. +50 −64 utilities/sanitizer.py
  154. +0 −75 utilities/uEdit.py
  155. +65 −0 utilities/u_edit.py
View
40 bin/Umbra 100755 → 100644
@@ -5,47 +5,34 @@
**Umbra**
**Platform:**
- Windows, Linux, Mac Os X.
+ Windows, Linux, Mac Os X.
**Description:**
- This module starts the Application.
+ This module starts the Application.
**Others:**
"""
-#**********************************************************************************************************************
-#*** Future imports.
-#**********************************************************************************************************************
from __future__ import unicode_literals
-#**********************************************************************************************************************
-#*** External imports.
-#**********************************************************************************************************************
import os
import sys
-#**********************************************************************************************************************
-#*** Path manipulations.
-#**********************************************************************************************************************
-def _setApplicationPackageDirectory():
- """
- This definition sets the Application package directory in the path.
- """
- applicationPackageDirectory = os.path.normpath(os.path.join(os.path.dirname(__file__), "../"))
- applicationPackageDirectory not in sys.path and sys.path.append(applicationPackageDirectory)
+def _set_application_package_directory():
+ """
+ Sets the Application package directory in the path.
+ """
-_setApplicationPackageDirectory()
+ application_package_directory = os.path.normpath(os.path.join(os.path.dirname(__file__), "../"))
+ application_package_directory not in sys.path and sys.path.append(application_package_directory)
+
+
+_set_application_package_directory()
-#**********************************************************************************************************************
-#*** Internal imports.
-#**********************************************************************************************************************
from umbra.launcher import main
-#**********************************************************************************************************************
-#*** Module attributes.
-#**********************************************************************************************************************
__author__ = "Thomas Mansencal"
__copyright__ = "Copyright (C) 2008 - 2014 - Thomas Mansencal"
__license__ = "GPL V3.0 - http://www.gnu.org/licenses/"
@@ -55,8 +42,5 @@ __status__ = "Production"
__all__ = []
-#**********************************************************************************************************************
-#*** Launcher.
-#**********************************************************************************************************************
if __name__ == "__main__":
- main()
+ main()
Oops, something went wrong.

0 comments on commit 66f45f0

Please sign in to comment.