Author: dongxu
Date: Thu Sep 12 04:32:18 2013
New Revision: 1522359
URL: http://svn.apache.org/r1522359
Log:
fixed issue#62
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.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/ui/ComposeView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml
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/_CenterSettingPanel.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.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/activity/ComposeActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java?rev=1522359&r1=1522358&r2=1522359&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/ComposeActivity.java
Thu Sep 12 04:32:18 2013
@@ -141,6 +141,7 @@ import com.google.web.bindery.requestfac
public class ComposeActivity extends AppBaseActivity {
@Inject private Displayable display;
@Inject private HupaController hupaController;
+ @Inject private TopBarActivity topBar;
private List<MessageAttachment> attachments = new
ArrayList<MessageAttachment>();
<<<<<<< HEAD
<<<<<<< HEAD
@@ -463,6 +464,9 @@ public class ComposeActivity extends App
if (user == null){
user = place.getParameters().getUser();
}
+ if(user == null){
+ user = topBar.getUser();
+ }
display.getFromList().addItem(user.getName());
if("new".equals(place.getToken())){
return;
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java?rev=1522359&r1=1522358&r2=1522359&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/TopBarActivity.java
Thu Sep 12 04:32:18 2013
@@ -247,5 +247,12 @@ public class TopBarActivity extends AppB
void showLoading(String message);
void hideLoading();
}
+<<<<<<< HEAD
>>>>>>> add logout support
+=======
+
+ public User getUser(){
+ return user;
+ }
+>>>>>>> fixed issue#62
}
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=1522359&r1=1522358&r2=1522359&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:32:18 2013
@@ -352,6 +352,7 @@ public class AppGinModule extends Abstra
bind(StatusActivity.Displayable.class).to(StatusView.class);
bind(ComposeToolBarActivity.Displayable.class).to(ComposeToolBarView.class);
<<<<<<< HEAD
+<<<<<<< HEAD
bind(ComposeActivity.Displayable.class).to(ComposeView.class);
bind(SearchBoxActivity.Displayable.class).to(SearchBoxView.class);
@@ -365,6 +366,9 @@ public class AppGinModule extends Abstra
<<<<<<< HEAD
>>>>>>> fixed issue#61; add loading to mark, unmark.
=======
+=======
+//
bind(ComposeActivity.Displayable.class).to(ComposeView.class).in(Singleton.class);
+>>>>>>> fixed issue#62
bind(LabelListActivity.Displayable.class).to(LabelListView.class).in(Singleton.class);
>>>>>>> make label settings prototype
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java?rev=1522359&r1=1522358&r2=1522359&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.java
Thu Sep 12 04:32:18 2013
@@ -29,6 +29,7 @@ import org.apache.hupa.client.validation
import org.apache.hupa.client.validation.SetFocusAction;
import org.apache.hupa.shared.SConsts;
import org.apache.hupa.widgets.editor.Editor;
+import org.apache.hupa.widgets.editor.Toolbar;
import org.apache.hupa.widgets.ui.MultiValueSuggestArea;
import com.google.gwt.core.client.GWT;
@@ -124,6 +125,7 @@ public class ComposeView extends Composi
@UiField protected DockLayoutPanel thisPanel;
@UiField protected SimplePanel header;
@UiField protected FlexTable headerTable;
+ @UiField protected SimplePanel editorToolBar;
@UiField protected SimplePanel composeEditor;
@UiField protected FlowPanel attach;
@UiField protected Style style;
@@ -198,6 +200,10 @@ public class ComposeView extends Composi
uploader.avoidRepeatFiles(true);
uploader.setI18Constants(constants);
attach.add(uploader);
+
+ Toolbar toolbar = new Toolbar(editor.getArea(), constants);
+ toolbar.ensureDebugId("hupa-editor-toolbar");
+ editorToolBar.add(toolbar);
composeEditor.add(editor);
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml?rev=1522359&r1=1522358&r2=1522359&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ComposeView.ui.xml
Thu Sep 12 04:32:18 2013
@@ -309,8 +309,15 @@
</g:FlowPanel>
</g:east>
<g:center>
- <g:SimplePanel
ui:field="composeEditor"
-
addStyleNames="{style.composebodycontainer}" />
+ <g:DockLayoutPanel>
+ <g:north size="37">
+ <g:SimplePanel
ui:field="editorToolBar" />
+ </g:north>
+ <g:center>
+ <g:SimplePanel
ui:field="composeEditor"
+
addStyleNames="{style.composebodycontainer}" />
+ </g:center>
+ </g:DockLayoutPanel>
</g:center>
</g:DockLayoutPanel>
>>>>>>> make send text mail work excellently
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=1522359&r1=1522358&r2=1522359&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:32:18 2013
@@ -12,14 +12,20 @@
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
xmlns:g='urn:import:com.google.gwt.user.client.ui'
xmlns:hupa='urn:import:org.apache.hupa.client.ui'>
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> fixed issue#62
<ui:style src="res/CssSplitLayoutPanel.css" />
<g:SplitLayoutPanel ui:field="thisPanel"
addStyleNames="{style.splitLayoutPanel}">
<g:west size="220">
+<<<<<<< HEAD
=======
<g:SplitLayoutPanel ui:field="thisPanel">
<g:west size="373">
>>>>>>> split the layout panel to more small ones
+=======
+>>>>>>> fixed issue#62
<hupa:__OutlinePanel ui:field="outlinePanel" />
</g:west>
<g:center>
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=1522359&r1=1522358&r2=1522359&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:32:18 2013
@@ -100,7 +100,6 @@ import com.google.gwt.uibinder.client.Ui
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;
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java?rev=1522359&r1=1522358&r2=1522359&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java
Thu Sep 12 04:32:18 2013
@@ -45,7 +45,7 @@ public class __ContentPanel extends Comp
public __ContentPanel() {
initWidget(binder.createAndBindUi(this));
-// thisPanel.setWidgetHidden(contactBox, true);
+ thisPanel.setWidgetHidden(contactBox, true);
thisPanel.setWidgetMinSize(messageListBox, 130);
}
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=1522359&r1=1522358&r2=1522359&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:32:18 2013
@@ -100,12 +100,13 @@ public class Editor extends FlowPanel im
>>>>>>> make send text mail work excellently
area.setHeight("100%");
- Toolbar toolbar = new Toolbar(area, constants);
- toolbar.ensureDebugId("hupa-editor-toolbar");
+// Toolbar toolbar = new Toolbar(area, constants);
+// toolbar.ensureDebugId("hupa-editor-toolbar");
- super.add(toolbar);
+// super.add(toolbar);
super.add(area);
setWidth("100%");
+ setHeight("100%");
<<<<<<< HEAD
// Note: rich-area is created in an iframe, so Hupa's style
sheets
@@ -153,12 +154,18 @@ public class Editor extends FlowPanel im
}
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> fixed issue#62
public RichTextArea getArea(){
return area;
}
+<<<<<<< HEAD
=======
>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can
>>>>>>> not automatically adjust the height and width
+=======
+>>>>>>> fixed issue#62
@Override
public void setSize(String width, String height) {
@@ -168,18 +175,26 @@ public class Editor extends FlowPanel im
@Override
public void setWidth(String width) {
<<<<<<< HEAD
+<<<<<<< HEAD
super.setWidth(width);
=======
>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can
>>>>>>> not automatically adjust the height and width
+=======
+ super.setWidth(width);
+>>>>>>> fixed issue#62
area.setWidth(width);
}
@Override
public void setHeight(String height) {
<<<<<<< HEAD
+<<<<<<< HEAD
super.setHeight(height);
=======
>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can
>>>>>>> not automatically adjust the height and width
+=======
+ super.setHeight(height);
+>>>>>>> fixed issue#62
area.setHeight(height);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
