X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUIFrame.java;h=301bdc68de43c65b75afac2334240f00cbfbf9ea;hp=689ea7f312676cc46c451918bfe5b6e69b3a20cd;hb=eaf2ee0f498b519d64e1664a2b8c66c52ac1497c;hpb=c8078d352a7f54a4a97d25af080155d3f875536a diff --git a/altosuilib/AltosUIFrame.java b/altosuilib/AltosUIFrame.java index 689ea7f3..301bdc68 100644 --- a/altosuilib/AltosUIFrame.java +++ b/altosuilib/AltosUIFrame.java @@ -3,7 +3,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,7 +16,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altosuilib_3; +package org.altusmetrum.altosuilib_13; import java.awt.*; import java.awt.event.*; @@ -23,8 +24,13 @@ import javax.swing.*; import java.util.*; class AltosUIFrameListener extends WindowAdapter { + @Override public void windowClosing (WindowEvent e) { - AltosUIPreferences.unregister_ui_listener((AltosUIFrame) e.getWindow()); + AltosUIFrame frame = (AltosUIFrame) e.getWindow(); + AltosUIPreferences.unregister_ui_listener(frame); + AltosUIFrame.frame_closed(); + frame.setVisible(false); + frame.dispose(); } } @@ -36,12 +42,12 @@ public class AltosUIFrame extends JFrame implements AltosUIListener, AltosPositi } static String[] altos_icon_names = { - "/altus-metrum-16.png", - "/altus-metrum-32.png", - "/altus-metrum-48.png", - "/altus-metrum-64.png", - "/altus-metrum-128.png", - "/altus-metrum-256.png" + "/altusmetrum-altosui-16.png", + "/altusmetrum-altosui-32.png", + "/altusmetrum-altosui-48.png", + "/altusmetrum-altosui-64.png", + "/altusmetrum-altosui-128.png", + "/altusmetrum-altosui-256.png" }; static public String[] icon_names; @@ -163,10 +169,123 @@ public class AltosUIFrame extends JFrame implements AltosUIListener, AltosPositi return "Altus Metrum"; } + public void macosx_quit_handler() { + System.out.printf("Got quit handler\n"); + } + + public void macosx_about_handler() { + System.out.printf("Got about handler\n"); + } + + public void macosx_preferences_handler() { + System.out.printf("Got preferences handler\n"); + } + + public void macosx_file_handler(String path) { + System.out.printf("Got file handler with \"%s\"\n", path); + } + + /* Check that we are on Mac OS X. This is crucial to loading and using the OSXAdapter class. + */ + public static boolean MAC_OS_X = (System.getProperty("os.name").toLowerCase().startsWith("mac os x")); + + private static boolean registered_for_macosx_events; + + /* Generic registration with the Mac OS X application menu + * Checks the platform, then attempts to register with the Apple EAWT + * See OSXAdapter.java to see how this is done without directly referencing any Apple APIs + */ + public synchronized void register_for_macosx_events() { + if (registered_for_macosx_events) + return; + registered_for_macosx_events = true; + if (MAC_OS_X) { + try { + // Generate and register the OSXAdapter, passing it a hash of all the methods we wish to + // use as delegates for various com.apple.eawt.ApplicationListener methods + OSXAdapter.setQuitHandler(this, getClass().getDeclaredMethod("macosx_quit_handler", (Class[])null)); +// OSXAdapter.setAboutHandler(this, getClass().getDeclaredMethod("macosx_about_handler", (Class[])null)); + OSXAdapter.setPreferencesHandler(this, getClass().getDeclaredMethod("macosx_preferences_handler", (Class[])null)); + OSXAdapter.setFileHandler(this, getClass().getDeclaredMethod("macosx_file_handler", new Class[] { String.class })); + } catch (Exception e) { + System.err.println("Error while loading the OSXAdapter:"); + e.printStackTrace(); + } + } + } + + int row = 0; + + public void next_row() { + row++; + } + + int inset = 0; + + public void set_inset(int i) { + inset = i; + } + + public GridBagConstraints constraints (int x, int width, int fill, int anchor, double weightx, double weighty) { + return new GridBagConstraints(x, /* x */ + row, /* y */ + width, /* width */ + 1, /* height */ + weightx, /* weightx */ + weighty, /* weighty */ + anchor, /* anchor */ + fill, /* fill */ + new Insets(inset,inset,inset,inset), /* insets */ + 0, /* ipadx */ + 0); /* ipady */ + } + + public GridBagConstraints constraints (int x, int width, int fill, int anchor) { + double weightx = 0; + double weighty = 0; + + if (fill == GridBagConstraints.NONE) { + weightx = 0; + weighty = 0; + } else if (fill == GridBagConstraints.HORIZONTAL) { + weightx = 1; + weighty = 0; + } else if (fill == GridBagConstraints.VERTICAL) { + weightx = 0; + weighty = 1; + } else if (fill == GridBagConstraints.BOTH) { + weightx = 1; + weighty = 1; + } + + return constraints (x, width, fill, anchor, weightx, weighty); + } + + public GridBagConstraints constraints (int x, int width, int fill) { + return constraints (x, width, fill, GridBagConstraints.WEST); + } + + public GridBagConstraints constraints(int x, int width) { + return constraints(x, width, GridBagConstraints.NONE); + } + + static int open_frames; + + public static void frame_opened() { + ++open_frames; + } + + public static void frame_closed() { + --open_frames; + if (open_frames == 0) + System.exit(0); + } + void init() { AltosUIPreferences.register_ui_listener(this); AltosUIPreferences.register_position_listener(this); position = AltosUIPreferences.position(); + frame_opened(); addWindowListener(new AltosUIFrameListener()); /* Try to make menus live in the menu bar like regular Mac apps */ @@ -175,7 +294,7 @@ public class AltosUIFrame extends JFrame implements AltosUIListener, AltosPositi global_settings_done = true; System.setProperty("com.apple.mrj.application.apple.menu.about.name", getName()); System.setProperty("com.apple.macos.useScreenMenuBar", "true"); - System.setProperty( "apple.laf.useScreenMenuBar", "true" ); // for older versions of Java + System.setProperty("apple.laf.useScreenMenuBar", "true" ); // for older versions of Java } catch (Exception e) { } }