From: <sc...@us...> - 2008-05-09 19:49:36
|
Revision: 12604 http://jedit.svn.sourceforge.net/jedit/?rev=12604&view=rev Author: scarlac Date: 2008-05-09 12:49:30 -0700 (Fri, 09 May 2008) Log Message: ----------- + Toolbars (main toolbar, actionbar and searchbar) now use JToolBar for better integration with the chosen L&F. Modified Paths: -------------- jEdit/trunk/org/gjt/sp/jedit/GUIUtilities.java jEdit/trunk/org/gjt/sp/jedit/View.java jEdit/trunk/org/gjt/sp/jedit/browser/VFSBrowser.java jEdit/trunk/org/gjt/sp/jedit/gui/ActionBar.java jEdit/trunk/org/gjt/sp/jedit/search/SearchBar.java Modified: jEdit/trunk/org/gjt/sp/jedit/GUIUtilities.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/GUIUtilities.java 2008-05-09 18:56:34 UTC (rev 12603) +++ jEdit/trunk/org/gjt/sp/jedit/GUIUtilities.java 2008-05-09 19:49:30 UTC (rev 12604) @@ -364,7 +364,7 @@ * @param name The toolbar name * @since jEdit 4.2pre2 */ - public static Box loadToolBar(String name) + public static Container loadToolBar(String name) { return loadToolBar(jEdit.getActionContext(),name); } //}}} @@ -378,10 +378,13 @@ * @param name The toolbar name * @since jEdit 4.2pre2 */ - public static Box loadToolBar(ActionContext context, String name) + public static Container loadToolBar(ActionContext context, String name) { - Box toolBar = new Box(BoxLayout.X_AXIS); - + JPanel toolBar = new JPanel(new BorderLayout()); + JToolBar toolB = new JToolBar(); + toolB.setFloatable(false); + toolB.setMargin(new Insets(0,0,0,0)); + String buttons = jEdit.getProperty(name); if(buttons != null) { @@ -390,18 +393,19 @@ { String button = st.nextToken(); if(button.equals("-")) - toolBar.add(Box.createHorizontalStrut(12)); + { + toolB.addSeparator(new Dimension(12,12)); + } else { JButton b = loadToolButton(context,button); if(b != null) - toolBar.add(b); + toolB.add(b); } } } - toolBar.add(Box.createGlue()); - + toolBar.add(toolB); return toolBar; } //}}} Modified: jEdit/trunk/org/gjt/sp/jedit/View.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/View.java 2008-05-09 18:56:34 UTC (rev 12603) +++ jEdit/trunk/org/gjt/sp/jedit/View.java 2008-05-09 19:49:30 UTC (rev 12604) @@ -215,7 +215,7 @@ * Returns the view's tool bar. * @since jEdit 4.2pre1 */ - public Box getToolBar() + public Container getToolBar() { return toolBar; } //}}} @@ -1280,7 +1280,7 @@ private JPanel bottomToolBars; private ToolBarManager toolBarManager; - private Box toolBar; + private Container toolBar; private SearchBar searchBar; private ActionBar actionBar; Modified: jEdit/trunk/org/gjt/sp/jedit/browser/VFSBrowser.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/browser/VFSBrowser.java 2008-05-09 18:56:34 UTC (rev 12603) +++ jEdit/trunk/org/gjt/sp/jedit/browser/VFSBrowser.java 2008-05-09 19:49:30 UTC (rev 12604) @@ -1151,7 +1151,7 @@ } //}}} //{{{ createToolBar() method - private Box createToolBar() + private Container createToolBar() { if(mode == BROWSER) return GUIUtilities.loadToolBar(actionContext, @@ -1175,12 +1175,11 @@ if(jEdit.getBooleanProperty("vfs.browser.showToolbar")) { - Box toolbar = createToolBar(); + Container toolbar = createToolBar(); if(horizontalLayout) toolbarBox.add(toolbar); else { - toolbar.add(Box.createGlue()); toolbarBox.add(toolbar); } } Modified: jEdit/trunk/org/gjt/sp/jedit/gui/ActionBar.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/gui/ActionBar.java 2008-05-09 18:56:34 UTC (rev 12603) +++ jEdit/trunk/org/gjt/sp/jedit/gui/ActionBar.java 2008-05-09 19:49:30 UTC (rev 12604) @@ -35,21 +35,20 @@ /** * Action invocation bar. */ -public class ActionBar extends JPanel +public class ActionBar extends JToolBar { //{{{ ActionBar constructor public ActionBar(View view, boolean temp) { - setLayout(new BoxLayout(this,BoxLayout.X_AXIS)); - this.view = view; this.temp = temp; - add(Box.createHorizontalStrut(2)); + setFloatable(false); + addSeparator(new Dimension(2,2)); JLabel label = new JLabel(jEdit.getProperty("view.action.prompt")); add(label); - add(Box.createHorizontalStrut(12)); + addSeparator(new Dimension(12,12)); add(action = new ActionTextField()); action.setEnterAddsToHistory(false); Dimension max = action.getPreferredSize(); Modified: jEdit/trunk/org/gjt/sp/jedit/search/SearchBar.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/search/SearchBar.java 2008-05-09 18:56:34 UTC (rev 12603) +++ jEdit/trunk/org/gjt/sp/jedit/search/SearchBar.java 2008-05-09 19:49:30 UTC (rev 12604) @@ -38,20 +38,19 @@ * Incremental search tool bar. * @version $Id$ */ -public class SearchBar extends JPanel +public class SearchBar extends JToolBar { //{{{ SearchBar constructor public SearchBar(final View view, boolean temp) { - setLayout(new BoxLayout(this,BoxLayout.X_AXIS)); - this.view = view; - add(Box.createHorizontalStrut(2)); + setFloatable(false); + addSeparator(new Dimension(2,2)); JLabel label = new JLabel(jEdit.getProperty("view.search.find")); add(label); - add(Box.createHorizontalStrut(12)); + addSeparator(new Dimension(12,12)); add(find = new HistoryTextField("find")); find.setSelectAllOnFocus(true); @@ -70,23 +69,27 @@ Insets margin = new Insets(1,1,1,1); - add(Box.createHorizontalStrut(12)); + addSeparator(new Dimension(12,12)); + add(ignoreCase = new JCheckBox(jEdit.getProperty( "search.case"))); ignoreCase.addActionListener(actionHandler); ignoreCase.setMargin(margin); + ignoreCase.setOpaque(false); ignoreCase.setRequestFocusEnabled(false); - add(Box.createHorizontalStrut(2)); + addSeparator(new Dimension(2,2)); add(regexp = new JCheckBox(jEdit.getProperty( "search.regexp"))); regexp.addActionListener(actionHandler); regexp.setMargin(margin); + regexp.setOpaque(false); regexp.setRequestFocusEnabled(false); - add(Box.createHorizontalStrut(2)); + addSeparator(new Dimension(2,2)); add(hyperSearch = new JCheckBox(jEdit.getProperty( "search.hypersearch"))); hyperSearch.addActionListener(actionHandler); hyperSearch.setMargin(margin); + hyperSearch.setOpaque(false); hyperSearch.setRequestFocusEnabled(false); update(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |