Changeset 126 in josm


Ignore:
Timestamp:
2006-07-25T18:53:18+02:00 (18 years ago)
Author:
imi
Message:

fixed annotation presets view (added a new renderer)

Files:
1 added
1 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • po/de.po

    r124 r126  
    1212"Project-Id-Version: de\n"
    1313"Report-Msgid-Bugs-To: \n"
    14 "POT-Creation-Date: 2006-07-23 23:39+0200\n"
     14"POT-Creation-Date: 2006-07-25 00:28+0200\n"
    1515"PO-Revision-Date: 2006-07-22 14:48+0200\n"
    1616"Last-Translator: Sven Anders <sven@anders-hamburg.de>\n"
    … …  
    967967msgstr "Den Schlüssel aus allen Objekten löschen."
    968968
    969 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:156
     969#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:160
    970970#, java-format
    971971msgid "Unknown type at line {0}"
    972972msgstr "Unbekannter Typ in Zeile {0}"
    973973
    974 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:174
     974#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:178
    975975#, java-format
    976976msgid "Cannot have a writable combobox with default values (line {0})"
    977977msgstr ""
    978978
    979 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:179
     979#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:183
    980980#, java-format
    981981msgid ""
    … …  
    983983msgstr ""
    984984
    985 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:180
    986 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:181
     985#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:184
     986#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:185
    987987#, fuzzy
    988988msgid "element"
    … …  
    991991msgstr[1] "Abschnitte"
    992992
    993 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:186
     993#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:190
    994994#, java-format
    995995msgid "Unknown annotation object {0} at line {1} column {2}"
    996996msgstr "Unbekannt Vermerktes Objekt {0} an Zeile {1} Spalte {2}"
    997997
    998 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:256
     998#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:260
    999999msgid "Change Properties"
    10001000msgstr "Einstellungen ändern"

  • po/en_GB.po

    r124 r126  
    1111"Project-Id-Version: JOSM SVN\n"
    1212"Report-Msgid-Bugs-To: \n"
    13 "POT-Creation-Date: 2006-07-23 23:39+0200\n"
     13"POT-Creation-Date: 2006-07-25 00:28+0200\n"
    1414"PO-Revision-Date: 2006-07-22 16:18+0100\n"
    1515"Last-Translator: Bruce Cowan <bruce.cowan@dsl.pipex.com>\n"
    … …  
    958958msgstr "Delete the selected key in all objects"
    959959
    960 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:156
     960#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:160
    961961#, fuzzy, java-format
    962962msgid "Unknown type at line {0}"
    963963msgstr "Unknown file extension: {0}"
    964964
    965 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:174
     965#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:178
    966966#, java-format
    967967msgid "Cannot have a writable combobox with default values (line {0})"
    968968msgstr ""
    969969
    970 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:179
     970#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:183
    971971#, java-format
    972972msgid ""
    … …  
    974974msgstr ""
    975975
    976 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:180
    977 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:181
     976#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:184
     977#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:185
    978978#, fuzzy
    979979msgid "element"
    … …  
    982982msgstr[1] "segment"
    983983
    984 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:186
     984#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:190
    985985#, java-format
    986986msgid "Unknown annotation object {0} at line {1} column {2}"
    987987msgstr ""
    988988
    989 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:256
     989#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:260
    990990#, fuzzy
    991991msgid "Change Properties"

  • po/fr.po

    r124 r126  
    77"Project-Id-Version: fr\n"
    88"Report-Msgid-Bugs-To: \n"
    9 "POT-Creation-Date: 2006-07-23 23:39+0200\n"
     9"POT-Creation-Date: 2006-07-25 00:28+0200\n"
    1010"PO-Revision-Date: 2006-07-21 21:36+0200\n"
    1111"Last-Translator: Frederic Bonifas <fredericbonifas@gmail.com>\n"
    … …  
    970970msgstr "Supprimer la clé sélectionnée de tous les objets"
    971971
    972 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:156
     972#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:160
    973973#, fuzzy, java-format
    974974msgid "Unknown type at line {0}"
    975975msgstr "Extension de fichier inconnue : {0}"
    976976
    977 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:174
     977#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:178
    978978#, java-format
    979979msgid "Cannot have a writable combobox with default values (line {0})"
    980980msgstr ""
    981981
    982 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:179
     982#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:183
    983983#, java-format
    984984msgid ""
    … …  
    986986msgstr ""
    987987
    988 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:180
    989 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:181
     988#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:184
     989#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:185
    990990#, fuzzy
    991991msgid "element"
    … …  
    994994msgstr[1] "segments"
    995995
    996 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:186
     996#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:190
    997997#, java-format
    998998msgid "Unknown annotation object {0} at line {1} column {2}"
    999999msgstr "Objet d'annotation inconnu : {0} à la ligne {1} colonne {2}"
    10001000
    1001 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:256
     1001#: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:260
    10021002msgid "Change Properties"
    10031003msgstr "Changer les propriétés"

  • src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java

    r125 r126  
    202202
    203203        private List<Item> data;
    204         public final String name;
    205         private Collection<Class<?>> types;
     204        public String name;
     205        Collection<Class<?>> types;
    206206
    207207        public AnnotationPreset(List<Item> data, String name, Collection<Class<?>> currentTypes) {
    … …  
    216216         * Use this as default item for "do not select anything".
    217217         */
    218         public AnnotationPreset() {
    219                 name = "";
    220         }
     218        public AnnotationPreset() {}
    221219
    222220        public static List<AnnotationPreset> readAll(InputStream inStream) throws IOException, SAXException {

  • src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

    r120 r126  
    2828
    2929import javax.swing.DefaultComboBoxModel;
     30import javax.swing.DefaultListCellRenderer;
    3031import javax.swing.JButton;
    3132import javax.swing.JComboBox;
     33import javax.swing.JComponent;
    3234import javax.swing.JDialog;
    3335import javax.swing.JLabel;
     36import javax.swing.JList;
    3437import javax.swing.JOptionPane;
    3538import javax.swing.JPanel;
    … …  
    261264                        }
    262265                });
     266                annotationPresets.setRenderer(new DefaultListCellRenderer(){
     267                        @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
     268                    AnnotationPreset a = (AnnotationPreset)value;
     269                                if (a.name == null)
     270                        return super.getListCellRendererComponent(list, "", index, false, false);
     271                                JComponent c = (JComponent)super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
     272                    JLabel l = new JLabel((a).name);
     273                    l.setForeground(c.getForeground());
     274                    l.setBackground(c.getBackground());
     275                    l.setFont(c.getFont());
     276                    l.setBorder(c.getBorder());
     277                    if (a.types == null)
     278                        l.setIcon(ImageProvider.get("data", "empty"));
     279                    else if (a.types.size() != 1)
     280                        l.setIcon(ImageProvider.get("data", "object"));
     281                    else
     282                        l.setIcon(ImageProvider.get("data", a.types.iterator().next().getSimpleName().toLowerCase()));
     283                    l.setOpaque(true);
     284                    return l;
     285            }
     286                });
    263287
    264288                data.setColumnIdentifiers(new String[]{tr("Key"),tr("Value")});
Note: See TracChangeset for help on using the changeset viewer.