Make File menu appear sans Open item when used as part of OR app
This commit is contained in:
parent
2dd457b245
commit
8e98ab42f6
@ -85,19 +85,20 @@ public class PhotoFrame extends JFrame {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private JMenuBar getMenu(final boolean showFileMenu) {
|
private JMenuBar getMenu(final boolean showOpen) {
|
||||||
JMenuBar menubar = new JMenuBar();
|
JMenuBar menubar = new JMenuBar();
|
||||||
JMenu menu;
|
JMenu menu;
|
||||||
JMenuItem item;
|
JMenuItem item;
|
||||||
|
|
||||||
// // File
|
// // File
|
||||||
if (showFileMenu) {
|
|
||||||
menu = new JMenu(trans.get("main.menu.file"));
|
menu = new JMenu(trans.get("main.menu.file"));
|
||||||
menu.setMnemonic(KeyEvent.VK_F);
|
menu.setMnemonic(KeyEvent.VK_F);
|
||||||
// // File-handling related tasks
|
// // File-handling related tasks
|
||||||
menu.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.file.desc"));
|
menu.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.file.desc"));
|
||||||
menubar.add(menu);
|
menubar.add(menu);
|
||||||
|
|
||||||
|
if (showOpen) {
|
||||||
item = new JMenuItem(trans.get("main.menu.file.open"), KeyEvent.VK_O);
|
item = new JMenuItem(trans.get("main.menu.file.open"), KeyEvent.VK_O);
|
||||||
item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, SHORTCUT_KEY));
|
item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, SHORTCUT_KEY));
|
||||||
// // Open a rocket design
|
// // Open a rocket design
|
||||||
@ -122,7 +123,8 @@ public class PhotoFrame extends JFrame {
|
|||||||
if (option == JFileChooser.APPROVE_OPTION) {
|
if (option == JFileChooser.APPROVE_OPTION) {
|
||||||
File file = chooser.getSelectedFile();
|
File file = chooser.getSelectedFile();
|
||||||
log.debug("Opening File " + file.getAbsolutePath());
|
log.debug("Opening File " + file.getAbsolutePath());
|
||||||
((SwingPreferences) Application.getPreferences()).setDefaultDirectory(chooser.getCurrentDirectory());
|
((SwingPreferences) Application.getPreferences()).setDefaultDirectory(chooser
|
||||||
|
.getCurrentDirectory());
|
||||||
GeneralRocketLoader grl = new GeneralRocketLoader(file);
|
GeneralRocketLoader grl = new GeneralRocketLoader(file);
|
||||||
try {
|
try {
|
||||||
OpenRocketDocument doc = grl.load();
|
OpenRocketDocument doc = grl.load();
|
||||||
@ -134,12 +136,13 @@ public class PhotoFrame extends JFrame {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
menu.add(item);
|
menu.add(item);
|
||||||
|
}
|
||||||
|
|
||||||
item = new JMenuItem("Save Image...", KeyEvent.VK_S); // TODO Trans
|
item = new JMenuItem("Save Image...", KeyEvent.VK_S); // TODO Trans
|
||||||
item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, SHORTCUT_KEY));
|
item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, SHORTCUT_KEY));
|
||||||
// // Open a rocket design
|
// // Open a rocket design
|
||||||
item.getAccessibleContext().setAccessibleDescription("Save Image"); //TODO Trans
|
item.getAccessibleContext().setAccessibleDescription("Save Image"); // TODO
|
||||||
|
// Trans
|
||||||
item.setIcon(Icons.FILE_OPEN);
|
item.setIcon(Icons.FILE_OPEN);
|
||||||
item.addActionListener(new ActionListener() {
|
item.addActionListener(new ActionListener() {
|
||||||
@Override
|
@Override
|
||||||
@ -150,7 +153,8 @@ public class PhotoFrame extends JFrame {
|
|||||||
public void performAction(final BufferedImage image) {
|
public void performAction(final BufferedImage image) {
|
||||||
log.info("Got image {} to save...", image);
|
log.info("Got image {} to save...", image);
|
||||||
|
|
||||||
final FileFilter png = new SimpleFileFilter("PNG Image", ".png"); //TODO Trans
|
final FileFilter png = new SimpleFileFilter("PNG Image", ".png"); // TODO
|
||||||
|
// Trans
|
||||||
|
|
||||||
final JFileChooser chooser = new JFileChooser();
|
final JFileChooser chooser = new JFileChooser();
|
||||||
|
|
||||||
@ -158,7 +162,8 @@ public class PhotoFrame extends JFrame {
|
|||||||
chooser.setFileFilter(png);
|
chooser.setFileFilter(png);
|
||||||
chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
|
chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
|
||||||
|
|
||||||
chooser.setCurrentDirectory(((SwingPreferences) Application.getPreferences()).getDefaultDirectory());
|
chooser.setCurrentDirectory(((SwingPreferences) Application.getPreferences())
|
||||||
|
.getDefaultDirectory());
|
||||||
final int option = chooser.showSaveDialog(PhotoFrame.this);
|
final int option = chooser.showSaveDialog(PhotoFrame.this);
|
||||||
|
|
||||||
if (option != JFileChooser.APPROVE_OPTION) {
|
if (option != JFileChooser.APPROVE_OPTION) {
|
||||||
@ -172,7 +177,8 @@ public class PhotoFrame extends JFrame {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
((SwingPreferences) Application.getPreferences()).setDefaultDirectory(chooser.getCurrentDirectory());
|
((SwingPreferences) Application.getPreferences()).setDefaultDirectory(chooser
|
||||||
|
.getCurrentDirectory());
|
||||||
log.info(Markers.USER_MARKER, "User chose to save image as {}", file);
|
log.info(Markers.USER_MARKER, "User chose to save image as {}", file);
|
||||||
|
|
||||||
if (FileHelper.confirmWrite(file, PhotoFrame.this)) {
|
if (FileHelper.confirmWrite(file, PhotoFrame.this)) {
|
||||||
@ -188,8 +194,6 @@ public class PhotoFrame extends JFrame {
|
|||||||
});
|
});
|
||||||
menu.add(item);
|
menu.add(item);
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
// // Edit
|
// // Edit
|
||||||
menu = new JMenu(trans.get("main.menu.edit"));
|
menu = new JMenu(trans.get("main.menu.edit"));
|
||||||
menu.setMnemonic(KeyEvent.VK_E);
|
menu.setMnemonic(KeyEvent.VK_E);
|
||||||
@ -205,7 +209,8 @@ public class PhotoFrame extends JFrame {
|
|||||||
public void performAction(final BufferedImage image) {
|
public void performAction(final BufferedImage image) {
|
||||||
Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new Transferable() {
|
Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new Transferable() {
|
||||||
@Override
|
@Override
|
||||||
public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException {
|
public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException,
|
||||||
|
IOException {
|
||||||
if (flavor.equals(DataFlavor.imageFlavor) && image != null) {
|
if (flavor.equals(DataFlavor.imageFlavor) && image != null) {
|
||||||
return image;
|
return image;
|
||||||
} else {
|
} else {
|
||||||
@ -326,7 +331,8 @@ public class PhotoFrame extends JFrame {
|
|||||||
pa.setTitle("OpenRocket - Photo Studio Alpha");
|
pa.setTitle("OpenRocket - Photo Studio Alpha");
|
||||||
pa.setVisible(true);
|
pa.setVisible(true);
|
||||||
|
|
||||||
GeneralRocketLoader grl = new GeneralRocketLoader(new File("C:/Users/bkuker/git/openrocket/swing/resources/datafiles/examples/A simple model rocket.ork"));
|
GeneralRocketLoader grl = new GeneralRocketLoader(new File(
|
||||||
|
"C:/Users/bkuker/git/openrocket/swing/resources/datafiles/examples/A simple model rocket.ork"));
|
||||||
OpenRocketDocument doc = grl.load();
|
OpenRocketDocument doc = grl.load();
|
||||||
pa.photoPanel.setDoc(doc);
|
pa.photoPanel.setDoc(doc);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user