Lines 60-65
Link Here
|
60 |
import org.apache.jmeter.gui.tree.JMeterCellRenderer; |
60 |
import org.apache.jmeter.gui.tree.JMeterCellRenderer; |
61 |
import org.apache.jmeter.gui.tree.JMeterTreeListener; |
61 |
import org.apache.jmeter.gui.tree.JMeterTreeListener; |
62 |
import org.apache.jmeter.gui.util.JMeterMenuBar; |
62 |
import org.apache.jmeter.gui.util.JMeterMenuBar; |
|
|
63 |
import org.apache.jmeter.gui.util.JMeterToolBar; |
63 |
import org.apache.jmeter.samplers.Remoteable; |
64 |
import org.apache.jmeter.samplers.Remoteable; |
64 |
import org.apache.jmeter.testelement.TestElement; |
65 |
import org.apache.jmeter.testelement.TestElement; |
65 |
import org.apache.jmeter.testelement.TestListener; |
66 |
import org.apache.jmeter.testelement.TestListener; |
Lines 83-88
Link Here
|
83 |
// The default title for the Menu bar |
84 |
// The default title for the Menu bar |
84 |
private static final String DEFAULT_TITLE = |
85 |
private static final String DEFAULT_TITLE = |
85 |
"Apache JMeter ("+JMeterUtils.getJMeterVersion()+")"; // $NON-NLS-1$ $NON-NLS-2$ |
86 |
"Apache JMeter ("+JMeterUtils.getJMeterVersion()+")"; // $NON-NLS-1$ $NON-NLS-2$ |
|
|
87 |
|
88 |
// Allow display/hide toolbar |
89 |
private static final boolean DISPLAY_TOOLBAR = |
90 |
JMeterUtils.getPropDefault("jmeter.toolbar", true); // $NON-NLS-1$ |
86 |
|
91 |
|
87 |
/** The menu bar. */ |
92 |
/** The menu bar. */ |
88 |
private JMeterMenuBar menuBar; |
93 |
private JMeterMenuBar menuBar; |
Lines 428-433
Link Here
|
428 |
*/ |
433 |
*/ |
429 |
private Component createToolBar() { |
434 |
private Component createToolBar() { |
430 |
Box toolPanel = new Box(BoxLayout.X_AXIS); |
435 |
Box toolPanel = new Box(BoxLayout.X_AXIS); |
|
|
436 |
if (DISPLAY_TOOLBAR) { |
437 |
toolPanel.add(JMeterToolBar.createToolbar()); // add the toolbar |
438 |
} |
431 |
toolPanel.add(Box.createRigidArea(new Dimension(10, 15))); |
439 |
toolPanel.add(Box.createRigidArea(new Dimension(10, 15))); |
432 |
toolPanel.add(Box.createGlue()); |
440 |
toolPanel.add(Box.createGlue()); |
433 |
toolPanel.add(activeThreads); |
441 |
toolPanel.add(activeThreads); |