From: <ez...@us...> - 2008-08-14 02:52:44
|
Revision: 13296 http://jedit.svn.sourceforge.net/jedit/?rev=13296&view=rev Author: ezust Date: 2008-08-14 02:52:42 +0000 (Thu, 14 Aug 2008) Log Message: ----------- Toggle docked areas in BufferList doesn't work correctly, so I wrote a better one for core. Modified Paths: -------------- jEdit/trunk/org/gjt/sp/jedit/actions.xml jEdit/trunk/org/gjt/sp/jedit/gui/DockableWindowManager.java jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props Modified: jEdit/trunk/org/gjt/sp/jedit/actions.xml =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/actions.xml 2008-08-14 01:41:37 UTC (rev 13295) +++ jEdit/trunk/org/gjt/sp/jedit/actions.xml 2008-08-14 02:52:42 UTC (rev 13296) @@ -1331,6 +1331,12 @@ </CODE> </ACTION> +<ACTION NAME="toggle-dock-areas"> + <CODE> + wm.toggleDockAreas(); + </CODE> +</ACTION> + <ACTION NAME="toggle-line-numbers"> <CODE> textArea.getGutter().toggleExpanded(); Modified: jEdit/trunk/org/gjt/sp/jedit/gui/DockableWindowManager.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/gui/DockableWindowManager.java 2008-08-14 01:41:37 UTC (rev 13295) +++ jEdit/trunk/org/gjt/sp/jedit/gui/DockableWindowManager.java 2008-08-14 02:52:42 UTC (rev 13296) @@ -95,6 +95,39 @@ abstract public boolean isDockableWindowVisible(String name); abstract public void closeCurrentArea(); abstract public DockingLayout getDockingLayout(ViewConfig config); + + + private boolean tBottom, tTop, tLeft, tRight; + private boolean closeToggle = true; + /** + * Hides all visible dock areas, or shows them again, + * if the last time it was a hide. + * @since jEdit 4.3pre16 + * + */ + public void toggleDockAreas() + { + if (closeToggle) + { + tTop = getTopDockingArea().getCurrent() != null; + tLeft = getLeftDockingArea().getCurrent() != null; + tRight = getRightDockingArea().getCurrent() != null; + tBottom = getBottomDockingArea().getCurrent() != null; + getBottomDockingArea().show(null); + getTopDockingArea().show(null); + getRightDockingArea().show(null); + getLeftDockingArea().show(null); + } + else + { + if (tBottom) getBottomDockingArea().showMostRecent(); + if (tLeft) getLeftDockingArea().showMostRecent(); + if (tRight) getRightDockingArea().showMostRecent(); + if (tTop) getTopDockingArea().showMostRecent(); + } + closeToggle = !closeToggle; + } + protected void applyAlternateLayout(boolean alternateLayout) { } Modified: jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props 2008-08-14 01:41:37 UTC (rev 13295) +++ jEdit/trunk/org/gjt/sp/jedit/jedit_gui.props 2008-08-14 02:52:42 UTC (rev 13296) @@ -578,6 +578,7 @@ right-docking-area \ bottom-docking-area \ - \ + toggle-dock-areas \ close-docking-area \ - \ perspective-load \ @@ -586,13 +587,14 @@ perspective-save-current-mode docking.label=$Docking docking.menu.label=Dockable Menu +toggle-dock-areas.label=Toggle Docked $Areas left-docking-area.label=Go to $Left Docking Area top-docking-area.label=Go to $Top Docking Area right-docking-area.label=Go to $Right Docking Area bottom-docking-area.label=Go to $Bottom Docking Area close-docking-area.label=$Close Current Docking Area -perspective-load.label=Load docking layout ... -perspective-save.label=Save docking layout ... +perspective-load.label=$Load docking layout ... +perspective-save.label=$Save docking layout ... perspective-load-current-mode.label=Load docking layout of current mode perspective-save-current-mode.label=Save docking layout of current mode This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |