Changeset 8442 in josm for trunk/src

Timestamp:

2015-06-02T14:58:03+02:00 (9 years ago)

Author:

Don-vip

Message:

Fix #11266 - SVG versions of JOSM and OAuth logos + some other buttons (patch by floscher)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AboutAction.java (modified) (4 diffs)
• gui/SideButton.java (modified) (1 diff)
• gui/SplashScreen.java (modified) (1 diff)
• gui/oauth/FullyAutomaticAuthorizationUI.java (modified) (1 diff)
• gui/oauth/ManualAuthorizationUI.java (modified) (1 diff)
• gui/oauth/OAuthAuthorizationWizard.java (modified) (3 diffs)
• gui/oauth/SemiAutomaticAuthorizationUI.java (modified) (3 diffs)
• gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (modified) (3 diffs)

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

@@ -6 +6 @@
 import java.awt.Dimension;
 import java.awt.GridBagLayout;
+import java.awt.Image;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 
 import javax.swing.BorderFactory;
+import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -30 +32 @@
 
 /**
- * Nice about screen. I guess every application need one these days.. *sigh*
+ * Nice about screen.
  *
- * The REVISION resource is read and if present, it shows the revision
- * information of the jar-file.
+ * The REVISION resource is read and if present, it shows the revision information of the jar-file.
  *
  * @author imi
@@ -90 +91 @@
         info.add(GBC.glue(0,5), GBC.eol());
         info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(10,0,10,0));
-        info.add(BugReportExceptionHandler.getBugReportUrlLabel(Utils.strip(ShowStatusReportAction.getReportHeader())), GBC.eol().fill(GBC.HORIZONTAL));
+        info.add(BugReportExceptionHandler.getBugReportUrlLabel(Utils.strip(ShowStatusReportAction.getReportHeader())),
+                GBC.eol().fill(GBC.HORIZONTAL));
 
         about.addTab(tr("Info"), info);
@@ -105 +107 @@
 
         GuiHelper.prepareResizeableOptionPane(panel, panel.getPreferredSize());
-        JOptionPane.showMessageDialog(Main.parent, panel, tr("About JOSM..."),
-                JOptionPane.INFORMATION_MESSAGE, ImageProvider.get("logo"));
+        JOptionPane.showMessageDialog(Main.parent, panel, tr("About JOSM..."), JOptionPane.INFORMATION_MESSAGE,
+                new ImageIcon(ImageProvider.get("logo.svg").getImage().getScaledInstance(256, 258, Image.SCALE_SMOOTH)));
     }
 

trunk/src/org/openstreetmap/josm/gui/SideButton.java

@@ -83 +83 @@
         setLayout(new BorderLayout());
         setIconTextGap(2);
-        setMargin(new Insets(-1,0,-1,0));
+        setMargin(new Insets(0,0,0,0));
     }
 

trunk/src/org/openstreetmap/josm/gui/SplashScreen.java

@@ -60 +60 @@
 
         // Add the logo
-        JLabel logo = new JLabel(new ImageIcon(ImageProvider.get("logo.png").getImage().getScaledInstance(128, 129, Image.SCALE_SMOOTH)));
+        JLabel logo = new JLabel(new ImageIcon(ImageProvider.get("logo.svg").getImage().getScaledInstance(128, 129, Image.SCALE_SMOOTH)));
         GridBagConstraints gbc = new GridBagConstraints();
         gbc.gridheight = 2;

trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java

@@ -335 +335 @@
         public RunAuthorisationAction() {
             putValue(NAME, tr("Authorize now"));
-            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth"));
+            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));
             putValue(SHORT_DESCRIPTION, tr("Click to redirect you to the authorization form on the JOSM web site"));
             updateEnabledState();

trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java

@@ -247 +247 @@
         public TestAccessTokenAction() {
             putValue(NAME, tr("Test Access Token"));
-            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth"));
+            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));
             putValue(SHORT_DESCRIPTION, tr("Click to test the Access Token"));
             updateEnabledState();

trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java

@@ -89 +89 @@
      * Builds the panel with general information in the header
      *
-     * @return panel woth information display
+     * @return panel with information display
      */
     protected JPanel buildHeaderInfoPanel() {
@@ -101 +101 @@
         gc.weightx = 1.0;
         gc.gridwidth = 2;
-        JLabel lbl = new JLabel();
-        lbl.setIcon(ImageProvider.get("oauth", "oauth-logo"));
+        ImageProvider logoProv = new ImageProvider("oauth", "oauth-logo");
+        JLabel lbl = new JLabel(logoProv.get());
+        lbl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         lbl.setOpaque(true);
         pnl.add(lbl, gc);
@@ -167 +168 @@
 
         setTitle(tr("Get an Access Token for ''{0}''", apiUrl));
+        this.setMinimumSize(new Dimension(420, 400));
 
         pnlFullyAutomaticAuthorisationUI = new FullyAutomaticAuthorizationUI(apiUrl);

trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java

@@ -385 +385 @@
         public RetrieveRequestTokenAction() {
             putValue(NAME, tr("Retrieve Request Token"));
-            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth"));
+            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));
             putValue(SHORT_DESCRIPTION, tr("Click to retrieve a Request Token"));
         }
@@ -421 +421 @@
         public RetrieveAccessTokenAction() {
             putValue(NAME, tr("Retrieve Access Token"));
-            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth"));
+            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));
             putValue(SHORT_DESCRIPTION, tr("Click to retrieve an Access Token"));
         }
@@ -458 +458 @@
         public TestAccessTokenAction() {
             putValue(NAME, tr("Test Access Token"));
-            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth"));
+            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));
             putValue(SHORT_DESCRIPTION, tr("Click to test the Access Token"));
         }

trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java

@@ -311 +311 @@
             putValue(NAME, tr("Authorize now"));
             putValue(SHORT_DESCRIPTION, tr("Click to step through the OAuth authorization process"));
-            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth"));
+            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));
 
         }
@@ -337 +337 @@
             putValue(NAME, tr("New Access Token"));
             putValue(SHORT_DESCRIPTION, tr("Click to step through the OAuth authorization process and generate a new Access Token"));
-            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth"));
+            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));
 
         }
@@ -363 +363 @@
             putValue(NAME, tr("Test Access Token"));
             putValue(SHORT_DESCRIPTION, tr("Click test access to the OSM server with the current access token"));
-            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth"));
+            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));
 
         }