Changeset 824

Timestamp:

02/04/14 16:20:02 (10 years ago)

Author:

ngw8

Message:

Added overlay to browser that shows while the page is converting. Started styling JFX elements of browser a little bit.

Location:

trunk/src/org/expeditee

Files:

• assets/style (added)
• assets/style/jfx.css (added)
• io/WebParser.java (modified) (4 diffs)
• items/widgets/JfxBrowser.java (modified) (10 diffs)

trunk/src/org/expeditee/io/WebParser.java

@@ -48 +48 @@
 import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
+import org.expeditee.items.widgets.JfxBrowser;
 import org.w3c.dom.Node;
 import org.w3c.dom.html.HTMLBodyElement;
@@ -281 +282 @@
          *            The Expeditee frame to output the converted page to
          */
-        public static void parsePageSimple(final WebEngine webEngine, final WebView webView, final Frame frame) {
+        public static void parsePageSimple(JfxBrowser browserWidget, final WebEngine webEngine, final WebView webView, final Frame frame) {
                 try {
+                        browserWidget.setOverlayVisible(true);
+
                         final Object notifier = new Object();
                         
@@ -633 +636 @@
                 }
 
-
+                browserWidget.setOverlayVisible(false);
 
         }
@@ -1179 +1182 @@
                         bounds = (JSObject) ((JSObject) currentNode.getParentNode()).call("getBoundingClientRect", new Object[] {});
 
-                        // TODO: This doesn't check if an element or any of its parent elements have position:fixed set - the only way to check seems to be to walking through the element's parents until the document root is reached (or a recursive function)
+                        // TODO: This doesn't check if an element or any of its parent elements have position:fixed set - the only way to check seems to
+                        // be to walking through the element's parents until the document root is reached (or a recursive function)
                         float x = Float.valueOf(bounds.getMember("left").toString());
                         float y = Float.valueOf(bounds.getMember("top").toString());

trunk/src/org/expeditee/items/widgets/JfxBrowser.java

@@ -22 +22 @@
 import javafx.event.EventDispatcher;
 import javafx.event.EventHandler;
+import javafx.geometry.Insets;
 import javafx.geometry.Point2D;
+import javafx.geometry.Pos;
 import javafx.geometry.Rectangle2D;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.ProgressIndicator;
 import javafx.scene.control.TextField;
 import javafx.scene.input.KeyEvent;
@@ -33 +37 @@
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
+import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.web.WebEngine;
@@ -68 +73 @@
         private WebEngine _webEngine;
         private TextField _urlField;
+        private StackPane _overlay;
         
         private MouseButton _buttonDownId = MouseButton.NONE;
@@ -145 +151 @@
         private void initFx(String url) {
                 try {
+                        StackPane mainLayout = new StackPane();
                         VBox vertical = new VBox();
                         HBox horizontal = new HBox();
+                        horizontal.getStyleClass().add("custom-toolbar");
                         
                         Button backButton = new Button("Back");
                         backButton.setMinWidth(Button.USE_PREF_SIZE);
                         backButton.setFocusTraversable(false);
+                        backButton.getStyleClass().add("first");
+
                         Button forwardButton = new Button("Forward");
                         forwardButton.setMinWidth(Button.USE_PREF_SIZE);
                         forwardButton.setFocusTraversable(false);
+                        forwardButton.getStyleClass().add("last");
+
                         this._urlField = new TextField(url);
+                        this._urlField.getStyleClass().add("first");
                         this._urlField.setMinWidth(0);
                         this._urlField.setMaxWidth(Double.MAX_VALUE);
                         this._urlField.setFocusTraversable(false);
+
+                        Button goButton = new Button("Go");
+                        goButton.getStyleClass().add("last");
+                        goButton.setMinWidth(Button.USE_PREF_SIZE);
+                        goButton.setFocusTraversable(false);
+
                         Button convertButton = new Button("Convert");
                         convertButton.setMinWidth(Button.USE_PREF_SIZE);
                         convertButton.setFocusTraversable(false);
-                        Button convertButtonNew = new Button("Convert (New Method)");
-                        convertButtonNew.setMinWidth(Button.USE_PREF_SIZE);
-                        convertButtonNew.setFocusTraversable(false);
-                        
-                        horizontal.getChildren().addAll(backButton, forwardButton, this._urlField, convertButton, convertButtonNew);
-                        
+                        
+                        horizontal.getChildren().addAll(backButton, forwardButton, this._urlField, goButton, convertButton);
+
                         HBox.setHgrow(backButton, Priority.NEVER);
                         HBox.setHgrow(forwardButton, Priority.NEVER);
                         HBox.setHgrow(convertButton, Priority.NEVER);
-                        HBox.setHgrow(convertButtonNew, Priority.NEVER);
+                        HBox.setHgrow(goButton, Priority.NEVER);
                         HBox.setHgrow(this._urlField, Priority.ALWAYS);
                         
+                        HBox.setMargin(goButton, new Insets(0, 5, 0, 0));
+                        HBox.setMargin(forwardButton, new Insets(0, 5, 0, 0));
+
                         this._webView = new WebView();
                         this._webView.setMaxWidth(Double.MAX_VALUE);
@@ -179 +198 @@
                         VBox.setVgrow(this._webView, Priority.ALWAYS);
                         this._webEngine = this._webView.getEngine();
-                        
+
                         vertical.getChildren().addAll(horizontal, this._webView);
-                        
-                        Scene scene = new Scene(vertical);
+
+                        this._overlay = new StackPane();
+                        this._overlay.setMaxSize(Double.MAX_VALUE, Double.MAX_VALUE);
+
+                        // Class for CSS styling
+                        this._overlay.getStyleClass().add("browser-overlay");
+
+                        // Don't show the overlay until processing the page
+                        this._overlay.setVisible(false);
+
+                        Label overlayLabel = new Label("Importing page to Expeditee...");
+
+                        ProgressIndicator prog = new ProgressIndicator();
+                        prog.setMaxSize(25, 25);
+
+                        this._overlay.getChildren().addAll(overlayLabel, prog);
+
+                        this._overlay.setAlignment(Pos.CENTER);
+                        StackPane.setMargin(overlayLabel, new Insets(-50, 0, 0, 0));
+                        StackPane.setMargin(prog, new Insets(50, 0, 0, 0));
+
+                        mainLayout.getChildren().addAll(vertical, this._overlay);
+                        
+                        Scene scene = new Scene(mainLayout);
+
+                        scene.getStylesheets().add(ClassLoader.getSystemResource("org/expeditee/assets/style/jfx.css").toString());
 
                         this._panel.setScene(scene);
@@ -217 +260 @@
                         });
                         
-                        
                         convertButton.setOnAction(new EventHandler<ActionEvent>() {
-                                @Override
-                public void handle(ActionEvent e) {
-                    getFrame();
-                }
-                        });
-
-                        convertButtonNew.setOnAction(new EventHandler<ActionEvent>() {
                                 @Override
                 public void handle(ActionEvent e) {
@@ -591 +626 @@
                         new Thread(new Runnable() {
                                 public void run() {
-                                        WebParser.parsePageSimple(JfxBrowser.this._webEngine, JfxBrowser.this._webView, DisplayIO.getCurrentFrame());
+                                        WebParser.parsePageSimple(JfxBrowser.this, JfxBrowser.this._webEngine, JfxBrowser.this._webView, DisplayIO.getCurrentFrame());
                                 }
                         }).start();
@@ -613 +648 @@
         public boolean ItemsLeftClickDropped() {
                 Text carried = null;
-                if ((carried = FreeItems.getTextAttachedToCursor()) == null) {  // fails if no text is attached to cursor.
+                if ((carried = FreeItems.getTextAttachedToCursor()) == null) { // fails if no text is attached to cursor.
                         return false;
                 }
                 
-                if(carried.getText().toLowerCase().equals(BACK)) {
+                if (carried.getText().toLowerCase().equals(BACK)) {
                         navigateBack();
-                } else if(carried.getText().toLowerCase().equals(FORWARD)) {
+                } else if (carried.getText().toLowerCase().equals(FORWARD)) {
                         navigateForward();
-                } else if(carried.getText().toLowerCase().equals(REFRESH)) {
+                } else if (carried.getText().toLowerCase().equals(REFRESH)) {
                         refresh();
-                } else if(carried.getText().toLowerCase().equals(CONVERT)) {
+                } else if (carried.getText().toLowerCase().equals(CONVERT)) {
                         getFrame();
                 } else {
@@ -630 +665 @@
                         FreeItems.getInstance().clear();
                 }
-                
+
                 return true;
         }
@@ -683 +718 @@
         }
         
+        public void setOverlayVisible(final boolean visible) {
+                Platform.runLater(new Runnable() {
+
+                        @Override
+                        public void run() {
+                                JfxBrowser.this._overlay.setVisible(visible);
+                        }
+                });
+
+        }
+
         @Override
         protected String[] getArgs() {