Author: dongxu
Date: Thu Sep 12 04:00:33 2013
New Revision: 1522284
URL: http://svn.apache.org/r1522284
Log:
composing composing panel
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/ComposePlace.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.ui.xml
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java?rev=1522284&r1=1522283&r2=1522284&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/mapper/FolderListActivityMapper.java
Thu Sep 12 04:00:33 2013
@@ -23,6 +23,7 @@ import org.apache.hupa.client.activity.F
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import org.apache.hupa.client.place.SettingPlace;
import com.google.gwt.activity.shared.Activity;
@@ -33,6 +34,9 @@ import com.google.gwt.core.client.RunAsy
import org.apache.hupa.client.place.DefaultPlace;
=======
>>>>>>> support code split
+=======
+import org.apache.hupa.client.place.ComposePlace;
+>>>>>>> composing composing panel
import org.apache.hupa.client.place.MailFolderPlace;
>>>>>>> make folder list panel work as expected
@@ -89,8 +93,12 @@ public class FolderListActivityMapper im
=======
=======
public Activity getActivity(final Place place) {
+<<<<<<< HEAD
>>>>>>> use GinFactoryModuleBuilder to inject multiple displayable instances
>>>>>>> of some activities
if (place instanceof MailFolderPlace) {
+=======
+ if (place instanceof MailFolderPlace || place instanceof
ComposePlace) {
+>>>>>>> composing composing panel
return new ActivityAsyncProxy() {
@Override
protected void doAsync(RunAsyncCallback
callback) {
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/ComposePlace.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/ComposePlace.java?rev=1522284&r1=1522283&r2=1522284&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/ComposePlace.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/place/ComposePlace.java
Thu Sep 12 04:00:33 2013
@@ -19,14 +19,18 @@
package org.apache.hupa.client.place;
+<<<<<<< HEAD
import org.apache.hupa.client.ui.ToolBarView.Parameters;
import com.google.gwt.place.shared.Place;
+=======
+>>>>>>> composing composing panel
import com.google.gwt.place.shared.PlaceTokenizer;
import com.google.gwt.place.shared.Prefix;
public class ComposePlace extends AbstractPlace {
+<<<<<<< HEAD
private String token;
private Parameters parameters;
@@ -60,5 +64,20 @@ public class ComposePlace extends Abstra
public Parameters getParameters() {
return parameters;
}
+=======
+ @Prefix("compose")
+ public static class Tokenizer implements PlaceTokenizer<ComposePlace> {
+
+ @Override
+ public ComposePlace getPlace(String token) {
+ return new ComposePlace();
+ }
+
+ @Override
+ public String getToken(ComposePlace place) {
+ return "compose";
+ }
+ }
+>>>>>>> composing composing panel
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java?rev=1522284&r1=1522283&r2=1522284&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolBarView.java
Thu Sep 12 04:00:33 2013
@@ -23,6 +23,7 @@ package org.apache.hupa.client.ui;
<<<<<<< HEAD
import org.apache.hupa.client.activity.ToolBarActivity;
import org.apache.hupa.client.place.ComposePlace;
+<<<<<<< HEAD
import org.apache.hupa.client.rf.HupaRequestFactory;
import org.apache.hupa.shared.domain.Message;
import org.apache.hupa.shared.domain.MessageDetails;
@@ -35,11 +36,17 @@ import com.google.gwt.event.dom.client.C
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.event.shared.EventBus;
+=======
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+>>>>>>> composing composing panel
import com.google.gwt.place.shared.PlaceController;
import com.google.gwt.resources.client.CssResource;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.uibinder.client.UiHandler;
+<<<<<<< HEAD
import com.google.gwt.user.client.ui.Anchor;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.DecoratedPopupPanel;
@@ -328,14 +335,19 @@ import com.google.gwt.resources.client.C
>>>>>>> dynamical style tool bar
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
+=======
+>>>>>>> composing composing panel
import com.google.gwt.user.client.ui.Anchor;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.HTMLPanel;
+import com.google.inject.Inject;
public class ToolBarView extends Composite implements
ToolBarActivity.Displayable {
+ @Inject PlaceController placeController;
+
@UiField Style style;
@UiField Anchor refresh;
@@ -349,6 +361,11 @@ public class ToolBarView extends Composi
@UiField Anchor mark;
@UiField Anchor more;
+ @UiHandler("compose")
+ void handleClick(ClickEvent e) {
+ placeController.goTo(new ComposePlace());
+ }
+
public ToolBarView() {
initWidget(binder.createAndBindUi(this));
<<<<<<< HEAD
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java?rev=1522284&r1=1522283&r2=1522284&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java
Thu Sep 12 04:00:33 2013
@@ -23,6 +23,7 @@ import com.google.gwt.core.client.GWT;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.DockLayoutPanel;
@@ -76,15 +77,19 @@ public class __ComposePanel extends Comp
}
=======
+=======
+import com.google.gwt.user.client.ui.Anchor;
+>>>>>>> composing composing panel
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.DockLayoutPanel;
import com.google.gwt.user.client.ui.FlexTable;
import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
-import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
-import com.google.gwt.user.client.ui.HasVerticalAlignment;
-import com.google.gwt.user.client.ui.VerticalPanel;
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.ListBox;
+import com.google.gwt.user.client.ui.TextBox;
public class __ComposePanel extends Composite {
@@ -93,47 +98,81 @@ public class __ComposePanel extends Comp
public __ComposePanel() {
initWidget(binder.createAndBindUi(this));
FlexCellFormatter cellFormatter =
headerTable.getFlexCellFormatter();
- headerTable.addStyleName("cw-FlexTable");
- headerTable.setWidth("32em");
headerTable.setCellSpacing(5);
headerTable.setCellPadding(3);
// Add some text
cellFormatter.setHorizontalAlignment(0, 1,
- HasHorizontalAlignment.ALIGN_LEFT);
- headerTable.setHTML(0, 0, "cwFlexTableDetails");
- cellFormatter.setColSpan(0, 0, 2);
+ HasHorizontalAlignment.ALIGN_RIGHT);
+ headerTable.setWidget(0, 0, new Label("From"));
- // Add a button that will add more rows to the table
- Button addRowButton = new Button("cwFlexTableAddRow");
- addRowButton.addStyleName("sc-FixedWidthButton");
+ headerTable.setWidget(1, 0, new Label("To"));
+ headerTable.setWidget(2, 0, new Label("Cc"));
+ headerTable.setWidget(3, 0, new Label("Bcc"));
+ headerTable.setWidget(4, 0, new Label("Reply-To"));
+ headerTable.setWidget(5, 0, new Label("Followup-To"));
+ headerTable.setWidget(6, 0, new Label("Links"));
+ headerTable.setWidget(7, 0, new Label("Subject"));
+// cellFormatter.setColSpan(0, 0, 2);
- Button removeRowButton = new Button("cwFlexTableRemoveRow");
- removeRowButton.addStyleName("sc-FixedWidthButton");
- VerticalPanel buttonPanel = new VerticalPanel();
- buttonPanel.setStyleName("cw-FlexTable-buttonPanel");
+ // Add a button that will add more rows to the table
+ ListBox lb = new ListBox();
+ lb.addItem("foo");
+ lb.addItem("bar");
+ Button addRowButton = new Button("Send message");
+ Button removeRowButton = new Button("Save as draft");
+ Button cancel = new Button("Cancel");
+ HorizontalPanel buttonPanel = new HorizontalPanel();
+ buttonPanel.add(lb);
+ buttonPanel.add(new Anchor("Edit identities"));
buttonPanel.add(addRowButton);
buttonPanel.add(removeRowButton);
+ buttonPanel.add(cancel);
headerTable.setWidget(0, 1, buttonPanel);
- cellFormatter
- .setVerticalAlignment(0, 1,
HasVerticalAlignment.ALIGN_TOP);
+ headerTable.setWidget(1, 1, create());
+ headerTable.setWidget(2, 1, create());
+ headerTable.setWidget(3, 1, create());
+ headerTable.setWidget(4, 1, create());
+ headerTable.setWidget(5, 1, create());
+ headerTable.setWidget(6, 1, create());
+ headerTable.setWidget(7, 1, create());
+
+// cellFormatter
+// .setVerticalAlignment(0, 1,
HasVerticalAlignment.ALIGN_TOP);
// Add two rows to start
- addRow(headerTable);
- addRow(headerTable);
+// addRow(headerTable);
+// addRow(headerTable);
// Return the panel
headerTable.ensureDebugId("cwFlexTable");
}
+ private TextBox create() {
+ TextBox t = new TextBox();
+ t.setWidth("100%");
+ return t;
+ }
+
/**
* Add a row to the flex table.
*/
private void addRow(FlexTable flexTable) {
int numRows = flexTable.getRowCount();
- flexTable.setWidget(numRows, 0, new HTML("logo"));
- flexTable.setWidget(numRows, 1, new HTML("logo"));
- flexTable.getFlexCellFormatter().setRowSpan(0, 1, numRows + 1);
+ ListBox lb = new ListBox();
+ lb.addItem("foo");
+ lb.addItem("bar");
+ Button addRowButton = new Button("cwFlexTableAddRow");
+ Button removeRowButton = new Button("cwFlexTableRemoveRow");
+ HorizontalPanel buttonPanel = new HorizontalPanel();
+ buttonPanel.add(new Anchor("logo"));
+ buttonPanel.add(lb);
+ buttonPanel.add(addRowButton);
+ buttonPanel.add(removeRowButton);
+
+ flexTable.setWidget(numRows, 0, buttonPanel);
+ flexTable.setWidget(numRows, 1, new TextBox());
+// flexTable.getFlexCellFormatter().setRowSpan(0, 1, numRows + 1);
}
/**
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.ui.xml?rev=1522284&r1=1522283&r2=1522284&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.ui.xml
Thu Sep 12 04:00:33 2013
@@ -70,7 +70,12 @@
border-collapse: separate;
border-spacing: 2px;
border-color: gray;
+<<<<<<< HEAD
>>>>>>> preparing for composing panel
+=======
+ width: 99%;
+ margin: 4px 0;
+>>>>>>> composing composing panel
}
</ui:style>
<g:DockLayoutPanel ui:field="thisPanel" unit="PX"
@@ -90,7 +95,7 @@
addStyleNames="{style.mailviewbottom}{style.box}" />
=======
<g:SimplePanel ui:field="composeHeader"
addStyleNames="{style.composeHeader}">
- <g:FlexTable ui:field="headerTable"
addStyleNames="{style.headerTable}"></g:FlexTable>
+ <g:FlexTable ui:field="headerTable"
addStyleNames="{style.headerTable}" />
</g:SimplePanel>
</g:north>
<g:center>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
