X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Farchaeopteryx%2FMainFrameApplication.java;h=dc9306377ab70c810cb7b1474806eed767d0c93f;hb=5642da5f473ab9ae57fee86c0cb3b33525a2e916;hp=2c9b585485cf4db0e79a87959e75ca64e8870587;hpb=8671c5d876cfa2585e2325c8d60417acdc77c616;p=jalview.git diff --git a/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java b/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java index 2c9b585..dc93063 100644 --- a/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java +++ b/forester/java/src/org/forester/archaeopteryx/MainFrameApplication.java @@ -304,10 +304,12 @@ public final class MainFrameApplication extends MainFrame { // } ); // The window listener setDefaultCloseOperation( WindowConstants.DO_NOTHING_ON_CLOSE ); + addInternalFrameListener( new InternalFrameAdapter() { @Override public void internalFrameClosing( final InternalFrameEvent e ) { + if (MainFrameApplication.this.getParent() == null) { if ( isUnsavedDataPresent() ) { final int r = JOptionPane.showConfirmDialog( _mainpanel, "Close Archaeopteryx despite potentially unsaved changes?", @@ -317,16 +319,16 @@ public final class MainFrameApplication extends MainFrame { return; } } -// else { -// final int r = JOptionPane -// .showConfirmDialog( null, "Exit Archaeopteryx?", "Exit?", JOptionPane.YES_NO_OPTION ); -// if ( r != JOptionPane.YES_OPTION ) { -// return; -// } -// } + else { + final int r = JOptionPane + .showConfirmDialog( null, "Exit Archaeopteryx?", "Exit?", JOptionPane.YES_NO_OPTION ); + if ( r != JOptionPane.YES_OPTION ) { + return; + } + }} exit(); - } - } ); + + } }); // The component listener addComponentListener( new ComponentAdapter() { @@ -1744,6 +1746,7 @@ public final class MainFrameApplication extends MainFrame { if ( AptxUtil.canWriteFormat( "bmp" ) ) { _file_jmenu.add( _write_to_bmp_item = new JMenuItem( "Export to BMP file..." ) ); } + _file_jmenu.add( _write_to_eps_item = new JMenuItem("Export to EPS file...") ); _file_jmenu.addSeparator(); _file_jmenu.add( _print_item = new JMenuItem( "Print..." ) ); _file_jmenu.addSeparator(); @@ -1772,6 +1775,7 @@ public final class MainFrameApplication extends MainFrame { customizeJMenuItem( _write_to_gif_item ); customizeJMenuItem( _write_to_tif_item ); customizeJMenuItem( _write_to_bmp_item ); + customizeJMenuItem( _write_to_eps_item ); customizeJMenuItem( _print_item ); customizeJMenuItem( _exit_item ); _jmenubar.add( _file_jmenu );