July 2008 - kune-commits - lists.ourproject.org

r782 - in sandbox3/src/main/java/org/op: client public
by vjrj 04 Jul '08

04 Jul '08

Author: vjrj Date: 2008-07-04 12:54:42 +0200 (Fri, 04 Jul 2008) New Revision: 782 Modified: sandbox3/src/main/java/org/op/client/EntityWorkspace.java sandbox3/src/main/java/org/op/client/FakeToolbar.java sandbox3/src/main/java/org/op/client/Sandbox.java sandbox3/src/main/java/org/op/public/Sandbox.html Log: more ext probes Modified: sandbox3/src/main/java/org/op/client/EntityWorkspace.java =================================================================== --- sandbox3/src/main/java/org/op/client/EntityWorkspace.java 2008-07-03 02:29:31 UTC (rev 781) +++ sandbox3/src/main/java/org/op/client/EntityWorkspace.java 2008-07-04 10:54:42 UTC (rev 782) @@ -3,9 +3,14 @@ import org.ourproject.kune.platf.client.View; import org.ourproject.kune.platf.client.ui.RoundedBorderDecorator; -import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.Label; +import com.gwtext.client.core.EventObject; +import com.gwtext.client.widgets.Button; import com.gwtext.client.widgets.Panel; import com.gwtext.client.widgets.Toolbar; +import com.gwtext.client.widgets.ToolbarButton; +import com.gwtext.client.widgets.event.ButtonListenerAdapter; import com.gwtext.client.widgets.layout.AnchorLayout; import com.gwtext.client.widgets.layout.AnchorLayoutData; @@ -70,7 +75,20 @@ // contentTopBar = new FakeToolbar(); contentTopBar = createTopBar(content); + contentTopBar.addElement((new Label("l")).getElement()); + contentTopBar.addSeparator(); + contentTopBar.addElement((new Label("c")).getElement()); + contentTopBar.addSpacer(); + contentTopBar.addElement((new Label("r")).getElement()); containerTopBar = new FakeToolbar(); + final ToolbarButton rula = new ToolbarButton("kkrula?"); + containerTopBar.add(rula); + + rula.addListener(new ButtonListenerAdapter() { + public void onClick(final Button button, final EventObject e) { + Window.alert("click"); + } + }); containerBottomBar = new FakeToolbar(); containerTopBar.addClass("faketoolbar-bottom-line"); containerBottomBar.addClass("faketoolbar-top-line"); @@ -88,25 +106,16 @@ add(bottomPanel, DefaultBorderLayout.Position.SOUTH, DEF_TOOLBAR_HEIGHT); } - public void addItemToContainerBottomBar(final View view) { - containerBottomBar.add((Widget) view); + public void addItemToContentTopBar(final View view) { + setPanel(content, view); } - public void addItemToContainerTopBar(final View view) { - containerTopBar.add((Widget) view); + public FakeToolbar getContainerBottomBar() { + return containerBottomBar; } - public void addItemToContentTopBar(final View view) { - // final Container container = new Container(); - // final Widget widget = (Widget) view; - // container.add(widget); - // component.setEl(widget.getElement()); - // final Adapter adapter = new Adapter(component); - // final WidgetComponent component = new WidgetComponent((Widget) view); - // contentTopBar.getElement().appendChild(component.getElement()); - // contentTopBar.getElement().appendChild(container.getElement()); - // contentTopBar.addElement(container.getElement()); - setPanel(content, view); + public FakeToolbar getContainerTopBar() { + return containerTopBar; } public void setBottom(final View view) { Modified: sandbox3/src/main/java/org/op/client/FakeToolbar.java =================================================================== --- sandbox3/src/main/java/org/op/client/FakeToolbar.java 2008-07-03 02:29:31 UTC (rev 781) +++ sandbox3/src/main/java/org/op/client/FakeToolbar.java 2008-07-04 10:54:42 UTC (rev 782) @@ -1,51 +1,31 @@ package org.op.client; +import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; import com.gwtext.client.widgets.Panel; public class FakeToolbar { private final Panel container; + private final HorizontalPanel horPanel; - // private final Panel horPanel; - public FakeToolbar() { container = new Panel(); - // container.setFrame(true); - // container.setLayout(new FitLayout()); container.setBorder(false); container.setBodyBorder(false); container.setHeight(DefaultBorderLayout.DEF_TOOLBAR_HEIGHT); container.setWidth("100%"); container.setHeader(false); - // container.addClass("x-toolbar"); - // x-panel-tbar x-panel-tbar-noheader container.setBaseCls("x-toolbar"); container.addClass("x-panel"); - // container.addClass("x-panel-tbar-noheader"); - // container.setBodyStyle("x-panel-tbar"); - - // Adapter adapter = new Adapter(); - // container.setCls("x-panel-tbar-noheader"); - // container.setCls("x-panel-header"); - // container.setCls("x-panel-header-noborder"); - // container.setCls("x-unselectable"); - // horPanel = new Panel(); - // horPanel.setLayout(new HorizontalLayout(3)); - // horPanel.setBorder(false); - // horPanel.setCls("x-toolbar"); - // horPanel.setHeight(DefaultBorderLayout.DEF_TOOLBAR_HEIGHT); - // horPanel.setWidth("100%"); - // container.add(horPanel); - // <div class="x-toolbar x-small-editor" id="ext-gen74" style="height: - // 17px;"><table cellspacing="0"><tbody><tr/></tbody></table></div> - + horPanel = new HorizontalPanel(); + container.add(horPanel); } public void add(final Widget widget) { - // horPanel.add(widget); - container.add(widget); + horPanel.add(widget); if (container.isRendered()) { - container.doLayout(true); + container.doLayout(false); } } @@ -53,8 +33,25 @@ container.addClass(cls); } + public void addFill() { + final Label emptyLabel = new Label(""); + horPanel.add(emptyLabel); + horPanel.setCellWidth(emptyLabel, "100%"); + } + + public void addSeparator() { + final Label emptyLabel = new Label(""); + emptyLabel.setStyleName("ytb-sep"); + horPanel.add(emptyLabel); + } + + public void addSpacer() { + final Label emptyLabel = new Label(""); + emptyLabel.setStyleName("ytb-spacer"); + horPanel.add(emptyLabel); + } + public Panel getPanel() { return container; } - } Modified: sandbox3/src/main/java/org/op/client/Sandbox.java =================================================================== --- sandbox3/src/main/java/org/op/client/Sandbox.java 2008-07-03 02:29:31 UTC (rev 781) +++ sandbox3/src/main/java/org/op/client/Sandbox.java 2008-07-04 10:54:42 UTC (rev 782) @@ -99,9 +99,15 @@ new Viewport(panel); wk.getEntityWorkspace().addItemToContentTopBar(new MenuBarWrapper()); - wk.getEntityWorkspace().addItemToContainerTopBar(new MenuBarWrapper()); - wk.getEntityWorkspace().addItemToContainerBottomBar(new MenuBarWrapper()); - wk.getEntityWorkspace().addItemToContainerBottomBar(new LabelWrapper("otro")); + wk.getEntityWorkspace().getContainerTopBar().add(new MenuBarWrapper()); + wk.getEntityWorkspace().getContainerTopBar().addFill(); + wk.getEntityWorkspace().getContainerTopBar().add(new LabelWrapper("uno")); + wk.getEntityWorkspace().getContainerTopBar().addSeparator(); + wk.getEntityWorkspace().getContainerTopBar().add(new LabelWrapper("dos")); + wk.getEntityWorkspace().getContainerTopBar().addSpacer(); + wk.getEntityWorkspace().getContainerTopBar().add(new LabelWrapper("tres")); + wk.getEntityWorkspace().getContainerBottomBar().add(new MenuBarWrapper()); + wk.getEntityWorkspace().getContainerBottomBar().add(new LabelWrapper("otro")); wk.getEntityWorkspace().setContainer(new LabelWrapper("Container")); wk.getEntityWorkspace().setContent(new LabelWrapper("Content")); // wk.getEntityWorkspace().setContent(fooMenu); Modified: sandbox3/src/main/java/org/op/public/Sandbox.html =================================================================== --- sandbox3/src/main/java/org/op/public/Sandbox.html 2008-07-03 02:29:31 UTC (rev 781) +++ sandbox3/src/main/java/org/op/public/Sandbox.html 2008-07-04 10:54:42 UTC (rev 782) @@ -25,7 +25,7 @@ --> <script type="text/javascript" language="javascript" src="org.op.Sandbox.nocache.js"></script> - <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.5.2/build/base/base-min.css"> +  </head>

1 0

r781 - in sandbox4: . src/main/java/org/op/client src/main/java/org/op/public
by vjrj 03 Jul '08

03 Jul '08

