Changeset 24416 in osm for applications/editors/josm/plugins

Timestamp:

2010-11-26T16:38:45+01:00 (14 years ago)

Author:

postfix

Message:

ore work on harbor edtor

Location:

applications/editors/josm/plugins/smed

Files:

• plugs/harbour/src/harbour/panels/PanelGeneral.java (modified) (11 diffs)
• plugs/harbour/src/harbour/panels/PanelLimits.java (deleted)
• plugs/harbour/src/harbour/widgets (added)
• plugs/harbour/src/harbour/widgets/ExtTextField.java (added)
• plugs/harbour/src/harbour/widgets/LightTile.java (added)
• plugs/harbour/src/harbour/widgets/Sheltergram.java (added)
• plugs/harbour/src/images/anker.png (added)
• plugs/harbour/src/images/e.png (added)
• plugs/harbour/src/images/n.png (added)
• plugs/harbour/src/images/ne.png (added)
• plugs/harbour/src/images/nw.png (added)
• plugs/harbour/src/images/s.png (added)
• plugs/harbour/src/images/se.png (added)
• plugs/harbour/src/images/sw.png (added)
• plugs/harbour/src/images/w.png (added)
• src/smed/menu/SmedMenuBar.java (modified) (2 diffs)

applications/editors/josm/plugins/smed/plugs/harbour/src/harbour/panels/PanelGeneral.java

@@ -1 +1 @@
 package harbour.panels;
+
+import harbour.widgets.Sheltergram;
 
 import javax.swing.BorderFactory;
@@ -6 +8 @@
 import java.awt.Color;
 import java.awt.Dimension;
-import javax.swing.JButton;
 import java.awt.Rectangle;
 import java.awt.Font;
@@ -12 +13 @@
 import javax.swing.JTextField;
 import javax.swing.JComboBox;
-import java.awt.Label;
 import javax.swing.JCheckBox;
 import java.awt.Cursor;
-import java.awt.GridBagLayout;
-import javax.swing.ImageIcon;
 
 public class PanelGeneral extends JPanel {
@@ -44 +42 @@
         private JCheckBox desCheckBox = null;
         private JCheckBox jCheckBox1 = null;
-        private JLabel shelterLabel = null;
         private JLabel tshelterLabel = null;
+        private JPanel shelterPanel = null;
+        private JLabel sizeLabel = null;
+        private JLabel typeLabel = null;
         public PanelGeneral() {
                 super();
@@ -58 +58 @@
          */
         private void initialize() {
+        typeLabel = new JLabel();
+        typeLabel.setBounds(new Rectangle(270, 2, 43, 20));
+        typeLabel.setFont(new Font("Dialog", Font.PLAIN, 12));
+        typeLabel.setText("Type");
+        sizeLabel = new JLabel();
+        sizeLabel.setBounds(new Rectangle(210, 2, 34, 20));
+        sizeLabel.setFont(new Font("Dialog", Font.PLAIN, 12));
+        sizeLabel.setText("Size");
         tshelterLabel = new JLabel();
-        tshelterLabel.setBounds(new Rectangle(252, 145, 50, 20));
+        tshelterLabel.setBounds(new Rectangle(246, 144, 50, 20));
         tshelterLabel.setText("Schutz");
-        shelterLabel = new JLabel();
-        shelterLabel.setBounds(new Rectangle(235, 167, 80, 80));
-        shelterLabel.setIcon(new ImageIcon(getClass().getResource("/images/shelter.png")));
         qLabel = new JLabel();
         qLabel.setBounds(new Rectangle(50, 205, 85, 20));
@@ -76 +81 @@
         chartLabel.setBounds(new Rectangle(210, 50, 35, 20));
         chartLabel.setFont(new Font("Dialog", Font.PLAIN, 12));
-        chartLabel.setText("Chart");
+        chartLabel.setText("Karte");
         pubLabel = new JLabel();
         pubLabel.setBounds(new Rectangle(53, 50, 70, 20));
@@ -82 +87 @@
         pubLabel.setText("Publication");
         harborLabel = new JLabel();
-        harborLabel.setBounds(new Rectangle(148, 2, 160, 20));
-        harborLabel.setText("Harbor : Size       Type");
+        harborLabel.setBounds(new Rectangle(148, 2, 55, 20));
+        harborLabel.setText("Harbor:");
         lonLabel = new JLabel();
         lonLabel.setBounds(new Rectangle(100, 25, 23, 20));
@@ -123 +128 @@
         this.add(getDesCheckBox(), null);
         this.add(getJCheckBox1(), null);
-        this.add(shelterLabel, null);
         this.add(tshelterLabel, null);
+        this.add(getShelterPanel(), null);
+        this.add(sizeLabel, null);
+        this.add(typeLabel, null);
         }
 
@@ -282 +289 @@
                 if (jCheckBox2 == null) {
                         jCheckBox2 = new JCheckBox();
-                        jCheckBox2.setBounds(new Rectangle(125, 117, 110, 21));
+                        jCheckBox2.setBounds(new Rectangle(125, 117, 70, 21));
                         jCheckBox2.setFont(new Font("Dialog", Font.PLAIN, 12));
                         jCheckBox2.setText("ratsam");
@@ -301 +308 @@
                         tugCheckBox.setBounds(new Rectangle(5, 160, 121, 20));
                         tugCheckBox.setFont(new Font("Dialog", Font.PLAIN, 12));
-                        tugCheckBox.setText("Rettungsdienst");
+                        tugCheckBox.setText("Bergungsschiff");
                 }
                 return tugCheckBox;
@@ -374 +381 @@
         }
 
+
+
+        /**
+         * This method initializes shelterPanel 
+         *      
+         * @return javax.swing.JPanel   
+         */
+        private JPanel getShelterPanel() {
+                if (shelterPanel == null) {
+                        shelterPanel = new Sheltergram();
+                        shelterPanel.setBounds(new Rectangle(232, 170, 75, 75));
+                }
+                return shelterPanel;
+        }
+
 }

