Author: dongxu Date: Thu Sep 12 04:31:43 2013 New Revision: 1522358 URL: http://svn.apache.org/r1522358 Log: make label settings prototype
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.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/LabelListActivityMapper.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/HupaLayoutable.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.ui.xml james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java?rev=1522358&r1=1522357&r2=1522358&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/LabelListActivity.java Thu Sep 12 04:31:43 2013 @@ -19,6 +19,7 @@ package org.apache.hupa.client.activity; +<<<<<<< HEAD import org.apache.hupa.client.HupaController; import org.apache.hupa.client.rf.DeleteFolderRequest; import org.apache.hupa.client.ui.LabelNode; @@ -110,4 +111,22 @@ public class LabelListActivity extends A } }); } +======= +import org.apache.hupa.client.ui.WidgetDisplayable; + +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.user.client.ui.AcceptsOneWidget; +import com.google.inject.Inject; + +public class LabelListActivity extends AppBaseActivity { + + @Override + public void start(AcceptsOneWidget container, EventBus eventBus) { + container.setWidget(display.asWidget()); + } + + @Inject private Displayable display; + + public interface Displayable extends WidgetDisplayable {} +>>>>>>> make label settings prototype } 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=1522358&r1=1522357&r2=1522358&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:31:43 2013 @@ -146,6 +146,7 @@ import org.apache.hupa.client.activity.F >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers import org.apache.hupa.client.activity.IMAPMessageActivity; import org.apache.hupa.client.activity.IMAPMessageListActivity; +import org.apache.hupa.client.activity.LabelListActivity; import org.apache.hupa.client.activity.LoginActivity; import org.apache.hupa.client.activity.LogoActivity; import org.apache.hupa.client.activity.MessageContentActivity; @@ -223,6 +224,7 @@ import org.apache.hupa.client.mapper.Com 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.LabelListActivityMapper; import org.apache.hupa.client.mapper.LoginActivityMapper; import org.apache.hupa.client.mapper.LogoActivityMapper; import org.apache.hupa.client.mapper.MessageContentActivityMapper; @@ -256,6 +258,7 @@ import org.apache.hupa.client.ui.IMAPMes ======= >>>>>>> 1. improve the inbox folder place. import org.apache.hupa.client.ui.IMAPMessageView; +import org.apache.hupa.client.ui.LabelListView; import org.apache.hupa.client.ui.LoginLayout; import org.apache.hupa.client.ui.LoginLayoutable; import org.apache.hupa.client.ui.LoginView; @@ -359,7 +362,12 @@ public class AppGinModule extends Abstra bind(ContactPropertiesActivity.Displayable.class).to(ContactPropertiesView.class).in(Singleton.class); ======= bind(ComposeActivity.Displayable.class).to(ComposeView.class).in(Singleton.class); +<<<<<<< HEAD >>>>>>> fixed issue#61; add loading to mark, unmark. +======= + + bind(LabelListActivity.Displayable.class).to(LabelListView.class).in(Singleton.class); +>>>>>>> make label settings prototype bind(LoginActivity.class).in(Singleton.class); bind(TopBarActivity.class).in(Singleton.class); @@ -542,6 +550,8 @@ public class AppGinModule extends Abstra bind(ComposeActivity.class).in(Singleton.class); ======= + bind(LabelListActivity.class).in(Singleton.class); + bind(_CenterSettingPanel.class).in(Singleton.class); >>>>>>> attempt to add label setting feature @@ -662,7 +672,19 @@ public class AppGinModule extends Abstra ======= +<<<<<<< HEAD >>>>>>> integrate all of the views to their corresponding activities and >>>>>>> mappers +======= + + + @Provides + @Singleton + @Named("LabelListRegion") + public ActivityManager getLabelListActivityMapper(LabelListActivityMapper activityMapper, EventBus eventBus) { + return new ActivityManager(activityMapper, eventBus); + } + +>>>>>>> make label settings prototype @Provides @Singleton @Named("LoginPage") 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=1522358&r1=1522357&r2=1522358&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:31:43 2013 @@ -34,6 +34,8 @@ public class ActivityManagerInitializer @Inject public ActivityManagerInitializer(LoginLayoutable loginLayout, HupaLayoutable hupaLayout, + + @Named("LabelListRegion") ActivityManager labelListActivityManager, @Named("LoginPage") ActivityManager loginActivityManager, @Named("TopBarRegion") ActivityManager topBarActivityManager, @Named("LogoRegion") ActivityManager logoActivityManager, @@ -47,6 +49,7 @@ public class ActivityManagerInitializer @Named("StatusRegion") ActivityManager statusActivityManager, @Named("ComposeToolBarRegion") ActivityManager composeToolBarActivityManager, @Named("ComposeRegion") ActivityManager composeActivityManager) { + labelListActivityManager.setDisplay(hupaLayout.getLabelListView()); loginActivityManager.setDisplay(loginLayout.getLoginView()); topBarActivityManager.setDisplay(hupaLayout.getTopBarView()); logoActivityManager.setDisplay(hupaLayout.getLogoView()); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LabelListActivityMapper.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LabelListActivityMapper.java?rev=1522358&r1=1522357&r2=1522358&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LabelListActivityMapper.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/LabelListActivityMapper.java Thu Sep 12 04:31:43 2013 @@ -29,7 +29,11 @@ import com.google.gwt.place.shared.Place import com.google.inject.Inject; import com.google.inject.Provider; +<<<<<<< HEAD public class LabelListActivityMapper extends _HupaActivityMapper { +======= +public class LabelListActivityMapper extends MainActivityMapper { +>>>>>>> make label settings prototype private final Provider<LabelListActivity> labelListActivityProvider; @Inject 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=1522358&r1=1522357&r2=1522358&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:31:43 2013 @@ -402,6 +402,11 @@ public class HupaLayout implements HupaL public AcceptsOneWidget getStatusView() { return centerPanel.getStatusView(); } + + @Override + public AcceptsOneWidget getLabelListView() { + return settingPanel.getLabelListView(); + } <<<<<<< HEAD @Override 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=1522358&r1=1522357&r2=1522358&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:31:43 2013 @@ -141,5 +141,10 @@ public interface HupaLayoutable extends ======= void switchToSetting(); +<<<<<<< HEAD >>>>>>> attempt to add label setting feature +======= + + AcceptsOneWidget getLabelListView(); +>>>>>>> make label settings prototype } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java?rev=1522358&r1=1522357&r2=1522358&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.java Thu Sep 12 04:31:43 2013 @@ -19,6 +19,7 @@ package org.apache.hupa.client.ui; +<<<<<<< HEAD import java.util.ArrayList; import java.util.List; @@ -178,10 +179,63 @@ public class LabelListView extends Compo } interface LabelListUiBinder extends UiBinder<DockLayoutPanel, LabelListView> { +======= +import java.util.Arrays; +import java.util.List; + +import org.apache.hupa.client.activity.LabelListActivity; + +import com.google.gwt.cell.client.TextCell; +import com.google.gwt.core.client.GWT; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.cellview.client.CellList; +import com.google.gwt.user.cellview.client.HasKeyboardSelectionPolicy.KeyboardSelectionPolicy; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.HTMLPanel; +import com.google.gwt.user.client.ui.SimplePanel; +import com.google.gwt.view.client.SelectionChangeEvent; +import com.google.gwt.view.client.SingleSelectionModel; + +public class LabelListView extends Composite implements LabelListActivity.Displayable { + + @UiField SimplePanel thisView; + + public LabelListView() { + initWidget(binder.createAndBindUi(this)); + thisView.setWidget(createTabList()); + } + + private static final List<String> TABS = Arrays.asList("Mock-Inbox", "Mock-Junk", "Mock-Draft", "Mock-Delete"); + + private CellList<String> createTabList() { + TextCell textCell = new TextCell(); + CellList<String> cellList = new CellList<String>(textCell); + cellList.setKeyboardSelectionPolicy(KeyboardSelectionPolicy.ENABLED); + final SingleSelectionModel<String> selectionModel = new SingleSelectionModel<String>(); + cellList.setSelectionModel(selectionModel); + selectionModel.addSelectionChangeHandler(new SelectionChangeEvent.Handler() { + public void onSelectionChange(SelectionChangeEvent event) { + String selected = selectionModel.getSelectedObject(); + if (selected != null) { + // Window.alert("You selected: " + selected); + } + } + }); + cellList.setRowCount(TABS.size(), true); + + // Push the data into the widget. + cellList.setRowData(0, TABS); + return cellList; + } + + interface LabelListUiBinder extends UiBinder<SimplePanel, LabelListView> { +>>>>>>> make label settings prototype } private static LabelListUiBinder binder = GWT.create(LabelListUiBinder.class); +<<<<<<< HEAD @Override public HasClickHandlers getAdd() { return add; @@ -197,4 +251,6 @@ public class LabelListView extends Compo data.refresh(); } +======= +>>>>>>> make label settings prototype } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.ui.xml?rev=1522358&r1=1522357&r2=1522358&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/LabelListView.ui.xml Thu Sep 12 04:31:43 2013 @@ -11,6 +11,7 @@ <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' xmlns:g='urn:import:com.google.gwt.user.client.ui'> +<<<<<<< HEAD <g:DockLayoutPanel> <g:center> <g:ScrollPanel ui:field="thisView" /> @@ -22,4 +23,7 @@ </g:FlowPanel> </g:south> </g:DockLayoutPanel> +======= + <g:SimplePanel ui:field="thisView" /> +>>>>>>> make label settings prototype </ui:UiBinder> \ No newline at end of file Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java?rev=1522358&r1=1522357&r2=1522358&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.java Thu Sep 12 04:31:43 2013 @@ -20,6 +20,7 @@ package org.apache.hupa.client.ui; <<<<<<< HEAD +<<<<<<< HEAD import org.apache.hupa.client.place.SettingPlace; import com.google.gwt.core.client.GWT; @@ -88,18 +89,62 @@ public class _CenterSettingPanel extends interface _CeterSettingPanelUiBinder extends UiBinder<SplitLayoutPanel, _CenterSettingPanel> { ======= +======= +import java.util.Arrays; +import java.util.List; + +import com.google.gwt.cell.client.TextCell; +>>>>>>> make label settings prototype import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.cellview.client.CellList; +import com.google.gwt.user.cellview.client.HasKeyboardSelectionPolicy.KeyboardSelectionPolicy; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.IsWidget; +import com.google.gwt.user.client.ui.ScrollPanel; +import com.google.gwt.user.client.ui.SimpleLayoutPanel; import com.google.gwt.user.client.ui.SplitLayoutPanel; +import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.view.client.SelectionChangeEvent; +import com.google.gwt.view.client.SingleSelectionModel; public class _CenterSettingPanel extends Composite { - + @UiField SplitLayoutPanel thisPanel; + @UiField SimpleLayoutPanel settingsTab; + + @UiField ScrollPanel labelListContainer; + public _CenterSettingPanel() { + initWidget(binder.createAndBindUi(this)); + settingsTab.setWidget(createTabList()); + } + private static final List<String> TABS = Arrays.asList("Folders"); + + private CellList<String> createTabList() { + TextCell textCell = new TextCell(); + CellList<String> cellList = new CellList<String>(textCell); + cellList.setKeyboardSelectionPolicy(KeyboardSelectionPolicy.ENABLED); + final SingleSelectionModel<String> selectionModel = new SingleSelectionModel<String>(); + cellList.setSelectionModel(selectionModel); + selectionModel.addSelectionChangeHandler(new SelectionChangeEvent.Handler() { + public void onSelectionChange(SelectionChangeEvent event) { + String selected = selectionModel.getSelectedObject(); + if (selected != null) { +// Window.alert("You selected: " + selected); + } + } + }); + cellList.setRowCount(TABS.size(), true); + + // Push the data into the widget. + cellList.setRowData(0, TABS); + return cellList; } <<<<<<< HEAD @@ -113,6 +158,7 @@ public class _CenterSettingPanel extends private static _CeterSettingPanelUiBinder binder = GWT.create(_CeterSettingPanelUiBinder.class); <<<<<<< HEAD +<<<<<<< HEAD public AcceptsOneWidget getLabelListView() { return settingLabelPanel.getLabelListView(); } @@ -126,10 +172,18 @@ public class _CenterSettingPanel extends @Override public void setWidget(IsWidget w) { settingNavContainer.setWidget(Widget.asWidgetOrNull(w)); +======= + public AcceptsOneWidget getLabelListView() { + return new AcceptsOneWidget() { + @Override + public void setWidget(IsWidget w) { + labelListContainer.setWidget(Widget.asWidgetOrNull(w)); +>>>>>>> make label settings prototype } }; } +<<<<<<< HEAD public void swithTo(SettingPlace sp) { int lyt; if ("ecs".equals(sp.getToken())) { @@ -143,4 +197,6 @@ public class _CenterSettingPanel extends } ======= >>>>>>> attempt to add label setting feature +======= +>>>>>>> make label settings prototype } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml?rev=1522358&r1=1522357&r2=1522358&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterSettingPanel.ui.xml Thu Sep 12 04:31:43 2013 @@ -136,6 +136,10 @@ xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:hupa='urn:import:org.apache.hupa.client.ui'> <ui:style src="res/CssSplitLayoutPanel.css"> + .scroller { + overflow: auto; + } + .uibox { border: 1px solid #a3a3a3; border-radius: 4px; @@ -152,6 +156,24 @@ overflow: hidden; } + .listbox .scroller { + position: absolute; + top: 0; + left: 0; + width: 100%; + bottom: 0; + overflow-x: hidden; + overflow-y: auto; + } + + .listbox .scroller.withfooter { + bottom: 42px; + } + + .listbox .boxtitle+.scroller { + top: 34px; + } + .boxtitle,.uibox .listing thead td { font-size: 12px; font-weight: bold; @@ -181,6 +203,15 @@ border-bottom: 1px solid #ccc; } + .contentbox .scroller { + position: absolute; + top: 34px; + left: 0; + right: 0; + bottom: 28px; + overflow: auto; + } + body.iframe .boxtitle { position: fixed; top: 0; @@ -200,20 +231,30 @@ </g:HTML> </g:north> <g:center> - <g:HTML> - center - </g:HTML> + <g:SimpleLayoutPanel ui:field="settingsTab" + addStyleNames="{style.scroller}" /> </g:center> </g:DockLayoutPanel> </g:west> <g:center> <g:SplitLayoutPanel> <g:west size="260"> - <g:SimpleLayoutPanel addStyleNames="{style.listbox} {style.uibox}"> - <g:HTML> - <h2 class="{style.boxtitle}">Section</h2> - </g:HTML> - </g:SimpleLayoutPanel> + <g:DockLayoutPanel addStyleNames="{style.listbox} {style.uibox}"> + <g:north size="34"> + <g:HTML> + <h2 class="{style.boxtitle}">Folders</h2> + </g:HTML> + </g:north> + <g:center> + <g:ScrollPanel ui:field="labelListContainer" /> + </g:center> + <g:south size="43"> + <g:FlowPanel ui:field="folderOpButtons"> + <g:Button ui:field="add">Add</g:Button> + <g:Button ui:field="delete">Delete</g:Button> + </g:FlowPanel> + </g:south> + </g:DockLayoutPanel> </g:west> <g:center> <g:SimpleLayoutPanel addStyleNames="{style.uibox} {style.contentbox}"> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org