Author: vjrj Date: 2008-07-03 04:29:31 +0200 (Thu, 03 Jul 2008) New Revision: 781 Modified: sandbox4/pom.xml sandbox4/src/main/java/org/op/client/BasicDialog.java sandbox4/src/main/java/org/op/client/BasicDialogExtended.java sandbox4/src/main/java/org/op/client/BasicDialogForm.java sandbox4/src/main/java/org/op/client/DefaultBorderLayout.java sandbox4/src/main/java/org/op/client/DefaultTabbedForm.java sandbox4/src/main/java/org/op/client/Sandbox.java sandbox4/src/main/java/org/op/client/Sandbox2.java sandbox4/src/main/java/org/op/client/SandboxCollapse.java sandbox4/src/main/java/org/op/client/SandboxTooltip.java sandbox4/src/main/java/org/op/public/Sandbox.html Log: more ext probes Modified: sandbox4/pom.xml =================================================================== --- sandbox4/pom.xml 2008-07-03 02:28:30 UTC (rev 780) +++ sandbox4/pom.xml 2008-07-03 02:29:31 UTC (rev 781) @@ -127,7 +127,7 @@ <dependency> <groupId>com.extjs</groupId> <artifactId>gxt</artifactId> - <version>1.0-beta3</version> + <version>1.0-rc2</version> </dependency> <dependency> Modified: sandbox4/src/main/java/org/op/client/BasicDialog.java =================================================================== --- sandbox4/src/main/java/org/op/client/BasicDialog.java 2008-07-03 02:28:30 UTC (rev 780) +++ sandbox4/src/main/java/org/op/client/BasicDialog.java 2008-07-03 02:29:31 UTC (rev 781) @@ -27,41 +27,41 @@ public class BasicDialog extends Window { public BasicDialog(final String caption, final boolean modal) { - this(caption, modal, Scroll.AUTO); + this(caption, modal, Scroll.AUTO); } public BasicDialog(final String caption, final boolean modal, final Scroll scroll) { - setAutoWidth(true); - // Param values - setHeading(caption); - setModal(modal); - setScrollMode(scroll); - setButtonAlign(HorizontalAlignment.RIGHT); + setAutoWidth(true); + // Param values + setHeading(caption); + setModal(modal); + setScrollMode(scroll); + setButtonAlign(HorizontalAlignment.RIGHT); - // Def values - setShadow(true); - setPlain(true); - setClosable(true); - setResizable(true); - setCollapsible(true); + // Def values + setShadow(true); + setPlain(true); + setClosable(true); + setResizable(true); + setCollapsible(true); } public BasicDialog(final String caption, final boolean modal, final Scroll scroll, final int width, final int height) { - this(caption, modal, scroll); - setWidth(width); - setHeight(height); + this(caption, modal, scroll); + setWidth(width); + setHeight(height); } public BasicDialog(final String caption, final boolean modal, final Scroll scroll, final int width, - final int height, final int minWidth, final int minHeight) { - this(caption, modal, scroll, width, height); - setMinWidth(minWidth); - setMinHeight(minHeight); + final int height, final int minWidth, final int minHeight) { + this(caption, modal, scroll, width, height); + setMinWidth(minWidth); + setMinHeight(minHeight); } public void renderIfNeeded() { - if (this.isRendered()) { - this.layout(true); - } + if (this.isRendered()) { + this.layout(); + } } } Modified: sandbox4/src/main/java/org/op/client/BasicDialogExtended.java =================================================================== --- sandbox4/src/main/java/org/op/client/BasicDialogExtended.java 2008-07-03 02:28:30 UTC (rev 780) +++ sandbox4/src/main/java/org/op/client/BasicDialogExtended.java 2008-07-03 02:29:31 UTC (rev 781) @@ -24,46 +24,46 @@ import com.extjs.gxt.ui.client.Style.Scroll; import com.extjs.gxt.ui.client.event.ComponentEvent; import com.extjs.gxt.ui.client.event.SelectionListener; -import com.extjs.gxt.ui.client.widget.Button; +import com.extjs.gxt.ui.client.widget.button.Button; import com.extjs.gxt.ui.client.widget.layout.FitLayout; import com.google.gwt.user.client.ui.Widget; public class BasicDialogExtended extends BasicDialog { public BasicDialogExtended(final String title, final boolean modal, final Scroll scroll, final int width, - final int heigth, final String iconStyle, final String firstButtonTitle, final String cancelButtonTitle, - final BasicDialogListener listener) { - super(title, modal, scroll, width, heigth); - super.setLayout(new FitLayout()); - super.setCollapsible(false); - if (iconStyle != null) { - super.setIconStyle(iconStyle); - } + final int heigth, final String iconStyle, final String firstButtonTitle, final String cancelButtonTitle, + final BasicDialogListener listener) { + super(title, modal, scroll, width, heigth); + super.setLayout(new FitLayout()); + super.setCollapsible(false); + if (iconStyle != null) { + super.setIconStyle(iconStyle); + } - final Button firstButton = new Button(firstButtonTitle, new SelectionListener<ComponentEvent>() { - public void componentSelected(ComponentEvent ce) { - listener.onFirstButtonClick(); - } - }); + final Button firstButton = new Button(firstButtonTitle, new SelectionListener<ComponentEvent>() { + public void componentSelected(ComponentEvent ce) { + listener.onFirstButtonClick(); + } + }); - firstButton.setTabIndex(1); + firstButton.setTabIndex(1); - final Button cancel = new Button(cancelButtonTitle, new SelectionListener<ComponentEvent>() { - public void componentSelected(ComponentEvent ce) { - listener.onCancelButtonClick(); - } - }); + final Button cancel = new Button(cancelButtonTitle, new SelectionListener<ComponentEvent>() { + public void componentSelected(ComponentEvent ce) { + listener.onCancelButtonClick(); + } + }); - cancel.setTabIndex(2); + cancel.setTabIndex(2); - super.addButton(firstButton); - super.addButton(cancel); + super.addButton(firstButton); + super.addButton(cancel); } @Override public boolean add(final Widget widget) { - boolean value = super.add(widget); - super.renderIfNeeded(); - return value; + final boolean value = super.add(widget); + super.renderIfNeeded(); + return value; } } Modified: sandbox4/src/main/java/org/op/client/BasicDialogForm.java =================================================================== --- sandbox4/src/main/java/org/op/client/BasicDialogForm.java 2008-07-03 02:28:30 UTC (rev 780) +++ sandbox4/src/main/java/org/op/client/BasicDialogForm.java 2008-07-03 02:29:31 UTC (rev 781) @@ -18,53 +18,53 @@ private final BasicDialogListener listener; public BasicDialogForm(final String title, final boolean modal, final Scroll scroll, final int width, - final int heigth, final String iconStyle, final String firstButtonTitle, final String cancelButtonTitle, - final BasicDialogListener listener) { - this.title = title; - this.modal = modal; - this.scroll = scroll; - this.width = width; - this.heigth = heigth; - this.iconStyle = iconStyle; - this.firstButtonTitle = firstButtonTitle; - this.cancelButtonTitle = cancelButtonTitle; - this.listener = listener; - formPanel = new FormPanel(); - // formPanel.setLayout(new FillLayout(10)); - // formPanel.setFrame(true); - formPanel.setBorders(false); - formPanel.setHeaderVisible(false); - formPanel.setScrollMode(scroll); - formPanel.setLabelWidth(100); - formPanel.setWidth(width - 10); + final int heigth, final String iconStyle, final String firstButtonTitle, final String cancelButtonTitle, + final BasicDialogListener listener) { + this.title = title; + this.modal = modal; + this.scroll = scroll; + this.width = width; + this.heigth = heigth; + this.iconStyle = iconStyle; + this.firstButtonTitle = firstButtonTitle; + this.cancelButtonTitle = cancelButtonTitle; + this.listener = listener; + formPanel = new FormPanel(); + // formPanel.setLayout(new FillLayout(10)); + // formPanel.setFrame(true); + formPanel.setBorders(false); + formPanel.setHeaderVisible(false); + formPanel.setScrollMode(scroll); + formPanel.setLabelWidth(100); + formPanel.setWidth(width - 10); } public void addField(final Field<?> field) { - field.setValidateOnBlur(false); - formPanel.add(field); - renderIfNeeded(); + field.setValidateOnBlur(false); + formPanel.add(field); + renderIfNeeded(); } public void hide() { - dialog.hide(); + dialog.hide(); } public void show() { - if (dialog == null) { - dialog = new BasicDialogExtended(title, modal, scroll, width, heigth, iconStyle, firstButtonTitle, - cancelButtonTitle, listener); - dialog.add(formPanel); - } - dialog.show(); + if (dialog == null) { + dialog = new BasicDialogExtended(title, modal, scroll, width, heigth, iconStyle, firstButtonTitle, + cancelButtonTitle, listener); + dialog.add(formPanel); + } + dialog.show(); } private void renderIfNeeded() { - if (formPanel.isRendered()) { - formPanel.layout(true); - } - if (dialog != null) { - dialog.renderIfNeeded(); - } + if (formPanel.isRendered()) { + formPanel.layout(); + } + if (dialog != null) { + dialog.renderIfNeeded(); + } } } Modified: sandbox4/src/main/java/org/op/client/DefaultBorderLayout.java =================================================================== --- sandbox4/src/main/java/org/op/client/DefaultBorderLayout.java 2008-07-03 02:28:30 UTC (rev 780) +++ sandbox4/src/main/java/org/op/client/DefaultBorderLayout.java 2008-07-03 02:29:31 UTC (rev 781) @@ -13,128 +13,128 @@ public class DefaultBorderLayout { public enum Position { - NORTH, CENTER, SOUTH, EAST, WEST + NORTH, CENTER, SOUTH, EAST, WEST } protected static final int DEF_TOOLBAR_HEIGHT = 20; private static final int NO_SIZE = -1; private static LayoutRegion[] regionPositions = new LayoutRegion[] { LayoutRegion.NORTH, LayoutRegion.CENTER, - LayoutRegion.SOUTH, LayoutRegion.EAST, LayoutRegion.WEST }; + LayoutRegion.SOUTH, LayoutRegion.EAST, LayoutRegion.WEST }; private final LayoutContainer container; public DefaultBorderLayout() { - container = new LayoutContainer(); - container.setData("layout", new FitLayout()); - container.setLayout(new BorderLayout()); - container.setBorders(false); + container = new LayoutContainer(); + container.setData("layout", new FitLayout()); + container.setLayout(new BorderLayout()); + container.setBorders(false); } public Component getPanel() { - return container; + return container; }; public void setStyleName(final String style) { - container.setStyleName(style); + container.setStyleName(style); } protected void add(final Component panel, final Position position) { - add(panel, position, false, false); + add(panel, position, false, false); } protected void add(final Component panel, final Position position, final boolean split, final boolean collapsible) { - add(panel, position, split, collapsible, NO_SIZE); + add(panel, position, split, collapsible, NO_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) { - borderLayoutData = new BorderLayoutData(regionPosition, size); - } else { - borderLayoutData = new BorderLayoutData(regionPosition); - } - borderLayoutData.setSplit(split); - borderLayoutData.setCollapsible(collapsible); - if (split) { - // Not implemented yet: - // borderLayoutData.collapseMode = "mini"; - switch (position) { - case EAST: - borderLayoutData.setMargins(new Margins(0, 0, 0, 5)); - break; - case WEST: - borderLayoutData.setMargins(new Margins(0, 5, 0, 0)); - break; - case NORTH: - borderLayoutData.setMargins(new Margins(0, 0, 5, 0)); - break; - case SOUTH: - borderLayoutData.setMargins(new Margins(5, 0, 0, 0)); - break; - default: - break; - } - } else { - borderLayoutData.setMargins(new Margins(0, 0, 0, 0)); - } - container.add(panel, borderLayoutData); - doLayoutIfNeeded(); + final int size) { + final LayoutRegion regionPosition = regionPositions[position.ordinal()]; + BorderLayoutData borderLayoutData; + if (size != NO_SIZE) { + borderLayoutData = new BorderLayoutData(regionPosition, size); + } else { + borderLayoutData = new BorderLayoutData(regionPosition); + } + borderLayoutData.setSplit(split); + borderLayoutData.setCollapsible(collapsible); + if (split) { + // Not implemented yet: + // borderLayoutData.collapseMode = "mini"; + switch (position) { + case EAST: + borderLayoutData.setMargins(new Margins(0, 0, 0, 5)); + break; + case WEST: + borderLayoutData.setMargins(new Margins(0, 5, 0, 0)); + break; + case NORTH: + borderLayoutData.setMargins(new Margins(0, 0, 5, 0)); + break; + case SOUTH: + borderLayoutData.setMargins(new Margins(5, 0, 0, 0)); + break; + default: + break; + } + } else { + borderLayoutData.setMargins(new Margins(0, 0, 0, 0)); + } + container.add(panel, borderLayoutData); + doLayoutIfNeeded(); } protected void add(final Component panel, final Position position, final int size) { - add(panel, position, false, false, size); + add(panel, position, false, false, size); } protected void add(final DefaultPanel panel, final Widget widget) { - panel.add(widget); - if (panel.isRendered()) { - panel.layout(true); - } + panel.add(widget); + if (panel.isRendered()) { + panel.layout(); + } } protected ToolBar createBottomBar(final DefaultPanel panel) { - return createBottomBar(panel, null); + return createBottomBar(panel, null); } protected ToolBar createBottomBar(final DefaultPanel panel, final String cssStyle) { - final ToolBar bottomToolBar = new ToolBar(); - bottomToolBar.setHeight(DEF_TOOLBAR_HEIGHT); - if (cssStyle != null) { - bottomToolBar.setStyleName(cssStyle); - } - panel.setBottomComponent(bottomToolBar); - return bottomToolBar; + final ToolBar bottomToolBar = new ToolBar(); + bottomToolBar.setHeight(DEF_TOOLBAR_HEIGHT); + if (cssStyle != null) { + bottomToolBar.setStyleName(cssStyle); + } + panel.setBottomComponent(bottomToolBar); + return bottomToolBar; } protected ToolBar createTopBar(final DefaultPanel panel) { - return createTopBar(panel, null); + return createTopBar(panel, null); } protected ToolBar createTopBar(final DefaultPanel panel, final String cssStyle) { - final ToolBar topToolBar = new ToolBar(); - topToolBar.setHeight(DEF_TOOLBAR_HEIGHT); - if (cssStyle != null) { - topToolBar.setStyleName(cssStyle); - } - panel.setTopComponent(topToolBar); - return topToolBar; + final ToolBar topToolBar = new ToolBar(); + topToolBar.setHeight(DEF_TOOLBAR_HEIGHT); + if (cssStyle != null) { + topToolBar.setStyleName(cssStyle); + } + panel.setTopComponent(topToolBar); + return topToolBar; } protected void doLayoutIfNeeded() { - if (container.isRendered()) { - container.layout(true); - } + if (container.isRendered()) { + container.layout(); + } } protected void setBorders(final boolean show) { - container.setBorders(show); + container.setBorders(show); } protected void setPanel(final DefaultPanel panel, final View view) { - Widget widget = (Widget) view; - panel.removeAll(); - add(panel, widget); + final Widget widget = (Widget) view; + panel.removeAll(); + add(panel, widget); } } Modified: sandbox4/src/main/java/org/op/client/DefaultTabbedForm.java =================================================================== --- sandbox4/src/main/java/org/op/client/DefaultTabbedForm.java 2008-07-03 02:28:30 UTC (rev 780) +++ sandbox4/src/main/java/org/op/client/DefaultTabbedForm.java 2008-07-03 02:29:31 UTC (rev 781) @@ -1,9 +1,9 @@ package org.op.client; import com.extjs.gxt.ui.client.Style.HorizontalAlignment; -import com.extjs.gxt.ui.client.widget.Button; import com.extjs.gxt.ui.client.widget.TabItem; import com.extjs.gxt.ui.client.widget.TabPanel; +import com.extjs.gxt.ui.client.widget.button.Button; import com.extjs.gxt.ui.client.widget.form.FormPanel; import com.extjs.gxt.ui.client.widget.layout.FormLayout; @@ -12,34 +12,34 @@ private final TabPanel tabPanel; public DefaultTabbedForm(final int width, final int labelWidth) { - formPanel = new FormPanel(); - formPanel.setFrame(true); - formPanel.setLabelWidth(labelWidth); - formPanel.setBorders(false); - formPanel.setWidth(width); - formPanel.setButtonAlign(HorizontalAlignment.RIGHT); + formPanel = new FormPanel(); + formPanel.setFrame(true); + formPanel.setLabelWidth(labelWidth); + formPanel.setBorders(false); + formPanel.setWidth(width); + formPanel.setButtonAlign(HorizontalAlignment.RIGHT); - tabPanel = new TabPanel(); - formPanel.add(tabPanel); + tabPanel = new TabPanel(); + formPanel.add(tabPanel); } public void addButton(final Button button) { - formPanel.addButton(button); + formPanel.addButton(button); } public void addTab(final String title, final TabItem tab) { - tab.setTitle(title); - tab.setLayout(new FormLayout()); - tab.setAutoHeight(true); - // tab.setPaddings(10); - tabPanel.add(tab); - if (tabPanel.isRendered()) { - tabPanel.render(tab.getElement()); - } + tab.setTitle(title); + tab.setLayout(new FormLayout()); + tab.setAutoHeight(true); + // tab.setPaddings(10); + tabPanel.add(tab); + if (tabPanel.isRendered()) { + tabPanel.render(tab.getElement()); + } } public FormPanel getForm() { - return formPanel; + return formPanel; } } Modified: sandbox4/src/main/java/org/op/client/Sandbox.java =================================================================== --- sandbox4/src/main/java/org/op/client/Sandbox.java 2008-07-03 02:28:30 UTC (rev 780) +++ sandbox4/src/main/java/org/op/client/Sandbox.java 2008-07-03 02:29:31 UTC (rev 781) @@ -4,10 +4,10 @@ import com.extjs.gxt.ui.client.Style.HorizontalAlignment; import com.extjs.gxt.ui.client.Style.Scroll; -import com.extjs.gxt.ui.client.widget.Button; import com.extjs.gxt.ui.client.widget.TabItem; import com.extjs.gxt.ui.client.widget.TabPanel; import com.extjs.gxt.ui.client.widget.Viewport; +import com.extjs.gxt.ui.client.widget.button.Button; import com.extjs.gxt.ui.client.widget.form.TextField; import com.extjs.gxt.ui.client.widget.layout.FillLayout; import com.extjs.gxt.ui.client.widget.layout.FitLayout; @@ -26,44 +26,44 @@ public class Sandbox implements EntryPoint { class LabelWrapper extends Label implements View { - public LabelWrapper(final String text) { - super(text); - } + public LabelWrapper(final String text) { + super(text); + } } class MenuBarWrapper extends Composite implements View { - public MenuBarWrapper() { + public MenuBarWrapper() { - // Make a command that we will execute from all leaves. - Command cmd = new Command() { - public void execute() { - Window.alert("You selected a menu item!"); - } - }; + // Make a command that we will execute from all leaves. + final Command cmd = new Command() { + public void execute() { + Window.alert("You selected a menu item!"); + } + }; - // Make some sub-menus that we will cascade from the top menu. - MenuBar fooMenu = new MenuBar(true); - fooMenu.addItem("the", cmd); - fooMenu.addItem("foo", cmd); - fooMenu.addItem("menu", cmd); + // Make some sub-menus that we will cascade from the top menu. + final MenuBar fooMenu = new MenuBar(true); + fooMenu.addItem("the", cmd); + fooMenu.addItem("foo", cmd); + fooMenu.addItem("menu", cmd); - MenuBar barMenu = new MenuBar(true); - barMenu.addItem("the", cmd); - barMenu.addItem("bar", cmd); - barMenu.addItem("menu", cmd); + final MenuBar barMenu = new MenuBar(true); + barMenu.addItem("the", cmd); + barMenu.addItem("bar", cmd); + barMenu.addItem("menu", cmd); - MenuBar bazMenu = new MenuBar(true); - bazMenu.addItem("the", cmd); - bazMenu.addItem("baz", cmd); - bazMenu.addItem("menu", cmd); + final MenuBar bazMenu = new MenuBar(true); + bazMenu.addItem("the", cmd); + bazMenu.addItem("baz", cmd); + bazMenu.addItem("menu", cmd); - // Make a new menu bar, adding a few cascading menus to it. - MenuBar menu = new MenuBar(); - menu.addItem("foo", fooMenu); - menu.addItem("bar", barMenu); - menu.addItem("baz", bazMenu); - initWidget(menu); - } + // Make a new menu bar, adding a few cascading menus to it. + final MenuBar menu = new MenuBar(); + menu.addItem("foo", fooMenu); + menu.addItem("bar", barMenu); + menu.addItem("baz", bazMenu); + initWidget(menu); + } } private BasicDialogForm dialog; @@ -73,114 +73,114 @@ * This is the entry point method. */ public void onModuleLoad() { - Viewport vp = new Viewport(); - // Test fit vs fill layout - vp.setLayout(new FillLayout(4)); - Workspace wk = new Workspace(); - vp.add(wk.getPanel()); - vp.layout(); - RootPanel.get().add(vp); - wk.getEntityWorkspace().addItemToContentTopBar(new MenuBarWrapper()); - wk.getEntityWorkspace().setContainer(new LabelWrapper("Container")); - wk.getEntityWorkspace().setContent(new LabelWrapper("Content")); - wk.getEntityWorkspace().setBottom(new LabelWrapper("Bottom")); - wk.getEntityWorkspace().setTitle(new LabelWrapper("Title 2")); - wk.getEntityWorkspace().setSubtitle(new LabelWrapper("Subtitle")); - wk.getSiteBar().addView(new LabelWrapper("sitebar-right")); + final Viewport vp = new Viewport(); + // Test fit vs fill layout + vp.setLayout(new FillLayout()); + final Workspace wk = new Workspace(); + vp.add(wk.getPanel()); + vp.layout(); + RootPanel.get().add(vp); + wk.getEntityWorkspace().addItemToContentTopBar(new MenuBarWrapper()); + wk.getEntityWorkspace().setContainer(new LabelWrapper("Container")); + wk.getEntityWorkspace().setContent(new LabelWrapper("Content")); + wk.getEntityWorkspace().setBottom(new LabelWrapper("Bottom")); + wk.getEntityWorkspace().setTitle(new LabelWrapper("Title 2")); + wk.getEntityWorkspace().setSubtitle(new LabelWrapper("Subtitle")); + wk.getSiteBar().addView(new LabelWrapper("sitebar-right")); - dialog = new BasicDialogForm("Test dialog", false, Scroll.AUTO, 380, 200, null, "Join", "Cancel", - new BasicDialogListener() { - public void onCancelButtonClick() { - dialog.hide(); - } + dialog = new BasicDialogForm("Test dialog", false, Scroll.AUTO, 380, 200, null, "Join", "Cancel", + new BasicDialogListener() { + public void onCancelButtonClick() { + dialog.hide(); + } - public void onFirstButtonClick() { - dialog.hide(); - } - }); + public void onFirstButtonClick() { + dialog.hide(); + } + }); - TextField jid = new TextField(); - jid.setMessageTarget("tooltip"); - jid.setToolTip(new ToolTipConfig("Information", "Prints the current document")); - jid.setFieldLabel("Jabber id"); - dialog.addField(jid); - dialog.show(); + final TextField jid = new TextField(); + jid.setMessageTarget("tooltip"); + jid.setToolTip(new ToolTipConfig("Information", "Prints the current document")); + jid.setFieldLabel("Jabber id"); + dialog.addField(jid); + dialog.show(); - BasicDialog dialog2 = new BasicDialog("Hellooooo", false); - dialog2.add(new Label("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. " - + "Donec vitae eros. Nunc sit amet neque. Ut id dui. Integer viverra feugiat sem.")); - dialog2.show(); + final BasicDialog dialog2 = new BasicDialog("Hellooooo", false); + dialog2.add(new Label("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. " + + "Donec vitae eros. Nunc sit amet neque. Ut id dui. Integer viverra feugiat sem.")); + dialog2.show(); - dialog3 = new BasicDialogExtended("Dialog extended", false, Scroll.NONE, 300, 200, "", "Yes", "No", - new BasicDialogListener() { + dialog3 = new BasicDialogExtended("Dialog extended", false, Scroll.NONE, 300, 200, "", "Yes", "No", + new BasicDialogListener() { - public void onCancelButtonClick() { - dialog3.hide(); - } + public void onCancelButtonClick() { + dialog3.hide(); + } - public void onFirstButtonClick() { - dialog3.hide(); - } - }); - dialog3.add(new Label("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. " - + "Donec vitae eros. Nunc sit amet neque. Ut id dui. Integer viverra feugiat sem.")); - dialog3.show(); + public void onFirstButtonClick() { + dialog3.hide(); + } + }); + dialog3.add(new Label("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. " + + "Donec vitae eros. Nunc sit amet neque. Ut id dui. Integer viverra feugiat sem.")); + dialog3.show(); - BasicDialog chatDialog = new BasicDialog("Emite chat", false, Scroll.NONE, 600, 415, 300, 300); - chatDialog.setMaximizable(true); - // chatDialog.setBodyBorder(false); - chatDialog.setBorders(false); - // chatDialog.setBodyBorder(false); - // chatDialog.setBorders(false); - chatDialog.setLayout(new FitLayout()); - Button sendBtn = new Button("Send"); - sendBtn.setToolTip("send"); - chatDialog.addButton(sendBtn); - chatDialog.setButtonAlign(HorizontalAlignment.LEFT); - DefaultBorderLayout chatPanel = new DefaultBorderLayout(); - DefaultPanel east = new DefaultPanel("Users"); - DefaultPanel south = new DefaultPanel(); - DefaultPanel north = new DefaultPanel(); - chatPanel.createTopBar(south); - chatPanel.createTopBar(north); - chatPanel.createBottomBar(east); - chatPanel.createTopBar(north); - chatPanel.add(north, Position.NORTH, false, false, 22); - TabPanel centerPanel = new TabPanel(); - TabItem item1 = new TabItem("Chat1"); - item1.setIconStyle("icon1"); - item1.setLayout(new FitLayout()); - ToolTipConfig tipConfig = new ToolTipConfig("fulano(a)kk.com"); - item1.setToolTip(tipConfig); - // item.getHeader().setToolTip("Test"); (in beta3) - 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, true, 150); - chatPanel.add(south, Position.SOUTH, true, false, 75); - chatDialog.add(chatPanel.getPanel()); - chatDialog.show(); - chatDialog.layout(); - item1.setIconStyle("icon2"); - item1.setText("<span ext:qtip=\"kk\" style=\"icon2\">chat1</span>"); - item1.layout(true); - // chatDialog.renderIfNeeded(); + final BasicDialog chatDialog = new BasicDialog("Emite chat", false, Scroll.NONE, 600, 415, 300, 300); + chatDialog.setMaximizable(true); + // chatDialog.setBodyBorder(false); + chatDialog.setBorders(false); + // chatDialog.setBodyBorder(false); + // chatDialog.setBorders(false); + chatDialog.setLayout(new FitLayout()); + final Button sendBtn = new Button("Send"); + sendBtn.setToolTip("send"); + chatDialog.addButton(sendBtn); + chatDialog.setButtonAlign(HorizontalAlignment.LEFT); + final DefaultBorderLayout chatPanel = new DefaultBorderLayout(); + final DefaultPanel east = new DefaultPanel("Users"); + final DefaultPanel south = new DefaultPanel(); + final DefaultPanel north = new DefaultPanel(); + chatPanel.createTopBar(south); + chatPanel.createTopBar(north); + chatPanel.createBottomBar(east); + chatPanel.createTopBar(north); + chatPanel.add(north, Position.NORTH, false, false, 22); + final TabPanel centerPanel = new TabPanel(); + final TabItem item1 = new TabItem("Chat1"); + item1.setIconStyle("icon1"); + item1.setLayout(new FitLayout()); + final ToolTipConfig tipConfig = new ToolTipConfig("fulano(a)kk.com"); + item1.setToolTip(tipConfig); + // item.getHeader().setToolTip("Test"); (in beta3) + final 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, true, 150); + chatPanel.add(south, Position.SOUTH, true, false, 75); + chatDialog.add(chatPanel.getPanel()); + chatDialog.show(); + chatDialog.layout(); + item1.setIconStyle("icon2"); + item1.setText("<span ext:qtip=\"kk\" style=\"icon2\">chat1</span>"); + item1.layout(); + // chatDialog.renderIfNeeded(); - // BasicDialog chatDialog2 = new BasicDialog("Layout sample", false, - // Scroll.NONE, 600, 415, 300, 300); - // chatDialog2.setLayout(new FitLayout()); - // TestBorderLayout testBL = new TestBorderLayout(); - // chatDialog2.add(testBL); - // chatDialog2.show(); - // chatDialog2.layout(); - // - // vp.add(chatPanel.getPanel()); - // vp.layout(); - // RootPanel.get().add(vp); + // BasicDialog chatDialog2 = new BasicDialog("Layout sample", false, + // Scroll.NONE, 600, 415, 300, 300); + // chatDialog2.setLayout(new FitLayout()); + // TestBorderLayout testBL = new TestBorderLayout(); + // chatDialog2.add(testBL); + // chatDialog2.show(); + // chatDialog2.layout(); + // + // vp.add(chatPanel.getPanel()); + // vp.layout(); + // RootPanel.get().add(vp); - // wk.getEntityWorkspace().setContent(chatPanel.getPanel());// + // wk.getEntityWorkspace().setContent(chatPanel.getPanel());// } } Modified: sandbox4/src/main/java/org/op/client/Sandbox2.java =================================================================== --- sandbox4/src/main/java/org/op/client/Sandbox2.java 2008-07-03 02:28:30 UTC (rev 780) +++ sandbox4/src/main/java/org/op/client/Sandbox2.java 2008-07-03 02:29:31 UTC (rev 781) @@ -4,10 +4,10 @@ import com.extjs.gxt.ui.client.Style.HorizontalAlignment; import com.extjs.gxt.ui.client.Style.Scroll; -import com.extjs.gxt.ui.client.widget.Button; import com.extjs.gxt.ui.client.widget.TabItem; import com.extjs.gxt.ui.client.widget.TabPanel; import com.extjs.gxt.ui.client.widget.Viewport; +import com.extjs.gxt.ui.client.widget.button.Button; import com.extjs.gxt.ui.client.widget.form.TextField; import com.extjs.gxt.ui.client.widget.layout.FillLayout; import com.extjs.gxt.ui.client.widget.layout.FitLayout; @@ -26,44 +26,44 @@ public class Sandbox2 implements EntryPoint { class LabelWrapper extends Label implements View { - public LabelWrapper(final String text) { - super(text); - } + public LabelWrapper(final String text) { + super(text); + } } class MenuBarWrapper extends Composite implements View { - public MenuBarWrapper() { + public MenuBarWrapper() { - // Make a command that we will execute from all leaves. - Command cmd = new Command() { - public void execute() { - Window.alert("You selected a menu item!"); - } - }; + // Make a command that we will execute from all leaves. + final Command cmd = new Command() { + public void execute() { + Window.alert("You selected a menu item!"); + } + }; - // Make some sub-menus that we will cascade from the top menu. - MenuBar fooMenu = new MenuBar(true); - fooMenu.addItem("the", cmd); - fooMenu.addItem("foo", cmd); - fooMenu.addItem("menu", cmd); + // Make some sub-menus that we will cascade from the top menu. + final MenuBar fooMenu = new MenuBar(true); + fooMenu.addItem("the", cmd); + fooMenu.addItem("foo", cmd); + fooMenu.addItem("menu", cmd); - MenuBar barMenu = new MenuBar(true); - barMenu.addItem("the", cmd); - barMenu.addItem("bar", cmd); - barMenu.addItem("menu", cmd); + final MenuBar barMenu = new MenuBar(true); + barMenu.addItem("the", cmd); + barMenu.addItem("bar", cmd); + barMenu.addItem("menu", cmd); - MenuBar bazMenu = new MenuBar(true); - bazMenu.addItem("the", cmd); - bazMenu.addItem("baz", cmd); - bazMenu.addItem("menu", cmd); + final MenuBar bazMenu = new MenuBar(true); + bazMenu.addItem("the", cmd); + bazMenu.addItem("baz", cmd); + bazMenu.addItem("menu", cmd); - // Make a new menu bar, adding a few cascading menus to it. - MenuBar menu = new MenuBar(); - menu.addItem("foo", fooMenu); - menu.addItem("bar", barMenu); - menu.addItem("baz", bazMenu); - initWidget(menu); - } + // Make a new menu bar, adding a few cascading menus to it. + final MenuBar menu = new MenuBar(); + menu.addItem("foo", fooMenu); + menu.addItem("bar", barMenu); + menu.addItem("baz", bazMenu); + initWidget(menu); + } } private BasicDialogForm dialog; @@ -73,112 +73,112 @@ * This is the entry point method. */ public void onModuleLoad() { - Viewport vp = new Viewport(); - // Test fit vs fill layout - vp.setLayout(new FillLayout(4)); - Workspace wk = new Workspace(); - vp.add(wk.getPanel()); - vp.layout(); - RootPanel.get().add(vp); - wk.getEntityWorkspace().addItemToContentTopBar(new MenuBarWrapper()); - wk.getEntityWorkspace().setContainer(new LabelWrapper("Container")); - wk.getEntityWorkspace().setContent(new LabelWrapper("Content")); - wk.getEntityWorkspace().setBottom(new LabelWrapper("Bottom")); - wk.getEntityWorkspace().setTitle(new LabelWrapper("Title 2")); - wk.getEntityWorkspace().setSubtitle(new LabelWrapper("Subtitle")); - wk.getSiteBar().addView(new LabelWrapper("sitebar-right")); + final Viewport vp = new Viewport(); + // Test fit vs fill layout + vp.setLayout(new FillLayout()); + final Workspace wk = new Workspace(); + vp.add(wk.getPanel()); + vp.layout(); + RootPanel.get().add(vp); + wk.getEntityWorkspace().addItemToContentTopBar(new MenuBarWrapper()); + wk.getEntityWorkspace().setContainer(new LabelWrapper("Container")); + wk.getEntityWorkspace().setContent(new LabelWrapper("Content")); + wk.getEntityWorkspace().setBottom(new LabelWrapper("Bottom")); + wk.getEntityWorkspace().setTitle(new LabelWrapper("Title 2")); + wk.getEntityWorkspace().setSubtitle(new LabelWrapper("Subtitle")); + wk.getSiteBar().addView(new LabelWrapper("sitebar-right")); - dialog = new BasicDialogForm("Test dialog", false, Scroll.AUTO, 380, 200, null, "Join", "Cancel", - new BasicDialogListener() { - public void onCancelButtonClick() { - dialog.hide(); - } + dialog = new BasicDialogForm("Test dialog", false, Scroll.AUTO, 380, 200, null, "Join", "Cancel", + new BasicDialogListener() { + public void onCancelButtonClick() { + dialog.hide(); + } - public void onFirstButtonClick() { - dialog.hide(); - } - }); + public void onFirstButtonClick() { + dialog.hide(); + } + }); - TextField jid = new TextField(); - jid.setMessageTarget("tooltip"); - jid.setToolTip(new ToolTipConfig("Information", "Prints the current document")); - jid.setFieldLabel("Jabber id"); - dialog.addField(jid); - dialog.show(); + final TextField jid = new TextField(); + jid.setMessageTarget("tooltip"); + jid.setToolTip(new ToolTipConfig("Information", "Prints the current document")); + jid.setFieldLabel("Jabber id"); + dialog.addField(jid); + dialog.show(); - BasicDialog dialog2 = new BasicDialog("Hellooooo", false); - dialog2.add(new Label("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. " - + "Donec vitae eros. Nunc sit amet neque. Ut id dui. Integer viverra feugiat sem.")); - dialog2.show(); + final BasicDialog dialog2 = new BasicDialog("Hellooooo", false); + dialog2.add(new Label("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. " + + "Donec vitae eros. Nunc sit amet neque. Ut id dui. Integer viverra feugiat sem.")); + dialog2.show(); - dialog3 = new BasicDialogExtended("Dialog extended", false, Scroll.NONE, 300, 200, "", "Yes", "No", - new BasicDialogListener() { + dialog3 = new BasicDialogExtended("Dialog extended", false, Scroll.NONE, 300, 200, "", "Yes", "No", + new BasicDialogListener() { - public void onCancelButtonClick() { - dialog3.hide(); - } + public void onCancelButtonClick() { + dialog3.hide(); + } - public void onFirstButtonClick() { - dialog3.hide(); - } - }); - dialog3.add(new Label("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. " - + "Donec vitae eros. Nunc sit amet neque. Ut id dui. Integer viverra feugiat sem.")); - dialog3.show(); + public void onFirstButtonClick() { + dialog3.hide(); + } + }); + dialog3.add(new Label("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. " + + "Donec vitae eros. Nunc sit amet neque. Ut id dui. Integer viverra feugiat sem.")); + dialog3.show(); - BasicDialog chatDialog = new BasicDialog("Emite chat", false, Scroll.NONE, 600, 415, 300, 300); - chatDialog.setMaximizable(true); - // chatDialog.setBodyBorder(false); - chatDialog.setBorders(false); - // chatDialog.setBorders(false); - chatDialog.setLayout(new FitLayout()); - Button sendBtn = new Button("Send"); - sendBtn.setToolTip("send"); - chatDialog.addButton(sendBtn); - chatDialog.setButtonAlign(HorizontalAlignment.LEFT); - DefaultBorderLayout chatPanel = new DefaultBorderLayout(); - DefaultPanel east = new DefaultPanel("Users"); - DefaultPanel south = new DefaultPanel(); - DefaultPanel north = new DefaultPanel(); - chatPanel.createTopBar(south); - chatPanel.createTopBar(north); - chatPanel.createBottomBar(east); - chatPanel.createTopBar(north); - chatPanel.add(north, Position.NORTH, false, false, 22); - TabPanel centerPanel = new TabPanel(); - TabItem item1 = new TabItem("Chat1"); - item1.setIconStyle("icon1"); - item1.setLayout(new FitLayout()); - ToolTipConfig tipConfig = new ToolTipConfig("fulano(a)kk.com"); - item1.setToolTip(tipConfig); - 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, true, 150); - chatPanel.add(south, Position.SOUTH, true, false, 75); - chatDialog.add(chatPanel.getPanel()); - chatDialog.show(); - chatDialog.layout(); - item1.setIconStyle("icon2"); - item1.setText("<span ext:qtip=\"kk\" style=\"icon2\">chat1</span>"); - item1.layout(true); - // chatDialog.renderIfNeeded(); + final BasicDialog chatDialog = new BasicDialog("Emite chat", false, Scroll.NONE, 600, 415, 300, 300); + chatDialog.setMaximizable(true); + // chatDialog.setBodyBorder(false); + chatDialog.setBorders(false); + // chatDialog.setBorders(false); + chatDialog.setLayout(new FitLayout()); + final Button sendBtn = new Button("Send"); + sendBtn.setToolTip("send"); + chatDialog.addButton(sendBtn); + chatDialog.setButtonAlign(HorizontalAlignment.LEFT); + final DefaultBorderLayout chatPanel = new DefaultBorderLayout(); + final DefaultPanel east = new DefaultPanel("Users"); + final DefaultPanel south = new DefaultPanel(); + final DefaultPanel north = new DefaultPanel(); + chatPanel.createTopBar(south); + chatPanel.createTopBar(north); + chatPanel.createBottomBar(east); + chatPanel.createTopBar(north); + chatPanel.add(north, Position.NORTH, false, false, 22); + final TabPanel centerPanel = new TabPanel(); + final TabItem item1 = new TabItem("Chat1"); + item1.setIconStyle("icon1"); + item1.setLayout(new FitLayout()); + final ToolTipConfig tipConfig = new ToolTipConfig("fulano(a)kk.com"); + item1.setToolTip(tipConfig); + final 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, true, 150); + chatPanel.add(south, Position.SOUTH, true, false, 75); + chatDialog.add(chatPanel.getPanel()); + chatDialog.show(); + chatDialog.layout(); + item1.setIconStyle("icon2"); + item1.setText("<span ext:qtip=\"kk\" style=\"icon2\">chat1</span>"); + item1.layout(); + // chatDialog.renderIfNeeded(); - // BasicDialog chatDialog2 = new BasicDialog("Layout sample", false, - // Scroll.NONE, 600, 415, 300, 300); - // chatDialog2.setLayout(new FitLayout()); - // TestBorderLayout testBL = new TestBorderLayout(); - // chatDialog2.add(testBL); - // chatDialog2.show(); - // chatDialog2.layout(); - // - // vp.add(chatPanel.getPanel()); - // vp.layout(); - // RootPanel.get().add(vp); + // BasicDialog chatDialog2 = new BasicDialog("Layout sample", false, + // Scroll.NONE, 600, 415, 300, 300); + // chatDialog2.setLayout(new FitLayout()); + // TestBorderLayout testBL = new TestBorderLayout(); + // chatDialog2.add(testBL); + // chatDialog2.show(); + // chatDialog2.layout(); + // + // vp.add(chatPanel.getPanel()); + // vp.layout(); + // RootPanel.get().add(vp); - // wk.getEntityWorkspace().setContent(chatPanel.getPanel());// + // wk.getEntityWorkspace().setContent(chatPanel.getPanel());// } } Modified: sandbox4/src/main/java/org/op/client/SandboxCollapse.java =================================================================== --- sandbox4/src/main/java/org/op/client/SandboxCollapse.java 2008-07-03 02:28:30 UTC (rev 780) +++ sandbox4/src/main/java/org/op/client/SandboxCollapse.java 2008-07-03 02:29:31 UTC (rev 781) @@ -2,9 +2,9 @@ import com.extjs.gxt.ui.client.Style.LayoutRegion; import com.extjs.gxt.ui.client.util.Margins; -import com.extjs.gxt.ui.client.widget.Button; import com.extjs.gxt.ui.client.widget.ContentPanel; import com.extjs.gxt.ui.client.widget.Viewport; +import com.extjs.gxt.ui.client.widget.button.Button; import com.extjs.gxt.ui.client.widget.layout.BorderLayout; import com.extjs.gxt.ui.client.widget.layout.BorderLayoutData; import com.google.gwt.core.client.EntryPoint; @@ -12,26 +12,26 @@ public class SandboxCollapse implements EntryPoint { public void onModuleLoad() { - Viewport viewport = new Viewport(); - viewport.setLayout(new BorderLayout()); + final Viewport viewport = new Viewport(); + viewport.setLayout(new BorderLayout()); - BorderLayoutData westData = new BorderLayoutData(LayoutRegion.WEST, 125, 0, 200); - westData.setSplit(true); - westData.setCollapsible(true); - // westData.collapseMode = "mini"; - westData.setMargins(new Margins(5, 5, 5, 5)); - BorderLayoutData centerData = new BorderLayoutData(LayoutRegion.CENTER); + final BorderLayoutData westData = new BorderLayoutData(LayoutRegion.WEST, 125, 0, 200); + westData.setSplit(true); + westData.setCollapsible(true); + // westData.collapseMode = "mini"; + westData.setMargins(new Margins(5, 5, 5, 5)); + final BorderLayoutData centerData = new BorderLayoutData(LayoutRegion.CENTER); - ContentPanel west = new ContentPanel(); - west.setHeaderVisible(false); - ContentPanel center = new ContentPanel(); - west.setTitle("Testing"); - center.add(new Button("button1")); - west.add(new Button("button2")); + final ContentPanel west = new ContentPanel(); + west.setHeaderVisible(false); + final ContentPanel center = new ContentPanel(); + west.setTitle("Testing"); + center.add(new Button("button1")); + west.add(new Button("button2")); - viewport.add(west, westData); - viewport.add(center, centerData); - viewport.layout(); - RootPanel.get().add(viewport); + viewport.add(west, westData); + viewport.add(center, centerData); + viewport.layout(); + RootPanel.get().add(viewport); } } \ No newline at end of file Modified: sandbox4/src/main/java/org/op/client/SandboxTooltip.java =================================================================== --- sandbox4/src/main/java/org/op/client/SandboxTooltip.java 2008-07-03 02:28:30 UTC (rev 780) +++ sandbox4/src/main/java/org/op/client/SandboxTooltip.java 2008-07-03 02:29:31 UTC (rev 781) @@ -1,8 +1,8 @@ package org.op.client; import com.extjs.gxt.ui.client.Style.HorizontalAlignment; -import com.extjs.gxt.ui.client.widget.Button; import com.extjs.gxt.ui.client.widget.Viewport; +import com.extjs.gxt.ui.client.widget.button.Button; import com.extjs.gxt.ui.client.widget.form.FormPanel; import com.extjs.gxt.ui.client.widget.form.TextField; import com.extjs.gxt.ui.client.widget.layout.FillLayout; @@ -12,22 +12,22 @@ public class SandboxTooltip implements EntryPoint { public void onModuleLoad() { - Viewport viewport = new Viewport(); - viewport.setLayout(new FillLayout(5)); + final Viewport viewport = new Viewport(); + viewport.setLayout(new FillLayout()); - FormPanel form = new FormPanel(); - form.setHeading("Form title"); - form.setToolTip(new ToolTipConfig("form title tip", "form text tip")); - form.setButtonAlign(HorizontalAlignment.LEFT); - TextField field = new TextField(); - field.setFieldLabel("Some label"); - field.setToolTip(new ToolTipConfig("field title", "field text tip")); - form.add(field); - Button button = new Button("Ok"); - button.setToolTip(new ToolTipConfig("button title", "button text tip")); - form.addButton(button); - viewport.add(form); + final FormPanel form = new FormPanel(); + form.setHeading("Form title"); + form.setToolTip(new ToolTipConfig("form title tip", "form text tip")); + form.setButtonAlign(HorizontalAlignment.LEFT); + final TextField field = new TextField(); + field.setFieldLabel("Some label"); + field.setToolTip(new ToolTipConfig("field title", "field text tip")); + form.add(field); + final Button button = new Button("Ok"); + button.setToolTip(new ToolTipConfig("button title", "button text tip")); + form.addButton(button); + viewport.add(form); - RootPanel.get().add(viewport); + RootPanel.get().add(viewport); } } Modified: sandbox4/src/main/java/org/op/public/Sandbox.html =================================================================== --- sandbox4/src/main/java/org/op/public/Sandbox.html 2008-07-03 02:28:30 UTC (rev 780) +++ sandbox4/src/main/java/org/op/public/Sandbox.html 2008-07-03 02:29:31 UTC (rev 781) @@ -1,3 +1,4 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">

1 0

r780 - in sandbox3: . src/main/java/org/op src/main/java/org/op/client src/main/java/org/op/public
by vjrj 03 Jul '08

03 Jul '08

Author: vjrj Date: 2008-07-03 04:28:30 +0200 (Thu, 03 Jul 2008) New Revision: 780 Removed: sandbox3/src/main/java/org/op/client/DefaultTabPanel.java sandbox3/src/main/java/org/op/client/DefaultTabbedForm.java Modified: sandbox3/pom.xml sandbox3/src/main/java/org/op/Sandbox.gwt.xml sandbox3/src/main/java/org/op/client/DefaultBorderLayout.java sandbox3/src/main/java/org/op/client/EntityWorkspace.java sandbox3/src/main/java/org/op/client/FakeToolbar.java sandbox3/src/main/java/org/op/client/Sandbox.java sandbox3/src/main/java/org/op/client/SiteBar.java sandbox3/src/main/java/org/op/client/Workspace.java sandbox3/src/main/java/org/op/public/Sandbox.html sandbox3/src/main/java/org/op/public/sandbox.css Log: more ext probes Modified: sandbox3/pom.xml =================================================================== --- sandbox3/pom.xml 2008-06-11 20:19:21 UTC (rev 779) +++ sandbox3/pom.xml 2008-07-03 02:28:30 UTC (rev 780) @@ -123,16 +123,19 @@ </dependency>  + + <dependency> <groupId>com.gwtext</groupId> <artifactId>gwtext</artifactId> - <version>2.0.4-beta2</version> + <version>2.0.4</version> </dependency> <dependency> Modified: sandbox3/src/main/java/org/op/Sandbox.gwt.xml =================================================================== --- sandbox3/src/main/java/org/op/Sandbox.gwt.xml 2008-06-11 20:19:21 UTC (rev 779) +++ sandbox3/src/main/java/org/op/Sandbox.gwt.xml 2008-07-03 02:28:30 UTC (rev 780) @@ -8,9 +8,11 @@ <script src="js/ext/adapter/ext/ext-base.js" /> <script src="js/ext/ext-all.js" /> + <stylesheet src="js/ext/resources/css/ext-all.css"/> <stylesheet src="js/ext/resources/css/xtheme-gray.css"/> Modified: sandbox3/src/main/java/org/op/client/DefaultBorderLayout.java =================================================================== --- sandbox3/src/main/java/org/op/client/DefaultBorderLayout.java 2008-06-11 20:19:21 UTC (rev 779) +++ sandbox3/src/main/java/org/op/client/DefaultBorderLayout.java 2008-07-03 02:28:30 UTC (rev 780) @@ -12,7 +12,7 @@ public class DefaultBorderLayout { public enum Position { - NORTH, CENTER, SOUTH, EAST, WEST + NORTH, CENTER, SOUTH, EAST, WEST } protected static final int DEF_TOOLBAR_HEIGHT = 22; @@ -20,111 +20,115 @@ private static final int NO_SIZE = -1; private static RegionPosition[] regionPositions = new RegionPosition[] { RegionPosition.NORTH, - RegionPosition.CENTER, RegionPosition.SOUTH, RegionPosition.EAST, RegionPosition.WEST }; + RegionPosition.CENTER, RegionPosition.SOUTH, RegionPosition.EAST, RegionPosition.WEST }; private final Panel mainPanel; public DefaultBorderLayout() { - mainPanel = new Panel(); - mainPanel.setLayout(new BorderLayout()); - mainPanel.setBorder(false); + mainPanel = new Panel(); + mainPanel.setLayout(new BorderLayout()); + mainPanel.setBorder(false); } + public void setBorder(final boolean border) { + mainPanel.setBorder(border); + } + protected void add(final Panel panel, final Position position) { - add(panel, position, false); + add(panel, position, false); } protected void add(final Panel panel, final Position position, final boolean split) { - add(panel, position, split, NO_SIZE); + add(panel, position, split, NO_SIZE); } protected void add(final Panel panel, final Position position, final boolean split, final int size) { - RegionPosition regionPosition = regionPositions[position.ordinal()]; - BorderLayoutData borderLayoutData = new BorderLayoutData(regionPosition); - borderLayoutData.setSplit(split); - if (split) { - borderLayoutData.setUseSplitTips(true); - borderLayoutData.setCollapseModeMini(true); - } - if (size != NO_SIZE) { - switch (position) { - case NORTH: - case SOUTH: - panel.setHeight(size); - break; - case EAST: - case WEST: - panel.setWidth(size); - } - } - mainPanel.add(panel, borderLayoutData); - doLayoutIfNeeded(); + final RegionPosition regionPosition = regionPositions[position.ordinal()]; + final BorderLayoutData borderLayoutData = new BorderLayoutData(regionPosition); + borderLayoutData.setSplit(split); + if (split) { + borderLayoutData.setUseSplitTips(true); + borderLayoutData.setCollapseModeMini(true); + } + if (size != NO_SIZE) { + switch (position) { + case NORTH: + case SOUTH: + panel.setHeight(size); + break; + case EAST: + case WEST: + panel.setWidth(size); + } + } + mainPanel.add(panel, borderLayoutData); + doLayoutIfNeeded(); } protected void add(final Panel panel, final Position position, final int size) { - add(panel, position, false, size); + add(panel, position, false, size); } protected void add(final Panel panel, final Widget widget) { - panel.add(widget); - // FIXME: test if this is is necessary - if (panel.isRendered()) { - panel.syncSize(); - panel.doLayout(); - } - // FIXME: useDoLayoutIfNeeded - if (mainPanel.isRendered()) { - mainPanel.syncSize(); - mainPanel.doLayout(); - } + panel.add(widget); + // FIXME: test if this is is necessary + if (panel.isRendered()) { + panel.syncSize(); + panel.doLayout(); + } + // FIXME: useDoLayoutIfNeeded + if (mainPanel.isRendered()) { + mainPanel.syncSize(); + mainPanel.doLayout(); + } } protected Toolbar createBottomBar(final Panel panel) { - return createBottomBar(panel, null); + return createBottomBar(panel, null); } protected Toolbar createBottomBar(final Panel panel, final String cssStyle) { - final Toolbar bottomToolbar = new Toolbar(); - bottomToolbar.setHeight(DEF_TOOLBAR_HEIGHT); - if (cssStyle != null) { - bottomToolbar.setCls(cssStyle); - } - panel.setBottomToolbar(bottomToolbar); - return bottomToolbar; + final Toolbar bottomToolbar = new Toolbar(); + bottomToolbar.setHeight(DEF_TOOLBAR_HEIGHT); + if (cssStyle != null) { + bottomToolbar.setCls(cssStyle); + } + panel.setBottomToolbar(bottomToolbar); + return bottomToolbar; } protected Toolbar createTopBar(final Panel panel) { - return createTopBar(panel, null); + return createTopBar(panel, null); } protected Toolbar createTopBar(final Panel panel, final String cssStyle) { - final Toolbar topToolbar = new Toolbar(); - topToolbar.setHeight(DEF_TOOLBAR_HEIGHT); - if (cssStyle != null) { - topToolbar.setCls(cssStyle); - } - panel.setTopToolbar(topToolbar); - return topToolbar; + final Toolbar topToolbar = new Toolbar(); + topToolbar.setHeight(DEF_TOOLBAR_HEIGHT); + if (cssStyle != null) { + topToolbar.setCls(cssStyle); + } + panel.setTopToolbar(topToolbar); + return topToolbar; } protected void doLayoutIfNeeded() { - if (mainPanel.isRendered()) { - mainPanel.doLayout(); - } + if (mainPanel.isRendered()) { + mainPanel.doLayout(); + } } protected Panel getPanel() { - return mainPanel; + return mainPanel; } protected void setCls(final String style) { - mainPanel.setCls(style); + mainPanel.setCls(style); } protected void setPanel(final Panel panel, final View view) { - Widget widget = (Widget) view; - panel.clear(); - add(panel, widget); + final Widget widget = (Widget) view; + panel.clear(); + add(panel, widget); } } Deleted: sandbox3/src/main/java/org/op/client/DefaultTabPanel.java =================================================================== --- sandbox3/src/main/java/org/op/client/DefaultTabPanel.java 2008-06-11 20:19:21 UTC (rev 779) +++ sandbox3/src/main/java/org/op/client/DefaultTabPanel.java 2008-07-03 02:28:30 UTC (rev 780) @@ -1,23 +0,0 @@ -package org.op.client; - -import com.extjs.gxt.ui.client.widget.TabItem; -import com.extjs.gxt.ui.client.widget.TabPanel; - -public class DefaultTabPanel { - - private final TabPanel tabPanel; - - public DefaultTabPanel() { - tabPanel = new TabPanel(); - tabPanel.setTabScroll(true); - } - - public void addTabItem(final TabItem item) { - tabPanel.add(item); - tabPanel.setSelection(item); - } - - public TabPanel getTabPanel() { - return tabPanel; - } -} Deleted: sandbox3/src/main/java/org/op/client/DefaultTabbedForm.java =================================================================== --- sandbox3/src/main/java/org/op/client/DefaultTabbedForm.java 2008-06-11 20:19:21 UTC (rev 779) +++ sandbox3/src/main/java/org/op/client/DefaultTabbedForm.java 2008-07-03 02:28:30 UTC (rev 780) @@ -1,45 +0,0 @@ -package org.op.client; - -import com.extjs.gxt.ui.client.Style.HorizontalAlignment; -import com.extjs.gxt.ui.client.widget.Button; -import com.extjs.gxt.ui.client.widget.TabItem; -import com.extjs.gxt.ui.client.widget.TabPanel; -import com.extjs.gxt.ui.client.widget.form.FormPanel; -import com.extjs.gxt.ui.client.widget.layout.FormLayout; - -public class DefaultTabbedForm { - private final FormPanel formPanel; - private final TabPanel tabPanel; - - public DefaultTabbedForm(final int width, final int labelWidth) { - formPanel = new FormPanel(); - formPanel.setFrame(true); - formPanel.setLabelWidth(labelWidth); - formPanel.setBorder(false); - formPanel.setWidth(width); - formPanel.setButtonAlign(HorizontalAlignment.RIGHT); - - tabPanel = new TabPanel(); - formPanel.add(tabPanel); - } - - public void addButton(final Button button) { - formPanel.addButton(button); - } - - public void addTab(final String title, final TabItem tab) { - tab.setTitle(title); - tab.setLayout(new FormLayout()); - tab.setAutoHeight(true); - // tab.setPaddings(10); - tabPanel.add(tab); - if (tabPanel.isRendered()) { - tabPanel.render(tab.getElement()); - } - } - - public FormPanel getForm() { - return formPanel; - } - -} Modified: sandbox3/src/main/java/org/op/client/EntityWorkspace.java =================================================================== --- sandbox3/src/main/java/org/op/client/EntityWorkspace.java 2008-06-11 20:19:21 UTC (rev 779) +++ sandbox3/src/main/java/org/op/client/EntityWorkspace.java 2008-07-03 02:28:30 UTC (rev 780) @@ -11,97 +11,122 @@ public class EntityWorkspace extends DefaultBorderLayout { private static final String SAMPLE_COLOR = "blue"; - private final FakeToolbar contentTopBar; - private final FakeToolbar containerTopBar; + private final Toolbar contentTopBar; @SuppressWarnings("unused") private final Toolbar contentBottomBar; @SuppressWarnings("unused") - private final Toolbar containerBottomBar; private final Panel container; private final Panel content; private final Panel bottom; private final Panel title; private final Panel subTitle; + private final FakeToolbar containerTopBar; + private final FakeToolbar containerBottomBar; public EntityWorkspace() { - super.setCls("entityworkspace"); - Panel titles = new Panel(); - titles.setBorder(false); - titles.setLayout(new AnchorLayout()); + super.setCls("entityworkspace"); + final Panel titles = new Panel(); + titles.setBorder(false); + titles.setLayout(new AnchorLayout()); - title = new Panel(); - title.setBorder(false); - title.setBaseCls("entity-title"); - subTitle = new Panel(); - subTitle.setBorder(false); - subTitle.setBaseCls("entity-subtitle"); - bottom = new Panel(); - bottom.setBorder(false); - bottom.setBaseCls("entity-bottom"); + title = new Panel(); + title.setBorder(false); + title.setBaseCls("entity-title"); + subTitle = new Panel(); + subTitle.setBorder(false); + subTitle.setBaseCls("entity-subtitle"); + bottom = new Panel(); + bottom.setBorder(false); + bottom.setBaseCls("entity-bottom"); - RoundedBorderDecorator roundedTitle = new RoundedBorderDecorator(title, RoundedBorderDecorator.TOPLEFT); - roundedTitle.setColor(SAMPLE_COLOR); - // roundedTitle.addStyleName("entity-title-rd"); - roundedTitle.setHeight("" + DEF_TOOLBAR_HEIGHT); + final RoundedBorderDecorator roundedTitle = new RoundedBorderDecorator(title, RoundedBorderDecorator.TOPLEFT); + roundedTitle.setColor(SAMPLE_COLOR); + // roundedTitle.addStyleName("entity-title-rd"); + roundedTitle.setHeight("" + DEF_TOOLBAR_HEIGHT); - RoundedBorderDecorator roundedBottom = new RoundedBorderDecorator(bottom, RoundedBorderDecorator.BOTTOMLEFT); - roundedBottom.setColor(SAMPLE_COLOR); - // roundedBottom.addStyleName("entity-bottom-rd"); - roundedBottom.setHeight("" + DEF_TOOLBAR_HEIGHT); + final RoundedBorderDecorator roundedBottom = new RoundedBorderDecorator(bottom, + RoundedBorderDecorator.BOTTOMLEFT); + roundedBottom.setColor(SAMPLE_COLOR); + // roundedBottom.addStyleName("entity-bottom-rd"); + roundedBottom.setHeight("" + DEF_TOOLBAR_HEIGHT); - titles.add(roundedTitle, new AnchorLayoutData("100% -" + DEF_TOOLBAR_HEIGHT)); - titles.add(subTitle, new AnchorLayoutData("100% -" + DEF_TOOLBAR_HEIGHT)); + titles.add(roundedTitle, new AnchorLayoutData("100% -" + DEF_TOOLBAR_HEIGHT)); + titles.add(subTitle, new AnchorLayoutData("100% -" + DEF_TOOLBAR_HEIGHT)); - DefaultBorderLayout contentWrap = new DefaultBorderLayout(); - DefaultBorderLayout containerWrap = new DefaultBorderLayout(); - content = new Panel(); - container = new Panel(); - container.setCollapsible(true); - content.setPaddings(5); - container.setPaddings(5); + final DefaultBorderLayout contentWrap = new DefaultBorderLayout(); + final DefaultBorderLayout containerWrap = new DefaultBorderLayout(); + containerWrap.setBorder(true); + content = new Panel(); + container = new Panel(); + container.setBorder(false); + container.setCollapsible(true); + content.setPaddings(5); + container.setPaddings(5); - Panel bottomPanel = new Panel(); - bottomPanel.setBorder(false); - bottomPanel.setLayout(new AnchorLayout()); - bottomPanel.add(roundedBottom, new AnchorLayoutData("100% -" + DEF_TOOLBAR_HEIGHT)); + final Panel bottomPanel = new Panel(); + bottomPanel.setBorder(false); + bottomPanel.setLayout(new AnchorLayout()); + bottomPanel.add(roundedBottom, new AnchorLayoutData("100% -" + DEF_TOOLBAR_HEIGHT)); - contentTopBar = new FakeToolbar(); - containerTopBar = new FakeToolbar(); - contentWrap.add(contentTopBar.getPanel(), Position.NORTH, false, DEF_TOOLBAR_HEIGHT); - containerWrap.add(containerTopBar.getPanel(), Position.NORTH, false, DEF_TOOLBAR_HEIGHT); - contentWrap.add(content, Position.CENTER); - containerWrap.add(container, Position.CENTER); - contentBottomBar = createBottomBar(content); - containerBottomBar = createBottomBar(container); + // contentTopBar = new FakeToolbar(); + contentTopBar = createTopBar(content); + containerTopBar = new FakeToolbar(); + containerBottomBar = new FakeToolbar(); + containerTopBar.addClass("faketoolbar-bottom-line"); + containerBottomBar.addClass("faketoolbar-top-line"); + // contentWrap.add(contentTopBar.getPanel(), Position.NORTH, false, + // DEF_TOOLBAR_HEIGHT); + containerWrap.add(containerTopBar.getPanel(), Position.NORTH, false, DEF_TOOLBAR_HEIGHT); + containerWrap.add(container, Position.CENTER); + containerWrap.add(containerBottomBar.getPanel(), Position.SOUTH, false, DEF_TOOLBAR_HEIGHT); + contentWrap.add(content, Position.CENTER); + contentBottomBar = createBottomBar(content); - add(titles, DefaultBorderLayout.Position.NORTH, DEF_TOOLBAR_HEIGHT * 2); - add(contentWrap.getPanel(), DefaultBorderLayout.Position.CENTER); - add(containerWrap.getPanel(), DefaultBorderLayout.Position.EAST, true, 175); - add(bottomPanel, DefaultBorderLayout.Position.SOUTH, DEF_TOOLBAR_HEIGHT); + add(titles, DefaultBorderLayout.Position.NORTH, DEF_TOOLBAR_HEIGHT * 2); + add(contentWrap.getPanel(), DefaultBorderLayout.Position.CENTER); + add(containerWrap.getPanel(), DefaultBorderLayout.Position.EAST, true, 175); + add(bottomPanel, DefaultBorderLayout.Position.SOUTH, DEF_TOOLBAR_HEIGHT); } + public void addItemToContainerBottomBar(final View view) { + containerBottomBar.add((Widget) view); + } + + public void addItemToContainerTopBar(final View view) { + containerTopBar.add((Widget) view); + } + public void addItemToContentTopBar(final View view) { - contentTopBar.add((Widget) view); + // final Container container = new Container(); + // final Widget widget = (Widget) view; + // container.add(widget); + // component.setEl(widget.getElement()); + // final Adapter adapter = new Adapter(component); + // final WidgetComponent component = new WidgetComponent((Widget) view); + // contentTopBar.getElement().appendChild(component.getElement()); + // contentTopBar.getElement().appendChild(container.getElement()); + // contentTopBar.addElement(container.getElement()); + setPanel(content, view); } public void setBottom(final View view) { - setPanel(bottom, view); + setPanel(bottom, view); } public void setContainer(final View view) { - setPanel(container, view); + setPanel(container, view); } public void setContent(final View view) { - setPanel(content, view); + setPanel(content, view); } public void setSubtitle(final View view) { - setPanel(subTitle, view); + setPanel(subTitle, view); } public void setTitle(final View view) { - setPanel(title, view); + setPanel(title, view); } } Modified: sandbox3/src/main/java/org/op/client/FakeToolbar.java =================================================================== --- sandbox3/src/main/java/org/op/client/FakeToolbar.java 2008-06-11 20:19:21 UTC (rev 779) +++ sandbox3/src/main/java/org/op/client/FakeToolbar.java 2008-07-03 02:28:30 UTC (rev 780) @@ -1,9 +1,7 @@ package org.op.client; -import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; import com.gwtext.client.widgets.Panel; -import com.gwtext.client.widgets.layout.FitLayout; public class FakeToolbar { private final Panel container; @@ -11,40 +9,52 @@ // private final Panel horPanel; public FakeToolbar() { - container = new Panel(); - container.setLayout(new FitLayout()); - container.setBorder(false); - container.setHeight(DefaultBorderLayout.DEF_TOOLBAR_HEIGHT); - container.setWidth("100%"); - container.setCls("x-toolbar"); - // x-panel-tbar x-panel-tbar-noheader - container.setCls("x-panel-tbar"); - // container.setCls("x-panel-tbar-noheader"); - // container.setCls("x-panel-header"); - // container.setCls("x-panel-header-noborder"); - // container.setCls("x-unselectable"); - // horPanel = new Panel(); - // horPanel.setLayout(new HorizontalLayout(3)); - // horPanel.setBorder(false); - // horPanel.setCls("x-toolbar"); - // horPanel.setHeight(DefaultBorderLayout.DEF_TOOLBAR_HEIGHT); - // horPanel.setWidth("100%"); - container.add(new Label("testkk")); - // container.add(horPanel); - // <div class="x-toolbar x-small-editor" id="ext-gen74" style="height: - // 17px;"><table cellspacing="0"><tbody><tr/></tbody></table></div> + container = new Panel(); + // container.setFrame(true); + // container.setLayout(new FitLayout()); + container.setBorder(false); + container.setBodyBorder(false); + container.setHeight(DefaultBorderLayout.DEF_TOOLBAR_HEIGHT); + container.setWidth("100%"); + container.setHeader(false); + // container.addClass("x-toolbar"); + // x-panel-tbar x-panel-tbar-noheader + container.setBaseCls("x-toolbar"); + container.addClass("x-panel"); + // container.addClass("x-panel-tbar-noheader"); + // container.setBodyStyle("x-panel-tbar"); + // Adapter adapter = new Adapter(); + // container.setCls("x-panel-tbar-noheader"); + // container.setCls("x-panel-header"); + // container.setCls("x-panel-header-noborder"); + // container.setCls("x-unselectable"); + // horPanel = new Panel(); + // horPanel.setLayout(new HorizontalLayout(3)); + // horPanel.setBorder(false); + // horPanel.setCls("x-toolbar"); + // horPanel.setHeight(DefaultBorderLayout.DEF_TOOLBAR_HEIGHT); + // horPanel.setWidth("100%"); + // container.add(horPanel); + // <div class="x-toolbar x-small-editor" id="ext-gen74" style="height: + // 17px;"><table cellspacing="0"><tbody><tr/></tbody></table></div> + } public void add(final Widget widget) { - // horPanel.add(widget); - if (container.isRendered()) { - container.doLayout(true); - } + // horPanel.add(widget); + container.add(widget); + if (container.isRendered()) { + container.doLayout(true); + } } + public void addClass(final String cls) { + container.addClass(cls); + } + public Panel getPanel() { - return container; + return container; } } Modified: sandbox3/src/main/java/org/op/client/Sandbox.java =================================================================== --- sandbox3/src/main/java/org/op/client/Sandbox.java 2008-06-11 20:19:21 UTC (rev 779) +++ sandbox3/src/main/java/org/op/client/Sandbox.java 2008-07-03 02:28:30 UTC (rev 780) @@ -18,125 +18,130 @@ public class Sandbox implements EntryPoint { class LabelWrapper extends Label implements View { - public LabelWrapper(final String text) { - super(text); - } + public LabelWrapper(final String text) { + super(text); + } } class MenuBarWrapper extends Composite implements View { - public MenuBarWrapper() { + public MenuBarWrapper() { - // Make a command that we will execute from all leaves. - Command cmd = new Command() { - public void execute() { - Window.alert("You selected a menu item!"); - } - }; + // Make a command that we will execute from all leaves. + final Command cmd = new Command() { + public void execute() { + Window.alert("You selected a menu item!"); + } + }; - // Make some sub-menus that we will cascade from the top menu. - MenuBar fooMenu = new MenuBar(true); - fooMenu.addItem("the", cmd); - fooMenu.addItem("foo", cmd); - fooMenu.addItem("menu", cmd); + // Make some sub-menus that we will cascade from the top menu. + final MenuBar fooMenu = new MenuBar(true); + fooMenu.addItem("the", cmd); + fooMenu.addItem("foo", cmd); + fooMenu.addItem("menu", cmd); - MenuBar barMenu = new MenuBar(true); - barMenu.addItem("the", cmd); - barMenu.addItem("bar", cmd); - barMenu.addItem("menu", cmd); + final MenuBar barMenu = new MenuBar(true); + barMenu.addItem("the", cmd); + barMenu.addItem("bar", cmd); + barMenu.addItem("menu", cmd); - MenuBar bazMenu = new MenuBar(true); - bazMenu.addItem("the", cmd); - bazMenu.addItem("baz", cmd); - bazMenu.addItem("menu", cmd); + final MenuBar bazMenu = new MenuBar(true); + bazMenu.addItem("the", cmd); + bazMenu.addItem("baz", cmd); + bazMenu.addItem("menu", cmd); - // Make a new menu bar, adding a few cascading menus to it. - MenuBar menu = new MenuBar(); - menu.addItem("foo", fooMenu); - menu.addItem("bar", barMenu); - menu.addItem("baz", bazMenu); - initWidget(menu); - } + // Make a new menu bar, adding a few cascading menus to it. + final MenuBar menu = new MenuBar(); + menu.addItem("foo", fooMenu); + menu.addItem("bar", barMenu); + menu.addItem("baz", bazMenu); + initWidget(menu); + } } /** * This is the entry point method. */ public void onModuleLoad() { - // final DefaultTabbedForm form = new DefaultTabbedForm(300, 75); - // - // form.addButton(new Button("Save")); - // - // final TabItem tab = new TabItem(); - // - // final TextField field1 = new TextField(); - // final TextField field2 = new TextField(); - // field1.setFieldLabel("Nombre"); - // field2.setFieldLabel("App"); - // tab.add(field1); - // tab.add(field2); - // - // final TabItem tab2 = new TabItem(); - // final TextField field3 = new TextField(); - // final TextField field4 = new TextField(); - // field3.setFieldLabel("Nombre"); - // field4.setFieldLabel("App"); - // tab2.add(field3); - // tab2.add(field4); - // - // form.addTab("Primero", tab); - // form.addTab("Segundo", tab2); - // dialog.add(form.getForm()); + // final DefaultTabbedForm form = new DefaultTabbedForm(300, 75); + // + // form.addButton(new Button("Save")); + // + // final TabItem tab = new TabItem(); + // + // final TextField field1 = new TextField(); + // final TextField field2 = new TextField(); + // field1.setFieldLabel("Nombre"); + // field2.setFieldLabel("App"); + // tab.add(field1); + // tab.add(field2); + // + // final TabItem tab2 = new TabItem(); + // final TextField field3 = new TextField(); + // final TextField field4 = new TextField(); + // field3.setFieldLabel("Nombre"); + // field4.setFieldLabel("App"); + // tab2.add(field3); + // tab2.add(field4); + // + // form.addTab("Primero", tab); + // form.addTab("Segundo", tab2); + // dialog.add(form.getForm()); - final Workspace wk = new Workspace(); - // EntityCnt ent = new EntityCnt(); + final Workspace wk = new Workspace(); + // EntityCnt ent = new EntityCnt(); - Panel panel = new Panel(); - panel.setBorder(false); - panel.setPaddings(5); - panel.setLayout(new FitLayout()); - // panel.add(ent.getPanel()); - panel.add(wk.getPanel()); + final Panel panel = new Panel(); + panel.setBorder(false); + panel.setPaddings(5); + panel.setLayout(new FitLayout()); + // panel.add(ent.getPanel()); + panel.add(wk.getPanel()); - new Viewport(panel); - wk.getEntityWorkspace().addItemToContentTopBar(new MenuBarWrapper()); - wk.getEntityWorkspace().setContainer(new LabelWrapper("Container")); - wk.getEntityWorkspace().setContent(new LabelWrapper("Content")); - wk.getEntityWorkspace().setBottom(new LabelWrapper("Bottom")); - wk.getEntityWorkspace().setTitle(new LabelWrapper("Title")); - wk.getEntityWorkspace().setSubtitle(new LabelWrapper("Subtitle")); - wk.getSiteBar().add(new LabelWrapper("sitebar-right")); - // final TabItem item1 = new TabItem(); - // item1.setText("Nose que1"); - // item1.add(new Label("Hola 1")); - // tabPanel.addTabItem(item1); - // - // final TabItem item2 = new TabItem(); - // item2.setText("Nose que2"); - // item2.add(new Label("Hola 2")); - // tabPanel.addTabItem(item2); - // final TextField field1 = new TextField(); - // final TextField field2 = new TextField(); - // field1.setFieldLabel("Nombre"); - // field2.setFieldLabel("App"); - // item1.add(field1); - // item2.add(field2); - // - // final Window window = new Window(); - // window.add(tabPanel.getTabPanel()); - // RootPanel.get().add(panel); - // window.setTitle("Layout Window"); - // window.setClosable(true); - // window.setWidth(600); - // window.setHeight(350); - // window.setPlain(true); - // window.setLayout(new BorderLayout()); - // final BorderLayoutData centerData = new - // BorderLayoutData(RegionPosition.CENTER); - // // final Panel panel = new Panel(); - // // panel.add(form.getForm()); - // window.add(form.getForm(), centerData); - // window.setCloseAction(Window.HIDE); - // RootPanel.get("slot1").add(window); - // window.show(); + new Viewport(panel); + wk.getEntityWorkspace().addItemToContentTopBar(new MenuBarWrapper()); + wk.getEntityWorkspace().addItemToContainerTopBar(new MenuBarWrapper()); + wk.getEntityWorkspace().addItemToContainerBottomBar(new MenuBarWrapper()); + wk.getEntityWorkspace().addItemToContainerBottomBar(new LabelWrapper("otro")); + wk.getEntityWorkspace().setContainer(new LabelWrapper("Container")); + wk.getEntityWorkspace().setContent(new LabelWrapper("Content")); + // wk.getEntityWorkspace().setContent(fooMenu); + wk.getEntityWorkspace().setBottom(new LabelWrapper("Bottom")); + wk.getEntityWorkspace().setTitle(new LabelWrapper("Title")); + wk.getEntityWorkspace().setSubtitle(new LabelWrapper("Subtitle")); + wk.getSiteBar().add(new LabelWrapper("sitebar-right")); + + // final TabItem item1 = new TabItem(); + // item1.setText("Nose que1"); + // item1.add(new Label("Hola 1")); + // tabPanel.addTabItem(item1); + // + // final TabItem item2 = new TabItem(); + // item2.setText("Nose que2"); + // item2.add(new Label("Hola 2")); + // tabPanel.addTabItem(item2); + // final TextField field1 = new TextField(); + // final TextField field2 = new TextField(); + // field1.setFieldLabel("Nombre"); + // field2.setFieldLabel("App"); + // item1.add(field1); + // item2.add(field2); + // + // final Window window = new Window(); + // window.add(tabPanel.getTabPanel()); + // RootPanel.get().add(panel); + // window.setTitle("Layout Window"); + // window.setClosable(true); + // window.setWidth(600); + // window.setHeight(350); + // window.setPlain(true); + // window.setLayout(new BorderLayout()); + // final BorderLayoutData centerData = new + // BorderLayoutData(RegionPosition.CENTER); + // // final Panel panel = new Panel(); + // // panel.add(form.getForm()); + // window.add(form.getForm(), centerData); + // window.setCloseAction(Window.HIDE); + // RootPanel.get("slot1").add(window); + // window.show(); } } Modified: sandbox3/src/main/java/org/op/client/SiteBar.java =================================================================== --- sandbox3/src/main/java/org/op/client/SiteBar.java 2008-06-11 20:19:21 UTC (rev 779) +++ sandbox3/src/main/java/org/op/client/SiteBar.java 2008-07-03 02:28:30 UTC (rev 780) @@ -2,32 +2,26 @@ import org.ourproject.kune.platf.client.View; -import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.Widget; import com.gwtext.client.widgets.Panel; -public class SiteBar extends DefaultBorderLayout { +public class SiteBar { - private final Panel rightPanel;; + private final Panel panel; public SiteBar() { - rightPanel = createDefPanel(); - // rightPanel.setAutoWidth(true); - Panel centerPanel = createDefPanel(); - add(centerPanel, Position.CENTER); - add(rightPanel, Position.EAST); - rightPanel.add(new Label("Site")); + panel = new Panel(); + panel.setBorder(false); } public void add(final View view) { - setPanel(rightPanel, view); + panel.add((Widget) view); + if (panel.isRendered()) { + panel.doLayout(false); + } } - private Panel createDefPanel() { - Panel panel = new Panel(); - // panel.setLayout(new HorizontalLayout(3)); - panel.setAutoWidth(true); - panel.setHeight(DEF_TOOLBAR_HEIGHT); - panel.setBorder(false); - return panel; + public Panel getPanel() { + return panel; } } Modified: sandbox3/src/main/java/org/op/client/Workspace.java =================================================================== --- sandbox3/src/main/java/org/op/client/Workspace.java 2008-06-11 20:19:21 UTC (rev 779) +++ sandbox3/src/main/java/org/op/client/Workspace.java 2008-07-03 02:28:30 UTC (rev 780) @@ -5,17 +5,17 @@ private final SiteBar sitebar; public Workspace() { - sitebar = new SiteBar(); - entity = new Entity(); - add(sitebar.getPanel(), DefaultBorderLayout.Position.NORTH, DEF_TOOLBAR_HEIGHT); - add(entity.getPanel(), DefaultBorderLayout.Position.CENTER); + sitebar = new SiteBar(); + entity = new Entity(); + add(sitebar.getPanel(), DefaultBorderLayout.Position.NORTH, DEF_TOOLBAR_HEIGHT); + add(entity.getPanel(), DefaultBorderLayout.Position.CENTER); } public EntityWorkspace getEntityWorkspace() { - return entity.getEntityWorkspace(); + return entity.getEntityWorkspace(); } public SiteBar getSiteBar() { - return sitebar; + return sitebar; } } Modified: sandbox3/src/main/java/org/op/public/Sandbox.html =================================================================== --- sandbox3/src/main/java/org/op/public/Sandbox.html 2008-06-11 20:19:21 UTC (rev 779) +++ sandbox3/src/main/java/org/op/public/Sandbox.html 2008-07-03 02:28:30 UTC (rev 780) @@ -18,28 +18,14 @@  <title>Wrapper HTML for Sandbox 3</title> -  -  -  - <style type="text/css"> - body,td,a,div,.p{font-family:arial,sans-serif} - div,td{color:#000000} - a:link,.w,.w a:link{color:#0000cc} - a:visited{color:#551a8b} - a:active{color:#ff0000} - </style> -  -  -  -  -   <script type="text/javascript" language="javascript" src="org.op.Sandbox.nocache.js"></script> + <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.5.2/build/base/base-min.css"> </head>  Modified: sandbox3/src/main/java/org/op/public/sandbox.css =================================================================== --- sandbox3/src/main/java/org/op/public/sandbox.css 2008-06-11 20:19:21 UTC (rev 779) +++ sandbox3/src/main/java/org/op/public/sandbox.css 2008-07-03 02:28:30 UTC (rev 780) @@ -35,6 +35,18 @@ } +.faketoolbar-top-line { +border-top-color: rgb(208, 208, 208); +border-top-style: solid; +border-top-width: 1px; +} + +.faketoolbar-bottom-line { +border-bottom-color: rgb(208, 208, 208); +border-bottom-style: solid; +border-bottom-width: 1px; +} + .entity-bottom-rd { } \ No newline at end of file

1 0