Changeset 13781 in josm

Timestamp:

2018-05-18T01:41:13+02:00 (7 years ago)

Author:

Don-vip

Message:

see #8011 - improve About dialog to promote translations:

• add direct link to Launchpad
• add image links to our different profiles on external sites (OSM diary and social medias)
• OSM icon: ​https://wiki.openstreetmap.org/wiki/File:Logo_simple.svg (CC SA 2.0)
• Social icons: ​https://github.com/Automattic/social-logos (GPLv2 or later)

Location:

trunk

Files:

• CONTRIBUTION (modified) (1 diff)
• images/dialogs/about (added)
• images/dialogs/about/facebook.svg (added)
• images/dialogs/about/github.svg (added)
• images/dialogs/about/google-plus.svg (added)
• images/dialogs/about/openstreetmap.svg (added)
• images/dialogs/about/twitter.svg (added)
• src/org/openstreetmap/josm/actions/AboutAction.java (modified) (4 diffs)

trunk/CONTRIBUTION

@@ -104 +104 @@
 Some are originally LGPL but redistributed here under GPL. 
 
+Simple OpenStreetMap logo has been created by ScubbX (CC-SA 2.0) based on official
+logo used by the OpenStreetMap Foundation:
+https://wiki.openstreetmap.org/wiki/File:Logo_simple.svg
+
+Social logos come from https://github.com/Automattic/social-logos (GPLv2 or later)
+
 The keyboard icon comes fom:
 - source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on

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

@@ -6 +6 @@
 import java.awt.Color;
 import java.awt.Dimension;
+import java.awt.FlowLayout;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -32 +35 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.Utils;
@@ -93 +98 @@
                 "<p style='font-size:50%'></p>" +
                 "</html>");
-        info.add(label, GBC.eol().fill(GBC.HORIZONTAL).insets(10, 0, 0, 0));
+        info.add(label, GBC.eol().fill(GBC.HORIZONTAL).insets(10, 0, 0, 10));
         info.add(new JLabel(tr("Homepage")), GBC.std().insets(10, 0, 10, 0));
-        info.add(new UrlLabel(Main.getJOSMWebsite(), 2), GBC.eol().fill(GBC.HORIZONTAL));
+        info.add(new UrlLabel(Main.getJOSMWebsite(), 2), GBC.eol());
+        info.add(new JLabel(tr("Translations")), GBC.std().insets(10, 0, 10, 0));
+        info.add(new UrlLabel("https://translations.launchpad.net/josm", 2), GBC.eol());
+        info.add(new JLabel(tr("Follow us on")), GBC.std().insets(10, 10, 10, 0));
+        JPanel logos = new JPanel(new FlowLayout());
+        logos.add(createImageLink("OpenStreetMap", "openstreetmap", "https://www.openstreetmap.org/user/josmeditor/diary"));
+        logos.add(createImageLink("Twitter", "twitter", "https://twitter.com/josmeditor"));
+        logos.add(createImageLink("Facebook", "facebook", "https://www.facebook.com/josmeditor"));
+        logos.add(createImageLink("Google+", "google-plus", "https://plus.google.com/115458051662705872607"));
+        logos.add(createImageLink("Github", "github", "https://github.com/JOSM"));
+        info.add(logos, GBC.eol().insets(0, 10, 0, 0));
         info.add(GBC.glue(0, 5), GBC.eol());
 
@@ -120 +135 @@
             MainApplication.getMenu().reportbug.actionPerformed(null);
         }
+    }
+
+    private static JLabel createImageLink(String tooltip, String icon, final String link) {
+        JLabel label = new JLabel(ImageProvider.get("dialogs/about", icon, ImageSizes.LARGEICON));
+        label.setToolTipText(tooltip);
+        label.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                OpenBrowser.displayUrl(link);
+            }
+        });
+        return label;
     }