Mercurial Repositories > Pyramid Project / file diff

--- a/ProjectPyramid/Project.py	Wed Aug 29 16:49:56 2012 +0200
+++ b/ProjectPyramid/Project.py	Wed Aug 29 17:41:43 2012 +0200
@@ -22,6 +22,7 @@
 from .CreateParametersDialog import CreateParametersDialog
 from .PyramidDialog import PyramidDialog
 from .DistributionTypeSelectionDialog import DistributionTypeSelectionDialog
+from .PyramidRoutesDialog import PyramidRoutesDialog
 
 import Utilities
 from Globals import isWindowsPlatform
@@ -207,28 +208,28 @@
         self.showViewsAct.triggered[()].connect(self.__showMatchingViews)
         self.actions.append(self.showViewsAct)
         
-        self.showRoutesAct = E5Action(self.trUtf8('Show All Routes'),
-                self.trUtf8('Show All &Routes'), 
+        self.showRoutesAct = E5Action(self.trUtf8('Show Routes'),
+                self.trUtf8('Show &Routes'), 
                 0, 0,
                 self,'pyramid_show_routes')
         self.showRoutesAct.setStatusTip(self.trUtf8(
             'Show all URL dispatch routes used by a Pyramid application'))
         self.showRoutesAct.setWhatsThis(self.trUtf8(
-            """<b>Show All Routes</b>"""
+            """<b>Show Routes</b>"""
             """<p>Show all URL dispatch routes used by a Pyramid application"""
             """ in the order in which they are evaluated.</p>"""
         ))
         self.showRoutesAct.triggered[()].connect(self.__showRoutes)
         self.actions.append(self.showRoutesAct)
         
-        self.showTweensAct = E5Action(self.trUtf8('Show All Tween Objects'),
-                self.trUtf8('Show All &Tween Objects'), 
+        self.showTweensAct = E5Action(self.trUtf8('Show Tween Objects'),
+                self.trUtf8('Show &Tween Objects'), 
                 0, 0,
                 self,'pyramid_show_routes')
         self.showTweensAct.setStatusTip(self.trUtf8(
             'Show all implicit and explicit tween objects used by a Pyramid application'))
         self.showTweensAct.setWhatsThis(self.trUtf8(
-            """<b>Show All Tween Objects</b>"""
+            """<b>Show Tween Objects</b>"""
             """<p>Show all implicit and explicit tween objects used by a"""
             """ Pyramid application.</p>"""
         ))
@@ -952,8 +953,7 @@
         """
         Private slot showing all URL dispatch routes.
         """
-        # TODO: use a specialized dialog parsing the output of proutes
-        title = self.trUtf8("Show All Routes")
+        title = self.trUtf8("Show Routes")
         try:
             projectPath = self.__projectPath()
         except PyramidNoProjectSelectedException:
@@ -963,12 +963,8 @@
                             ' created yet. Aborting...'))
             return
         
-        cmd = self.getPyramidCommand("proutes")
-        args = []
-        args.append("development.ini")
-
-        dia = PyramidDialog(title, fixed=True, linewrap=False)
-        res = dia.startProcess(cmd, args, projectPath)
+        dia = PyramidRoutesDialog(self)
+        res = dia.start(projectPath)
         if res:
             dia.exec_()
     
@@ -976,7 +972,7 @@
         """
         Private slot showing all implicit and explicit tween objects.
         """
-        title = self.trUtf8("Show All Tween Objects")
+        title = self.trUtf8("Show Tween Objects")
         try:
             projectPath = self.__projectPath()
         except PyramidNoProjectSelectedException: