Changeset 1481

Timestamp:

07/10/08 18:14:38 (2 months ago)

Author:

rob

Message:

Added JobControlMixin? to FundamentalMode? so that all text modes can use the RunFilter? command
* removed JobControlMixin? from PythonMode? and BashMode?
* added class_storage to MajorMode?
* remember last filter by storing in class_storage

Location:

trunk/peppy

Files:

• fundamental.py (modified) (1 diff)
• mainmenu.py (modified) (1 diff)
• major.py (modified) (1 diff)
• plugins/bash_mode.py (modified) (1 diff)
• plugins/python_mode.py (modified) (1 diff)

trunk/peppy/fundamental.py

@@ -77 +77 @@
 
 class FundamentalMode(FoldExplorerMixin, EditraSTCMixin,
-                      PeppySTC, MajorMode):
+                      PeppySTC, MajorMode, JobControlMixin):
     """Major mode for editing generic text files.
     

trunk/peppy/mainmenu.py

@@ -512 +512 @@
 
     def action(self, index=-1, multiplier=1):
+        if self.name in self.mode.class_storage:
+            last = self.mode.class_storage[self.name]
+        else:
+            last = ''
         minibuffer = TextMinibuffer(self.mode, self, label="Command line:",
-                                    initial = self.mode.getScriptArgs())
+                                    initial = last)
         self.mode.setMinibuffer(minibuffer)
         self.mode.setStatusText("Enter command line, %s will be replaced by full path to file")
 
     def processMinibuffer(self, minibuffer, mode, text):
+        self.mode.class_storage[self.name] = text
         self.mode.startCommandLine(text, expand=True)
 

trunk/peppy/major.py

@@ -410 +410 @@
     # of a superclass.  This is a dict based on the class name.
     localkeymaps = {}
-    
+
+    # Generic storage for all instances of this class
+    class_storage = {}
+
     def __init__(self, parent, wrapper, buffer, frame):
         # set up the view-local versions of classprefs

trunk/peppy/plugins/bash_mode.py

@@ -17 +17 @@
 from peppy.fundamental import FundamentalMode
 
-class BashMode(JobControlMixin, SimpleFoldFunctionMatchMixin, FundamentalMode):
+class BashMode(SimpleFoldFunctionMatchMixin, FundamentalMode):
     """Major mode for editing Bash/KSH/Bourne shell scripts.
     """

trunk/peppy/plugins/python_mode.py

@@ -222 +222 @@
 
 
-class PythonMode(JobControlMixin, SimpleFoldFunctionMatchMixin,
-                 FundamentalMode):
+class PythonMode(SimpleFoldFunctionMatchMixin, FundamentalMode):
     keyword='Python'
     icon='icons/py.png'