Ignore:
Timestamp:
2011-08-23T22:41:50+02:00 (13 years ago)
Author:
malcolmh
Message:

save

Location:
applications/editors/josm/plugins/smed/plugs/oseam/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChr.java

    r26561 r26562  
    2828        public JToggleButton veryQuickButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/VeryQuickButton.png")));
    2929        public JToggleButton ultraQuickButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/UltraQuickButton.png")));
    30         public JToggleButton interruptedQuickButton = new JToggleButton(new ImageIcon(getClass().getResource(
    31                         "/images/InterruptedQuickButton.png")));
    32         public JToggleButton interruptedVeryQuickButton = new JToggleButton(new ImageIcon(getClass().getResource(
    33                         "/images/InterruptedVeryQuickButton.png")));
    34         public JToggleButton interruptedUltraQuickButton = new JToggleButton(new ImageIcon(getClass().getResource(
    35                         "/images/InterruptedUltraQuickButton.png")));
     30        public JToggleButton interruptedQuickButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/InterruptedQuickButton.png")));
     31        public JToggleButton interruptedVeryQuickButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/InterruptedVeryQuickButton.png")));
     32        public JToggleButton interruptedUltraQuickButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/InterruptedUltraQuickButton.png")));
    3633        public JToggleButton isophasedButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/IsophasedButton.png")));
    3734        public JToggleButton occultingButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/OccultingButton.png")));

  • applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java

    r26561 r26562  
    2828        public JRadioButton violetButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/VioletButton.png")));
    2929        public JRadioButton blackButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BlackButton.png")));
    30         private EnumMap<Col, JRadioButton> colours = new EnumMap<Col, JRadioButton>(Col.class);
     30        public EnumMap<Col, JRadioButton> colours = new EnumMap<Col, JRadioButton>(Col.class);
    3131        private ActionListener alColour = new ActionListener() {
    3232                public void actionPerformed(java.awt.event.ActionEvent e) {

  • applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java

    r26561 r26562  
    5252                dlg = dia;
    5353                panelChan = new PanelChan(dlg);
    54                 panelChan.setBounds(new Rectangle(65, 0, 165, 160));
     54                panelChan.setBounds(new Rectangle(65, 0, 180, 160));
    5555                panelChan.setVisible(false);
    5656                panelHaz = new PanelHaz(dlg);
    57                 panelHaz.setBounds(new Rectangle(65, 0, 165, 160));
     57                panelHaz.setBounds(new Rectangle(65, 0, 180, 160));
    5858                panelHaz.setVisible(false);
    5959                panelSpec = new PanelSpec(dlg);
    60                 panelSpec.setBounds(new Rectangle(65, 0, 165, 160));
     60                panelSpec.setBounds(new Rectangle(65, 0, 180, 160));
    6161                panelSpec.setVisible(false);
    6262                panelLights = new PanelLights(dlg);
    63                 panelLights.setBounds(new Rectangle(65, 0, 165, 160));
     63                panelLights.setBounds(new Rectangle(65, 0, 180, 160));
    6464                panelLights.setVisible(false);
    6565                panelMore = new PanelMore(dlg);
    … …  
    8080
    8181                shapeIcon = new JLabel();
    82                 shapeIcon.setBounds(new Rectangle(250, 0, 150, 185));
     82                shapeIcon.setBounds(new Rectangle(235, 0, 150, 185));
    8383                this.add(shapeIcon, null);
    8484                lightIcon = new JLabel();
    85                 lightIcon.setBounds(new Rectangle(250, 0, 150, 185));
     85                lightIcon.setBounds(new Rectangle(235, 0, 150, 185));
    8686                this.add(lightIcon, null);
    8787                topIcon = new JLabel();
    88                 topIcon.setBounds(new Rectangle(250, 0, 150, 185));
     88                topIcon.setBounds(new Rectangle(235, 0, 150, 185));
    8989                this.add(topIcon, null);
    9090                radarIcon = new JLabel();
    91                 radarIcon.setBounds(new Rectangle(250, 0, 150, 185));
     91                radarIcon.setBounds(new Rectangle(235, 0, 150, 185));
    9292                this.add(radarIcon, null);
    9393                fogIcon = new JLabel();
    94                 fogIcon.setBounds(new Rectangle(250, 0, 150, 185));
     94                fogIcon.setBounds(new Rectangle(235, 0, 150, 185));
    9595                this.add(fogIcon, null);
    9696
    … …  
    138138                                                        panelSpec.clearSelections();
    139139                                                        panelSpec.panelCol.yellowButton.doClick();
     140                                                } else {
     141                                                        panelSpec.panelCol.colours.get(dlg.mark.getColour(Ent.BODY, 0)).doClick();
    140142                                                }
    141143                                                if (panelSpec.shapes.containsKey(dlg.mark.getShape())) {
    … …  
    258260
    259261                moreButton = new JButton();
    260                 moreButton.setBounds(new Rectangle(357, 145, 38, 15));
     262                moreButton.setBounds(new Rectangle(350, 145, 40, 15));
    261263                moreButton.setMargin(new Insets(0, 0, 0, 0));
    262264                moreButton.setText("v v v");

  • applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java

    r26561 r26562  
    33import java.awt.*;
    44import java.awt.event.*;
     5
    56import javax.swing.*;
     7
    68import java.util.*;
    79
    … …  
    1315
    1416        private OSeaMAction dlg;
     17        public JLabel categoryLabel;
     18        public JComboBox categoryBox;
     19        private ActionListener alCategoryBox = new ActionListener() {
     20                public void actionPerformed(java.awt.event.ActionEvent e) {
     21                }
     22        };
     23
    1524        public ButtonGroup shapeButtons = new ButtonGroup();
    1625        public JRadioButton pillarButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PillarButton.png")));
    … …  
    5564                this.add(panelCol, null);
    5665                this.add(getShapeButton(pillarButton, 35, 0, 34, 32, "Pillar", Shp.PILLAR, Obj.BOYSPP), null);
    57                 this.add(getShapeButton(sparButton, 35, 32, 34, 32, "Spar", Shp.SPAR, Obj.BOYSPP), null);
    58                 this.add(getShapeButton(canButton, 35, 64, 34, 32, "Can", Shp.CAN, Obj.BOYSPP), null);
    59                 this.add(getShapeButton(coneButton, 35, 96, 34, 32, "Cone", Shp.CONE, Obj.BOYSPP), null);
    60                 this.add(getShapeButton(sphereButton, 70, 0, 34, 32, "Sphere", Shp.SPHERE, Obj.BOYSPP), null);
     66                this.add(getShapeButton(sparButton, 70, 0, 34, 32, "Spar", Shp.SPAR, Obj.BOYSPP), null);
     67                this.add(getShapeButton(canButton, 105, 0, 34, 32, "Can", Shp.CAN, Obj.BOYSPP), null);
     68                this.add(getShapeButton(coneButton, 140, 0, 34, 32, "Cone", Shp.CONE, Obj.BOYSPP), null);
     69                this.add(getShapeButton(sphereButton, 35, 32, 34, 32, "Sphere", Shp.SPHERE, Obj.BOYSPP), null);
    6170                this.add(getShapeButton(barrelButton, 70, 32, 34, 32, "Barrel", Shp.BARREL, Obj.BOYSPP), null);
    62                 this.add(getShapeButton(superButton, 70, 64, 34, 32, "Super", Shp.SUPER, Obj.BOYSPP), null);
    63                 this.add(getShapeButton(floatButton, 70, 96, 34, 32, "Float", Shp.FLOAT, Obj.LITFLT), null);
    64                 this.add(getShapeButton(beaconButton, 105, 0, 34, 32, "Beacon", Shp.BEACON, Obj.BCNSPP), null);
    65                 this.add(getShapeButton(towerButton, 105, 32, 34, 32, "Tower", Shp.TOWER, Obj.BCNSPP), null);
     71                this.add(getShapeButton(superButton, 105, 32, 34, 32, "Super", Shp.SUPER, Obj.BOYSPP), null);
     72                this.add(getShapeButton(floatButton, 140, 32, 34, 32, "Float", Shp.FLOAT, Obj.LITFLT), null);
     73                this.add(getShapeButton(beaconButton, 35, 64, 34, 32, "Beacon", Shp.BEACON, Obj.BCNSPP), null);
     74                this.add(getShapeButton(towerButton, 70, 64, 34, 32, "Tower", Shp.TOWER, Obj.BCNSPP), null);
    6675                this.add(getShapeButton(stakeButton, 105, 64, 34, 32, "Stake", Shp.STAKE, Obj.BCNSPP), null);
    67                 this.add(getShapeButton(cairnButton, 105, 96, 34, 32, "Cairn", Shp.CAIRN, Obj.BCNSPP), null);
     76                this.add(getShapeButton(cairnButton, 140, 64, 34, 32, "Cairn", Shp.CAIRN, Obj.BCNSPP), null);
     77
     78                categoryLabel = new JLabel(Messages.getString("Category"), SwingConstants.CENTER);
     79                categoryLabel.setBounds(new Rectangle(35, 100, 140, 20));
     80                this.add(categoryLabel, null);
     81                categoryBox = new JComboBox();
     82                categoryBox.setBounds(new Rectangle(35, 120, 140, 20));
     83                this.add(categoryBox, null);
     84                categoryBox.addActionListener(alCategoryBox);
     85                categoryBox.addItem(Messages.getString("NoneSpecified"));
     86                categoryBox.addItem(Messages.getString("General"));
     87                categoryBox.addItem(Messages.getString("ChannelSeparation"));
     88                categoryBox.addItem(Messages.getString("EntryProhibited"));
     89                categoryBox.addItem(Messages.getString("Yachting"));
     90                categoryBox.addItem(Messages.getString("Diving"));
     91                categoryBox.addItem(Messages.getString("Anchorage"));
     92                categoryBox.addItem(Messages.getString("Pipeline"));
     93                categoryBox.addItem(Messages.getString("SpeedLimit"));
     94                categoryBox.addItem(Messages.getString("FerryCrossing"));
     95                categoryBox.addItem(Messages.getString("FoulGround"));
     96                categoryBox.addItem(Messages.getString("UnknownPurpose"));
    6897        }
    6998
Note: See TracChangeset for help on using the changeset viewer.