Sat, 23 Feb 2013 15:19:29 +0100
Modified the code to do lazy import.
--- a/ChangeLog Sun Feb 03 17:00:27 2013 +0100 +++ b/ChangeLog Sat Feb 23 15:19:29 2013 +0100 @@ -1,5 +1,9 @@ ChangeLog --------- +Version 1.1.0 +- bug fixes +- modified code to do lazy import + Version 1.0.0 - first stable release
--- a/PluginProjectPyramid.py Sun Feb 03 17:00:27 2013 +0100 +++ b/PluginProjectPyramid.py Sat Feb 23 15:19:29 2013 +0100 @@ -19,9 +19,6 @@ from Globals import isWindowsPlatform, isMacPlatform -from Project.ProjectBrowser import SourcesBrowserFlag, FormsBrowserFlag, \ - TranslationsBrowserFlag, OthersBrowserFlag - from ProjectPyramid.Project import Project # Start-of-Header @@ -29,7 +26,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "1.0.0" +version = "1.1.0" className = "ProjectPyramidPlugin" packageName = "ProjectPyramid" shortDescription = "Project support for Pyramid projects." @@ -195,6 +192,9 @@ self.fileTypesCallback, lexerAssociationCallback=self.lexerAssociationCallback, binaryTranslationsCallback=self.binaryTranslationsCallback) + + from Project.ProjectBrowser import SourcesBrowserFlag, FormsBrowserFlag, \ + TranslationsBrowserFlag, OthersBrowserFlag Preferences.setProjectBrowserFlagsDefault("Pyramid", SourcesBrowserFlag | \ FormsBrowserFlag | \
--- a/ProjectPyramid/Documentation/source/Plugin_Project_Pyramid.PluginProjectPyramid.html Sun Feb 03 17:00:27 2013 +0100 +++ b/ProjectPyramid/Documentation/source/Plugin_Project_Pyramid.PluginProjectPyramid.html Sat Feb 23 15:19:29 2013 +0100 @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' -'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<!DOCTYPE html> <html><head> <title>Plugin_Project_Pyramid.PluginProjectPyramid</title> +<meta charset="UTF-8"> <style> body { background: #EDECE6;
--- a/ProjectPyramid/Documentation/source/Plugin_Project_Pyramid.ProjectPyramid.ConfigurationPage.PyramidPage.html Sun Feb 03 17:00:27 2013 +0100 +++ b/ProjectPyramid/Documentation/source/Plugin_Project_Pyramid.ProjectPyramid.ConfigurationPage.PyramidPage.html Sat Feb 23 15:19:29 2013 +0100 @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' -'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<!DOCTYPE html> <html><head> <title>Plugin_Project_Pyramid.ProjectPyramid.ConfigurationPage.PyramidPage</title> +<meta charset="UTF-8"> <style> body { background: #EDECE6;
--- a/ProjectPyramid/Documentation/source/Plugin_Project_Pyramid.ProjectPyramid.CreateParametersDialog.html Sun Feb 03 17:00:27 2013 +0100 +++ b/ProjectPyramid/Documentation/source/Plugin_Project_Pyramid.ProjectPyramid.CreateParametersDialog.html Sat Feb 23 15:19:29 2013 +0100 @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' -'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<!DOCTYPE html> <html><head> <title>Plugin_Project_Pyramid.ProjectPyramid.CreateParametersDialog</title> +<meta charset="UTF-8"> <style> body { background: #EDECE6;
--- a/ProjectPyramid/Documentation/source/Plugin_Project_Pyramid.ProjectPyramid.DistributionTypeSelectionDialog.html Sun Feb 03 17:00:27 2013 +0100 +++ b/ProjectPyramid/Documentation/source/Plugin_Project_Pyramid.ProjectPyramid.DistributionTypeSelectionDialog.html Sat Feb 23 15:19:29 2013 +0100 @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' -'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<!DOCTYPE html> <html><head> <title>Plugin_Project_Pyramid.ProjectPyramid.DistributionTypeSelectionDialog</title> +<meta charset="UTF-8"> <style> body { background: #EDECE6;
--- a/ProjectPyramid/Documentation/source/Plugin_Project_Pyramid.ProjectPyramid.FormSelectionDialog.html Sun Feb 03 17:00:27 2013 +0100 +++ b/ProjectPyramid/Documentation/source/Plugin_Project_Pyramid.ProjectPyramid.FormSelectionDialog.html Sat Feb 23 15:19:29 2013 +0100 @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' -'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<!DOCTYPE html> <html><head> <title>Plugin_Project_Pyramid.ProjectPyramid.FormSelectionDialog</title> +<meta charset="UTF-8"> <style> body { background: #EDECE6;
--- a/ProjectPyramid/Documentation/source/Plugin_Project_Pyramid.ProjectPyramid.Project.html Sun Feb 03 17:00:27 2013 +0100 +++ b/ProjectPyramid/Documentation/source/Plugin_Project_Pyramid.ProjectPyramid.Project.html Sat Feb 23 15:19:29 2013 +0100 @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' -'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<!DOCTYPE html> <html><head> <title>Plugin_Project_Pyramid.ProjectPyramid.Project</title> +<meta charset="UTF-8"> <style> body { background: #EDECE6;
--- a/ProjectPyramid/Documentation/source/Plugin_Project_Pyramid.ProjectPyramid.PyramidDialog.html Sun Feb 03 17:00:27 2013 +0100 +++ b/ProjectPyramid/Documentation/source/Plugin_Project_Pyramid.ProjectPyramid.PyramidDialog.html Sat Feb 23 15:19:29 2013 +0100 @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' -'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<!DOCTYPE html> <html><head> <title>Plugin_Project_Pyramid.ProjectPyramid.PyramidDialog</title> +<meta charset="UTF-8"> <style> body { background: #EDECE6;
--- a/ProjectPyramid/Documentation/source/Plugin_Project_Pyramid.ProjectPyramid.PyramidRoutesDialog.html Sun Feb 03 17:00:27 2013 +0100 +++ b/ProjectPyramid/Documentation/source/Plugin_Project_Pyramid.ProjectPyramid.PyramidRoutesDialog.html Sat Feb 23 15:19:29 2013 +0100 @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' -'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<!DOCTYPE html> <html><head> <title>Plugin_Project_Pyramid.ProjectPyramid.PyramidRoutesDialog</title> +<meta charset="UTF-8"> <style> body { background: #EDECE6;
--- a/ProjectPyramid/Documentation/source/index-Plugin_Project_Pyramid.ProjectPyramid.ConfigurationPage.html Sun Feb 03 17:00:27 2013 +0100 +++ b/ProjectPyramid/Documentation/source/index-Plugin_Project_Pyramid.ProjectPyramid.ConfigurationPage.html Sat Feb 23 15:19:29 2013 +0100 @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' -'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<!DOCTYPE html> <html><head> <title>Plugin_Project_Pyramid.ProjectPyramid.ConfigurationPage</title> +<meta charset="UTF-8"> <style> body { background: #EDECE6;
--- a/ProjectPyramid/Documentation/source/index-Plugin_Project_Pyramid.ProjectPyramid.html Sun Feb 03 17:00:27 2013 +0100 +++ b/ProjectPyramid/Documentation/source/index-Plugin_Project_Pyramid.ProjectPyramid.html Sat Feb 23 15:19:29 2013 +0100 @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' -'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<!DOCTYPE html> <html><head> <title>Plugin_Project_Pyramid.ProjectPyramid</title> +<meta charset="UTF-8"> <style> body { background: #EDECE6;
--- a/ProjectPyramid/Documentation/source/index-Plugin_Project_Pyramid.html Sun Feb 03 17:00:27 2013 +0100 +++ b/ProjectPyramid/Documentation/source/index-Plugin_Project_Pyramid.html Sat Feb 23 15:19:29 2013 +0100 @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' -'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<!DOCTYPE html> <html><head> <title>Plugin_Project_Pyramid</title> +<meta charset="UTF-8"> <style> body { background: #EDECE6;
--- a/ProjectPyramid/Documentation/source/index.html Sun Feb 03 17:00:27 2013 +0100 +++ b/ProjectPyramid/Documentation/source/index.html Sat Feb 23 15:19:29 2013 +0100 @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' -'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<!DOCTYPE html> <html><head> <title>Table of contents</title> +<meta charset="UTF-8"> <style> body { background: #EDECE6;
--- a/ProjectPyramid/Project.py Sun Feb 03 17:00:27 2013 +0100 +++ b/ProjectPyramid/Project.py Sat Feb 23 15:19:29 2013 +0100 @@ -18,11 +18,7 @@ from E5Gui import E5MessageBox, E5FileDialog from E5Gui.E5Action import E5Action -from .FormSelectionDialog import FormSelectionDialog -from .CreateParametersDialog import CreateParametersDialog from .PyramidDialog import PyramidDialog -from .DistributionTypeSelectionDialog import DistributionTypeSelectionDialog -from .PyramidRoutesDialog import PyramidRoutesDialog import Utilities from Globals import isWindowsPlatform @@ -381,6 +377,8 @@ @param path full directory path for the new form file (string) """ + from .FormSelectionDialog import FormSelectionDialog + dlg = FormSelectionDialog() if dlg.exec_() == QDialog.Accepted: template = dlg.getTemplateText() @@ -532,6 +530,8 @@ """ Private slot to create a new Pyramid project. """ + from .CreateParametersDialog import CreateParametersDialog + dlg = CreateParametersDialog(self) if dlg.exec_() == QDialog.Accepted: scaffold, project, overwrite, simulate = dlg.getData() @@ -849,6 +849,8 @@ ' created yet. Aborting...')) return + from .DistributionTypeSelectionDialog import DistributionTypeSelectionDialog + dlg = DistributionTypeSelectionDialog(self, projectPath, self.__ui) if dlg.exec_() == QDialog.Accepted: formats = dlg.getFormats() @@ -960,6 +962,8 @@ ' created yet. Aborting...')) return + from .PyramidRoutesDialog import PyramidRoutesDialog + dia = PyramidRoutesDialog(self) res = dia.start(projectPath) if res: