Author: dongxu
Date: Thu Sep 12 04:06:02 2013
New Revision: 1522298

URL: http://svn.apache.org/r1522298
Log:
dealing with new message editor

Modified:
    
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeContentView.java
    
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeContentView.ui.xml
    
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeHeaderView.java
    
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java
    
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeContentView.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeContentView.java?rev=1522298&r1=1522297&r2=1522298&view=diff
==============================================================================
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeContentView.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeContentView.java
 Thu Sep 12 04:06:02 2013
@@ -20,17 +20,24 @@
 package org.apache.hupa.client.ui;
 
 import org.apache.hupa.client.activity.ComposeContentActivity;
+import org.apache.hupa.widgets.editor.Editor;
 
 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.client.ui.Composite;
 import com.google.gwt.user.client.ui.DockLayoutPanel;
+import com.google.gwt.user.client.ui.SimplePanel;
 
 public class ComposeContentView extends Composite implements
                ComposeContentActivity.Displayable {
+       
+       @UiField SimplePanel composeEditor;
 
        public ComposeContentView() {
                initWidget(binder.createAndBindUi(this));
+               Editor editor = new Editor();
+               composeEditor.add(editor);
        }
 
        interface ComposeContentUiBinder extends

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeContentView.ui.xml
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeContentView.ui.xml?rev=1522298&r1=1522297&r2=1522298&view=diff
==============================================================================
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeContentView.ui.xml
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeContentView.ui.xml
 Thu Sep 12 04:06:02 2013
@@ -51,7 +51,7 @@
                        </g:HTMLPanel>
                </g:east>
                <g:center>
-                       <g:HTMLPanel 
addStyleNames="{style.composebodycontainer}">composeBody</g:HTMLPanel>
+                       <g:SimplePanel ui:field="composeEditor" 
addStyleNames="{style.composebodycontainer}" />
                </g:center>
        </g:DockLayoutPanel>
 </ui:UiBinder>
\ No newline at end of file

Modified: 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeHeaderView.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeHeaderView.java?rev=1522298&r1=1522297&r2=1522298&view=diff
==============================================================================
--- 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeHeaderView.java
 (original)
+++ 
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeHeaderView.java
 Thu Sep 12 04:06:02 2013
@@ -212,7 +212,7 @@ public class ComposeHeaderView extends C
                // addRow(headerTable);
 
                // Return the panel
-               headerTable.ensureDebugId("cwFlexTable");
+//             headerTable.ensureDebugId("cwFlexTable");
        }
 
        private TextBox create() {

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=1522298&r1=1522297&r2=1522298&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:06:02 2013
@@ -277,15 +277,11 @@ public class HupaLayout implements HupaL
 
        @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() {

Modified: 
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java?rev=1522298&r1=1522297&r2=1522298&view=diff
==============================================================================
--- 
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java
 (original)
+++ 
james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java
 Thu Sep 12 04:06:02 2013
@@ -260,7 +260,8 @@ public class Editor extends VerticalPane
         super.setStyleName("hupa-editor");
         super.add(toolbar);
         super.add(area);
-        super.setWidth("100%");
+        super.setSize("100%", "100%");
+        
         
         // Note: rich-area is created in an iframe, so Hupa's style sheets 
         // are not available, unless we inject them to the generated iframe



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

Reply via email to