Changeset 839 for trunk/src/org/expeditee/io

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.

File:

• trunk/src/org/expeditee/io/WebParser.java (modified) (8 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();
+                        }
+                });
         }