hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #399 from teyrana/hide_analysis

Browse Source 
Hide Buggy UI Dialogs
This commit is contained in:
Wes Cravens 2018-04-08 17:34:19 -05:00 committed by GitHub
commit 08d47280ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
swing/src/net/sf/openrocket/gui/main/BasicFrame.java
View File

@ -684,30 +684,33 @@ public class BasicFrame extends JFrame {
menu.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.desc")); menu.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.desc"));
menubar.add(menu); menubar.add(menu);
//// Component analysis
item = new JMenuItem(trans.get("main.menu.analyze.componentAnalysis"), KeyEvent.VK_C);
//// Analyze the rocket components separately
item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.componentAnalysis.desc"));
item.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
log.info(Markers.USER_MARKER, "Component analysis selected");
ComponentAnalysisDialog.showDialog(rocketpanel);
}
});
menu.add(item);
//// Optimize // TODO: reimplement this
item = new JMenuItem(trans.get("main.menu.analyze.optimization"), KeyEvent.VK_O); // //// Component analysis
item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.optimization.desc")); // item = new JMenuItem(trans.get("main.menu.analyze.componentAnalysis"), KeyEvent.VK_C);
item.addActionListener(new ActionListener() { // //// Analyze the rocket components separately
@Override // item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.componentAnalysis.desc"));
public void actionPerformed(ActionEvent e) { // item.addActionListener(new ActionListener() {
log.info(Markers.USER_MARKER, "Rocket optimization selected"); // @Override
new GeneralOptimizationDialog(document, BasicFrame.this).setVisible(true); // public void actionPerformed(ActionEvent e) {
} // log.info(Markers.USER_MARKER, "Component analysis selected");
}); // ComponentAnalysisDialog.showDialog(rocketpanel);
menu.add(item); // }
// });
// menu.add(item);
// TODO: reimplement this dialog
// //// Optimize
// item = new JMenuItem(trans.get("main.menu.analyze.optimization"), KeyEvent.VK_O);
// item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.optimization.desc"));
// item.addActionListener(new ActionListener() {
// @Override
// public void actionPerformed(ActionEvent e) {
// log.info(Markers.USER_MARKER, "Rocket optimization selected");
// new GeneralOptimizationDialog(document, BasicFrame.this).setVisible(true);
// }
// });
// menu.add(item);
//// Custom expressions //// Custom expressions
item = new JMenuItem(trans.get("main.menu.analyze.customExpressions"), KeyEvent.VK_E); item = new JMenuItem(trans.get("main.menu.analyze.customExpressions"), KeyEvent.VK_E);