Author: dongxu
Date: Thu Sep 12 04:35:15 2013
New Revision: 1522365
URL: http://svn.apache.org/r1522365
Log:
try to make switch to setting work
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java?rev=1522365&r1=1522364&r2=1522365&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ioc/AppGinModule.java
Thu Sep 12 04:35:15 2013
@@ -568,8 +568,12 @@ public class AppGinModule extends Abstra
bind(LabelListActivity.class).in(Singleton.class);
bind(LabelPropertiesActivity.class).in(Singleton.class);
+<<<<<<< HEAD
bind(_CenterSettingPanel.class).in(Singleton.class);
>>>>>>> attempt to add label setting feature
+=======
+// bind(_CenterSettingPanel.class).in(Singleton.class);
+>>>>>>> try to make switch to setting work
<<<<<<< HEAD
>>>>>>> integrate all of the views to their corresponding activities and
>>>>>>> mappers
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java?rev=1522365&r1=1522364&r2=1522365&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java
Thu Sep 12 04:35:15 2013
@@ -268,13 +268,11 @@ public class HupaLayout implements HupaL
@UiField _CenterPanel centerPanel;
@UiField DockLayoutPanel mainBox;
- private _CenterSettingPanel settingPanel;
+ @UiField _CenterSettingPanel settingPanel;
private LayoutPanel hupaMainPanel;
- @Inject
- public HupaLayout(_CenterSettingPanel settingPanel) {
- this.settingPanel = settingPanel;
+ public HupaLayout() {
hupaMainPanel = binder.createAndBindUi(this);
}
@@ -311,6 +309,9 @@ public class HupaLayout implements HupaL
}
private void changeToMessage() {
+// mainBox.remove(settingPanel);
+ mainBox.setWidgetHidden(settingPanel, true);
+ mainBox.setWidgetHidden(centerPanel,false);
centerPanel.thisPanel.remove(centerPanel.composeContainer);
centerPanel.thisPanel.add(centerPanel.contentPanel);
toolPanel.toggleToCompose(false);
@@ -471,8 +472,9 @@ public interface HupaLayout {
@Override
public void switchToSetting() {
- centerPanel.removeFromParent();
- mainBox.add(settingPanel);
+// centerPanel.removeFromParent();
+ mainBox.setWidgetHidden(centerPanel, true);
+ mainBox.setWidgetHidden(settingPanel, false);
}
>>>>>>> attempt to add label setting feature
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml?rev=1522365&r1=1522364&r2=1522365&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
Thu Sep 12 04:35:15 2013
@@ -257,6 +257,9 @@
<g:center>
<hupa:_CenterPanel
ui:field="centerPanel" />
</g:center>
+ <g:south size="0">
+ <hupa:_CenterSettingPanel
ui:field="settingPanel" />
+ </g:south>
</g:DockLayoutPanel>
<<<<<<< HEAD
</g:layer> -->
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java?rev=1522365&r1=1522364&r2=1522365&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
Thu Sep 12 04:35:15 2013
@@ -22,13 +22,18 @@ package org.apache.hupa.client.ui;
<<<<<<< HEAD
<<<<<<< HEAD
import org.apache.hupa.client.activity.NavigationActivity;
+<<<<<<< HEAD
import org.apache.hupa.client.place.ContactPlace;
import org.apache.hupa.client.place.FolderPlace;
+=======
+import org.apache.hupa.client.place.MailFolderPlace;
+>>>>>>> try to make switch to setting work
import org.apache.hupa.client.place.SettingPlace;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.place.shared.PlaceController;
+<<<<<<< HEAD
import com.google.gwt.resources.client.CssResource;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
@@ -38,6 +43,14 @@ import com.google.gwt.user.client.ui.Anc
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.DockLayoutPanel;
import com.google.gwt.user.client.ui.SimplePanel;
+=======
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.uibinder.client.UiHandler;
+import com.google.gwt.user.client.ui.Anchor;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.DockLayoutPanel;
+>>>>>>> try to make switch to setting work
import com.google.inject.Inject;
public class NavigationView extends Composite implements
NavigationActivity.Displayable{
@@ -45,6 +58,7 @@ public class NavigationView extends Comp
@Inject PlaceController placeController;
@UiField Anchor mail;
@UiField Anchor setting;
+<<<<<<< HEAD
@UiField Anchor contact;
@UiField SimplePanel contactOuter;
@UiField SimplePanel mailOuter;
@@ -75,11 +89,14 @@ public class NavigationView extends Comp
=======
public class NavigationView extends Composite implements
NavigationActivity.Displayable{
>>>>>>> integrate all of the views to their corresponding activities and
>>>>>>> mappers
+=======
+>>>>>>> try to make switch to setting work
public NavigationView() {
initWidget(binder.createAndBindUi(this));
}
<<<<<<< HEAD
+<<<<<<< HEAD
@UiHandler("mail")
public void onMailClick(ClickEvent e){
@@ -130,6 +147,18 @@ public class NavigationView extends Comp
=======
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
+=======
+
+ @UiHandler("mail")
+ public void onMailClick(ClickEvent e){
+ placeController.goTo(new MailFolderPlace("Mock-Inbox"));
+ }
+
+ @UiHandler("setting")
+ public void onSettingClick(ClickEvent e){
+ placeController.goTo(new SettingPlace("folders"));
+ }
+>>>>>>> try to make switch to setting work
interface NavigationUiBinder extends UiBinder<DockLayoutPanel,
NavigationView> {
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml?rev=1522365&r1=1522364&r2=1522365&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.ui.xml
Thu Sep 12 04:35:15 2013
@@ -108,7 +108,7 @@
{style.mailInnerSelected} {style.inner}">
=======
<g:SimplePanel addStyleNames="{style.navigation}
{style.selected}">
- <g:Anchor
+ <g:Anchor ui:field="mail"
addStyleNames="
{style.mailInner} {style.inner}">
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
@@ -136,8 +136,12 @@
<g:Anchor ui:field="setting"
=======
<g:SimplePanel addStyleNames="{style.navigation}">
+<<<<<<< HEAD
<g:Anchor
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
+=======
+ <g:Anchor ui:field="setting"
+>>>>>>> try to make switch to setting work
addStyleNames="
{style.settingsInner} {style.inner}">
Settings
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
