You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2009/05/22 15:49:43 UTC

svn commit: r777523 - in /incubator/pivot/trunk/tutorials/src/pivot/tutorials/navigation: Accordions.java expanders.wtkx summary.wtkx

Author: gbrown
Date: Fri May 22 13:49:43 2009
New Revision: 777523

URL: http://svn.apache.org/viewvc?rev=777523&view=rev
Log:
Minor tutorial updates.


Modified:
    incubator/pivot/trunk/tutorials/src/pivot/tutorials/navigation/Accordions.java
    incubator/pivot/trunk/tutorials/src/pivot/tutorials/navigation/expanders.wtkx
    incubator/pivot/trunk/tutorials/src/pivot/tutorials/navigation/summary.wtkx

Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/navigation/Accordions.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/navigation/Accordions.java?rev=777523&r1=777522&r2=777523&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/navigation/Accordions.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/navigation/Accordions.java Fri May 22 13:49:43 2009
@@ -21,12 +21,14 @@
 import pivot.util.Vote;
 import pivot.wtk.Accordion;
 import pivot.wtk.AccordionSelectionListener;
+import pivot.wtk.ActivityIndicator;
 import pivot.wtk.Application;
 import pivot.wtk.Button;
 import pivot.wtk.ButtonPressListener;
 import pivot.wtk.Component;
 import pivot.wtk.DesktopApplicationContext;
 import pivot.wtk.Display;
+import pivot.wtk.Label;
 import pivot.wtk.PushButton;
 import pivot.wtk.Window;
 import pivot.wtkx.Bindable;
@@ -36,6 +38,9 @@
     @Bind(fieldName="window") private Accordion accordion;
     @Bind(fieldName="window", id="shippingPanel.nextButton") private PushButton shippingNextButton;
     @Bind(fieldName="window", id="paymentPanel.nextButton") private PushButton paymentNextButton;
+    @Bind(fieldName="window", id="summaryPanel.confirmOrderButton") private PushButton confirmOrderButton;
+    @Bind(fieldName="window", id="summaryPanel.activityIndicator") private ActivityIndicator activityIndicator;
+    @Bind(fieldName="window", id="summaryPanel.processingOrderLabel") private Label processingOrderLabel;
 
     private AccordionSelectionListener accordionSelectionListener = new AccordionSelectionListener() {
         private int selectedIndex = -1;
@@ -86,7 +91,17 @@
         shippingNextButton.getButtonPressListeners().add(nextButtonPressListener);
         paymentNextButton.getButtonPressListeners().add(nextButtonPressListener);
 
+        confirmOrderButton.getButtonPressListeners().add(new ButtonPressListener() {
+            public void buttonPressed(Button button) {
+                // Pretend to submit or cancel the order
+                activityIndicator.setActive(!activityIndicator.isActive());
+                processingOrderLabel.setDisplayable(activityIndicator.isActive());
+                updateConfirmOrderButton();
+            }
+        });
+
         updateAccordion();
+        updateConfirmOrderButton();
 
         window.open(display);
     }
@@ -114,6 +129,14 @@
         }
     }
 
+    private void updateConfirmOrderButton() {
+        if (activityIndicator.isActive()) {
+            confirmOrderButton.setButtonData("Cancel");
+        } else {
+            confirmOrderButton.setButtonData("Confirm Order");
+        }
+    }
+
     public static void main(String[] args) {
         DesktopApplicationContext.main(Accordions.class, args);
     }

Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/navigation/expanders.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/navigation/expanders.wtkx?rev=777523&r1=777522&r2=777523&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/navigation/expanders.wtkx (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/navigation/expanders.wtkx Fri May 22 13:49:43 2009
@@ -30,12 +30,12 @@
                                     <wtkx:include src="stocks.wtkx"/>
                                 </content>
                             </Expander>
-                            <Expander title="Weather">
+                            <Expander title="Weather" expanded="false">
                                 <content>
                                     <wtkx:include src="weather.wtkx"/>
                                 </content>
                             </Expander>
-                            <Expander title="Calendar">
+                            <Expander title="Calendar" expanded="false">
                                 <content>
                                     <wtkx:include src="calendar.wtkx"/>
                                 </content>

Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/navigation/summary.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/navigation/summary.wtkx?rev=777523&r1=777522&r2=777523&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/navigation/summary.wtkx (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/navigation/summary.wtkx Fri May 22 13:49:43 2009
@@ -36,9 +36,13 @@
                     <Label text="123 Main St."/>
                     <Label text="Anytown, USA 12345"/>
                 </FlowPane>
-                <FlowPane styles="{horizontalAlignment:'center', padding:{top:12}}">
-                    <PushButton wtkx:id="confirmOrderButton" buttonData="Confirm Order"
-                        styles="{preferredAspectRatio:3}"/>
+                <FlowPane orientation="vertical"
+                    styles="{horizontalAlignment:'center', spacing:12, padding:{top:12}}">
+                    <PushButton wtkx:id="confirmOrderButton" styles="{preferredAspectRatio:3}"/>
+                    <ActivityIndicator wtkx:id="activityIndicator" styles="{color:16}"
+                        preferredWidth="48" preferredHeight="48"/>
+                    <Label wtkx:id="processingOrderLabel" text="Pretending to process order..." displayable="false"
+                        styles="{fontItalic:true}"/>
                 </FlowPane>
             </FlowPane>
         </TablePane.Row>