icons for trees and tables context menus, added helper div for theme building, simple theme (without shadows) for context menus.

svn changeset:2399/svn branch:trunk

5 files changed, 56 insertions, 15 deletions

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/Action.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/Action.java
index 8e0dbbeeb5..dce4342fbe 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/Action.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/Action.java
@@ -25,11 +25,12 @@ public abstract class Action implements Command {
 
 	public String getHTML() {
 		StringBuffer sb = new StringBuffer();
+		sb.append("<div>");
 		if (getIconUrl() != null) {
 			sb.append("<img src=\"" + getIconUrl() + "\" alt=\"icon\" />");
 		}
-
 		sb.append(getCaption());
+		sb.append("</div>");
 		return sb.toString();
 	}
 
@@ -44,6 +45,10 @@ public abstract class Action implements Command {
 	public String getIconUrl() {
 		return iconUrl;
 	}
+
+	public void setIconUrl(String url) {
+		iconUrl = url;
+	}
 }
 
 /**
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
index 0c75f03a24..17286bbdf9 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
@@ -1824,6 +1824,7 @@ public class IScrollTable extends Composite implements Table, ScrollListener {
 					TreeAction a = new TreeAction(this, String.valueOf(rowKey),
 							actionKey);
 					a.setCaption(getActionCaption(actionKey));
+					a.setIconUrl(getActionIcon(actionKey));
 					actions[i] = a;
 				}
 				return actions;
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java
index 04b220e69d..e8411096d7 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java
@@ -241,6 +241,7 @@ public class ITree extends Tree implements Paintable {
 				String actionKey = actionKeys[i];
 				TreeAction a = new TreeAction(this, String.valueOf(key), actionKey);
 				a.setCaption(getActionCaption(actionKey));
+				a.setIconUrl(getActionIcon(actionKey));
 				actions[i] = a;
 			}
 			return actions;
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/TreeAction.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/TreeAction.java
index 1d630893a2..04e2aa00cf 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/TreeAction.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/TreeAction.java
@@ -53,13 +53,4 @@ public class TreeAction extends Action {
 	public void setTargetKey(String targetKey) {
 		this.targetKey = targetKey;
 	}
-
-	public String getHTML() {
-		StringBuffer sb = new StringBuffer();
-		if(iconUrl != null) {
-			sb.append("<img src=\""+iconUrl+"\" alt=\"icon\" />");
-		}
-		sb.append(caption);
-		return sb.toString();
-	}
 }
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/common/common.css b/src/com/itmill/toolkit/terminal/gwt/public/default/common/common.css
index 64dc530a00..593815b23a 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/common/common.css
+++ b/src/com/itmill/toolkit/terminal/gwt/public/default/common/common.css
@@ -21,14 +21,57 @@ select {
 	filter: Alpha(opacity=30);

 }

 

-.i-contextmenu {

-	background: #fff;	

-	border: #000;

-}

+.i-contextmenu {
+	background: #e9eced;
+	font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
+	background-color: #f6f7f7;
+	color: #464f52;
+	font-size: 12px;
+	line-height: 18px;
+}
+
+.i-contextmenu .gwt-MenuBar {
+	border-right: 1px solid #d0d4d5;
+	border-bottom: 2px solid #d0d4d5;
+	border-top: 1px solid #d0d4d5;
+	border-left: 2px solid #d0d4d5;
+}
+
+.i-contextmenu .gwt-MenuItem {
+	border-bottom: 1px solid #e6e9e9; 
+	padding:1px;
+	cursor: pointer;
+	vertical-align: middle;
+}
+
+.i-contextmenu .gwt-MenuItem div {
+	border: 1px solid #f6f7f7;
+	padding: 2px 10px 2px 5px;
+	cursor: pointer;
+	vertical-align: middle;
+}
+
+.i-contextmenu .gwt-MenuItem-selected {
+	background: #e6e9e9;
+}
+.i-contextmenu .gwt-MenuItem-selected div {
+	border: 1px solid #b6bbbc;
+}
+
+.i-contextmenu, table {
+	border-collapse:collapse;
+	margin:0;
+	padding:0;
+}
+.i-contextmenu .gwt-MenuItem img {
+	margin-right: 10px;
+	vertical-align: middle;
+}
 

 /* Provide some extra whitespace for wrapped elements

    (these elements usuallly need the extra space, since 

    they aren't even handling their own caption) */

 .i-captionwrapper {

 	margin: 0.3em 0 0 0;

-}
\ No newline at end of file
+}
+