Author: dongxu
Date: Thu Sep 12 03:23:13 2013
New Revision: 1522193
URL: http://svn.apache.org/r1522193
Log:
use DockLayoutPanel as the App Layout
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayout.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayout.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayout.java?rev=1522193&r1=1522192&r2=1522193&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayout.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayout.java
Thu Sep 12 03:23:13 2013
@@ -26,6 +26,7 @@ package org.apache.hupa.client.ui;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.DockLayoutPanel;
+<<<<<<< HEAD
public interface AppLayout {
DockLayoutPanel getAppLayoutPanel();
@@ -70,6 +71,11 @@ public interface AppLayout {
=======
>>>>>>> introduce the top activity
LayoutPanel getMainLayoutPanel();
+=======
+
+public interface AppLayout {
+ DockLayoutPanel getMainLayoutPanel();
+>>>>>>> use DockLayoutPanel as the App Layout
AcceptsOneWidget getTopContainer();
AcceptsOneWidget getWestContainer();
AcceptsOneWidget getMainContainer();
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.java?rev=1522193&r1=1522192&r2=1522193&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.java
Thu Sep 12 03:23:13 2013
@@ -31,6 +31,7 @@ import org.apache.hupa.client.HupaCSS;
>>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add
>>>>>>> license headers to all new files
package org.apache.hupa.client.ui;
+<<<<<<< HEAD
import static com.google.gwt.dom.client.Style.Unit.PCT;
>>>>>>> Change to new mvp framework - first step
=======
@@ -39,6 +40,8 @@ package org.apache.hupa.client.ui;
import static com.google.gwt.dom.client.Style.Unit.PCT;
>>>>>>> Change to new mvp framework - first step
+=======
+>>>>>>> use DockLayoutPanel as the App Layout
import com.google.gwt.core.client.GWT;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
@@ -47,6 +50,7 @@ import com.google.gwt.user.client.ui.Acc
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.user.client.ui.DockLayoutPanel;
import com.google.gwt.user.client.ui.HTMLPanel;
=======
@@ -59,8 +63,10 @@ import com.google.gwt.user.client.ui.Flo
=======
import com.google.gwt.user.client.ui.FlowPanel;
>>>>>>> decorate the theme
+=======
+import com.google.gwt.user.client.ui.DockLayoutPanel;
+>>>>>>> use DockLayoutPanel as the App Layout
import com.google.gwt.user.client.ui.IsWidget;
-import com.google.gwt.user.client.ui.LayoutPanel;
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.Widget;
import com.google.inject.Inject;
@@ -71,6 +77,7 @@ public class AppLayoutImpl implements Ap
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
private final DockLayoutPanel appLayoutPanel;
interface AppLayoutUiBinder extends UiBinder<DockLayoutPanel,
AppLayoutImpl> {
@@ -87,12 +94,18 @@ public class AppLayoutImpl implements Ap
>>>>>>> decorate the theme
=======
>>>>>>> decorate the theme
+=======
+ private final DockLayoutPanel mainLayoutPanel;
+
+ interface AppLayoutUiBinder extends UiBinder<DockLayoutPanel,
AppLayoutImpl> {
+>>>>>>> use DockLayoutPanel as the App Layout
}
private static AppLayoutUiBinder binder =
GWT.create(AppLayoutUiBinder.class);
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
@UiField LayoutPanel northPanel;
@UiField HTMLPanel southPanel;
@UiField SimplePanel westPanel;
@@ -116,12 +129,15 @@ public class AppLayoutImpl implements Ap
=======
SimplePanel topPanel;
>>>>>>> introduce the top activity
+=======
+ @UiField SimplePanel northPanel;
+ @UiField SimplePanel southPanel;
+>>>>>>> use DockLayoutPanel as the App Layout
- @UiField
- SimplePanel westPanel;
+ @UiField SimplePanel westPanel;
+ @UiField SimplePanel eastPanel;
- @UiField
- SimplePanel mainPanel;
+ @UiField SimplePanel centerPanel;
@Inject
public AppLayoutImpl() {
@@ -136,6 +152,7 @@ public class AppLayoutImpl implements Ap
@Override
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
public DockLayoutPanel getAppLayoutPanel() {
return appLayoutPanel;
}
@@ -165,13 +182,19 @@ public class AppLayoutImpl implements Ap
=======
+=======
+ public DockLayoutPanel getMainLayoutPanel() {
+ return mainLayoutPanel;
+ }
+
+>>>>>>> use DockLayoutPanel as the App Layout
@Override
public AcceptsOneWidget getTopContainer() {
return new AcceptsOneWidget() {
@Override
public void setWidget(IsWidget w) {
Widget widget = Widget.asWidgetOrNull(w);
- topPanel.setWidget(widget);
+ northPanel.setWidget(widget);
}
};
}
@@ -217,6 +240,7 @@ public class AppLayoutImpl implements Ap
Widget widget = Widget.asWidgetOrNull(w);
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
if(centerPanel.getWidgetCount() > 0){
centerPanel.remove(0);
}
@@ -229,6 +253,9 @@ public class AppLayoutImpl implements Ap
=======
mainPanel.setWidget(widget);
>>>>>>> decorate the theme
+=======
+ centerPanel.setWidget(widget);
+>>>>>>> use DockLayoutPanel as the App Layout
}
};
}
@@ -236,6 +263,7 @@ public class AppLayoutImpl implements Ap
public void setDefaultLayout() {
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
arrangeLayoutSize(8, 2, 15, 0);
}
@@ -333,15 +361,19 @@ public class AppLayoutImpl implements Ap
mainLayoutPanel.setWidgetTopHeight(mainPanel, MAINMENU_HEIGHT,
PCT, height, PCT);
mainLayoutPanel.setWidgetLeftWidth(mainPanel, VMASTER_WIDTH,
PCT, 100 - VMASTER_WIDTH, PCT);
// mainLayoutPanel.animate(500);
+=======
+ mainLayoutPanel.setWidgetSize(westPanel, 18);
+ mainLayoutPanel.setWidgetSize(northPanel, 8);
+ mainLayoutPanel.setWidgetSize(southPanel, 2);
+ mainLayoutPanel.setWidgetSize(eastPanel, 0);
+>>>>>>> use DockLayoutPanel as the App Layout
}
public void setLoginLayout() {
- int height = 100 - MAINMENU_HEIGHT;
- mainLayoutPanel.setWidgetTopHeight(topPanel, 0, PCT,
MAINMENU_HEIGHT, PCT);
- mainLayoutPanel.setWidgetTopHeight(westPanel, 0, PCT, 0, PCT);
- mainLayoutPanel.setWidgetTopHeight(mainPanel, MAINMENU_HEIGHT,
PCT, height, PCT);
- mainLayoutPanel.setWidgetLeftWidth(mainPanel, 0, PCT, 100, PCT);
- // mainLayoutPanel.animate(500);
+ mainLayoutPanel.setWidgetSize(westPanel, 0);
+ mainLayoutPanel.setWidgetSize(northPanel, 8);
+ mainLayoutPanel.setWidgetSize(southPanel, 2);
+ mainLayoutPanel.setWidgetSize(eastPanel, 0);
}
<<<<<<< HEAD
>>>>>>> decorate the theme
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml?rev=1522193&r1=1522192&r2=1522193&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/AppLayoutImpl.ui.xml
Thu Sep 12 03:23:13 2013
@@ -1,6 +1,9 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> use DockLayoutPanel as the App Layout
<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
license agreements. See the NOTICE file distributed with this work for
additional
information regarding copyright ownership. The ASF licenses this file
to
@@ -11,6 +14,7 @@
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
OF ANY KIND, either express or implied. See the License for the
specific
language governing permissions and limitations under the License. -->
+<<<<<<< HEAD
=======
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -31,6 +35,8 @@
under the License.
-->
>>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add
>>>>>>> license headers to all new files
+=======
+>>>>>>> use DockLayoutPanel as the App Layout
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
xmlns:g='urn:import:com.google.gwt.user.client.ui'>
@@ -128,7 +134,7 @@
margin-top: 15px;
}
- .topPanel {
+ .northPanel {
padding-left: 80px;
padding-right: 8px;
}
@@ -137,7 +143,11 @@
height: 64px;
background-color: #C5D9FF;
<<<<<<< HEAD
+<<<<<<< HEAD
background: literal("-moz-linear-gradient(#FFFFFF,
#C5D9FF)");
+=======
+ background: literal("-moz-linear-gradient(#FFFFFF,
#C5D9FF)");
+>>>>>>> use DockLayoutPanel as the App Layout
background: literal("-webkit-linear-gradient(#FFFFFF,
#C5D9FF)");
background: literal("-o-linear-gradient(#FFFFFF,
#C5D9FF)");
=======
@@ -187,7 +197,7 @@
margin: 8px 8px 8px 8px;
}
- .mainPanel {
+ .centerPanel {
border: 1px solid #7FAAFF;
box-shadow: 0 1px 4px grey;
border-radius: 5px;
@@ -206,6 +216,7 @@
min-height: 500px;
}
</ui:style>
+<<<<<<< HEAD
<g:LayoutPanel addStyleNames="{style.Hupa}">
<g:layer>
<<<<<<< HEAD
@@ -236,4 +247,23 @@
>>>>>>> Change to new mvp framework - first step
=======
>>>>>>> decorate the theme
+=======
+ <g:DockLayoutPanel unit='EM' addStyleNames="{style.Hupa}">
+ <g:north size='8'>
+ <g:SimplePanel ui:field="northPanel"
addStyleNames="{style.northPanel}" />
+ </g:north>
+ <g:south size='2'>
+ <g:SimplePanel ui:field="southPanel" />
+ </g:south>
+ <g:west size='18'>
+ <g:SimplePanel ui:field="westPanel"
addStyleNames="{style.westPanel}" />
+ </g:west>
+ <g:east size='0'>
+ <g:SimplePanel ui:field="eastPanel" />
+ </g:east>
+ <g:center>
+ <g:SimplePanel ui:field="centerPanel"
addStyleNames="{style.centerPanel}" />
+ </g:center>
+ </g:DockLayoutPanel>
+>>>>>>> use DockLayoutPanel as the App Layout
</ui:UiBinder>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
