Author: vjrj Date: 2008-05-13 23:49:48 +0200 (Tue, 13 May 2008) New Revision: 765 Added: sandbox4/src/main/java/org/op/public/images/ sandbox4/src/main/java/org/op/public/images/icon1.gif sandbox4/src/main/java/org/op/public/images/icon2.gif Modified: sandbox4/src/main/java/org/op/client/DefaultBorderLayout.java sandbox4/src/main/java/org/op/client/Entity.java sandbox4/src/main/java/org/op/client/EntityWorkspace.java sandbox4/src/main/java/org/op/client/Sandbox.java sandbox4/src/main/java/org/op/public/sandbox.css Log: emite chat 2 Modified: sandbox4/src/main/java/org/op/client/DefaultBorderLayout.java =================================================================== --- sandbox4/src/main/java/org/op/client/DefaultBorderLayout.java 2008-05-13 21:11:55 UTC (rev 764) +++ sandbox4/src/main/java/org/op/client/DefaultBorderLayout.java 2008-05-13 21:49:48 UTC (rev 765) @@ -38,14 +38,15 @@ } protected void add(final Component panel, final Position position) { - add(panel, position, false); + add(panel, position, false, false); } - protected void add(final Component panel, final Position position, final boolean split) { - add(panel, position, split, NO_SIZE); + protected void add(final Component panel, final Position position, final boolean split, final boolean collapsible) { + add(panel, position, split, collapsible, NO_SIZE); } - protected void add(final Component panel, final Position position, final boolean split, final int size) { + protected void add(final Component panel, final Position position, final boolean split, final boolean collapsible, + final int size) { LayoutRegion regionPosition = regionPositions[position.ordinal()]; BorderLayoutData borderLayoutData; if (size != NO_SIZE) { @@ -54,9 +55,9 @@ borderLayoutData = new BorderLayoutData(regionPosition); } borderLayoutData.split = split; + borderLayoutData.collapsible = collapsible; if (split) { borderLayoutData.collapseMode = "mini"; - borderLayoutData.collapsible = true; switch (position) { case EAST: borderLayoutData.margins = new Margins(0, 0, 0, 5); @@ -81,7 +82,7 @@ } protected void add(final Component panel, final Position position, final int size) { - add(panel, position, false, size); + add(panel, position, false, false, size); } protected void add(final DefaultPanel panel, final Widget widget) { Modified: sandbox4/src/main/java/org/op/client/Entity.java =================================================================== --- sandbox4/src/main/java/org/op/client/Entity.java 2008-05-13 21:11:55 UTC (rev 764) +++ sandbox4/src/main/java/org/op/client/Entity.java 2008-05-13 21:49:48 UTC (rev 765) @@ -18,7 +18,7 @@ add(entityMainHeader, DefaultBorderLayout.Position.NORTH, 65); add(entityWorkspace.getPanel(), DefaultBorderLayout.Position.CENTER); - add(entitySummary.getPanel(), DefaultBorderLayout.Position.EAST, true, 150); + add(entitySummary.getPanel(), DefaultBorderLayout.Position.EAST, true, true, 150); } public EntityWorkspace getEntityWorkspace() { Modified: sandbox4/src/main/java/org/op/client/EntityWorkspace.java =================================================================== --- sandbox4/src/main/java/org/op/client/EntityWorkspace.java 2008-05-13 21:11:55 UTC (rev 764) +++ sandbox4/src/main/java/org/op/client/EntityWorkspace.java 2008-05-13 21:49:48 UTC (rev 765) @@ -74,7 +74,7 @@ add(titles, DefaultBorderLayout.Position.NORTH, DEF_TOOLBAR_HEIGHT * 2); add(content, DefaultBorderLayout.Position.CENTER); - add(container, DefaultBorderLayout.Position.EAST, true, 175); + add(container, DefaultBorderLayout.Position.EAST, true, true, 175); add(bottomPanel, DefaultBorderLayout.Position.SOUTH, DEF_TOOLBAR_HEIGHT); } Modified: sandbox4/src/main/java/org/op/client/Sandbox.java =================================================================== --- sandbox4/src/main/java/org/op/client/Sandbox.java 2008-05-13 21:11:55 UTC (rev 764) +++ sandbox4/src/main/java/org/op/client/Sandbox.java 2008-05-13 21:49:48 UTC (rev 765) @@ -127,6 +127,9 @@ BasicDialog chatDialog = new BasicDialog("Emite chat", false, Scroll.NONE, 600, 415, 300, 300); chatDialog.setMaximizable(true); + chatDialog.setBodyBorder(false); + chatDialog.setBorder(false); + chatDialog.setBorders(false); chatDialog.setLayout(new FitLayout()); chatDialog.addButton(new Button("Send")); chatDialog.setButtonAlign(HorizontalAlignment.LEFT); @@ -138,20 +141,25 @@ chatPanel.createTopBar(north); chatPanel.createBottomBar(east); chatPanel.createTopBar(north); - chatPanel.add(north, Position.NORTH, true, 75); + chatPanel.add(north, Position.NORTH, false, false, 22); TabPanel centerPanel = new TabPanel(); TabItem item1 = new TabItem("Chat1"); + item1.setIconStyle("icon1"); item1.setLayout(new FitLayout()); + item1.setToolTip("[email protected]"); TabItem item2 = new TabItem("Chat1"); + item2.setIconStyle("icon1"); item2.setLayout(new FitLayout()); centerPanel.add(item1); centerPanel.add(item2); chatPanel.add(centerPanel, Position.CENTER); - chatPanel.add(east, Position.EAST, false, 150); - chatPanel.add(south, Position.SOUTH, true, 75); + chatPanel.add(east, Position.EAST, false, true, 150); + chatPanel.add(south, Position.SOUTH, true, false, 75); chatDialog.add(chatPanel.getPanel()); chatDialog.show(); chatDialog.layout(); + item1.setIconStyle("icon2"); + item1.layout(); // chatDialog.renderIfNeeded(); // BasicDialog chatDialog2 = new BasicDialog("Layout sample", false, Added: sandbox4/src/main/java/org/op/public/images/icon1.gif =================================================================== (Binary files differ) Property changes on: sandbox4/src/main/java/org/op/public/images/icon1.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: sandbox4/src/main/java/org/op/public/images/icon2.gif =================================================================== (Binary files differ) Property changes on: sandbox4/src/main/java/org/op/public/images/icon2.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: sandbox4/src/main/java/org/op/public/sandbox.css =================================================================== --- sandbox4/src/main/java/org/op/public/sandbox.css 2008-05-13 21:11:55 UTC (rev 764) +++ sandbox4/src/main/java/org/op/public/sandbox.css 2008-05-13 21:49:48 UTC (rev 765) @@ -54,4 +54,12 @@ .entity-bottom-rd { +} + +.icon1 { + background-image: url(images/icon1.gif) !important; +} + +.icon2 { + background-image: url(images/icon2.gif) !important; } \ No newline at end of file