[kune-commits] r1606 - in trunk/src/main/java/cc/kune/gspace/client: . options/license options/style tool tool/selector
Vicente J. Ruiz Jurado
vjrj_ at ourproject.org
Sat Nov 12 22:00:14 CET 2011
Author: vjrj_
Date: 2011-11-12 22:00:14 +0100 (Sat, 12 Nov 2011)
New Revision: 1606
Modified:
trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml
trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java
trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java
trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java
trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java
trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java
trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java
Log:
Some fix in last changes in i18n
Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-11-12 19:04:16 UTC (rev 1605)
+++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-11-12 21:00:14 UTC (rev 1606)
@@ -35,8 +35,8 @@
</g:tab>
<g:tab>
<g:header size='0'/>
- <g:SimplePanel
- ui:field="groupSpaceWrapper" styleName="k-group-space">
+ <g:SimplePanel ui:field="groupSpaceWrapper"
+ styleName="k-group-space">
<g:SplitLayoutPanel width="100%" height="100%"
styleName="k-space" ui:field="groupSpace">
<g:center size="1.0">
@@ -93,7 +93,7 @@
</g:south>
</g:DockLayoutPanel>
</g:center>
- <!-- east to RTL (plus css changes in corners and menus -->
+ <!-- east to RTL (plus css changes in corners and menus) -->
<g:west size="200.0">
<g:DockLayoutPanel unit="PX"
styleName="{res.style.entityTools}" ui:field="splitEast">
Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java 2011-11-12 19:04:16 UTC (rev 1605)
+++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java 2011-11-12 21:00:14 UTC (rev 1606)
@@ -28,6 +28,7 @@
import cc.kune.core.shared.i18n.I18nTranslationService;
import cc.kune.gspace.client.options.EntityOptionsView;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.Composite;
@@ -86,7 +87,7 @@
@Override
public void setLicense(final LicenseDTO defaultLicense) {
- licenseImage.setUrl(defaultLicense.getImageUrl());
+ licenseImage.setUrl(GWT.getModuleBaseURL() + defaultLicense.getImageUrl());
Tooltip.to(licenseImage, defaultLicense.getLongName());
}
}
Modified: trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java 2011-11-12 19:04:16 UTC (rev 1605)
+++ trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java 2011-11-12 21:00:14 UTC (rev 1606)
@@ -23,12 +23,9 @@
import gwtupload.client.IUploader.OnChangeUploaderHandler;
import gwtupload.client.IUploader.OnFinishUploaderHandler;
import gwtupload.client.IUploader.OnStartUploaderHandler;
-import cc.kune.common.client.notify.NotifyUser;
import cc.kune.common.client.tooltip.Tooltip;
-import cc.kune.common.client.ui.BasicThumb;
import cc.kune.common.client.ui.IconLabel;
import cc.kune.common.client.ui.dialogs.tabbed.TabTitleGenerator;
-import cc.kune.common.client.utils.TextUtils;
import cc.kune.core.client.resources.CoreResources;
import cc.kune.core.shared.i18n.I18nTranslationService;
import cc.kune.gspace.client.options.EntityOptionsView;
@@ -36,8 +33,6 @@
import cc.kune.gspace.client.themes.GSpaceThemeSelectorPanel;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.event.shared.HandlerRegistration;
import com.google.gwt.user.client.ui.Button;
@@ -104,19 +99,20 @@
// add(wsInfo);
final VerticalPanel stylesPanel = new VerticalPanel();
- final ClickHandler clickHandler = new ClickHandler() {
-
- @Override
- public void onClick(final ClickEvent event) {
- NotifyUser.info(i18n.t(TextUtils.IN_DEVELOPMENT));
- }
- };
- for (int i = 1; i <= 6; i++) {
- final BasicThumb thumb = new BasicThumb("images/styles/styl" + i + ".png", "Style " + i,
- clickHandler);
- thumb.setTooltip(i18n.t("Click to select and configure this theme"));
- // add(thumb);
- }
+ // final ClickHandler clickHandler = new ClickHandler() {
+ //
+ // @Override
+ // public void onClick(final ClickEvent event) {
+ // NotifyUser.info(i18n.t(TextUtils.IN_DEVELOPMENT));
+ // }
+ // };
+ // for (int i = 1; i <= 6; i++) {
+ // final BasicThumb thumb = new BasicThumb(
+ // GWT.getModuleBaseURL() + "images/styles/styl" + i + ".png", "Style " + i,
+ // clickHandler);
+ // thumb.setTooltip(i18n.t("Click to select and configure this theme"));
+ // // add(thumb);
+ // }
stylesPanel.addStyleName("oc-clean");
add(stylesPanel);
setBackImageVisibleImpl(false);
Modified: trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java 2011-11-12 19:04:16 UTC (rev 1605)
+++ trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java 2011-11-12 21:00:14 UTC (rev 1606)
@@ -23,14 +23,12 @@
import cc.kune.gspace.client.tool.selector.ToolSelectorItemPanel;
import cc.kune.gspace.client.tool.selector.ToolSelectorItemPresenter;
-import com.google.gwt.i18n.client.HasDirection.Direction;
-
public abstract class AbstractClientTool {
public AbstractClientTool(final String shortName, final String longName, final String tooltip,
- final ToolSelector toolSelector, final Direction direction) {
+ final ToolSelector toolSelector) {
final ToolSelectorItemPresenter presenter = new ToolSelectorItemPresenter(shortName, longName,
- tooltip, toolSelector, direction);
+ tooltip, toolSelector);
final ToolSelectorItemPanel panel = new ToolSelectorItemPanel();
presenter.init(panel);
}
Modified: trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java 2011-11-12 19:04:16 UTC (rev 1605)
+++ trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java 2011-11-12 21:00:14 UTC (rev 1606)
@@ -38,7 +38,7 @@
public FoldableAbstractClientTool(final String shortName, final String longName, final String tooltip,
final ToolSelector toolSelector, final ContentCapabilitiesRegistry contentCapabilitiesRegistry,
final I18nTranslationService i18n, final NavResources navResources) {
- super(shortName, longName, tooltip, toolSelector, i18n.getDirection());
+ super(shortName, longName, tooltip, toolSelector);
this.contentCapabilitiesRegistry = contentCapabilitiesRegistry;
this.i18n = i18n;
this.navResources = navResources;
Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java 2011-11-12 19:04:16 UTC (rev 1605)
+++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java 2011-11-12 21:00:14 UTC (rev 1606)
@@ -33,7 +33,7 @@
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.FocusPanel;
import com.google.gwt.user.client.ui.HTMLPanel;
-import com.google.gwt.user.client.ui.HasDirectionalText;
+import com.google.gwt.user.client.ui.HasText;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.InlineLabel;
import com.google.gwt.user.client.ui.Widget;
@@ -84,7 +84,7 @@
}
@Override
- public HasDirectionalText getLabel() {
+ public HasText getLabel() {
return label;
}
Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java 2011-11-12 19:04:16 UTC (rev 1605)
+++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java 2011-11-12 21:00:14 UTC (rev 1606)
@@ -24,9 +24,8 @@
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.HasClickHandlers;
-import com.google.gwt.i18n.client.HasDirection.Direction;
import com.google.gwt.user.client.History;
-import com.google.gwt.user.client.ui.HasDirectionalText;
+import com.google.gwt.user.client.ui.HasText;
import com.google.gwt.user.client.ui.IsWidget;
public class ToolSelectorItemPresenter implements ToolSelectorItem {
@@ -34,7 +33,7 @@
HasClickHandlers getFocus();
- HasDirectionalText getLabel();
+ HasText getLabel();
void setSelected(boolean selected);
@@ -43,7 +42,6 @@
void setVisible(boolean visible);
}
- private final Direction direction;
private final String longName;
private final String shortName;
private StateToken token;
@@ -52,12 +50,11 @@
private ToolSelectorItemView view;
public ToolSelectorItemPresenter(final String shortName, final String longName, final String tooltip,
- final ToolSelector toolSelector, final Direction direction) {
+ final ToolSelector toolSelector) {
this.shortName = shortName;
this.longName = longName;
this.tooltip = tooltip;
this.toolSelector = toolSelector;
- this.direction = direction;
}
@Override
@@ -79,7 +76,7 @@
History.newItem(token.toString());
}
});
- view.getLabel().setText(longName, direction);
+ view.getLabel().setText(longName);
view.setTooltip(tooltip);
}
More information about the kune-commits
mailing list