Author: jfuerth
Date: Wed Aug 27 14:47:49 2008
New Revision: 2638
Added:
trunk/src/icons/olap/cubeAdd.png (contents, props changed)
trunk/src/icons/olap/cubeGrantAdd.png (contents, props changed)
trunk/src/icons/olap/cubeUsageAdd.png (contents, props changed)
trunk/src/icons/olap/dimensionAdd.png (contents, props changed)
trunk/src/icons/olap/formulaAdd.png (contents, props changed)
trunk/src/icons/olap/hierarchyAdd.png (contents, props changed)
trunk/src/icons/olap/hierarchyGrantAdd.png (contents, props changed)
trunk/src/icons/olap/levelAdd.png (contents, props changed)
trunk/src/icons/olap/levelPropertyAdd.png (contents, props changed)
trunk/src/icons/olap/measureAdd.png (contents, props changed)
trunk/src/icons/olap/measurePropertyAdd.png (contents, props changed)
trunk/src/icons/olap/namedSetAdd.png (contents, props changed)
trunk/src/icons/olap/schemaAdd.png (contents, props changed)
trunk/src/icons/olap/schemaExport.png (contents, props changed)
trunk/src/icons/olap/schemaGrantAdd.png (contents, props changed)
trunk/src/icons/olap/securityRoleAdd.png (contents, props changed)
trunk/src/icons/olap/securityUnionAdd.png (contents, props changed)
trunk/src/icons/olap/virtualCubeAdd.png (contents, props changed)
Modified:
trunk/src/ca/sqlpower/architect/swingui/action/ProgressAction.java
trunk/src/ca/sqlpower/architect/swingui/olap/OSUtils.java
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateCubeAction.java
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateCubeUsageAction.java
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateDimensionAction.java
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateDimensionUsageAction.java
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateHierarchyAction.java
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateLevelAction.java
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateMeasureAction.java
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateOLAPChildAction.java
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateUsageAction.java
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateVirtualCubeAction.java
trunk/src/ca/sqlpower/architect/swingui/olap/action/ExportSchemaAction.java
trunk/src/icons/olap/cube.png
trunk/src/icons/olap/cubeGrant.png
trunk/src/icons/olap/cubeUsage.png
trunk/src/icons/olap/formula.png
trunk/src/icons/olap/hierarchy.png
trunk/src/icons/olap/hierarchyGrant.png
trunk/src/icons/olap/level.png
trunk/src/icons/olap/levelProperty.png
trunk/src/icons/olap/measure.png
trunk/src/icons/olap/measureProperty.png
trunk/src/icons/olap/namedSet.png
trunk/src/icons/olap/schema.png
trunk/src/icons/olap/schemaGrant.png
trunk/src/icons/olap/virtualCube.png
Log:
Integrated all of the "New" variants of our icons, as well as a "Schema
Export" icon. Thanks once again goes to Giulio, who offered to take the
credit for these.
PS: I know "create dimension usage" is still missing an icon. I'm working
on it.
Modified: trunk/src/ca/sqlpower/architect/swingui/action/ProgressAction.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/action/ProgressAction.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/action/ProgressAction.java Wed
Aug 27 14:47:49 2008
@@ -23,6 +23,7 @@
import java.util.Map;
import javax.swing.AbstractAction;
+import javax.swing.Icon;
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JLabel;
@@ -49,8 +50,8 @@
ArchitectSwingSession session,
String actionName,
String actionDescription,
- String iconResourceName) {
- super(session, actionName, actionDescription, iconResourceName);
+ Icon icon) {
+ super(session, actionName, actionDescription, icon);
}
public ProgressAction(
Modified: trunk/src/ca/sqlpower/architect/swingui/olap/OSUtils.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/olap/OSUtils.java (original)
+++ trunk/src/ca/sqlpower/architect/swingui/olap/OSUtils.java Wed Aug 27
14:47:49 2008
@@ -47,28 +47,49 @@
import ca.sqlpower.swingui.SPSUtils;
/**
- * A collection of utility methods for the OLAP Swing UI.
+ * A collection of utility methods for the OLAP Swing UI. Also the place
+ * where we keep all the icons.
*/
public class OSUtils {
public static final ImageIcon CUBE_ICON =
SPSUtils.createIcon("olap/cube", "Cube"); //$NON-NLS-1$ //$NON-NLS-2$
+ public static final ImageIcon CUBE_ADD_ICON =
SPSUtils.createIcon("olap/cubeAdd", "New Cube"); //$NON-NLS-1$ //$NON-NLS-2$
public static final ImageIcon CUBE_USAGE_ICON =
SPSUtils.createIcon("olap/cubeUsage", "Cube Usage"); //$NON-NLS-1$
//$NON-NLS-2$
+ public static final ImageIcon CUBE_USAGE_ADD_ICON =
SPSUtils.createIcon("olap/cubeUsageAdd", "New Cube Usage"); //$NON-NLS-1$
//$NON-NLS-2$
public static final ImageIcon DIMENSION_ICON =
SPSUtils.createIcon("olap/dimension", "Dimension"); //$NON-NLS-1$
//$NON-NLS-2$
+ public static final ImageIcon DIMENSION_ADD_ICON =
SPSUtils.createIcon("olap/dimensionAdd", "New Dimension"); //$NON-NLS-1$
//$NON-NLS-2$
public static final ImageIcon FORMULA_ICON =
SPSUtils.createIcon("olap/formula", "Formula"); //$NON-NLS-1$ //$NON-NLS-2$
+ public static final ImageIcon FORMULA_ADD_ICON =
SPSUtils.createIcon("olap/formulaAdd", "New Formula"); //$NON-NLS-1$
//$NON-NLS-2$
public static final ImageIcon HIERARCHY_ICON =
SPSUtils.createIcon("olap/hierarchy", "Hierarchy"); //$NON-NLS-1$
//$NON-NLS-2$
+ public static final ImageIcon HIERARCHY_ADD_ICON =
SPSUtils.createIcon("olap/hierarchyAdd", "New Hierarchy"); //$NON-NLS-1$
//$NON-NLS-2$
public static final ImageIcon LEVEL_ICON =
SPSUtils.createIcon("olap/level", "Level"); //$NON-NLS-1$ //$NON-NLS-2$
+ public static final ImageIcon LEVEL_ADD_ICON =
SPSUtils.createIcon("olap/levelAdd", "New Level"); //$NON-NLS-1$
//$NON-NLS-2$
public static final ImageIcon LEVEL_PROP_ICON =
SPSUtils.createIcon("olap/levelProperty", "Level Property"); //$NON-NLS-1$
//$NON-NLS-2$
+ public static final ImageIcon LEVEL_PROP_ADD_ICON =
SPSUtils.createIcon("olap/levelPropertyAdd", "New Level Property");
//$NON-NLS-1$ //$NON-NLS-2$
public static final ImageIcon MEASURE_ICON =
SPSUtils.createIcon("olap/measure", "Measure"); //$NON-NLS-1$ //$NON-NLS-2$
+ public static final ImageIcon MEASURE_ADD_ICON =
SPSUtils.createIcon("olap/measureAdd", "New Measure"); //$NON-NLS-1$
//$NON-NLS-2$
public static final ImageIcon MEASURE_PROP_ICON =
SPSUtils.createIcon("olap/measureProperty", "Measure Property");
//$NON-NLS-1$ //$NON-NLS-2$
+ public static final ImageIcon MEASURE_PROP_ADD_ICON =
SPSUtils.createIcon("olap/measurePropertyAdd", "New Measure Property");
//$NON-NLS-1$ //$NON-NLS-2$
public static final ImageIcon NAMED_SET_ICON =
SPSUtils.createIcon("olap/namedSet", "Named Set"); //$NON-NLS-1$
//$NON-NLS-2$
+ public static final ImageIcon NAMED_SET_ADD_ICON =
SPSUtils.createIcon("olap/namedSetAdd", "New Named Set"); //$NON-NLS-1$
//$NON-NLS-2$
public static final ImageIcon SCHEMA_ICON =
SPSUtils.createIcon("olap/schema", "Schema"); //$NON-NLS-1$ //$NON-NLS-2$
+ public static final ImageIcon SCHEMA_ADD_ICON =
SPSUtils.createIcon("olap/schemaAdd", "New Schema"); //$NON-NLS-1$
//$NON-NLS-2$
public static final ImageIcon SEC_GRANT_ICON =
SPSUtils.createIcon("olap/securityGrant", "Grant"); //$NON-NLS-1$
//$NON-NLS-2$
+ public static final ImageIcon SEC_GRANT_ADD_ICON =
SPSUtils.createIcon("olap/securityGrantAdd", "New Grant"); //$NON-NLS-1$
//$NON-NLS-2$
public static final ImageIcon SEC_CUBE_GRANT_ICON =
SPSUtils.createIcon("olap/cubeGrant", "Cube Grant"); //$NON-NLS-1$
//$NON-NLS-2$
+ public static final ImageIcon SEC_CUBE_GRANT_ADD_ICON =
SPSUtils.createIcon("olap/cubeGrantAdd", "New Cube Grant"); //$NON-NLS-1$
//$NON-NLS-2$
public static final ImageIcon SEC_HIERARCHY_GRANT_ICON =
SPSUtils.createIcon("olap/hierarchyGrant", "Hierarchy Grant");
//$NON-NLS-1$ //$NON-NLS-2$
+ public static final ImageIcon SEC_HIERARCHY_GRANT_ADD_ICON =
SPSUtils.createIcon("olap/hierarchyGrantAdd", "New Hierarchy Grant");
//$NON-NLS-1$ //$NON-NLS-2$
public static final ImageIcon SEC_SCHEMA_GRANT_ICON =
SPSUtils.createIcon("olap/schemaGrant", "Schema Grant"); //$NON-NLS-1$
//$NON-NLS-2$
+ public static final ImageIcon SEC_SCHEMA_GRANT_ADD_ICON =
SPSUtils.createIcon("olap/schemaGrantAdd", "New Schema Grant");
//$NON-NLS-1$ //$NON-NLS-2$
public static final ImageIcon SEC_ROLE_ICON =
SPSUtils.createIcon("olap/securityRole", "Role"); //$NON-NLS-1$
//$NON-NLS-2$
+ public static final ImageIcon SEC_ROLE_ADD_ICON =
SPSUtils.createIcon("olap/securityRoleAdd", "New Role"); //$NON-NLS-1$
//$NON-NLS-2$
public static final ImageIcon SEC_UNION_ICON =
SPSUtils.createIcon("olap/securityUnion", "Union"); //$NON-NLS-1$
//$NON-NLS-2$
+ public static final ImageIcon SEC_UNION_ADD_ICON =
SPSUtils.createIcon("olap/securityUnionAdd", "New Union"); //$NON-NLS-1$
//$NON-NLS-2$
public static final ImageIcon VIRTUAL_CUBE_ICON =
SPSUtils.createIcon("olap/virtualCube", "Virtual Cube"); //$NON-NLS-1$
//$NON-NLS-2$
+ public static final ImageIcon VIRTUAL_CUBE_ADD_ICON =
SPSUtils.createIcon("olap/virtualCubeAdd", "New Virtual Cube");
//$NON-NLS-1$ //$NON-NLS-2$
+
+ public static final ImageIcon SCHEMA_EXPORT_ICON =
SPSUtils.createIcon("olap/schemaExport", "Export Schema"); //$NON-NLS-1$
//$NON-NLS-2$
/**
* Returns the appropriate icon for the given OLAP object.
@@ -81,51 +102,68 @@
* returned.
*/
public static Icon iconFor(OLAPObject value) {
+ return iconFor(value, false);
+ }
+
+ /**
+ * Returns the appropriate icon for the given OLAP object.
+ *
+ * @param value
+ * The object you want an icon for
+ * @param addVariant
+ * true for the variant of the icon with an "add" badge,
false
+ * for the undecorated icon.
+ * @return The most appropriate icon for the given object. The icon
size
+ * will be 16x16, and it will have an alpha mask. If no
appropriate
+ * icon is available, a completely transparent 16x16 icon will
be
+ * returned.
+ */
+ public static Icon iconFor(OLAPObject value, boolean addVariant) {
if (false) {
} else if (value instanceof CalculatedMember) {
- return FORMULA_ICON;
+ return addVariant ? FORMULA_ADD_ICON : FORMULA_ICON;
} else if (value instanceof Cube) {
- return CUBE_ICON;
+ return addVariant ? CUBE_ADD_ICON : CUBE_ICON;
} else if (value instanceof CubeUsage) {
- return CUBE_USAGE_ICON;
+ return addVariant ? CUBE_USAGE_ADD_ICON : CUBE_USAGE_ICON;
} else if (value instanceof CubeDimension) {
- return DIMENSION_ICON;
+ return addVariant ? DIMENSION_ADD_ICON : DIMENSION_ICON;
} else if (value instanceof Formula) {
- return FORMULA_ICON;
+ return addVariant ? FORMULA_ADD_ICON : FORMULA_ICON;
} else if (value instanceof Hierarchy) {
- return HIERARCHY_ICON;
+ return addVariant ? HIERARCHY_ADD_ICON : HIERARCHY_ICON;
} else if (value instanceof Level) {
- return LEVEL_ICON;
+ return addVariant ? LEVEL_ADD_ICON : LEVEL_ICON;
} else if (value instanceof Property && value.getParent()
instanceof Level) {
- return LEVEL_PROP_ICON;
+ return addVariant ? LEVEL_PROP_ADD_ICON : LEVEL_PROP_ICON;
} else if (value instanceof Measure) {
- return MEASURE_ICON;
+ return addVariant ? MEASURE_ADD_ICON : MEASURE_ICON;
} else if (value instanceof Property && value.getParent()
instanceof Measure) {
- return MEASURE_PROP_ICON;
+ return addVariant ? MEASURE_PROP_ADD_ICON : MEASURE_PROP_ICON;
} else if (value instanceof MemberGrant) {
- return SEC_GRANT_ICON;
+ return addVariant ? SEC_GRANT_ADD_ICON : SEC_GRANT_ICON;
} else if (value instanceof NamedSet) {
- return NAMED_SET_ICON;
+ return addVariant ? NAMED_SET_ADD_ICON : NAMED_SET_ICON;
} else if (value instanceof Schema) {
- return SCHEMA_ICON;
+ return addVariant ? SCHEMA_ADD_ICON : SCHEMA_ICON;
} else if (value instanceof CubeGrant) {
- return SEC_CUBE_GRANT_ICON;
+ return addVariant ? SEC_CUBE_GRANT_ADD_ICON :
SEC_CUBE_GRANT_ICON;
// } else if (value instanceof DimensionGrant) { TODO get this icon
-// return SEC_DIMENSION_GRANT_ICON;
+// return addVariant ? SEC_DIMENSION_GRANT_ADD_ICON :
SEC_DIMENSION_GRANT_ICON;
} else if (value instanceof HierarchyGrant) {
- return SEC_HIERARCHY_GRANT_ICON;
+ return addVariant ? SEC_HIERARCHY_GRANT_ADD_ICON :
SEC_HIERARCHY_GRANT_ICON;
} else if (value instanceof SchemaGrant) {
- return SEC_SCHEMA_GRANT_ICON;
+ return addVariant ? SEC_SCHEMA_GRANT_ADD_ICON :
SEC_SCHEMA_GRANT_ICON;
} else if (value instanceof Grant) {
- return SEC_GRANT_ICON;
+ return addVariant ? SEC_GRANT_ADD_ICON : SEC_GRANT_ICON;
} else if (value instanceof Role) {
- return SEC_ROLE_ICON;
+ return addVariant ? SEC_ROLE_ADD_ICON : SEC_ROLE_ICON;
} else if (value instanceof Union) {
- return SEC_UNION_ICON;
+ return addVariant ? SEC_UNION_ADD_ICON : SEC_UNION_ICON;
} else if (value instanceof VirtualCube) {
- return VIRTUAL_CUBE_ICON;
+ return addVariant ? VIRTUAL_CUBE_ADD_ICON : VIRTUAL_CUBE_ICON;
} else if (value instanceof VirtualCubeMeasure) {
- return MEASURE_ICON;
+ return addVariant ? MEASURE_ADD_ICON : MEASURE_ICON;
}
return BlankIcon.getInstance(16, 16);
Modified:
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateCubeAction.java
==============================================================================
---
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateCubeAction.java
(original)
+++
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateCubeAction.java
Wed Aug 27 14:47:49 2008
@@ -35,6 +35,7 @@
import ca.sqlpower.architect.swingui.event.SelectionEvent;
import ca.sqlpower.architect.swingui.olap.CubeEditPanel;
import ca.sqlpower.architect.swingui.olap.CubePane;
+import ca.sqlpower.architect.swingui.olap.OSUtils;
import ca.sqlpower.swingui.DataEntryPanel;
public class CreateCubeAction extends AbstractArchitectAction {
@@ -42,7 +43,7 @@
private final Schema schema;
public CreateCubeAction(ArchitectSwingSession session, Schema schema,
PlayPen pp) {
- super(session, pp, "New Cube...", "Create a new cube in this
schema", (String) null);
+ super(session, pp, "New Cube...", "Create a new cube in this
schema", OSUtils.CUBE_ADD_ICON);
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('c'));
this.schema = schema;
}
Modified:
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateCubeUsageAction.java
==============================================================================
---
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateCubeUsageAction.java
(original)
+++
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateCubeUsageAction.java
Wed Aug 27 14:47:49 2008
@@ -28,6 +28,7 @@
import ca.sqlpower.architect.swingui.ArchitectSwingSession;
import ca.sqlpower.architect.swingui.PlayPen;
import ca.sqlpower.architect.swingui.olap.CubePane;
+import ca.sqlpower.architect.swingui.olap.OSUtils;
import ca.sqlpower.architect.swingui.olap.UsageComponent;
import ca.sqlpower.architect.swingui.olap.VirtualCubePane;
@@ -41,7 +42,7 @@
private static final Logger logger =
Logger.getLogger(CreateCubeUsageAction.class);
public CreateCubeUsageAction(ArchitectSwingSession session, PlayPen
pp) {
- super(session, pp, CubePane.class, VirtualCubePane.class, "Cube
Usage");
+ super(session, pp, CubePane.class, VirtualCubePane.class, "Cube
Usage", OSUtils.CUBE_USAGE_ADD_ICON);
}
@Override
Modified:
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateDimensionAction.java
==============================================================================
---
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateDimensionAction.java
(original)
+++
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateDimensionAction.java
Wed Aug 27 14:47:49 2008
@@ -35,6 +35,7 @@
import ca.sqlpower.architect.swingui.event.SelectionEvent;
import ca.sqlpower.architect.swingui.olap.DimensionEditPanel;
import ca.sqlpower.architect.swingui.olap.DimensionPane;
+import ca.sqlpower.architect.swingui.olap.OSUtils;
import ca.sqlpower.swingui.DataEntryPanel;
public class CreateDimensionAction extends AbstractArchitectAction {
@@ -42,7 +43,7 @@
private final Schema schema;
public CreateDimensionAction(ArchitectSwingSession session, Schema
schema, PlayPen pp) {
- super(session, pp, "New Dimension...", "Create a new shared
dimension in this schema", (String) null);
+ super(session, pp, "New Dimension...", "Create a new shared
dimension in this schema", OSUtils.DIMENSION_ADD_ICON);
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('d'));
this.schema = schema;
}
Modified:
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateDimensionUsageAction.java
==============================================================================
---
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateDimensionUsageAction.java
(original)
+++
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateDimensionUsageAction.java
Wed Aug 27 14:47:49 2008
@@ -52,7 +52,7 @@
private static final Logger logger =
Logger.getLogger(CreateDimensionUsageAction.class);
public CreateDimensionUsageAction(ArchitectSwingSession session,
PlayPen pp) {
- super(session, pp, DimensionPane.class, CubePane.class, "Dimension
Usage");
+ super(session, pp, DimensionPane.class, CubePane.class, "Dimension
Usage", null);
}
@Override
Modified:
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateHierarchyAction.java
==============================================================================
---
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateHierarchyAction.java
(original)
+++
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateHierarchyAction.java
Wed Aug 27 14:47:49 2008
@@ -27,6 +27,7 @@
import ca.sqlpower.architect.swingui.PlayPen;
import ca.sqlpower.architect.swingui.olap.DimensionPane;
import ca.sqlpower.architect.swingui.olap.HierarchyEditPanel;
+import ca.sqlpower.architect.swingui.olap.OSUtils;
import ca.sqlpower.swingui.DataEntryPanel;
/**
@@ -35,7 +36,7 @@
public class CreateHierarchyAction extends
CreateOLAPChildAction<DimensionPane, Hierarchy> {
public CreateHierarchyAction(ArchitectSwingSession session, PlayPen
olapPlayPen) {
- super(session, olapPlayPen, "Hierarchy",
DimensionPane.class, "Dimension", 'h');
+ super(session, olapPlayPen, "Hierarchy",
DimensionPane.class, "Dimension", 'h', OSUtils.HIERARCHY_ADD_ICON);
}
@Override
Modified:
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateLevelAction.java
==============================================================================
---
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateLevelAction.java
(original)
+++
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateLevelAction.java
Wed Aug 27 14:47:49 2008
@@ -31,12 +31,13 @@
import ca.sqlpower.architect.swingui.PlayPen;
import ca.sqlpower.architect.swingui.olap.DimensionPane;
import ca.sqlpower.architect.swingui.olap.LevelEditPanel;
+import ca.sqlpower.architect.swingui.olap.OSUtils;
import ca.sqlpower.swingui.DataEntryPanel;
public class CreateLevelAction extends
CreateOLAPChildAction<DimensionPane, Level> {
public CreateLevelAction(ArchitectSwingSession session, PlayPen
olapPlayPen) {
- super(session, olapPlayPen, "Level",
DimensionPane.class, "Hierarchy", 'l');
+ super(session, olapPlayPen, "Level",
DimensionPane.class, "Hierarchy", 'l', OSUtils.LEVEL_ADD_ICON);
}
@Override
Modified:
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateMeasureAction.java
==============================================================================
---
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateMeasureAction.java
(original)
+++
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateMeasureAction.java
Wed Aug 27 14:47:49 2008
@@ -27,12 +27,13 @@
import ca.sqlpower.architect.swingui.PlayPen;
import ca.sqlpower.architect.swingui.olap.CubePane;
import ca.sqlpower.architect.swingui.olap.MeasureEditPanel;
+import ca.sqlpower.architect.swingui.olap.OSUtils;
import ca.sqlpower.swingui.DataEntryPanel;
public class CreateMeasureAction extends CreateOLAPChildAction<CubePane,
Measure> {
public CreateMeasureAction(ArchitectSwingSession session, PlayPen
olapPlayPen) {
- super(session, olapPlayPen, "Measure",
CubePane.class, "Cube", 'm');
+ super(session, olapPlayPen, "Measure",
CubePane.class, "Cube", 'm', OSUtils.MEASURE_ADD_ICON);
}
@Override
Modified:
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateOLAPChildAction.java
==============================================================================
---
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateOLAPChildAction.java
(original)
+++
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateOLAPChildAction.java
Wed Aug 27 14:47:49 2008
@@ -23,6 +23,7 @@
import java.util.List;
import java.util.concurrent.Callable;
+import javax.swing.Icon;
import javax.swing.JDialog;
import javax.swing.KeyStroke;
import javax.swing.SwingUtilities;
@@ -103,11 +104,13 @@
* @param accelKey
* The key character that should be used to invoke this
action
* from the keyboard.
+ * @param icon
+ * The icon for this action.
*/
public CreateOLAPChildAction(ArchitectSwingSession session, PlayPen
olapPlayPen,
String friendlyChildName, Class<P> paneClass,
- String friendlyParentName, char accelKey) {
- super(session, olapPlayPen, "New " + friendlyChildName, null,
(String) null);
+ String friendlyParentName, char accelKey, Icon icon) {
+ super(session, olapPlayPen, "New " + friendlyChildName + "...",
null, icon);
this.friendlyChildName = friendlyChildName;
this.paneClass = paneClass;
this.friendlyParentName = friendlyParentName;
Modified:
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateUsageAction.java
==============================================================================
---
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateUsageAction.java
(original)
+++
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateUsageAction.java
Wed Aug 27 14:47:49 2008
@@ -22,6 +22,8 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import javax.swing.Icon;
+
import org.apache.log4j.Logger;
import ca.sqlpower.architect.swingui.ArchitectSwingSession;
@@ -79,8 +81,9 @@
PlayPen pp,
Class<P1> pane1Class,
Class<P2> pane2Class,
- String name) {
- super(session, pp, "New " + name, "Creates a " + name, (String)
null);
+ String name,
+ Icon icon) {
+ super(session, pp, "New " + name + "...", "Create a new " + name,
icon);
this.pane1Class = pane1Class;
this.pane2Class = pane2Class;
cursorManager = playpen.getCursorManager();
Modified:
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateVirtualCubeAction.java
==============================================================================
---
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateVirtualCubeAction.java
(original)
+++
trunk/src/ca/sqlpower/architect/swingui/olap/action/CreateVirtualCubeAction.java
Wed Aug 27 14:47:49 2008
@@ -31,6 +31,7 @@
import ca.sqlpower.architect.swingui.PlayPen;
import ca.sqlpower.architect.swingui.action.AbstractArchitectAction;
import ca.sqlpower.architect.swingui.event.SelectionEvent;
+import ca.sqlpower.architect.swingui.olap.OSUtils;
import ca.sqlpower.architect.swingui.olap.VirtualCubeEditPanel;
import ca.sqlpower.architect.swingui.olap.VirtualCubePane;
import ca.sqlpower.swingui.DataEntryPanel;
@@ -40,7 +41,7 @@
private final Schema schema;
public CreateVirtualCubeAction(ArchitectSwingSession session, Schema
schema, PlayPen pp) {
- super(session, pp, "New Virtual Cube...", "Create a new Virtual
Cube in this schema", (String) null);
+ super(session, pp, "New Virtual Cube...", "Create a new Virtual
Cube in this schema", OSUtils.VIRTUAL_CUBE_ADD_ICON);
this.schema = schema;
}
Modified:
trunk/src/ca/sqlpower/architect/swingui/olap/action/ExportSchemaAction.java
==============================================================================
---
trunk/src/ca/sqlpower/architect/swingui/olap/action/ExportSchemaAction.java
(original)
+++
trunk/src/ca/sqlpower/architect/swingui/olap/action/ExportSchemaAction.java
Wed Aug 27 14:47:49 2008
@@ -34,6 +34,7 @@
import ca.sqlpower.architect.swingui.ArchitectSwingSession;
import ca.sqlpower.architect.swingui.RecentMenu;
import ca.sqlpower.architect.swingui.action.ProgressAction;
+import ca.sqlpower.architect.swingui.olap.OSUtils;
import ca.sqlpower.swingui.SPSUtils;
import ca.sqlpower.util.MonitorableImpl;
@@ -48,7 +49,7 @@
private RecentMenu recent;
public ExportSchemaAction(ArchitectSwingSession session, Schema
schema) {
- super(session, "Export Schema...", "Exports Schema to xml" );
//$NON-NLS-1$ //$NON-NLS-2$
+ super(session, "Export Schema...", "Export Schema to xml",
OSUtils.SCHEMA_EXPORT_ICON); //$NON-NLS-1$ //$NON-NLS-2$
this.session = session;
this.schema = schema;
this.recent = session.getRecentMenu();
Modified: trunk/src/icons/olap/cube.png
==============================================================================
Binary files. No diff available.
Added: trunk/src/icons/olap/cubeAdd.png
==============================================================================
Binary file. No diff available.
Modified: trunk/src/icons/olap/cubeGrant.png
==============================================================================
Binary files. No diff available.
Added: trunk/src/icons/olap/cubeGrantAdd.png
==============================================================================
Binary file. No diff available.
Modified: trunk/src/icons/olap/cubeUsage.png
==============================================================================
Binary files. No diff available.
Added: trunk/src/icons/olap/cubeUsageAdd.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/icons/olap/dimensionAdd.png
==============================================================================
Binary file. No diff available.
Modified: trunk/src/icons/olap/formula.png
==============================================================================
Binary files. No diff available.
Added: trunk/src/icons/olap/formulaAdd.png
==============================================================================
Binary file. No diff available.
Modified: trunk/src/icons/olap/hierarchy.png
==============================================================================
Binary files. No diff available.
Added: trunk/src/icons/olap/hierarchyAdd.png
==============================================================================
Binary file. No diff available.
Modified: trunk/src/icons/olap/hierarchyGrant.png
==============================================================================
Binary files. No diff available.
Added: trunk/src/icons/olap/hierarchyGrantAdd.png
==============================================================================
Binary file. No diff available.
Modified: trunk/src/icons/olap/level.png
==============================================================================
Binary files. No diff available.
Added: trunk/src/icons/olap/levelAdd.png
==============================================================================
Binary file. No diff available.
Modified: trunk/src/icons/olap/levelProperty.png
==============================================================================
Binary files. No diff available.
Added: trunk/src/icons/olap/levelPropertyAdd.png
==============================================================================
Binary file. No diff available.
Modified: trunk/src/icons/olap/measure.png
==============================================================================
Binary files. No diff available.
Added: trunk/src/icons/olap/measureAdd.png
==============================================================================
Binary file. No diff available.
Modified: trunk/src/icons/olap/measureProperty.png
==============================================================================
Binary files. No diff available.
Added: trunk/src/icons/olap/measurePropertyAdd.png
==============================================================================
Binary file. No diff available.
Modified: trunk/src/icons/olap/namedSet.png
==============================================================================
Binary files. No diff available.
Added: trunk/src/icons/olap/namedSetAdd.png
==============================================================================
Binary file. No diff available.
Modified: trunk/src/icons/olap/schema.png
==============================================================================
Binary files. No diff available.
Added: trunk/src/icons/olap/schemaAdd.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/icons/olap/schemaExport.png
==============================================================================
Binary file. No diff available.
Modified: trunk/src/icons/olap/schemaGrant.png
==============================================================================
Binary files. No diff available.
Added: trunk/src/icons/olap/schemaGrantAdd.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/icons/olap/securityRoleAdd.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/icons/olap/securityUnionAdd.png
==============================================================================
Binary file. No diff available.
Modified: trunk/src/icons/olap/virtualCube.png
==============================================================================
Binary files. No diff available.
Added: trunk/src/icons/olap/virtualCubeAdd.png
==============================================================================
Binary file. No diff available.
