ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-01-29 15:43:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add option to hide search and tree panels

Browse Source 
Restore previous size of Variable Tree and Search Panel when visibility
is restored.
Save/restore visibility across sessions.
Add mnemonics and tooltips to menu items.
Ensure the Variable Tree is visible as part of the "Expand Parent in
Tree" actions.
Remove calls to setOneTouchExpandable.

Refs #415
This commit is contained in:
Derek Bankieris 2017-06-19 13:01:46 -05:00 committed by dbankieris
parent 38960e6505
commit 87423ec5aa
1 changed files with 51 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
trick_source/java/src/trick/tv/TVApplication.java
View File

@ -2,6 +2,7 @@ package trick.tv;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Container;
import java.awt.Desktop;
import java.awt.Dimension;
import java.awt.GridBagConstraints;
@ -155,6 +156,9 @@ public class TVApplication extends RunTimeTrickApplication implements VariableLi
/** field for manually entering variables */
JXTextField manualField;
/** check box for toggling Variable Tree visibility */
protected JCheckBoxMenuItem variableTreeCheckBox;
/** dialog for opening and saving files */
JFileChooser fileChooser;
@ -210,6 +214,8 @@ public class TVApplication extends RunTimeTrickApplication implements VariableLi
final String defaultUnitsKey = "defaultUnits";
final String characterArraysAsStringsKey = "characterArraysAsStrings";
final String validateAddressesKey = "validateAddresses";
final String searchPanelVisibleKey = "searchPanelVisible";
final String variableTreeVisibleKey = "variableTreeVisible";
/** new action */
protected AbstractAction newAction = new AbstractAction("New",
@ -371,26 +377,6 @@ public class TVApplication extends RunTimeTrickApplication implements VariableLi
}
};
// CTL Actions
protected void toggleTreePane() {
if(variableTree.getParent().getParent().isVisible()) {
variableTree.getParent().getParent().setVisible(false);
}
else {
variableTree.getParent().getParent().setVisible(true);
}
}
protected void toggleSearchPane() {
if(searchPanel.isVisible()) {
searchPanel.setVisible(false);
}
else {
searchPanel.setVisible(true);
}
}
@Override
protected void initialize(final String[] args) {
super.initialize(args);
@ -449,6 +435,8 @@ public class TVApplication extends RunTimeTrickApplication implements VariableLi
// Initialize the tree search panel.
searchPanel = new SearchPanel() {{
setVisible(Boolean.parseBoolean(trickProperties.getProperty(
searchPanelVisibleKey, Boolean.toString(true))));
setEnabled(false);
setFontSize(Float.parseFloat(trickProperties.getProperty(
fontSizeKey, Integer.toString(getFont().getSize()))));
@ -473,6 +461,7 @@ public class TVApplication extends RunTimeTrickApplication implements VariableLi
public void actionPerformed(ActionEvent actionEvent) {
List<SieTemplate> selection = getSelectedValues();
if (!selection.isEmpty()) {
setVariableTreeVisible(true);
variableTree.expandParent(selection.get(0).toString());
}
}
@ -494,6 +483,7 @@ public class TVApplication extends RunTimeTrickApplication implements VariableLi
}
public void actionPerformed(ActionEvent actionEvent) {
if (variable != null) {
setVariableTreeVisible(true);
variableTree.expandParent(variable.name);
}
}
@ -1619,20 +1609,33 @@ public class TVApplication extends RunTimeTrickApplication implements VariableLi
add(new JMenuItem(clearLogsAction));
}}, 1);
//CTL
menuBar.add(new JMenu("View") {{
add(new JCheckBoxMenuItem("Toggle Tree Pane", true) {{
setMnemonic(KeyEvent.VK_V);
variableTreeCheckBox = new JCheckBoxMenuItem("Variable Tree") {{
setToolTipText("Toggle visibility of the Variable Tree.");
setMnemonic(KeyEvent.VK_V);
setSelected(Boolean.parseBoolean(trickProperties.getProperty(
variableTreeVisibleKey, Boolean.toString(true))));
addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent actionEvent) {
toggleTreePane();
setVariableTreeVisible(isSelected());
}
});
}});
add(new JCheckBoxMenuItem("Toggle Search Pane", true) {{
}};
add(variableTreeCheckBox);
add(new JCheckBoxMenuItem("Search Panel") {{
setToolTipText("Toggle visibility of the Search Panel.");
setMnemonic(KeyEvent.VK_S);
setSelected(Boolean.parseBoolean(trickProperties.getProperty(
searchPanelVisibleKey, Boolean.toString(true))));
addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent actionEvent) {
toggleSearchPane();
if (!isSelected()) {
searchPanel.setPreferredSize(searchPanel.getSize());
}
searchPanel.setVisible(isSelected());
((JSplitPane)searchPanel.getParent()).resetToPreferredSizes();
}
});
}});
@ -1668,6 +1671,8 @@ public class TVApplication extends RunTimeTrickApplication implements VariableLi
public JComponent createMainPanel() {
return new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, new JScrollPane(variableTree) {{
setPreferredSize(new Dimension(200, 0));
setVisible(Boolean.parseBoolean(trickProperties.getProperty(
variableTreeVisibleKey, Boolean.toString(true))));
}}, new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, searchPanel, new JXPanel(new BorderLayout()) {{
add(new JScrollPane(variableTable), BorderLayout.CENTER);
@ -1723,14 +1728,29 @@ public class TVApplication extends RunTimeTrickApplication implements VariableLi
add(manualPanel, BorderLayout.SOUTH);
}}) {{
setName("innerSplitPane");
setOneTouchExpandable(true);
}}) {{
setName("outerSplitPane");
setBorder(new CompoundBorder(getBorder(), new EmptyBorder(5, 5, 0, 5)));
setOneTouchExpandable(true);
}};
}
protected void setVariableTreeVisible(boolean visible) {
Container container = variableTree.getParent().getParent();
if (container.isVisible() == visible) {
return;
}
if (!visible) {
container.setPreferredSize(container.getSize());
}
container.setVisible(visible);
variableTreeCheckBox.setSelected(visible);
((JSplitPane)container.getParent()).resetToPreferredSizes();
}
@Override
public void variablesUpdated() {
simulationTime.setValue(Double.toString(timeTicCount.getValue() / timeTicValue));
@ -1922,6 +1942,8 @@ public class TVApplication extends RunTimeTrickApplication implements VariableLi
trickProperties.setProperty(defaultUnitsKey, Boolean.toString(defaultAllUnits));
trickProperties.setProperty(characterArraysAsStringsKey, Boolean.toString(characterArraysAsStrings));
trickProperties.setProperty(validateAddressesKey, Boolean.toString(validateAddresses));
trickProperties.setProperty(searchPanelVisibleKey, Boolean.toString(searchPanel.isVisible()));
trickProperties.setProperty(variableTreeVisibleKey, Boolean.toString(variableTreeCheckBox.isSelected()));
for (UnitType type : UnitType.values()) {
trickProperties.setProperty(type.toString(),
defaultUnits.get(type.ordinal()).toString());