Revision: 3441
Author: ferguson.sebastian
Date: Wed Apr 7 13:56:01 2010
Log: Security UI now looks the same on windows and mac. No longer shows an
ellipsis in loo of the arrows in the group or user edit panels
http://code.google.com/p/power-architect/source/detail?r=3441
Added:
/trunk/src/main/resources/icons/arrow-down.png
/trunk/src/main/resources/icons/arrow-left.png
/trunk/src/main/resources/icons/arrow-right.png
/trunk/src/main/resources/icons/arrow-up.png
/trunk/src/main/resources/icons/famfamfam/add.png
/trunk/src/main/resources/icons/famfamfam/delete.png
Modified:
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/GroupEditorPanel.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/ProjectSecurityPanel.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/SecurityPanel.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/UserEditorPanel.java
=======================================
--- /dev/null
+++ /trunk/src/main/resources/icons/arrow-down.png Wed Apr 7 13:56:01 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/src/main/resources/icons/arrow-left.png Wed Apr 7 13:56:01 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/src/main/resources/icons/arrow-right.png Wed Apr 7 13:56:01 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/src/main/resources/icons/arrow-up.png Wed Apr 7 13:56:01 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/src/main/resources/icons/famfamfam/add.png Wed Apr 7 13:56:01
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/src/main/resources/icons/famfamfam/delete.png Wed Apr 7
13:56:01 2010
@@ -0,0 +1,20 @@
+‰PNG
+
+
+IHDR óÿa gAMA ¯È7 Šé tEXtSoftware Adobe
ImageReadyqÉe< ]IDAT8Ë¥“ûKSa Çý[¶ ¢ ‰n„„QP˜ó2wÖÚܦγL [,biŽ ašA Å\øC¨¥vÕÊ_2Ml”ZFjסå±òÒNMjmž³kÊ·¹`&.#záûËËûù¼< Ï“
å ²æbV¯ ÎP æ÷T 3¥%¹I†{Gª™qRiv•È
+ë
+ætzâ#E±ß
+6„ ˆ¼ Edd üÝ Ì Jñª `Ÿ«ÅDRÁ2<]Nñ ·;°4õ Ѿ;ˆ¶Û m>‡ 7›°8Ü É€Qe6ÿLžI¬ Ìèt‚ ìæ®·c‰q!zñ |
v ü¶j„/X i �...@øÞ
+Ì
+%1|hŸû±l !ˆÁô| ‹®±ø !
+ïY#‚uºUáN’ w]Á˼ H3è„à u„ t]E´³ >k%¾ I“f¡’ o« ÇR
+‡D:“ 0åÚ`ä~ ¢ |§
+øÓñ(rà¥
+áon„3oG0!˜$‹‚¡ÎV„ë
+ ž*[W0_ª‚¿© ýâ-+‚‰ ãµÖ d§Á
+WÇ & 2 ¾Z fMFô‰ÒVJp ËiF&B°³
+> ÞRÉ ˜•gƒ- Ð~ CâmèÍÚ´ÒÄ×ERÁ
+áž«Ð p«5Þ°y•ø ¨È +‹Á21ø¶ Œ K—aw·h£`Õ
ä #Š üôa ×Zñ½ž†‡Tâ³Z o üå L¨óÑ“•ÊÇ`"é(?•ï'ž
+ÜËŽJváKµ Þ†óñ|ª:†G9[—aöw8é2
+Jw Äéf'±“y ¿ ë mæzsÓ˜žìTswæ á_·ñ_ó
+ÒιIr þ IEND®B`‚
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/GroupEditorPanel.java
Wed Apr 7 13:00:40 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/GroupEditorPanel.java
Wed Apr 7 13:56:01 2010
@@ -27,6 +27,7 @@
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.DefaultListModel;
+import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JList;
@@ -37,13 +38,12 @@
import javax.swing.event.DocumentListener;
import ca.sqlpower.architect.ArchitectProject;
+import
ca.sqlpower.architect.swingui.action.enterprise.RefreshProjectAction;
import ca.sqlpower.enterprise.client.Grant;
import ca.sqlpower.enterprise.client.Group;
import ca.sqlpower.enterprise.client.GroupMember;
import ca.sqlpower.enterprise.client.User;
import ca.sqlpower.swingui.DataEntryPanel;
-import ca.sqlpower.swingui.LessthanGreaterthanIcon;
-import ca.sqlpower.swingui.LessthanGreaterthanIcon.Type;
import com.jgoodies.forms.builder.ButtonBarBuilder;
import com.jgoodies.forms.builder.DefaultFormBuilder;
@@ -52,6 +52,9 @@
public class GroupEditorPanel implements DataEntryPanel {
+ private static final ImageIcon RIGHT_ARROW = new
ImageIcon(RefreshProjectAction.class.getResource("/icons/arrow-right.png"));
+ private static final ImageIcon LEFT_ARROW = new
ImageIcon(RefreshProjectAction.class.getResource("/icons/arrow-left.png"));
+
private final Group group;
private final JPanel panel;
@@ -176,9 +179,9 @@
}
JButton addButton = new JButton(addAction);
- addButton.setIcon(new LessthanGreaterthanIcon(Type.GREATERTHAN));
+ addButton.setIcon(RIGHT_ARROW);
JButton removeButton = new JButton(removeAction);
- removeButton.setIcon(new LessthanGreaterthanIcon(Type.LESSTHAN));
+ removeButton.setIcon(LEFT_ARROW);
CellConstraints cc = new CellConstraints();
DefaultFormBuilder upperPanelBuilder = new DefaultFormBuilder(new
FormLayout(
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/ProjectSecurityPanel.java
Wed Apr 7 13:00:40 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/ProjectSecurityPanel.java
Wed Apr 7 13:56:01 2010
@@ -379,6 +379,7 @@
});
addButton.setIcon(ADD_ICON);
addButton.setBorderPainted(false);
+ addButton.setContentAreaFilled(false);
headerRow[6] = addButton;
rows.add(headerRow);
@@ -423,6 +424,7 @@
});
removeButton.setIcon(REMOVE_ICON);
removeButton.setBorderPainted(false);
+ removeButton.setContentAreaFilled(false);
Component [] rowComponents = new Component[numColumns];
rowComponents[0] = new JLabel(object.getName());
@@ -463,6 +465,7 @@
});
removeButton.setIcon(REMOVE_ICON);
removeButton.setBorderPainted(false);
+ removeButton.setContentAreaFilled(false);
Component [] rowComponents = new Component[numColumns];
rowComponents[0] = new JLabel(object.getName());
@@ -525,8 +528,9 @@
col.setCellEditor(new RowCellEditor(this));
}
- //table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
table.getColumnModel().getColumn(6).setPreferredWidth(table.getRowHeight());
+ table.setShowHorizontalLines(false);
+ table.setShowVerticalLines(false);
JScrollPane scrollpane = new JScrollPane(table);
scrollpane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
@@ -539,7 +543,7 @@
}
scrollpane.setPreferredSize(new Dimension(preferredWidth,
preferredHeight));
- scrollpane.setBackground(Color.WHITE);
+ scrollpane.getViewport().setBackground(Color.WHITE);
return scrollpane;
}
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/SecurityPanel.java
Wed Apr 7 13:00:40 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/SecurityPanel.java
Wed Apr 7 13:56:01 2010
@@ -62,7 +62,7 @@
import ca.sqlpower.swingui.SPSUtils;
public class SecurityPanel {
-
+
private final Action closeAction;
private final JTree tree;
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/UserEditorPanel.java
Wed Apr 7 13:00:40 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/UserEditorPanel.java
Wed Apr 7 13:56:01 2010
@@ -31,6 +31,7 @@
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.DefaultListModel;
+import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JLabel;
@@ -54,14 +55,13 @@
import ca.sqlpower.architect.ArchitectSession;
import ca.sqlpower.architect.enterprise.ArchitectClientSideSession;
import ca.sqlpower.architect.enterprise.JSONResponseHandler;
+import
ca.sqlpower.architect.swingui.action.enterprise.RefreshProjectAction;
import ca.sqlpower.enterprise.client.Grant;
import ca.sqlpower.enterprise.client.Group;
import ca.sqlpower.enterprise.client.GroupMember;
import ca.sqlpower.enterprise.client.SPServerInfo;
import ca.sqlpower.enterprise.client.User;
import ca.sqlpower.swingui.DataEntryPanel;
-import ca.sqlpower.swingui.LessthanGreaterthanIcon;
-import ca.sqlpower.swingui.LessthanGreaterthanIcon.Type;
import ca.sqlpower.util.UserPrompter.UserPromptOptions;
import ca.sqlpower.util.UserPrompter.UserPromptResponse;
import ca.sqlpower.util.UserPrompterFactory.UserPromptType;
@@ -73,6 +73,9 @@
public class UserEditorPanel implements DataEntryPanel{
+ private static final ImageIcon RIGHT_ARROW = new
ImageIcon(RefreshProjectAction.class.getResource("/icons/arrow-right.png"));
+ private static final ImageIcon LEFT_ARROW = new
ImageIcon(RefreshProjectAction.class.getResource("/icons/arrow-left.png"));
+
private final ArchitectProject securityWorkspace;
private final User user;
@@ -213,9 +216,9 @@
}
JButton addButton = new JButton(addAction);
- addButton.setIcon(new LessthanGreaterthanIcon(Type.GREATERTHAN));
+ addButton.setIcon(RIGHT_ARROW);
JButton removeButton = new JButton(removeAction);
- removeButton.setIcon(new LessthanGreaterthanIcon(Type.LESSTHAN));
+ removeButton.setIcon(LEFT_ARROW);
CellConstraints cc = new CellConstraints();
DefaultFormBuilder upperPanelBuilder = new DefaultFormBuilder(new
FormLayout(
--
To unsubscribe, reply using "remove me" as the subject.
