Author: dongxu Date: Thu Sep 12 04:05:31 2013 New Revision: 1522297 URL: http://svn.apache.org/r1522297 Log: toggle to display/hide the tool bar view to adjust the compose and message panel
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeToolBarActivity.java 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/mapper/ActivityManagerInitializer.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeToolBarView.ui.xml 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/HupaLayoutable.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeToolBarActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeToolBarActivity.java?rev=1522297&r1=1522296&r2=1522297&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeToolBarActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeToolBarActivity.java Thu Sep 12 04:05:31 2013 @@ -19,9 +19,16 @@ package org.apache.hupa.client.activity; +<<<<<<< HEAD import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.gwt.user.client.ui.IsWidget; +======= +import org.apache.hupa.client.ui.WidgetDisplayable; + +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.user.client.ui.AcceptsOneWidget; +>>>>>>> toggle to display/hide the tool bar view to adjust the compose and message panel import com.google.inject.Inject; public class ComposeToolBarActivity extends AppBaseActivity { @@ -33,5 +40,9 @@ public class ComposeToolBarActivity exte @Inject private Displayable display; +<<<<<<< HEAD public interface Displayable extends IsWidget {} +======= + public interface Displayable extends WidgetDisplayable {} +>>>>>>> toggle to display/hide the tool bar view to adjust the compose and message panel } 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=1522297&r1=1522296&r2=1522297&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:05:31 2013 @@ -55,7 +55,11 @@ import org.apache.hupa.client.activity.C import org.apache.hupa.client.activity.ComposeContentActivity; import org.apache.hupa.client.activity.ComposeHeaderActivity; import org.apache.hupa.client.activity.ComposeStatusActivity; +<<<<<<< HEAD >>>>>>> make compose panel managed by activity manager, there is a problem >>>>>>> here that whether the hidden view will be lazy loaded regarding the >>>>>>> code split mechnism +======= +import org.apache.hupa.client.activity.ComposeToolBarActivity; +>>>>>>> toggle to display/hide the tool bar view to adjust the compose and message panel import org.apache.hupa.client.activity.FolderListActivity; import org.apache.hupa.client.activity.LabelListActivity; import org.apache.hupa.client.activity.LabelPropertiesActivity; @@ -200,7 +204,11 @@ import org.apache.hupa.client.mapper.Mai import org.apache.hupa.client.mapper.ComposeContentActivityMapper; import org.apache.hupa.client.mapper.ComposeHeaderActivityMapper; import org.apache.hupa.client.mapper.ComposeStatusActivityMapper; +<<<<<<< HEAD >>>>>>> make compose panel managed by activity manager, there is a problem >>>>>>> here that whether the hidden view will be lazy loaded regarding the >>>>>>> code split mechnism +======= +import org.apache.hupa.client.mapper.ComposeToolBarActivityMapper; +>>>>>>> toggle to display/hide the tool bar view to adjust the compose and message panel import org.apache.hupa.client.mapper.FolderListActivityMapper; import org.apache.hupa.client.mapper.LoginActivityMapper; import org.apache.hupa.client.mapper.LogoActivityMapper; @@ -222,6 +230,7 @@ import org.apache.hupa.client.rf.HupaReq import org.apache.hupa.client.ui.ComposeContentView; import org.apache.hupa.client.ui.ComposeHeaderView; import org.apache.hupa.client.ui.ComposeStatusView; +import org.apache.hupa.client.ui.ComposeToolBarView; import org.apache.hupa.client.ui.FolderListView; import org.apache.hupa.client.ui.FoldersTreeViewModel; import org.apache.hupa.client.ui.HupaLayout; @@ -496,6 +505,7 @@ public class AppGinModule extends Abstra bind(MessageContentActivity.Displayable.class).to( MessageContentView.class); bind(StatusActivity.Displayable.class).to(StatusView.class); + bind(ComposeToolBarActivity.Displayable.class).to(ComposeToolBarView.class); bind(ComposeStatusActivity.Displayable.class).to(ComposeStatusView.class); bind(ComposeHeaderActivity.Displayable.class).to(ComposeHeaderView.class); bind(ComposeContentActivity.Displayable.class).to(ComposeContentView.class); @@ -510,6 +520,7 @@ public class AppGinModule extends Abstra // bind(MessageListFooterActivity.class).in(Singleton.class); // bind(MessageContentActivity.class).in(Singleton.class); // bind(StatusActivity.class).in(Singleton.class); + bind(ComposeToolBarActivity.class).in(Singleton.class); bind(ComposeHeaderActivity.class).in(Singleton.class); bind(ComposeContentActivity.class).in(Singleton.class); bind(ComposeStatusActivity.class).in(Singleton.class); @@ -714,10 +725,21 @@ public class AppGinModule extends Abstra @Provides @Singleton <<<<<<< HEAD +<<<<<<< HEAD @Named("TopRegion") public ActivityManager getTopRegionActivityMapper( CachingTopActivityMapper activityMapper, EventBus eventBus) { ======= +======= + @Named("ComposeToolBarRegion") + public ActivityManager getComposeToolBarActivityMapper( + ComposeToolBarActivityMapper activityMapper, EventBus eventBus) { + return new ActivityManager(activityMapper, eventBus); + } + + @Provides + @Singleton +>>>>>>> toggle to display/hide the tool bar view to adjust the compose and message panel @Named("ComposeHeaderRegion") public ActivityManager getComposeHeaderActivityMapper( ComposeHeaderActivityMapper activityMapper, EventBus eventBus) { Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java?rev=1522297&r1=1522296&r2=1522297&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ActivityManagerInitializer.java Thu Sep 12 04:05:31 2013 @@ -46,6 +46,7 @@ public class ActivityManagerInitializer @Named("MessageListFooterRegion") ActivityManager messageListFooterActivityManager, @Named("MessageContentRegion") ActivityManager messageContentActivityManager, @Named("StatusRegion") ActivityManager statusActivityManager, + @Named("ComposeToolBarRegion") ActivityManager composeToolBarActivityManager, @Named("ComposeHeaderRegion") ActivityManager composeHeaderActivityManager, @Named("ComposeContentRegion") ActivityManager composeContentActivityManager, @Named("ComposeStatusRegion") ActivityManager composeStatusActivityManager) { @@ -61,6 +62,8 @@ public class ActivityManagerInitializer messageContentActivityManager.setDisplay(hupaLayout .getMessageContentView()); statusActivityManager.setDisplay(hupaLayout.getStatusView()); + composeToolBarActivityManager.setDisplay(hupaLayout + .getComposeToolBarView()); composeHeaderActivityManager.setDisplay(hupaLayout.getComposeHeader()); composeContentActivityManager .setDisplay(hupaLayout.getComposeContent()); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java?rev=1522297&r1=1522296&r2=1522297&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/ToolBarActivityMapper.java Thu Sep 12 04:05:31 2013 @@ -86,8 +86,8 @@ public class ToolBarActivityMapper imple private final Provider<ToolBarActivity> toolBarActivityProvider; @Inject - public ToolBarActivityMapper(Provider<ToolBarActivity> topActivityProvider) { - this.toolBarActivityProvider = topActivityProvider; + public ToolBarActivityMapper(Provider<ToolBarActivity> toolActivityProvider) { + this.toolBarActivityProvider = toolActivityProvider; } public Activity getActivity(Place place) { Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeToolBarView.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeToolBarView.ui.xml?rev=1522297&r1=1522296&r2=1522297&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeToolBarView.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeToolBarView.ui.xml Thu Sep 12 04:05:31 2013 @@ -12,7 +12,11 @@ <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' xmlns:g='urn:import:com.google.gwt.user.client.ui'> <ui:image field="buttons" src="res/buttons.png" /> +<<<<<<< HEAD <ui:style> +======= + <ui:style type="org.apache.hupa.client.ui.ToolBarView.Style"> +>>>>>>> toggle to display/hide the tool bar view to adjust the compose and message panel .bar { position: absolute; display: block; 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=1522297&r1=1522296&r2=1522297&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:05:31 2013 @@ -268,11 +268,47 @@ public class HupaLayout implements HupaL return hupaMainPanel; } - interface HupaLayoutUiBinder extends UiBinder<LayoutPanel, HupaLayout> { + @Override + public void switchToCompose() { + if (isMessageOccupied()) { + changeToCompose(); + } } - private static HupaLayoutUiBinder binder = GWT - .create(HupaLayoutUiBinder.class); + @Override + public void switchToMessage() { + System.out.println("compose=====1"+(centerPanel.thisPanel.getWidgetIndex(centerPanel.composePanel))); + System.out.println("content-----1"+(centerPanel.thisPanel.getWidgetIndex(centerPanel.contentPanel))); + if (isMessageOccupied()) + return; + if (isComposeOccupied()) { + changeToMessage(); + } + System.out.println("compose====="+(centerPanel.thisPanel.getWidgetIndex(centerPanel.composePanel))); + System.out.println("content-----"+(centerPanel.thisPanel.getWidgetIndex(centerPanel.contentPanel))); + } + + private void changeToCompose() { + centerPanel.thisPanel.remove(centerPanel.contentPanel); + centerPanel.thisPanel.add(centerPanel.composePanel); + toolPanel.toggleToCompose(true); + centerPanel.temporarilyHiddenTheUnimplementedContactPanel(true); + } + + private boolean isMessageOccupied() { + return centerPanel.thisPanel.getWidgetIndex(centerPanel.contentPanel) >= 0; + } + + private void changeToMessage() { + centerPanel.thisPanel.remove(centerPanel.composePanel); + centerPanel.thisPanel.add(centerPanel.contentPanel); + toolPanel.toggleToCompose(false); + centerPanel.temporarilyHiddenTheUnimplementedContactPanel(false); + } + + private boolean isComposeOccupied() { + return centerPanel.thisPanel.getWidgetIndex(centerPanel.composePanel) >= 0; + } @Override public AcceptsOneWidget getTopBarView() { @@ -310,6 +346,11 @@ public class HupaLayout implements HupaL } @Override + public AcceptsOneWidget getComposeToolBarView() { + return toolPanel.getComposeToolBarView(); + } + + @Override public AcceptsOneWidget getFolderListView() { return centerPanel.getFolderListView(); } @@ -333,21 +374,11 @@ public class HupaLayout implements HupaL public AcceptsOneWidget getStatusView() { return centerPanel.getStatusView(); } - + @Override - public AcceptsOneWidget getComposeHeader(){ + public AcceptsOneWidget getComposeHeader() { return centerPanel.getComposeHeader(); } - - @Override - public AcceptsOneWidget getComposeContent(){ - return centerPanel.getComposeContent(); - } - - @Override - public AcceptsOneWidget getComposeStatus(){ - return centerPanel.getComposeStatus(); - } <<<<<<< HEAD <<<<<<< HEAD @@ -358,23 +389,12 @@ public interface HupaLayout { >>>>>>> make login page as one part of the overall layout & splite layout to >>>>>>> little one ======= @Override - public void switchToCompose() { - if (isMessageOccupied()) { - changeToCompose(); - } - } - - private void changeToCompose() { - centerPanel.thisPanel.remove(centerPanel.contentPanel); - centerPanel.thisPanel.add(centerPanel.composePanel); - centerPanel.temporarilyHiddenTheUnimplementedContactPanel(true); - } - - private boolean isMessageOccupied() { - return centerPanel.thisPanel.getWidgetIndex(centerPanel.contentPanel) >= 0; + public AcceptsOneWidget getComposeContent() { + return centerPanel.getComposeContent(); } @Override +<<<<<<< HEAD public void switchToMessage() { if (isMessageOccupied()) return; @@ -390,11 +410,19 @@ public interface HupaLayout { centerPanel.thisPanel.remove(centerPanel.composePanel); centerPanel.thisPanel.add(centerPanel.contentPanel); centerPanel.temporarilyHiddenTheUnimplementedContactPanel(false); +======= + public AcceptsOneWidget getComposeStatus() { + return centerPanel.getComposeStatus(); +>>>>>>> toggle to display/hide the tool bar view to adjust the compose and message panel } - private boolean isComposeOccupied() { - return centerPanel.thisPanel.getWidgetIndex(centerPanel.composePanel) >= 0; + interface HupaLayoutUiBinder extends UiBinder<LayoutPanel, HupaLayout> { } +<<<<<<< HEAD >>>>>>> scrub code +======= + private static HupaLayoutUiBinder binder = GWT + .create(HupaLayoutUiBinder.class); +>>>>>>> toggle to display/hide the tool bar view to adjust the compose and message panel } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java?rev=1522297&r1=1522296&r2=1522297&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayoutable.java Thu Sep 12 04:05:31 2013 @@ -120,5 +120,10 @@ public interface HupaLayoutable extends AcceptsOneWidget getComposeContent(); AcceptsOneWidget getComposeStatus(); +<<<<<<< HEAD >>>>>>> make compose panel managed by activity manager, there is a problem >>>>>>> here that whether the hidden view will be lazy loaded regarding the >>>>>>> code split mechnism +======= + + AcceptsOneWidget getComposeToolBarView(); +>>>>>>> toggle to display/hide the tool bar view to adjust the compose and message panel } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java?rev=1522297&r1=1522296&r2=1522297&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.java Thu Sep 12 04:05:31 2013 @@ -56,7 +56,6 @@ public class _CenterPanel extends Compos public _CenterPanel() { initWidget(binder.createAndBindUi(this)); thisPanel.setWidgetMinSize(outlinePanel, 144); - temporarilyHiddenTheUnimplementedContactPanel(true); thisPanel.setWidgetHidden(composePanel, true); } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java?rev=1522297&r1=1522296&r2=1522297&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java Thu Sep 12 04:05:31 2013 @@ -25,17 +25,27 @@ import com.google.gwt.uibinder.client.Ui import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.DockLayoutPanel; +import com.google.gwt.user.client.ui.HTMLPanel; import com.google.gwt.user.client.ui.IsWidget; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.Widget; public class _ToolPanel extends Composite { - @UiField SimplePanel toolBarContainer; + @UiField protected DockLayoutPanel thisPanel; + @UiField protected SimplePanel toolBarContainer; + @UiField protected SimplePanel composeToolBarContainer; + @UiField protected HTMLPanel searchFilterContainer; public _ToolPanel() { initWidget(binder.createAndBindUi(this)); } + + protected void toggleToCompose(boolean visible){ + toolBarContainer.setVisible(!visible); + searchFilterContainer.setVisible(!visible); + composeToolBarContainer.setVisible(visible); + } public AcceptsOneWidget getToolBarView() { return new AcceptsOneWidget() { @@ -46,6 +56,15 @@ public class _ToolPanel extends Composit }; } + public AcceptsOneWidget getComposeToolBarView() { + return new AcceptsOneWidget() { + @Override + public void setWidget(IsWidget w) { + composeToolBarContainer.setWidget(Widget.asWidgetOrNull(w)); + } + }; + } + interface _ToolPanelUiBinder extends UiBinder<DockLayoutPanel, _ToolPanel> { } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml?rev=1522297&r1=1522296&r2=1522297&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml Thu Sep 12 04:05:31 2013 @@ -11,12 +11,12 @@ <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' xmlns:g='urn:import:com.google.gwt.user.client.ui'> - <g:DockLayoutPanel unit="PX"> + <g:DockLayoutPanel unit="PX" ui:field="thisPanel"> <g:west size="518"> <g:SimplePanel ui:field="toolBarContainer" /> </g:west> <g:east size="180"> - <g:HTMLPanel> + <g:HTMLPanel ui:field="searchFilterContainer"> Search <input style='color: gray;' value='//TODO' /> </g:HTMLPanel> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org