james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From don...@apache.org
Subject svn commit: r1522389 - in /james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui: MessageContentView.java MessageContentView.ui.xml StatusView.ui.xml
Date Thu, 12 Sep 2013 04:46:09 GMT
Author: dongxu
Date: Thu Sep 12 04:46:08 2013
New Revision: 1522389

URL: http://svn.apache.org/r1522389
Log:
change the message content view with scrollbar

Modified:
    james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java
    james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml
    james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/StatusView.ui.xml

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java?rev=1522389&r1=1522388&r2=1522389&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java
(original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.java
Thu Sep 12 04:46:08 2013
@@ -50,12 +50,16 @@ import com.google.gwt.user.client.ui.Hor
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.ScrollPanel;
+<<<<<<< HEAD
 import com.google.gwt.user.client.ui.SimplePanel;
+=======
+>>>>>>> change the message content view with scrollbar
 import com.google.inject.Inject;
 
 public class MessageContentView extends Composite implements MessageContentActivity.Displayable
{
 	@UiField ScrollPanel messageContent;
 	HTML messageContentHTML = new HTML();
+<<<<<<< HEAD
 
 	//TODO should use a scrolled panel which can contain multiple children
 	@UiField FlowPanel attachments;
@@ -267,10 +271,10 @@ public class MessageContentView extends 
 =======
 public class MessageContentView extends Composite implements MessageContentActivity.Displayable
{
 >>>>>>> make message content work as expected partly
+=======
+>>>>>>> change the message content view with scrollbar
 
-	@UiField HTML messageContent;
-
-	@UiField FlowPanel attachments;
+	@UiField ScrollPanel attachments;
 
 <<<<<<< HEAD
 >>>>>>> prepare for message content panel
@@ -383,7 +387,8 @@ public class MessageContentView extends 
 
 	@Override
 	public void fillMessageContent(String messageDetail) {
-		messageContent.setHTML(messageDetail);
+		messageContentHTML.setHTML(messageDetail);
+		messageContent.add(messageContentHTML);
 	}
 
 <<<<<<< HEAD

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml?rev=1522389&r1=1522388&r2=1522389&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml
(original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/MessageContentView.ui.xml
Thu Sep 12 04:46:08 2013
@@ -135,11 +135,11 @@
 		<g:center>
 			<g:DockLayoutPanel unit="PX">
 				<g:center>
-					<g:HTML ui:field="messageContent" addStyleNames="{style.messageContent}" />
+					<g:ScrollPanel ui:field="messageContent" addStyleNames="{style.messageContent}" />
 				</g:center>
 				<g:east size="216">
-					<g:FlowPanel ui:field="attachments" addStyleNames="{style.attachBox}">
-					</g:FlowPanel>
+					<g:ScrollPanel ui:field="attachments" addStyleNames="{style.attachBox}">
+					</g:ScrollPanel>
 				</g:east>
 			</g:DockLayoutPanel>
 		</g:center>

Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/StatusView.ui.xml
URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/StatusView.ui.xml?rev=1522389&r1=1522388&r2=1522389&view=diff
==============================================================================
--- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/StatusView.ui.xml (original)
+++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/StatusView.ui.xml Thu
Sep 12 04:46:08 2013
@@ -12,9 +12,13 @@
 <ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
 	xmlns:g='urn:import:com.google.gwt.user.client.ui'>
 <<<<<<< HEAD
+<<<<<<< HEAD
 	<g:HTMLPanel>
 =======
 	<g:HTMLPanel>Status
 >>>>>>> make login page as one part of the overall layout & splite
layout to little one
+=======
+	<g:HTMLPanel>
+>>>>>>> change the message content view with scrollbar
 	</g:HTMLPanel>
 </ui:UiBinder>
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message