applications/editors/josm/plugins/smed/src/smed/menu/SmedMenuBar.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Desktop;
 import java.awt.event.KeyEvent;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ResourceBundle;
 
@@ -14 +18 @@
 public class SmedMenuBar extends JMenuBar {
 
-    /**
-     *
-     */
-    private static final long serialVersionUID = 1L;
-
-     JMenuBar menuBar;
-     JMenu menu, submenu;
-     JMenuItem menuItem;
+     /**
+      *
+      */
+         private static final long serialVersionUID = 1L;
+    
+         private String[] cmd = new String[4];
+         
+     private JMenuBar menuBar;
+     private JMenu menuFile, menuHelp, submenu;
+     private JMenuItem menuItemFile, menuItemOnLineHelp;
      
      public SmedMenuBar() {
-        ResourceBundle keyEvents = ResourceBundle.getBundle("smed.keys.Events");
+         cmd[0] = "cmd.exe";
+         cmd[1] = "/C";
+         cmd[2] = "start";
+         cmd[3] = "http://www.openseamap.org/";
+
+         ResourceBundle keyEvents = ResourceBundle.getBundle("smed.keys.Events");
         
         menuBar = new JMenuBar();
 
-        menu = new JMenu(tr("File"));
+        menuFile = new JMenu(tr("File"));
         // menu.setMnemonic(KeyEvent.VK_F);
-        menu.setMnemonic((Integer) keyEvents.getObject("SmedMenuBar.001"));
+        menuFile.setMnemonic((Integer) keyEvents.getObject("SmedMenuBar.001"));
         
-        menu.getAccessibleContext().setAccessibleDescription(
+        menuFile.getAccessibleContext().setAccessibleDescription(
                 "The only menu in this program that has menu items");
 
-        menuItem = new JMenuItem("Tabmanager",
-                KeyEvent.VK_T);
-
-        menuItem.addActionListener(new java.awt.event.ActionListener() {
+        menuItemFile = new JMenuItem("Tabmanager", KeyEvent.VK_T);
+        menuItemFile.addActionListener(new java.awt.event.ActionListener() {
                         public void actionPerformed(java.awt.event.ActionEvent e) { new TabManager(); } 
                         });
+        
+        menuFile.add(menuItemFile);
+        
+        menuHelp = new JMenu(tr("Help"));
+        menuHelp.setMnemonic(KeyEvent.VK_H);
+        
+        menuItemOnLineHelp = new JMenuItem(tr("Online Help"), KeyEvent.VK_O);
+        menuItemOnLineHelp.addActionListener(new java.awt.event.ActionListener() {
+                        public void actionPerformed(java.awt.event.ActionEvent e) {  
+                        try {
+                                Desktop.getDesktop().browse( new URI("http://www.openseamap.org/") ); 
+                        } catch (Exception ex) {
+                                ex.printStackTrace();
+                        }
 
+                        }
 
-        menu.add(menuItem);
-
-        menuBar.add(menu);
+                        });
+        
+        menuHelp.add(menuItemOnLineHelp);
+        
+        menuBar.add(menuFile);
+        menuBar.add(menuHelp);
 
         add(menuBar);