Changeset 4249

Timestamp:

07/08/08 12:42:16 (2 months ago)

Author:

nate

Message:

Added an EOLMode property. The property the is stored as a string and allows you to set the EOLMode of the file to CRLF, LF, or CR standards. If not explicitly set by the user, the standard will default to the OS standard. Upon setting the EOLMode, all end of line markers are automatically converted to the new standard.

Files:

• trunk/dabo/ui/uiwx/dEditor.py (modified) (4 diffs)

trunk/dabo/ui/uiwx/dEditor.py

@@ -242 +242 @@
-        self._hiliteLimitColumn = 79
-        self._encoding = self.Application.Encoding
+        self._eolMode = ""
-        self._useAntiAliasing = True
-        self._codeFolding = True
@@ -676 +677 @@
-        ## Seems that eolmode is CRLF on Mac by default... explicitly set it!
-        if wx.Platform == "__WXMSW__":
-SetEOLMode(stc.STC_EOL_CRLF)
-
-SetEOLMode(stc.STC_EOL_LF)
+EOLMode = "CRLF"
+
+EOLMode = "LF"
-
-        if self.HiliteCharsBeyondLimit:
@@ -1930 +1931 @@
-
-
+    def _getEOLMode(self):
+        return self._eolMode
+
+    def _setEOLMode(self, val):
+        if _constructer():
+            if val.lower() == "crlf":
+                self.SetEOLMode(stc.STC_EOL_CRLF)
+                self.ConvertEOLs(stc.STC_EOL_CRLF)
+                self._eolMode = "CRLF"
+            elif val.lower() == "lf":
+                self.SetEOLMode(stc.STC_EOL_LF)
+                self.ConvertEOLs(stc.STC_EOL_LF)
+                self._eolMode = "LF"
+            elif val.lower() == "cr":
+                self.SetEOLMode(stc.STC_EOL_CR)
+                self.ConvertEOLs(stc.STC_EOL_CR)
+                self._eolMode = "CR"
+            else:
+                raise ValueError, "EOLMode value must be either 'LFCR', 'LF', or 'CR'"
+        else:
+            self._properties["EOLMode"] = val
+
+
-    def _getFileName(self):
-        return os.path.split(self._fileName)[1]
@@ -2300 +2324 @@
-            _("Type of encoding to use. Defaults to the application's default encoding.  (str)"))
-    
+    EOLMode = property(_getEOLMode, _setEOLMode, None,
+            _("End of line characters. Allowed values are 'CRLF', 'LF' and 'CR'. (default=os dependent) (str)"))
+    
-    FileName = property(_getFileName, None, None,
-            _("Name of the file being edited (without path info)  (str)"))