Changeset 839

Timestamp:

02/05/14 14:16:00 (10 years ago)

Author:

ngw8

Message:

Changes to web parser so that the converted pages are displayed in a grid on the index page, plus the converted pages are set to be 90% of the frame size, rather than just using the displayed size of the webview.

Location:

trunk/src/org/expeditee

Files:

• io/WebParser.java (modified) (8 diffs)
• items/widgets/JfxBrowser.java (modified) (7 diffs)

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

@@ -39 +39 @@
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
+import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FrameMouseActions;
@@ -282 +283 @@
          *            The Expeditee frame to output the converted page to
          */
-        public static void parsePageSimple(JfxBrowser browserWidget, final WebEngine webEngine, final WebView webView, final Frame frame) {
+        public static void parsePageSimple(final JfxBrowser browserWidget, final WebEngine webEngine, final WebView webView, final Frame frame) {
                 try {
-                        browserWidget.setOverlayVisible(true);
+                        Platform.runLater(new Runnable() {
+
+                                @Override
+                                public void run() {
+                                        browserWidget.setOverlayVisible(true);
+                                        browserWidget.setWebViewSize(FrameGraphics.getMaxFrameSize().getWidth() * 0.9, FrameGraphics.getMaxFrameSize().getHeight() * 0.9);
+                                }
+                        });
 
                         final Object notifier = new Object();
@@ -291 +299 @@
                         final MutableBool rightReached = new MutableBool(false);
                         
-                        final MutableInt pageCount = new MutableInt(0);
+                        final MutableInt verticalCount = new MutableInt(0);
+                        final MutableInt horizontalCount = new MutableInt(0);
 
                         final String pageTitle = webEngine.getTitle();
@@ -323 +332 @@
                                                 this.stop();
                                                 
-                                                pageCount.setValue(pageCount.getValue() + 1);
-
-                                                frameToAddTo = FrameIO.CreateFrame(frameToAddTo.getFramesetName(), pageTitle + " " + pageCount.getValue(), null);
+                                                verticalCount.setValue(verticalCount.getValue() + 1);
+
+                                                frameToAddTo = FrameIO.CreateFrame(frameToAddTo.getFramesetName(), pageTitle, null);
 
                                                 try {
@@ -369 +378 @@
                                                         
                                                         // Adding thumbnail to the overview page
-                                                        Text thumb = frameset.addText(100, (int) (((((float) thumbWidth / image.getWidth()) * image.getHeight()) + 10) * pageCount.getValue()), "@i: " + out.getName() + " " + thumbWidth, null);
+                                                        Text thumb = frameset.addText((int) (thumbWidth * 1.1 * horizontalCount.getValue()) + 10,
+                                                                        (int) ((((float) thumbWidth / image.getWidth()) * image.getHeight()) * 1.1 * verticalCount.getValue()),
+                                                                        "@i: " + out.getName() + " " + thumbWidth, 
+                                                                        null);
+                                                        
                                                         thumb.setLink(frameToAddTo.getName());
                                                         thumb.setBorderColor(Color.lightGray);
@@ -392 +405 @@
 
                                                         // Button to go to the previous frame/page
-                                                        if (pageCount.getValue() > 1) {
+                                                        if (verticalCount.getValue() > 1) {
                                                                 Text previousButton = nextButton.copy();
                                                                 previousButton.setText("Previous");
@@ -642 +655 @@
         
                                 }
+
+                                horizontalCount.setValue(horizontalCount.getValue() + 1);
+                                verticalCount.setValue(0);
                         }
 
@@ -659 +675 @@
                 }
 
-                browserWidget.setOverlayVisible(false);
-
+                Platform.runLater(new Runnable() {
+
+                        @Override
+                        public void run() {             
+                                browserWidget.setOverlayVisible(false); 
+                                browserWidget.rebindWebViewSize();
+                        }
+                });
         }
 

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

@@ -33 +33 @@
 import javafx.scene.control.ProgressIndicator;
 import javafx.scene.control.TextField;
-import javafx.scene.effect.BlendMode;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.HBox;
+import javafx.scene.layout.Pane;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.StackPane;
@@ -46 +46 @@
 
 import org.expeditee.gui.DisplayIO;
+import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameMouseActions;
 import org.expeditee.gui.FreeItems;
@@ -63 +64 @@
  * @author ngw8
  * @author jts21
+ */
+/**
+ * @author ngw8
+ * 
  */
 public class JfxBrowser extends DataFrameWidget {
@@ -212 +217 @@
                         this._webView.setMaxWidth(Double.MAX_VALUE);
                         this._webView.setMaxHeight(Double.MAX_VALUE);
-                        HBox.setHgrow(this._webView, Priority.ALWAYS);
-                        VBox.setVgrow(this._webView, Priority.ALWAYS);
                         this._webEngine = this._webView.getEngine();
                         
                         this._urlProgressBar.progressProperty().bind(_webEngine.getLoadWorker().progressProperty());
 
-                        vertical.getChildren().addAll(horizontal, this._webView);
+
+                        // Pane to hold just the webview. This seems to be the only way to allow the webview to be resized to greater than its parent's
+                        // size. This also means that the webview's prefSize must be manually set when the Pane resizes, using the event handlers below
+                        Pane browserPane = new Pane();
+                        browserPane.getChildren().add(_webView);
+                        
+                        HBox.setHgrow(browserPane, Priority.ALWAYS);
+                        VBox.setVgrow(browserPane, Priority.ALWAYS);
+
+                        browserPane.widthProperty().addListener(new ChangeListener<Object>() {
+
+                                @Override
+                                public void changed(ObservableValue<?> observable, Object oldValue, Object newValue) {
+                                        JfxBrowser.this._webView.setPrefWidth((Double) newValue);
+                                }
+                        });
+
+                        browserPane.heightProperty().addListener(new ChangeListener<Object>() {
+
+                                @Override
+                                public void changed(ObservableValue<?> observable, Object oldValue, Object newValue) {
+                                        JfxBrowser.this._webView.setPrefHeight((Double) newValue);
+                                }
+                        });
+
+                        vertical.getChildren().addAll(horizontal, browserPane);
 
                         this._overlay = new StackPane();
@@ -291 +319 @@
                                 @Override
                 public void handle(ActionEvent e) {
-                    getFrameNew();
+                                        getFrameNew();
                 }
                         });
@@ -334 +362 @@
                 public void handle(MouseEvent arg0) {
                                         JfxBrowser.this._urlField.requestFocus();
-                }
+                                }
                         });
                         
@@ -774 +802 @@
         }
         
+        /**
+         * Shows/hides a message reading 'Importing page' over the widget
+         * 
+         * @param visible
+         */
         public void setOverlayVisible(final boolean visible) {
-                Platform.runLater(new Runnable() {
-
-                        @Override
-                        public void run() {
-                                JfxBrowser.this._overlay.setVisible(visible);
-                        }
-                });
-
+                this._overlay.setVisible(visible);
+        }
+
+        /**
+         * Sets the size of the webview element of the widget
+         * 
+         * @param width
+         * @param height
+         */
+        public void setWebViewSize(double width, double height) {
+                this._webView.setPrefSize(width, height);
+        }
+
+        /**
+         * Resizes the webview back to the size of its parent element
+         */
+        public void rebindWebViewSize() {
+                this._webView.getParent().resize(0, 0);
         }