diff options
| author | Oluwatobi Bashir-Bello <nbashirbello@google.com> | 2014-06-30 11:08:08 -0400 |
|---|---|---|
| committer | Oluwatobi Bashir-Bello <nbashirbello@google.com> | 2014-07-09 10:30:24 -0400 |
| commit | 8f4672960da1f3672938c2dcbf6223820d4b9045 (patch) | |
| tree | 7435af0d2813a51780d7b57b1d877f164982d1a4 | |
| parent | a90ae6c0ec9e4a489d2e8fd87475315187a19be2 (diff) | |
| download | cloud-8f4672960da1f3672938c2dcbf6223820d4b9045.tar.gz | |
Google Login UI: add a separator between items in the ui
Change-Id: I48eebc981f260fd02c0d690531cdd31a04d9bcb4
| -rw-r--r-- | login/src/com/google/gct/login/ui/GoogleLoginActionButton.java | 2 | ||||
| -rw-r--r-- | login/src/com/google/gct/login/ui/UsersListCellRenderer.java | 18 |
2 files changed, 14 insertions, 6 deletions
diff --git a/login/src/com/google/gct/login/ui/GoogleLoginActionButton.java b/login/src/com/google/gct/login/ui/GoogleLoginActionButton.java index 6782f01..3457485 100644 --- a/login/src/com/google/gct/login/ui/GoogleLoginActionButton.java +++ b/login/src/com/google/gct/login/ui/GoogleLoginActionButton.java @@ -31,7 +31,7 @@ import java.awt.Image; /** * The Google Login button that appears on the main toolbar. */ -public class GoogleLoginActionButton extends ActionButton { +public final class GoogleLoginActionButton extends ActionButton { private Icon defaultIcon; private final static String SIGN_IN_MESSAGE = "Sign in to Google..."; private final static String DEFAULT_AVATAR = "/icons/loginAvatar.png"; diff --git a/login/src/com/google/gct/login/ui/UsersListCellRenderer.java b/login/src/com/google/gct/login/ui/UsersListCellRenderer.java index 3fe9c3e..9c10ec0 100644 --- a/login/src/com/google/gct/login/ui/UsersListCellRenderer.java +++ b/login/src/com/google/gct/login/ui/UsersListCellRenderer.java @@ -18,7 +18,15 @@ package com.google.gct.login.ui; import com.intellij.ui.JBColor; import com.intellij.util.ui.UIUtil; -import javax.swing.*; +import javax.swing.BorderFactory; +import javax.swing.Box; +import javax.swing.BoxLayout; +import javax.swing.ImageIcon; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.JPanel; +import javax.swing.ListCellRenderer; import java.awt.Color; import java.awt.Component; @@ -42,7 +50,7 @@ import java.net.URL; public class UsersListCellRenderer extends JComponent implements ListCellRenderer { private final static String CLOUD_LABEL_TEXT = "Open Cloud Console"; private final static String PLAY_LABEL_TEXT = "Open Play Developer Console"; - private final static String DEFAULT_AVATAR = "/icons/loginAvatar.png"; + private final static String DEFAULT_AVATAR = "/icons/loginAvatar@2x.png"; private final static String GOOGLE_IMG = "/icons/google.png"; private final static String SIGN_IN_TEXT = "Sign in with your Google account"; private final Color ACTIVE_COLOR = JBColor.LIGHT_GRAY; @@ -110,7 +118,8 @@ public class UsersListCellRenderer extends JComponent implements ListCellRendere Image image = usersListItem.getUserPicture(); if(image == null){ // use default image - image = Toolkit.getDefaultToolkit().getImage(DEFAULT_AVATAR); + URL url = UsersListCellRenderer.class.getResource(DEFAULT_AVATAR); + image = Toolkit.getDefaultToolkit().getImage(url); } int imageWidth = calcIsSelected ? ACTIVE_USER_IMAGE_WIDTH : PLAIN_USER_IMAGE_WIDTH; @@ -126,8 +135,7 @@ public class UsersListCellRenderer extends JComponent implements ListCellRendere mainPanel.add(new JLabel(new ImageIcon(scaledImage))); mainPanel.add(textPanel); - - // TODO: add Separator to bottom of panel + mainPanel.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIUtil.getBorderColor())); return mainPanel; } |