[kune-commits] r799 - in trunk/src/main/java/org/ourproject/kune: platf/client/services platf/client/ui workspace/client/ui/newtmp/themes

Fri Jul 11 13:18:30 CEST 2008

Author: vjrj
Date: 2008-07-11 13:18:26 +0200 (Fri, 11 Jul 2008)
New Revision: 799

Modified:
   trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/DropDownPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/themes/WsThemePanel.java
Log:
Workspace refactorization

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java
===================================================================

--- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java	2008-07-11 10:36:49 UTC (rev 798)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java	2008-07-11 11:18:26 UTC (rev 799)
@@ -172,7 +172,7 @@
 	builder.registerProvider(WsThemePresenter.class, new Provider<WsThemePresenter>() {
 	    public WsThemePresenter get() {
 		final WsThemePresenter presenter = new WsThemePresenter(builder.getInstance(Session.class));
-		final WsThemePanel panel = new WsThemePanel(ws, presenter);
+		final WsThemePanel panel = new WsThemePanel(ws, presenter, i18n);
 		presenter.init(panel);
 		return presenter;
 	    }

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/DropDownPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/DropDownPanel.java	2008-07-11 10:36:49 UTC (rev 798)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/DropDownPanel.java	2008-07-11 11:18:26 UTC (rev 799)
@@ -44,11 +44,11 @@
     private final SimplePanel contentPanel;
     private final Images img;
     private final Image arrowImage;
-    private final RoundedBorderDecorator outerBorder;
+    private final RoundedPanel outerBorder;
 
     public DropDownPanel() {
 	vp = new VerticalPanel();
-	outerBorder = new RoundedBorderDecorator(vp, RoundedBorderDecorator.ALL);
+	outerBorder = new RoundedPanel(vp, RoundedPanel.ALL);
 	titleHP = new HorizontalPanel();
 	arrowImage = new Image();
 	titleLabel = new Label();
@@ -142,14 +142,14 @@
     public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) {
 	if (oldTheme != null) {
 	    final String oldThemeS = oldTheme.toString();
-	    outerBorder.removeStyleDependentName(oldThemeS);
+	    // outerBorder.removeStyleDependentName(oldThemeS);
 	    vp.removeStyleDependentName(oldThemeS);
 	    titleHP.removeStyleDependentName(oldThemeS);
 	    contentPanel.removeStyleDependentName(oldThemeS);
 	}
 	final String newThemeS = newTheme.toString();
 	outerBorder.setCornerStyleName("k-dropdownouter-" + newThemeS);
-	outerBorder.addStyleDependentName(newThemeS);
+	// outerBorder.addStyleDependentName(newThemeS);
 	vp.addStyleDependentName(newThemeS);
 	titleHP.addStyleDependentName(newThemeS);
 	contentPanel.addStyleDependentName(newThemeS);

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/themes/WsThemePanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/themes/WsThemePanel.java	2008-07-11 10:36:49 UTC (rev 798)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/themes/WsThemePanel.java	2008-07-11 11:18:26 UTC (rev 799)
@@ -1,5 +1,6 @@
 package org.ourproject.kune.workspace.client.ui.newtmp.themes;
 
+import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.workspace.client.ui.newtmp.skel.WorkspaceSkeleton;
 
 import com.calclab.suco.client.signal.Slot2;
@@ -15,13 +16,15 @@
     private final Menu menu;
     private final WsThemePresenter presenter;
 
-    public WsThemePanel(final WorkspaceSkeleton ws, final WsThemePresenter presenter) {
+    public WsThemePanel(final WorkspaceSkeleton ws, final WsThemePresenter presenter,
+	    final I18nUITranslationService i18n) {
 	this.presenter = presenter;
 	menu = new Menu();
 
 	menu.setDefaultAlign("br-tr");
 	super.setMenu(menu);
 	super.setIcon("images/colors.gif");
+	super.setTooltip(i18n.t("Select Workspace theme for this group"));
 	ws.getSiteTraybar().addButton(this);
 	presenter.onThemeChanged(new Slot2<WsTheme, WsTheme>() {
 	    public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) {


