Author: vjrj Date: 2008-07-06 00:17:07 +0200 (Sun, 06 Jul 2008) New Revision: 787 Added: sandbox3/src/main/java/org/op/client/WorkspaceModule.java Removed: sandbox3/src/main/java/org/op/client/DefaultPanel.java Modified: sandbox3/src/main/java/org/op/client/Entity.java sandbox3/src/main/java/org/op/client/EntitySummary.java sandbox3/src/main/java/org/op/client/EntityWorkspace.java sandbox3/src/main/java/org/op/public/css/sandbox.css Log: more ext probes Deleted: sandbox3/src/main/java/org/op/client/DefaultPanel.java =================================================================== --- sandbox3/src/main/java/org/op/client/DefaultPanel.java 2008-07-05 22:02:17 UTC (rev 786) +++ sandbox3/src/main/java/org/op/client/DefaultPanel.java 2008-07-05 22:17:07 UTC (rev 787) @@ -1,10 +0,0 @@ -package org.op.client; - -import com.gwtext.client.widgets.Panel; - -public class DefaultPanel extends Panel { - public DefaultPanel() { - setBorder(false); - - } -} Modified: sandbox3/src/main/java/org/op/client/Entity.java =================================================================== --- sandbox3/src/main/java/org/op/client/Entity.java 2008-07-05 22:02:17 UTC (rev 786) +++ sandbox3/src/main/java/org/op/client/Entity.java 2008-07-05 22:17:07 UTC (rev 787) @@ -29,7 +29,7 @@ } public void setTheme(final WsTheme theme) { - super.setCls("entity-" + theme); + super.setCls("k-entity-" + theme); entityWorkspace.setTheme(theme); } } Modified: sandbox3/src/main/java/org/op/client/EntitySummary.java =================================================================== --- sandbox3/src/main/java/org/op/client/EntitySummary.java 2008-07-05 22:02:17 UTC (rev 786) +++ sandbox3/src/main/java/org/op/client/EntitySummary.java 2008-07-05 22:17:07 UTC (rev 787) @@ -12,7 +12,7 @@ final Panel entitySummary = new Panel(); entitySummary.setBorder(false); entitySummary.add(new Label("Summary")); - trayBar = createBottomBar(entitySummary, "toolbar-transparent"); + trayBar = createBottomBar(entitySummary, "k-toolbar-transparent"); add(entitySummary, DefaultBorderLayout.Position.CENTER); } Modified: sandbox3/src/main/java/org/op/client/EntityWorkspace.java =================================================================== --- sandbox3/src/main/java/org/op/client/EntityWorkspace.java 2008-07-05 22:02:17 UTC (rev 786) +++ sandbox3/src/main/java/org/op/client/EntityWorkspace.java 2008-07-05 22:17:07 UTC (rev 787) @@ -31,12 +31,12 @@ title = new TitleBar(); title.setHeight("" + (DEF_TOOLBAR_HEIGHT - 2)); - title.setStylePrimaryName("entity-title"); + title.setStylePrimaryName("k-entity-title"); subTitle = new TitleBar(); - subTitle.setStylePrimaryName("entity-subtitle"); + subTitle.setStylePrimaryName("k-entity-subtitle"); bottom = new TitleBar(); bottom.setHeight("" + (DEF_TOOLBAR_HEIGHT - 2)); - bottom.setStylePrimaryName("entity-bottom"); + bottom.setStylePrimaryName("k-entity-bottom"); roundedTitle = new RoundedPanel(title, RoundedPanel.TOPLEFT, 2); roundedBottom = new RoundedPanel(bottom, RoundedPanel.BOTTOMLEFT, 2); @@ -68,10 +68,10 @@ containerTopBar.addClass("k-toolbar-bottom-line"); containerBottomBar.addClass("k-toolbar-top-line"); contentWrap.add(contentTopBar.getPanel(), Position.NORTH, false, DEF_TOOLBAR_HEIGHT); - contentWrap.add(content, Position.CENTER); - contentWrap.add(contentBottomBar.getPanel(), Position.SOUTH, false, DEF_TOOLBAR_HEIGHT); containerWrap.add(containerTopBar.getPanel(), Position.NORTH, false, DEF_TOOLBAR_HEIGHT); + contentWrap.add(content, Position.CENTER); containerWrap.add(container, Position.CENTER); + contentWrap.add(contentBottomBar.getPanel(), Position.SOUTH, false, DEF_TOOLBAR_HEIGHT); containerWrap.add(containerBottomBar.getPanel(), Position.SOUTH, false, DEF_TOOLBAR_HEIGHT); add(titles, DefaultBorderLayout.Position.NORTH, DEF_TOOLBAR_HEIGHT * 2); @@ -118,13 +118,12 @@ public void setTheme(final WsTheme theme) { final String themeS = theme.toString(); - super.setCls("entityworkspace-" + theme); - roundedTitle.setCornerStyleName("entity-title-rd-" + theme); - roundedBottom.setCornerStyleName("entity-bottom-rd-" + theme); + super.setCls("k-entityworkspace-" + theme); + roundedTitle.setCornerStyleName("k-entity-title-rd-" + theme); + roundedBottom.setCornerStyleName("k-entity-bottom-rd-" + theme); title.addStyleDependentName(themeS); subTitle.addStyleDependentName(themeS); bottom.addStyleDependentName(themeS); - container.setStyleName("entity-container-" + theme); + container.setStyleName("k-entity-container-" + theme); } - } Added: sandbox3/src/main/java/org/op/client/WorkspaceModule.java =================================================================== --- sandbox3/src/main/java/org/op/client/WorkspaceModule.java 2008-07-05 22:02:17 UTC (rev 786) +++ sandbox3/src/main/java/org/op/client/WorkspaceModule.java 2008-07-05 22:17:07 UTC (rev 787) @@ -0,0 +1,23 @@ +package org.op.client; + +import com.calclab.suco.client.container.Provider; +import com.calclab.suco.client.modules.Module; +import com.calclab.suco.client.modules.ModuleBuilder; +import com.calclab.suco.client.scopes.SingletonScope; + +public class WorkspaceModule implements Module { + + public Class<WorkspaceModule> getType() { + return WorkspaceModule.class; + } + + public void onLoad(final ModuleBuilder builder) { + builder.registerProvider(Workspace.class, new Provider<Workspace>() { + public Workspace get() { + return new Workspace(); + } + }, SingletonScope.class); + + } + +} Modified: sandbox3/src/main/java/org/op/public/css/sandbox.css =================================================================== --- sandbox3/src/main/java/org/op/public/css/sandbox.css 2008-07-05 22:02:17 UTC (rev 786) +++ sandbox3/src/main/java/org/op/public/css/sandbox.css 2008-07-05 22:17:07 UTC (rev 787) @@ -1,96 +1,96 @@ @CHARSET "UTF-8"; -.toolbar-transparent { +.k-toolbar-transparent { background: #EFEFEF none repeat scroll 0% 50%; border-top: 0px; } -.entity-def .x-layout-split { +.k-entity-def .x-layout-split { background: #DD8A3D none repeat scroll 0% 50%; } -.entity-green .x-layout-split { +.k-entity-green .x-layout-split { background: #5FD35F none repeat scroll 0% 50%; } -.entityworkspace .x-layout-split { +.k-entityworkspace .x-layout-split { background: transparent none repeat scroll 0% 50%; } -.entityworkspace-def .x-layout-split { +.k-entityworkspace-def .x-layout-split { background: #DEAA87 none repeat scroll 0% 50%; } -.entityworkspace-green .x-layout-split { +.k-entityworkspace-green .x-layout-split { background: #DCE8AB none repeat scroll 0% 50%; } -.entity-title { +.k-entity-title { line-height: 22px; border-left-style: solid; border-left-width: 2px; } -.entity-subtitle { +.k-entity-subtitle { line-height: 2em; } -.entity-title-rd-def { +.k-entity-title-rd-def { background: #DD8A3D; } -.entity-title-rd-green { +.k-entity-title-rd-green { background: #5FD35F; } -.entity-title-def { +.k-entity-title-def { background: #F1BB59 none repeat scroll 0% 50%; color: #69312F; border-left-color: #DD8A3D; } -.entity-title-green { +.k-entity-title-green { background: #AFA none repeat scroll 0% 50%; color: #250; border-left-color: #5FD35F; } -.entity-subtitle-def { +.k-entity-subtitle-def { background: #DD8A3D none repeat scroll 0% 50%; color: #FFF; } -.entity-subtitle-green { +.k-entity-subtitle-green { background: #5FD35F none repeat scroll 0% 50%; color: #FFF; } -.entity-bottom-rd-def { +.k-entity-bottom-rd-def { background: #DD8A3D; } -.entity-bottom-rd-green { +.k-entity-bottom-rd-green { background: #5FD35F; } -.entity-container-def div { +.k-entity-container-def div { background: #FFD09D none repeat scroll 0% 50%; } -.entity-container-green div { +.k-entity-container-green div { background: #CFA none repeat scroll 0% 50%; } -.entity-bottom { +.k-entity-bottom { line-height: 2em; } -.entity-bottom-def { +.k-entity-bottom-def { background: #DD8A3D; color: #FFF; } -.entity-bottom-green { +.k-entity-bottom-green { background: #5FD35F; color: #FFF; }