Author: dongxu
Date: Thu Sep 12 03:58:28 2013
New Revision: 1522279
URL: http://svn.apache.org/r1522279
Log:
split the layout panel to more small ones
Added:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java~HEAD
- copied, changed from r1522278,
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml~HEAD
- copied, changed from r1522278,
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java~HEAD
- copied, changed from r1522278,
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml~HEAD
- copied, changed from r1522278,
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml
Removed:
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/ToolPanel.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/ToolPanel.ui.xml
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
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/_ToolPanel.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.ui.xml
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=1522279&r1=1522278&r2=1522279&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 03:58:28 2013
@@ -253,9 +253,9 @@ public class HupaLayout implements HupaL
@UiField SimplePanel logoContainer;
@UiField SimpleLayoutPanel navigationContainer;
- @UiField ToolPanel toolPanel;
+ @UiField _ToolPanel toolPanel;
- @UiField CenterPanel centerPanel;
+ @UiField _CenterPanel centerPanel;
private LayoutPanel hupaMainPanel;
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml?rev=1522279&r1=1522278&r2=1522279&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/HupaLayout.ui.xml
Thu Sep 12 03:58:28 2013
@@ -236,10 +236,10 @@
<g:layer left='10px' right='10px' top='88px' bottom="20px">
<g:DockLayoutPanel ui:field="mainBox">
<g:north size="40">
- <hupa:ToolPanel ui:field="toolPanel" />
+ <hupa:_ToolPanel ui:field="toolPanel" />
</g:north>
<g:center>
- <hupa:CenterPanel
ui:field="centerPanel" />
+ <hupa:_CenterPanel
ui:field="centerPanel" />
</g:center>
</g:DockLayoutPanel>
<<<<<<< HEAD
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=1522279&r1=1522278&r2=1522279&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 03:58:28 2013
@@ -28,9 +28,15 @@ import com.google.gwt.user.client.ui.Spl
public class _CenterPanel extends Composite {
+<<<<<<< HEAD
@UiField protected SplitLayoutPanel thisPanel;
@UiField protected __OutlinePanel outlinePanel;
@UiField protected __ContentPanel contentPanel;
+=======
+ @UiField SplitLayoutPanel thisPanel;
+ @UiField __OutlinePanel outlinePanel;
+ @UiField __ContentPanel contentPanel;
+>>>>>>> split the layout panel to more small ones
public _CenterPanel() {
initWidget(binder.createAndBindUi(this));
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=1522279&r1=1522278&r2=1522279&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 03:58:28 2013
@@ -11,10 +11,15 @@
<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
<ui:style src="res/CssSplitLayoutPanel.css" />
<g:SplitLayoutPanel ui:field="thisPanel"
addStyleNames="{style.splitLayoutPanel}">
<g:west size="220">
+=======
+ <g:SplitLayoutPanel ui:field="thisPanel">
+ <g:west size="373">
+>>>>>>> split the layout panel to more small ones
<hupa:__OutlinePanel ui:field="outlinePanel" />
</g:west>
<g:center>
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java?rev=1522279&r1=1522278&r2=1522279&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java
Thu Sep 12 03:58:28 2013
@@ -19,6 +19,8 @@
package org.apache.hupa.client.ui;
+import org.apache.hupa.client.activity.StatusActivity;
+
import com.google.gwt.core.client.GWT;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
@@ -29,41 +31,14 @@ import com.google.gwt.user.client.ui.IsW
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.Widget;
-public class _ToolPanel extends Composite {
+public class _ToolPanel extends Composite implements
StatusActivity.Displayable {
- @UiField protected DockLayoutPanel thisPanel;
- @UiField protected SimplePanel toolBarContainer;
- @UiField protected SimplePanel composeToolBarContainer;
- @UiField protected SimplePanel searchBoxContainer;
+ @UiField SimplePanel toolBarContainer;
public _ToolPanel() {
initWidget(binder.createAndBindUi(this));
}
- void toggleTo(int layout) {
- switch (layout) {
- case HupaLayout.LAYOUT_MESSAGE:
- this.toggleToCompose(false);break;
- case HupaLayout.LAYOUT_COMPOSE:
- this.toggleToCompose(true);break;
- //TODO compose button should be shown when setting
- default:
- hideAll();
- }
- }
-
- private void hideAll() {
- toolBarContainer.setVisible(false);
- searchBoxContainer.setVisible(false);
- composeToolBarContainer.setVisible(false);
- }
-
- protected void toggleToCompose(boolean visible) {
- toolBarContainer.setVisible(!visible);
- searchBoxContainer.setVisible(!visible);
- composeToolBarContainer.setVisible(visible);
- }
-
public AcceptsOneWidget getToolBarView() {
return new AcceptsOneWidget() {
@Override
@@ -73,27 +48,10 @@ public class _ToolPanel extends Composit
};
}
- public AcceptsOneWidget getComposeToolBarView() {
- return new AcceptsOneWidget() {
- @Override
- public void setWidget(IsWidget w) {
-
composeToolBarContainer.setWidget(Widget.asWidgetOrNull(w));
- }
- };
- }
-
- public AcceptsOneWidget getSearchBoxView() {
- return new AcceptsOneWidget() {
- @Override
- public void setWidget(IsWidget w) {
-
searchBoxContainer.setWidget(Widget.asWidgetOrNull(w));
- }
- };
- }
-
interface _ToolPanelUiBinder extends UiBinder<DockLayoutPanel,
_ToolPanel> {
}
- private static _ToolPanelUiBinder binder =
GWT.create(_ToolPanelUiBinder.class);
+ private static _ToolPanelUiBinder binder = GWT
+ .create(_ToolPanelUiBinder.class);
}
Copied:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java~HEAD
(from r1522278,
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java)
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java%7EHEAD?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java%7EHEAD&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.java&r1=1522278&r2=1522279&rev=1522279&view=diff
==============================================================================
(empty)
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml?rev=1522279&r1=1522278&r2=1522279&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml
Thu Sep 12 03:58:28 2013
@@ -11,16 +11,18 @@
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
xmlns:g='urn:import:com.google.gwt.user.client.ui'>
- <g:DockLayoutPanel unit="PX" ui:field="thisPanel">
- <g:west size="518">
+ <g:DockLayoutPanel unit="PX">
+ <g:west size="550">
<g:SimplePanel ui:field="toolBarContainer" />
</g:west>
+ <g:east size="180">
+ <g:HTMLPanel>
+ Search
+ <input style='color: gray;' value='//TODO' />
+ </g:HTMLPanel>
+ </g:east>
<g:center>
- <g:SimplePanel ui:field="composeToolBarContainer" />
+ <g:HTMLPanel />
</g:center>
- <g:east size="210">
- <g:SimplePanel ui:field="searchBoxContainer">
- </g:SimplePanel>
- </g:east>
</g:DockLayoutPanel>
</ui:UiBinder>
\ No newline at end of file
Copied:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml~HEAD
(from r1522278,
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml)
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml%7EHEAD?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml%7EHEAD&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/_ToolPanel.ui.xml&r1=1522278&r2=1522279&rev=1522279&view=diff
==============================================================================
(empty)
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=1522279&r1=1522278&r2=1522279&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 03:58:28 2013
@@ -19,6 +19,8 @@
package org.apache.hupa.client.ui;
+import org.apache.hupa.client.activity.StatusActivity;
+
import com.google.gwt.core.client.GWT;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
@@ -27,17 +29,19 @@ import com.google.gwt.user.client.ui.Com
import com.google.gwt.user.client.ui.DockLayoutPanel;
import com.google.gwt.user.client.ui.HTMLPanel;
import com.google.gwt.user.client.ui.IsWidget;
+import com.google.gwt.user.client.ui.ScrollPanel;
import com.google.gwt.user.client.ui.SimpleLayoutPanel;
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.SplitLayoutPanel;
import com.google.gwt.user.client.ui.Widget;
-public class __ContentPanel extends Composite{
+public class __ContentPanel extends Composite implements
+ StatusActivity.Displayable {
@UiField SplitLayoutPanel thisPanel;
@UiField DockLayoutPanel messageListBox;
@UiField SimpleLayoutPanel messageListContainer;
@UiField SimplePanel messageListFooterContainer;
- @UiField SimpleLayoutPanel messageContentContainer;
+ @UiField ScrollPanel messageContentContainer;
@UiField SimplePanel statusContainer;
@UiField HTMLPanel contactBox;
Copied:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java~HEAD
(from r1522278,
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%7EHEAD?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java%7EHEAD&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.java&r1=1522278&r2=1522279&rev=1522279&view=diff
==============================================================================
(empty)
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml?rev=1522279&r1=1522278&r2=1522279&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml
Thu Sep 12 03:58:28 2013
@@ -87,10 +87,10 @@
<g:DockLayoutPanel unit="PX" addStyleNames="{style.box}"
ui:field="messageContentBox">
<g:center>
- <g:SimpleLayoutPanel
ui:field="messageContentContainer"
+ <g:ScrollPanel
ui:field="messageContentContainer"
addStyleNames="{style.messageContentWorkAround}" />
</g:center>
- <g:south size="0">
+ <g:south size="25">
<g:SimplePanel
ui:field="statusContainer" />
</g:south>
</g:DockLayoutPanel>
Copied:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml~HEAD
(from r1522278,
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml)
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml%7EHEAD?p2=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml%7EHEAD&p1=james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ContentPanel.ui.xml&r1=1522278&r2=1522279&rev=1522279&view=diff
==============================================================================
(empty)
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.java?rev=1522279&r1=1522278&r2=1522279&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.java
Thu Sep 12 03:58:28 2013
@@ -19,6 +19,11 @@
package org.apache.hupa.client.ui;
+<<<<<<< HEAD
+=======
+import org.apache.hupa.client.activity.StatusActivity;
+
+>>>>>>> split the layout panel to more small ones
import com.google.gwt.core.client.GWT;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
@@ -29,8 +34,14 @@ import com.google.gwt.user.client.ui.IsW
import com.google.gwt.user.client.ui.ScrollPanel;
import com.google.gwt.user.client.ui.Widget;
+<<<<<<< HEAD
public class __OutlinePanel extends Composite {
+=======
+public class __OutlinePanel extends Composite implements
+ StatusActivity.Displayable {
+
+>>>>>>> split the layout panel to more small ones
@UiField ScrollPanel folderListContainer;
public __OutlinePanel() {
@@ -45,7 +56,10 @@ public class __OutlinePanel extends Comp
}
};
}
+<<<<<<< HEAD
+=======
+>>>>>>> split the layout panel to more small ones
interface __OutlinePanelUiBinder extends
UiBinder<DockLayoutPanel, __OutlinePanel> {
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.ui.xml?rev=1522279&r1=1522278&r2=1522279&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__OutlinePanel.ui.xml
Thu Sep 12 03:58:28 2013
@@ -12,6 +12,7 @@
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
xmlns:g='urn:import:com.google.gwt.user.client.ui'>
<ui:style>
+<<<<<<< HEAD
.box {
border: 1px solid #A3A3A3;
border-radius: 4px;
@@ -23,6 +24,8 @@
background: white;
}
+=======
+>>>>>>> split the layout panel to more small ones
.folderList {
position: absolute;
top: 0;
@@ -34,6 +37,20 @@
overflow-y: auto;
}
+<<<<<<< HEAD
+=======
+ .box {
+ border: 1px solid #A3A3A3;
+ border-radius: 4px;
+ overflow: hidden;
+ box-shadow: 0 0 2px #999;
+ -o-box-shadow: 0 0 2px #999;
+ -webkit-box-shadow: 0 0 2px #999;
+ -moz-box-shadow: 0 0 2px #999;
+ background: white;
+ }
+
+>>>>>>> split the layout panel to more small ones
.listBox {
background: #D9ECF4;
overflow: hidden;
@@ -41,11 +58,14 @@
.box .boxFooter {
border-radius: 0 0 4px 4px;
+<<<<<<< HEAD
border-top: 1px solid #ccdde4;
-webkit-box-shadow: inset 0 1px 0 0 #fff;
-moz-box-shadow: inset 0 1px 0 0 #fff;
box-shadow: inset 0 1px 0 0 #fff;
background: #d9ecf4;
+=======
+>>>>>>> split the layout panel to more small ones
}
</ui:style>
<g:DockLayoutPanel unit="PX" ui:field="thisPanel"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
