merge

rstudio · Oct 27, 2011 · 3bfd090 · 3bfd090
2 parents 60dc5a9 + 5612882
commit 3bfd090
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 21 deletions.
diff --git a/src/gwt/src/org/rstudio/core/client/widget/Wizard.css b/src/gwt/src/org/rstudio/core/client/widget/Wizard.css
@@ -1,8 +1,3 @@
-
-@url WIZARDPAGESELECTOR wizardPageSelectorBackground;
-@url WIZARDPAGESELECTORFIRST wizardPageSelectorBackgroundFirst;
-@url WIZARDPAGESELECTORLAST wizardPageSelectorBackgroundLast;
-
 .mainWidget {
    width: 510px;
    height: 300px;
@@ -38,19 +33,17 @@
 
 }
 
-.wizardPageSelectorItem {
+@sprite .wizardPageSelectorItem {
    width: 100%;
-   height: 80px;
-   background: WIZARDPAGESELECTOR repeat-x;
+   gwt-image: 'wizardPageSelectorBackground';
 }
 
-.wizardPageSelectorItemFirst {
-   background: WIZARDPAGESELECTORFIRST repeat-x;
+@sprite .wizardPageSelectorItemFirst {
+   gwt-image: 'wizardPageSelectorBackgroundFirst';
 }
 
-.wizardPageSelectorItemLast {
-   background: WIZARDPAGESELECTORLAST repeat-x;
-   height: 82px;
+@sprite .wizardPageSelectorItemLast {
+   gwt-image: 'wizardPageSelectorBackgroundLast';
 }
 
 

diff --git a/src/gwt/src/org/rstudio/core/client/widget/Wizard.java b/src/gwt/src/org/rstudio/core/client/widget/Wizard.java
@@ -16,6 +16,7 @@
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
 
+
 public class Wizard<I,T> extends ModalDialog<T>
 {
    public Wizard(String caption, 
@@ -56,7 +57,7 @@ protected Widget createMainWidget()
       mainWidget.add(bodyPanel_);
 
       // page selection panel
-      pageSelectorPanel_ = new VerticalPanel();
+      pageSelectorPanel_ = new FlowPanel();
       pageSelectorPanel_.addStyleName(styles.wizardPageSelector());
       pageSelectorPanel_.setSize("100%", "100%");
       for (int i=0; i<pages_.size(); i++)
@@ -226,7 +227,7 @@ public void onClick(ClickEvent event)
    private final String subCaption_;
 
    private LayoutPanel bodyPanel_;
-   private VerticalPanel pageSelectorPanel_;
+   private FlowPanel pageSelectorPanel_;
 
    private boolean isAnimating_ = false;
 

diff --git a/src/gwt/src/org/rstudio/core/client/widget/WizardResources.java b/src/gwt/src/org/rstudio/core/client/widget/WizardResources.java
@@ -6,6 +6,8 @@
 import com.google.gwt.resources.client.CssResource;
 import com.google.gwt.resources.client.DataResource;
 import com.google.gwt.resources.client.ImageResource;
+import com.google.gwt.resources.client.ImageResource.ImageOptions;
+import com.google.gwt.resources.client.ImageResource.RepeatStyle;
 
 public interface WizardResources extends ClientBundle
 {
@@ -29,14 +31,14 @@ interface Styles extends CssResource
    ImageResource wizardDisclosureArrow();
 
 
-   @Source("wizardPageSelectorBackground.png")
-   DataResource wizardPageSelectorBackground();
+   @ImageOptions(repeatStyle = RepeatStyle.Horizontal)
+   ImageResource wizardPageSelectorBackground();
 
-   @Source("wizardPageSelectorBackgroundFirst.png")
-   DataResource wizardPageSelectorBackgroundFirst();
+   @ImageOptions(repeatStyle = RepeatStyle.Horizontal)
+   ImageResource wizardPageSelectorBackgroundFirst();
 
-   @Source("wizardPageSelectorBackgroundLast.png")
-   DataResource wizardPageSelectorBackgroundLast();
+   @ImageOptions(repeatStyle = RepeatStyle.Horizontal)
+   ImageResource wizardPageSelectorBackgroundLast();
 
 
    static WizardResources INSTANCE =