Changeset 10428 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2016-06-19T18:28:26+02:00 (8 years ago)

Author:

stoecker

Message:

see #9995 - patch mainly by strump - improve HIDPI behaviour

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AboutAction.java (modified) (1 diff)
• JosmAction.java (modified) (1 diff)
• UploadNotesAction.java (modified) (1 diff)
• mapmode/AddNoteAction.java (modified) (1 diff)
• relation/DeleteRelationsAction.java (modified) (1 diff)
• relation/DuplicateRelationAction.java (modified) (1 diff)
• relation/EditRelationAction.java (modified) (1 diff)
• relation/SelectRelationAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AboutAction.java

@@ -103 +103 @@
         JPanel panel = new JPanel(new GridBagLayout());
         panel.setPreferredSize(new Dimension(890, 300));
-        panel.add(new JLabel("", new ImageProvider("logo.svg").setSize(ImageProvider.ImageSizes.ABOUT_LOGO).get(),
+        panel.add(new JLabel("", ImageProvider.get("logo.svg", ImageProvider.ImageSizes.ABOUT_LOGO),
                 JLabel.CENTER), GBC.std().insets(0, 5, 0, 0));
         panel.add(about, GBC.std().fill());

trunk/src/org/openstreetmap/josm/actions/JosmAction.java

@@ -73 +73 @@
         super(name);
         if (icon != null)
-            icon.getResource().attachImageIcon(this);
+            icon.getResource().attachImageIcon(this, true);
         setHelpId();
         sc = shortcut;

trunk/src/org/openstreetmap/josm/actions/UploadNotesAction.java

@@ -26 +26 @@
         putValue(SHORT_DESCRIPTION, tr("Upload note changes to server"));
         putValue(NAME, tr("Upload notes"));
-        putValue(SMALL_ICON, ImageProvider.get("upload"));
+        new ImageProvider("upload").getResource().attachImageIcon(this, true);
     }
 

trunk/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java

@@ -70 +70 @@
 
         NoteInputDialog dialog = new NoteInputDialog(Main.parent, tr("Create new note"), tr("Create note"));
-        dialog.showNoteDialog(tr("Enter a detailed comment to create a note"), NotesDialog.ICON_NEW);
+        dialog.showNoteDialog(tr("Enter a detailed comment to create a note"), ImageProvider.get("dialogs/notes", "note_new"));
 
         if (dialog.getValue() != 1) {

trunk/src/org/openstreetmap/josm/actions/relation/DeleteRelationsAction.java

@@ -24 +24 @@
         putValue(SHORT_DESCRIPTION, tr("Delete the selected relation"));
         putValue(NAME, tr("Delete"));
-        putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
+        new ImageProvider("dialogs", "delete").getResource().attachImageIcon(this, true);
     }
 

trunk/src/org/openstreetmap/josm/actions/relation/DuplicateRelationAction.java

@@ -22 +22 @@
     public DuplicateRelationAction() {
         putValue(SHORT_DESCRIPTION, tr("Create a copy of this relation and open it in another editor window"));
-        putValue(SMALL_ICON, ImageProvider.get("duplicate"));
+        new ImageProvider("duplicate").getResource().attachImageIcon(this, true);
         putValue(NAME, tr("Duplicate"));
     }

trunk/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java

@@ -32 +32 @@
         putValue(NAME, tr("Edit"));
         putValue(SHORT_DESCRIPTION, tr("Call relation editor for selected relation"));
-        putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit"));
+        new ImageProvider("dialogs", "edit").getResource().attachImageIcon(this, true);
     }
 

trunk/src/org/openstreetmap/josm/actions/relation/SelectRelationAction.java

@@ -26 +26 @@
         putValue(SHORT_DESCRIPTION, add ? tr("Add the selected relations to the current selection") :
             tr("Set the current selection to the list of selected relations"));
-        putValue(SMALL_ICON, ImageProvider.get("dialogs", "select"));
+        new ImageProvider("dialogs", "select").getResource().attachImageIcon(this, true);
         putValue(NAME, add ? tr("Select relation (add)") : tr("Select relation"));
         this.add = add;