Switch from GPLv2 to GPLv2+

[fw/altos] / telegps / TeleGPSPreferences.java

diff --git a/telegps/TeleGPSPreferences.java b/telegps/TeleGPSPreferences.java
index 534cf550c8f288c47385701d21f579619d90c767..619523268e9268e8f8280e30016fb9e93e344591 100644 (file)
--- a/telegps/TeleGPSPreferences.java
+++ b/telegps/TeleGPSPreferences.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
@@ -22,7 +23,7 @@ import java.awt.event.*;
 import java.beans.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.altosuilib_2.*;
+import org.altusmetrum.altosuilib_11.*;
 
 public class TeleGPSPreferences
        extends AltosUIConfigure
@@ -112,38 +113,8 @@ public class TeleGPSPreferences
                row++;
        }
 
-       final static String[] position_names = {
-               "Top left",
-               "Top",
-               "Top right",
-               "Left",
-               "Center",
-               "Right",
-               "Bottom left",
-               "Bottom",
-               "Bottom right",
-       };
-
-       public void add_position() {
-               pane.add(new JLabel ("Menu position"), constraints(0, 1));
-
-               position_value = new JComboBox<String>(position_names);
-               position_value.setMaximumRowCount(position_names.length);
-               int position = AltosUIPreferences.position();
-               position_value.setSelectedIndex(position);
-               position_value.addActionListener(new ActionListener() {
-                               public void actionPerformed(ActionEvent e) {
-                                       int     position = position_value.getSelectedIndex();
-                                       AltosUIPreferences.set_position(position);
-                               }
-                       });
-               pane.add(position_value, constraints(1, 2, GridBagConstraints.BOTH));
-               position_value.setToolTipText("Position of main AltosUI window");
-               row++;
-       }
-
        public TeleGPSPreferences(JFrame owner, AltosVoice voice) {
-               super(owner);
+               super(owner, "TeleGPS Preferences", "Configure TeleGPS");
 
                this.voice = voice;
        }