[ jEdit-commits ] SF.net SVN: jedit:[22818] jEdit/trunk/org

[<ez...@us...>]

Revision: 22818
          http://jedit.svn.sourceforge.net/jedit/?rev=22818&view=rev
Author:   ezust
Date:     2013-02-28 16:11:18 +0000 (Thu, 28 Feb 2013)
Log Message:
-----------
#3606329 Environment variable replacement in displayed path

Modified Paths:
--------------
    jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java
    jEdit/trunk/org/gjt/sp/jedit/jedit.props
    jEdit/trunk/org/gjt/sp/jedit/options/ViewOptionPane.java
    jEdit/trunk/org/jedit/localization/jedit_en.props

Modified: jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java	2013-02-27 23:21:49 UTC (rev 22817)
+++ jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java	2013-02-28 16:11:18 UTC (rev 22818)
@@ -179,6 +179,7 @@
 	 */
 	public static String abbreviate(String path)
 	{
+		if (!jEdit.getBooleanProperty("view.abbreviatePaths")) return path;
 		if (svc == null)
 			svc = new VarCompressor();
 		return svc.compress(path);

Modified: jEdit/trunk/org/gjt/sp/jedit/jedit.props
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/jedit.props	2013-02-27 23:21:49 UTC (rev 22817)
+++ jEdit/trunk/org/gjt/sp/jedit/jedit.props	2013-02-28 16:11:18 UTC (rev 22818)
@@ -267,6 +267,9 @@
 # Drag and drop of text
 view.dragAndDrop=true
 
+# Abbreviate paths using environment variables
+view.abbreviatePaths=true
+
 # Treat consecutive non-alphanumeric characters as one word
 view.joinNonWordChars=true
 

Modified: jEdit/trunk/org/gjt/sp/jedit/options/ViewOptionPane.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/options/ViewOptionPane.java	2013-02-27 23:21:49 UTC (rev 22817)
+++ jEdit/trunk/org/gjt/sp/jedit/options/ViewOptionPane.java	2013-02-28 16:11:18 UTC (rev 22818)
@@ -95,6 +95,13 @@
 			"view.toolbar.floatable"));
 		addComponent(floatableToolbars);
 
+		/* Abbreviate pathnames when possible */		
+		abbreviatePaths = new JCheckBox(jEdit.getProperty(
+			"options.view.abbreviatePaths"));
+		abbreviatePaths.setSelected(jEdit.getBooleanProperty(
+			"view.abbreviatePaths"));
+		addComponent(abbreviatePaths);
+		
 		/* Show full path */
 		showFullPath = new JCheckBox(jEdit.getProperty(
 			"options.view.showFullPath"));
@@ -200,8 +207,8 @@
 		jEdit.setBooleanProperty("view.toolbar.alternateLayout",
 			layout.getIcon() == layoutIcon3
 			|| layout.getIcon() == layoutIcon4);
-		jEdit.setBooleanProperty("view.showFullPath",showFullPath
-			.isSelected());
+		jEdit.setBooleanProperty("view.abbreviatePaths",abbreviatePaths.isSelected());		
+		jEdit.setBooleanProperty("view.showFullPath",showFullPath.isSelected());
 		jEdit.setBooleanProperty("view.toolbar.floatable", floatableToolbars.isSelected());
 
 		jEdit.setBooleanProperty("view.showSearchbar",showSearchbar
@@ -225,6 +232,7 @@
 	private JLabel layout;
 	private Icon layoutIcon1, layoutIcon2, layoutIcon3, layoutIcon4;
 	private JButton alternateDockingLayout, alternateToolBarLayout;
+	private JCheckBox abbreviatePaths;
 	private JCheckBox showFullPath;
 	private JCheckBox floatableToolbars;
 	private JCheckBox showSearchbar;

Modified: jEdit/trunk/org/jedit/localization/jedit_en.props
===================================================================
--- jEdit/trunk/org/jedit/localization/jedit_en.props	2013-02-27 23:21:49 UTC (rev 22817)
+++ jEdit/trunk/org/jedit/localization/jedit_en.props	2013-02-28 16:11:18 UTC (rev 22818)
@@ -1636,6 +1636,7 @@
 options.view.floatableToolbars=Floatable Toolbars
 options.view.alternateDockingLayout=Alternate docked window placement
 options.view.alternateToolBarLayout=Alternate tool bar placement
+options.view.abbreviatePaths=Abbreviate paths with environment variables when possible
 options.view.showFullPath=Show full path of buffer in title bar
 options.view.showSearchbar=Always show search bar
 options.view.beepOnSearchAutoWrap=Beep when searching automatically wraps

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.