Author: dongxu
Date: Thu Sep 12 04:00:11 2013
New Revision: 1522283
URL: http://svn.apache.org/r1522283
Log:
preparing for composing panel
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.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/_CenterPanel.ui.xml
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/ui/FolderListView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java?rev=1522283&r1=1522282&r2=1522283&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FolderListView.java
Thu Sep 12 04:00:11 2013
@@ -235,11 +235,10 @@ public class FolderListView extends Comp
final EventBus eventBus, @Assisted Place place) {
if (place instanceof MailFolderPlace) {
cellTree = new CellTree(viewModel, null,
Resources.INSTANCE);
- cellTree.setAnimationEnabled(true);
- } else {
+ } else {// TODO this viewModel should be contacts
cellTree = new CellTree(viewModel, null);
- cellTree.setAnimationEnabled(true);
}
+ cellTree.setAnimationEnabled(true);
initWidget(binder.createAndBindUi(this));
>>>>>>> make login page as one part of the overall layout & splite layout to
>>>>>>> little one
}
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=1522283&r1=1522282&r2=1522283&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:00:11 2013
@@ -36,11 +36,18 @@ public class _CenterPanel extends Compos
@UiField SplitLayoutPanel thisPanel;
@UiField __OutlinePanel outlinePanel;
@UiField __ContentPanel contentPanel;
+<<<<<<< HEAD
>>>>>>> split the layout panel to more small ones
+=======
+ @UiField __ComposePanel composePanel;
+>>>>>>> preparing for composing panel
public _CenterPanel() {
initWidget(binder.createAndBindUi(this));
thisPanel.setWidgetMinSize(outlinePanel, 144);
+ thisPanel.setWidgetHidden(composePanel, true);
+ thisPanel.remove(contentPanel);
+ thisPanel.add(composePanel);
}
public AcceptsOneWidget getFolderListView() {
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.ui.xml?rev=1522283&r1=1522282&r2=1522283&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_CenterPanel.ui.xml
Thu Sep 12 04:00:11 2013
@@ -25,5 +25,8 @@
<g:center>
<hupa:__ContentPanel ui:field="contentPanel" />
</g:center>
+ <g:south size="0">
+ <hupa:__ComposePanel ui:field="composePanel" />
+ </g:south>
</g:SplitLayoutPanel>
</ui:UiBinder>
\ No newline at end of file
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=1522283&r1=1522282&r2=1522283&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:11 2013
@@ -22,6 +22,7 @@ package org.apache.hupa.client.ui;
import com.google.gwt.core.client.GWT;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
+<<<<<<< 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;
@@ -74,4 +75,84 @@ public class __ComposePanel extends Comp
};
}
+=======
+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;
+
+public class __ComposePanel extends Composite {
+
+ @UiField FlexTable headerTable;
+
+ 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);
+
+ // Add a button that will add more rows to the table
+ Button addRowButton = new Button("cwFlexTableAddRow");
+ addRowButton.addStyleName("sc-FixedWidthButton");
+
+ Button removeRowButton = new Button("cwFlexTableRemoveRow");
+ removeRowButton.addStyleName("sc-FixedWidthButton");
+ VerticalPanel buttonPanel = new VerticalPanel();
+ buttonPanel.setStyleName("cw-FlexTable-buttonPanel");
+ buttonPanel.add(addRowButton);
+ buttonPanel.add(removeRowButton);
+ headerTable.setWidget(0, 1, buttonPanel);
+ cellFormatter
+ .setVerticalAlignment(0, 1,
HasVerticalAlignment.ALIGN_TOP);
+
+ // Add two rows to start
+ addRow(headerTable);
+ addRow(headerTable);
+
+ // Return the panel
+ headerTable.ensureDebugId("cwFlexTable");
+ }
+
+ /**
+ * 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);
+ }
+
+ /**
+ * Remove a row from the flex table.
+ */
+ private void removeRow(FlexTable flexTable) {
+ int numRows = flexTable.getRowCount();
+ if (numRows > 1) {
+ flexTable.removeRow(numRows - 1);
+ flexTable.getFlexCellFormatter().setRowSpan(0, 1,
numRows - 1);
+ }
+ }
+
+ interface __ComposePanelUiBinder extends
+ UiBinder<DockLayoutPanel, __ComposePanel> {
+ }
+
+ private static __ComposePanelUiBinder binder = GWT
+ .create(__ComposePanelUiBinder.class);
+
+>>>>>>> preparing for composing panel
}
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=1522283&r1=1522282&r2=1522283&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:11 2013
@@ -10,7 +10,11 @@
language governing permissions and limitations under the License. -->
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
+<<<<<<< HEAD
xmlns:g='urn:import:com.google.gwt.user.client.ui'>
+=======
+ xmlns:g='urn:import:com.google.gwt.user.client.ui'
xmlns:hupa='urn:import:org.apache.hupa.client.ui'>
+>>>>>>> preparing for composing panel
<ui:style>
.box {
border: 1px solid #A3A3A3;
@@ -41,6 +45,7 @@
border-bottom: 1px solid #dfdfdf;
}
+<<<<<<< HEAD
.composeHeader td {
padding: 3px 8px;
}
@@ -59,11 +64,19 @@
bottom: 0;
width: 100%;
height: 26px;
+=======
+ .headerTable {
+ display: table;
+ border-collapse: separate;
+ border-spacing: 2px;
+ border-color: gray;
+>>>>>>> preparing for composing panel
}
</ui:style>
<g:DockLayoutPanel ui:field="thisPanel" unit="PX"
addStyleNames="{style.box}">
<g:north size="135">
+<<<<<<< HEAD
<g:SimplePanel ui:field="composeHeaderContainer"
addStyleNames="{style.composeHeader}">
</g:SimplePanel>
@@ -75,6 +88,29 @@
<g:south size="28">
<g:SimplePanel ui:field="composeStatusContainer"
addStyleNames="{style.mailviewbottom}{style.box}" />
+=======
+ <g:SimplePanel ui:field="composeHeader"
addStyleNames="{style.composeHeader}">
+ <g:FlexTable ui:field="headerTable"
addStyleNames="{style.headerTable}"></g:FlexTable>
+ </g:SimplePanel>
+ </g:north>
+ <g:center>
+ <g:DockLayoutPanel ui:field="composeContent" unit="PX">
+ <g:north size="23">
+ <g:HTMLPanel>composeOption</g:HTMLPanel>
+ </g:north>
+ <g:east size="257">
+
<g:HTMLPanel>composeAttachment</g:HTMLPanel>
+ </g:east>
+ <g:center>
+ <g:HTMLPanel>composeBody</g:HTMLPanel>
+ </g:center>
+ </g:DockLayoutPanel>
+ </g:center>
+ <g:south size="28">
+ <g:SimplePanel ui:field="composeStatus">
+ <g:HTMLPanel>composeStatus</g:HTMLPanel>
+ </g:SimplePanel>
+>>>>>>> preparing for composing panel
</g:south>
</g:DockLayoutPanel>
</ui:UiBinder>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
